[GitHub] [servicecomb-java-chassis] codecov-commenter commented on pull request #3569: Bump spectator-reg-servo from 1.4.2 to 1.5.1
codecov-commenter commented on PR #3569: URL: https://github.com/apache/servicecomb-java-chassis/pull/3569#issuecomment-1376836646 # [Codecov](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3569?src=pr=h1_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) Report > Merging [#3569](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3569?src=pr=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (f3d235a) into [master](https://codecov.io/gh/apache/servicecomb-java-chassis/commit/89c40062cc42a9543168120525d04e17d2f4fc37?el=desc_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) (89c4006) will **decrease** coverage by `0.01%`. > The diff coverage is `n/a`. ```diff @@ Coverage Diff @@ ## master#3569 +/- ## - Coverage 44.05% 44.04% -0.02% + Complexity 6300 6297 -3 Files 1590 1590 Lines 3993639936 Branches 3653 3653 - Hits 1759417590 -4 - Misses2098620987 +1 - Partials 1356 1359 +3 ``` | [Impacted Files](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3569?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) | Coverage Δ | | |---|---|---| | [...thentication/consumer/RSAConsumerTokenManager.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3569?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-aGFuZGxlcnMvaGFuZGxlci1wdWJsaWNrZXktYXV0aC9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2VydmljZWNvbWIvYXV0aGVudGljYXRpb24vY29uc3VtZXIvUlNBQ29uc3VtZXJUb2tlbk1hbmFnZXIuamF2YQ==) | `70.96% <0.00%> (-6.46%)` | :arrow_down: | | [...comb/core/definition/MicroserviceVersionsMeta.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3569?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-Y29yZS9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2VydmljZWNvbWIvY29yZS9kZWZpbml0aW9uL01pY3Jvc2VydmljZVZlcnNpb25zTWV0YS5qYXZh) | `96.00% <0.00%> (-4.00%)` | :arrow_down: | | [...ecomb/foundation/common/utils/SPIServiceUtils.java](https://codecov.io/gh/apache/servicecomb-java-chassis/pull/3569?src=pr=tree_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation#diff-Zm91bmRhdGlvbnMvZm91bmRhdGlvbi1zcGkvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NlcnZpY2Vjb21iL2ZvdW5kYXRpb24vY29tbW9uL3V0aWxzL1NQSVNlcnZpY2VVdGlscy5qYXZh) | `83.92% <0.00%> (-1.79%)` | :arrow_down: | :mega: We’re building smart automated test selection to slash your CI/CD build times. [Learn more](https://about.codecov.io/iterative-testing/?utm_medium=referral_source=github_content=comment_campaign=pr+comments_term=The+Apache+Software+Foundation) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] dependabot[bot] commented on pull request #3567: Bump spectator-reg-servo from 1.4.2 to 1.5.0
dependabot[bot] commented on PR #3567: URL: https://github.com/apache/servicecomb-java-chassis/pull/3567#issuecomment-1376821822 Superseded by #3569. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-java-chassis] branch dependabot/maven/com.netflix.spectator-spectator-reg-servo-1.5.1 created (now f3d235aa3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.netflix.spectator-spectator-reg-servo-1.5.1 in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git at f3d235aa3 Bump spectator-reg-servo from 1.4.2 to 1.5.1 No new revisions were added by this update.
[GitHub] [servicecomb-java-chassis] dependabot[bot] opened a new pull request, #3569: Bump spectator-reg-servo from 1.4.2 to 1.5.1
dependabot[bot] opened a new pull request, #3569: URL: https://github.com/apache/servicecomb-java-chassis/pull/3569 Bumps [spectator-reg-servo](https://github.com/Netflix/spectator) from 1.4.2 to 1.5.1. Release notes Sourced from https://github.com/Netflix/spectator/releases;>spectator-reg-servo's releases. v1.5.1 What's Changed make spark deps compileOnly by https://github.com/brharrington;>@brharrington in https://github-redirect.dependabot.com/Netflix/spectator/pull/1024;>Netflix/spectator#1024 Full Changelog: https://github.com/Netflix/spectator/compare/v1.5.0...v1.5.1;>https://github.com/Netflix/spectator/compare/v1.5.0...v1.5.1 v1.5.0 What's Changed dw metrics5 5.0.0-rc15 by https://github.com/sullis;>@sullis in https://github-redirect.dependabot.com/Netflix/spectator/pull/1011;>Netflix/spectator#1011 jmh 1.36 by https://github.com/sullis;>@sullis in https://github-redirect.dependabot.com/Netflix/spectator/pull/1012;>Netflix/spectator#1012 use custom replace for substitutions by https://github.com/brharrington;>@brharrington in https://github-redirect.dependabot.com/Netflix/spectator/pull/1013;>Netflix/spectator#1013 update benchmark for substitutions by https://github.com/brharrington;>@brharrington in https://github-redirect.dependabot.com/Netflix/spectator/pull/1014;>Netflix/spectator#1014 update dependencies by https://github.com/brharrington;>@brharrington in https://github-redirect.dependabot.com/Netflix/spectator/pull/1016;>Netflix/spectator#1016 switch spark ext to sidecar registry by https://github.com/jzhuge;>@jzhuge in https://github-redirect.dependabot.com/Netflix/spectator/pull/1018;>Netflix/spectator#1018 add helper for common tagging by https://github.com/brharrington;>@brharrington in https://github-redirect.dependabot.com/Netflix/spectator/pull/1015;>Netflix/spectator#1015 relocate spectator classes for spark ext by https://github.com/brharrington;>@brharrington in https://github-redirect.dependabot.com/Netflix/spectator/pull/1019;>Netflix/spectator#1019 reduce warning volume for sidecar registry by https://github.com/brharrington;>@brharrington in https://github-redirect.dependabot.com/Netflix/spectator/pull/1020;>Netflix/spectator#1020 include slf4j in spark shadow jar by https://github.com/brharrington;>@brharrington in https://github-redirect.dependabot.com/Netflix/spectator/pull/1021;>Netflix/spectator#1021 do not relocate spectator-api for spark jar by https://github.com/brharrington;>@brharrington in https://github-redirect.dependabot.com/Netflix/spectator/pull/1022;>Netflix/spectator#1022 do not shade slf4j in spark jar by https://github.com/brharrington;>@brharrington in https://github-redirect.dependabot.com/Netflix/spectator/pull/1023;>Netflix/spectator#1023 Full Changelog: https://github.com/Netflix/spectator/compare/v1.4.2...v1.5.0;>https://github.com/Netflix/spectator/compare/v1.4.2...v1.5.0 Commits https://github.com/Netflix/spectator/commit/47860c4d7d5195bea1fa5a82eecbf35217fcf2ac;>47860c4 make spark deps compileOnly (https://github-redirect.dependabot.com/Netflix/spectator/issues/1024;>#1024) https://github.com/Netflix/spectator/commit/b6576fdccfa5befb3e3ae5097ae99385e18f3caa;>b6576fd do not shade slf4j in spark jar (https://github-redirect.dependabot.com/Netflix/spectator/issues/1023;>#1023) https://github.com/Netflix/spectator/commit/9fce0dbde3d78f790717457ceacc500c002b4641;>9fce0db do not relocate spectator-api for spark jar (https://github-redirect.dependabot.com/Netflix/spectator/issues/1022;>#1022) https://github.com/Netflix/spectator/commit/bda3c908dd45ac0d35320704ab7307a421aaa70b;>bda3c90 include slf4j in spark shadow jar (https://github-redirect.dependabot.com/Netflix/spectator/issues/1021;>#1021) https://github.com/Netflix/spectator/commit/3269b9a7968b353f7bea226b16141fef583e5de8;>3269b9a reduce warning volume for sidecar registry (https://github-redirect.dependabot.com/Netflix/spectator/issues/1020;>#1020) https://github.com/Netflix/spectator/commit/edb88f636466d1f626bc95e85e2673c0b8ca7134;>edb88f6 relocate spectator classes for spark ext (https://github-redirect.dependabot.com/Netflix/spectator/issues/1019;>#1019) https://github.com/Netflix/spectator/commit/69e7582b168b99a30a8b29a3b1b45c3112056874;>69e7582 add helper for common tagging (https://github-redirect.dependabot.com/Netflix/spectator/issues/1015;>#1015) https://github.com/Netflix/spectator/commit/b7afac8debd33c3abb257d73d934b55004c9a630;>b7afac8 switch spark ext to sidecar registry (https://github-redirect.dependabot.com/Netflix/spectator/issues/1018;>#1018) https://github.com/Netflix/spectator/commit/a3c5ef43b90f0fd025b8b385f9c75c0e756b3c12;>a3c5ef4 update dependencies (https://github-redirect.dependabot.com/Netflix/spectator/issues/1016;>#1016)
[GitHub] [servicecomb-java-chassis] dependabot[bot] closed pull request #3567: Bump spectator-reg-servo from 1.4.2 to 1.5.0
dependabot[bot] closed pull request #3567: Bump spectator-reg-servo from 1.4.2 to 1.5.0 URL: https://github.com/apache/servicecomb-java-chassis/pull/3567 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-java-chassis] lbc97 commented on issue #3565: Apache
lbc97 commented on issue #3565: URL: https://github.com/apache/servicecomb-java-chassis/issues/3565#issuecomment-1376804292 https://servicecomb.apache.org/cn/docs/products/java-chassis/quick-start/ https://servicecomb.apache.org/references/java-chassis/zh_CN/featured-topics/application-bmi.html https://servicecomb.apache.org/cn/docs/products/java-chassis/distributed-tracing/ -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-service-center] branch dependabot/npm_and_yarn/ux/loader-utils-and-angular-devkit/build-angular-3.2.1 updated (05f82243 -> 09cfc704)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/ux/loader-utils-and-angular-devkit/build-angular-3.2.1 in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git discard 05f82243 Bump loader-utils and @angular-devkit/build-angular in /ux add 11844f2a Bump github.com/labstack/echo/v4 from 4.7.2 to 4.9.0 (#1343) add f11564bd Bump ansi-regex, ansi-regex and ansi-regex in /ux (#1346) add 09cfc704 Bump loader-utils and @angular-devkit/build-angular in /ux This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (05f82243) \ N -- N -- N refs/heads/dependabot/npm_and_yarn/ux/loader-utils-and-angular-devkit/build-angular-3.2.1 (09cfc704) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: go.mod | 2 +- go.sum | 4 ++-- ux/package-lock.json | 30 +++--- 3 files changed, 18 insertions(+), 18 deletions(-)
[servicecomb-service-center] branch dependabot/npm_and_yarn/ux/loader-utils-and-angular-devkit/build-angular-3.2.1 updated (166e7123 -> 05f82243)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch
dependabot/npm_and_yarn/ux/loader-utils-and-angular-devkit/build-angular-3.2.1
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
omit 166e7123 Bump loader-utils and @angular-devkit/build-angular in /ux
add bffb6ac0 feature: servicecomb turbo (#1331)
add bd25fc1e bugfix: return 'no permission' when discover provider in
specify env (#1370)
add 2d48e69f Bump json5 from 1.0.1 to 1.0.2 in /ux (#1369)
add 36be1317 Bump qs from 6.5.2 to 6.5.3 in /ux (#1364)
add 05f82243 Bump loader-utils and @angular-devkit/build-angular in /ux
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (166e7123)
\
N -- N -- N
refs/heads/dependabot/npm_and_yarn/ux/loader-utils-and-angular-devkit/build-angular-3.2.1
(05f82243)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
benchmark/{READM.md => README.md} |0
..._1000_intance.js => find_1000_intance_turbo.js} |2 +-
...nd_100_intance.js => find_100_intance_turbo.js} |2 +-
...nd_one_intance.js => find_one_intance_turbo.js} |2 +-
cmd/scserver/main.go |9 +-
docs/user-guides/turbo.md | 34 +-
go.mod | 41 +-
go.sum | 85 +-
pkg/rest/fiber.go | 78 ++
pkg/util/context.go|9 +
pkg/util/sys.go|2 +-
server/api_server.go |8 +-
server/core/core.go| 12 +
.../errortypes.go => server/middleware/context.go | 16 +-
server/{handler/context => middleware}/v4.go | 18 +-
server/plugin/auth/buildin/parser_test.go |6 +-
server/plugin/auth/buildin/service_parser.go | 24 +-
server/plugin/auth/buildin/service_parser_test.go | 123 +++
server/plugin/sonic.go | 42 -
server/resource/disco/instance_resource.go |8 +-
server/resource/disco/instance_resource_fiber.go | 102 ++
server/rest/controller/v3/instance_controller.go |2 +-
server/server.go | 55 +-
server/service/disco/instance.go |1 +
syncer/config/config.go|2 +-
syncer/init/init.go| 54 --
syncer/server/server.go| 11 +-
syncer/service/sync/sync.go| 19 +-
test/test.go |1 -
ux/package-lock.json | 1019 +++-
ux/package.json|2 +-
31 files changed, 1090 insertions(+), 699 deletions(-)
rename benchmark/{READM.md => README.md} (100%)
copy benchmark/find/{find_1000_intance.js => find_1000_intance_turbo.js} (96%)
copy benchmark/find/{find_100_intance.js => find_100_intance_turbo.js} (96%)
copy benchmark/find/{find_one_intance.js => find_one_intance_turbo.js} (95%)
create mode 100644 pkg/rest/fiber.go
copy datasource/mongo/dao/errortypes.go => server/middleware/context.go (84%)
copy server/{handler/context => middleware}/v4.go (78%)
create mode 100644 server/plugin/auth/buildin/service_parser_test.go
delete mode 100644 server/plugin/sonic.go
create mode 100644 server/resource/disco/instance_resource_fiber.go
delete mode 100644 syncer/init/init.go
[servicecomb-service-center] branch master updated: Bump ansi-regex, ansi-regex and ansi-regex in /ux (#1346)
This is an automated email from the ASF dual-hosted git repository.
tianxiaoliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
The following commit(s) were added to refs/heads/master by this push:
new f11564bd Bump ansi-regex, ansi-regex and ansi-regex in /ux (#1346)
f11564bd is described below
commit f11564bd8b51b8ef9c5c867a7bb807bd6431b37d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Jan 10 09:14:22 2023 +0800
Bump ansi-regex, ansi-regex and ansi-regex in /ux (#1346)
Bumps [ansi-regex](https://github.com/chalk/ansi-regex),
[ansi-regex](https://github.com/chalk/ansi-regex) and
[ansi-regex](https://github.com/chalk/ansi-regex). These dependencies needed to
be updated together.
Updates `ansi-regex` from 5.0.0 to 5.0.1
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1)
Updates `ansi-regex` from 4.1.0 to 5.0.1
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1)
Updates `ansi-regex` from 3.0.0 to 5.0.1
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1)
---
updated-dependencies:
- dependency-name: ansi-regex
dependency-type: indirect
- dependency-name: ansi-regex
dependency-type: indirect
- dependency-name: ansi-regex
dependency-type: indirect
...
Signed-off-by: dependabot[bot]
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
ux/package-lock.json | 50 +-
1 file changed, 25 insertions(+), 25 deletions(-)
diff --git a/ux/package-lock.json b/ux/package-lock.json
index f8485790..b033cbec 100644
--- a/ux/package-lock.json
+++ b/ux/package-lock.json
@@ -2318,9 +2318,9 @@
"dev": true
},
"ansi-regex": {
- "version": "5.0.0",
- "resolved":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz;,
- "integrity":
"sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "version": "5.0.1",
+ "resolved":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz;,
+ "integrity":
"sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
"dev": true
},
"ansi-styles": {
@@ -3289,9 +3289,9 @@
},
"dependencies": {
"ansi-regex": {
- "version": "4.1.0",
- "resolved":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz;,
- "integrity":
"sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+ "version": "4.1.1",
+ "resolved":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz;,
+ "integrity":
"sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
"dev": true
},
"emoji-regex": {
@@ -5986,7 +5986,7 @@
"ansi-regex": {
"version": "2.1.1",
"resolved":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz;,
- "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+ "integrity":
"sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
"dev": true
},
"is-fullwidth-code-point": {
@@ -6157,7 +6157,7 @@
"ansi-regex": {
"version": "2.1.1",
"resolved":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz;,
- "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+ "integrity":
"sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
"dev": true
}
}
@@ -10711,7 +10711,7 @@
"ansi-regex": {
"version": "2.1.1",
"resolved":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz;,
- "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+ "integrity":
"sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==",
"dev": true
},
"ansi-styles": {
@@ -10760,9 +10760,9 @@
},
"dependencies": {
"ansi-regex": {
- "version": "5.0.0",
- "resolved":
"https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz;,
- "integrity":
"sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+ "version": "5.0.1",
+ "resolved":
[GitHub] [servicecomb-service-center] tianxiaoliang merged pull request #1346: Bump ansi-regex, ansi-regex and ansi-regex in /ux
tianxiaoliang merged PR #1346: URL: https://github.com/apache/servicecomb-service-center/pull/1346 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-service-center] branch master updated: Bump github.com/labstack/echo/v4 from 4.7.2 to 4.9.0 (#1343)
This is an automated email from the ASF dual-hosted git repository. tianxiaoliang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git The following commit(s) were added to refs/heads/master by this push: new 11844f2a Bump github.com/labstack/echo/v4 from 4.7.2 to 4.9.0 (#1343) 11844f2a is described below commit 11844f2a053a1bca4737102b4a0834c1cbca1040 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jan 10 09:13:53 2023 +0800 Bump github.com/labstack/echo/v4 from 4.7.2 to 4.9.0 (#1343) Bumps [github.com/labstack/echo/v4](https://github.com/labstack/echo) from 4.7.2 to 4.9.0. - [Release notes](https://github.com/labstack/echo/releases) - [Changelog](https://github.com/labstack/echo/blob/master/CHANGELOG.md) - [Commits](https://github.com/labstack/echo/compare/v4.7.2...v4.9.0) --- updated-dependencies: - dependency-name: github.com/labstack/echo/v4 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index eeb09e24..39f56cdc 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( github.com/iancoleman/strcase v0.2.0 github.com/jinzhu/copier v0.3.5 github.com/karlseguin/ccache v2.0.3-0.20170217060820-3ba9789cfd2c+incompatible - github.com/labstack/echo/v4 v4.7.2 + github.com/labstack/echo/v4 v4.9.0 github.com/little-cui/etcdadpt v0.4.0 github.com/olekukonko/tablewriter v0.0.5 github.com/onsi/ginkgo v1.15.0 diff --git a/go.sum b/go.sum index d5d4bfef..1a5884bc 100644 --- a/go.sum +++ b/go.sum @@ -565,8 +565,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/labstack/echo/v4 v4.7.2 h1:Kv2/p8OaQ+M6Ex4eGimg9b9e6icoxA42JSlOR3msKtI= -github.com/labstack/echo/v4 v4.7.2/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks= +github.com/labstack/echo/v4 v4.9.0 h1:wPOF1CE6gvt/kmbMR4dGzWvHMPT+sAEUJOwOTtvITVY= +github.com/labstack/echo/v4 v4.9.0/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks= github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o= github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
[GitHub] [servicecomb-service-center] tianxiaoliang merged pull request #1343: Bump github.com/labstack/echo/v4 from 4.7.2 to 4.9.0
tianxiaoliang merged PR #1343: URL: https://github.com/apache/servicecomb-service-center/pull/1343 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-service-center] branch dependabot/go_modules/istio/examples/consumer-provider/github.com/gogo/protobuf-1.3.2 created (now f8ecffd2)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/istio/examples/consumer-provider/github.com/gogo/protobuf-1.3.2 in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git at f8ecffd2 Bump github.com/gogo/protobuf in /istio/examples/consumer-provider No new revisions were added by this update.
[GitHub] [servicecomb-service-center] dependabot[bot] opened a new pull request, #1371: Bump github.com/gogo/protobuf from 1.3.1 to 1.3.2 in /istio/examples/consumer-provider
dependabot[bot] opened a new pull request, #1371: URL: https://github.com/apache/servicecomb-service-center/pull/1371 Bumps [github.com/gogo/protobuf](https://github.com/gogo/protobuf) from 1.3.1 to 1.3.2. Release notes Sourced from https://github.com/gogo/protobuf/releases;>github.com/gogo/protobuf's releases. Release v.1.3.2 Tested versions: go 1.15.6 protoc 3.14.0 Bug fixes: skippy peanut butter Commits https://github.com/gogo/protobuf/commit/b03c65ea87cdc3521ede29f62fe3ce239267c1bc;>b03c65e skippy peanut butter https://github.com/gogo/protobuf/commit/550e88954e617545f49920b752c154d72abf1d8d;>550e889 update to go version 1.15.6 and protoc 3.14.0 (https://github-redirect.dependabot.com/gogo/protobuf/issues/717;>#717) https://github.com/gogo/protobuf/commit/deb6fe8ca7c6d06584bfbd40ca407bf69d9fd2aa;>deb6fe8 Update Readme.md See full diff in https://github.com/gogo/protobuf/compare/v1.3.1...v1.3.2;>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) - `@dependabot use these labels` will set the current labels as the default for future PRs for this repo and language - `@dependabot use these reviewers` will set the current reviewers as the default for future PRs for this repo and language - `@dependabot use these assignees` will set the current assignees as the default for future PRs for this repo and language - `@dependabot use this milestone` will set the current milestone as the default for future PRs for this repo and language You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/apache/servicecomb-service-center/network/alerts). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-service-center] dependabot[bot] closed pull request #1368: Bump json5 and @angular-devkit/build-angular in /ux
dependabot[bot] closed pull request #1368: Bump json5 and @angular-devkit/build-angular in /ux URL: https://github.com/apache/servicecomb-service-center/pull/1368 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [servicecomb-service-center] dependabot[bot] commented on pull request #1368: Bump json5 and @angular-devkit/build-angular in /ux
dependabot[bot] commented on PR #1368: URL: https://github.com/apache/servicecomb-service-center/pull/1368#issuecomment-1376583227 Looks like these dependencies are up-to-date now, so this is no longer needed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-service-center] branch master updated: Bump qs from 6.5.2 to 6.5.3 in /ux (#1364)
This is an automated email from the ASF dual-hosted git repository.
tianxiaoliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
The following commit(s) were added to refs/heads/master by this push:
new 36be1317 Bump qs from 6.5.2 to 6.5.3 in /ux (#1364)
36be1317 is described below
commit 36be1317205f764781ce8728c08d98045f936d83
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Jan 10 09:12:22 2023 +0800
Bump qs from 6.5.2 to 6.5.3 in /ux (#1364)
Bumps [qs](https://github.com/ljharb/qs) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.5.2...v6.5.3)
---
updated-dependencies:
- dependency-name: qs
dependency-type: indirect
...
Signed-off-by: dependabot[bot]
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
ux/package-lock.json | 31 +++
1 file changed, 11 insertions(+), 20 deletions(-)
diff --git a/ux/package-lock.json b/ux/package-lock.json
index db3c64b1..f8485790 100644
--- a/ux/package-lock.json
+++ b/ux/package-lock.json
@@ -5409,15 +5409,6 @@
"ipaddr.js": "1.9.1"
}
},
-"qs": {
- "version": "6.11.0",
- "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz;,
- "integrity":
"sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
- "dev": true,
- "requires": {
-"side-channel": "^1.0.4"
- }
-},
"raw-body": {
"version": "2.5.1",
"resolved":
"https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz;,
@@ -11082,6 +11073,14 @@
"integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=",
"dev": true
},
+"qs": {
+ "version": "6.11.0",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz;,
+ "integrity":
"sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+ "requires": {
+"side-channel": "^1.0.4"
+ }
+},
"querystring": {
"version": "0.2.0",
"resolved":
"https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz;,
@@ -11496,9 +11495,9 @@
},
"dependencies": {
"qs": {
- "version": "6.5.2",
- "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz;,
- "integrity":
"sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+ "version": "6.5.3",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz;,
+ "integrity":
"sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
"dev": true
}
}
@@ -13038,14 +13037,6 @@
"version": "5.0.0",
"resolved":
"https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz;,
"integrity":
"sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
-},
-"qs": {
- "version": "6.10.3",
- "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz;,
- "integrity":
"sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==",
- "requires": {
-"side-channel": "^1.0.4"
- }
}
}
},
[GitHub] [servicecomb-service-center] tianxiaoliang merged pull request #1364: Bump qs from 6.5.2 to 6.5.3 in /ux
tianxiaoliang merged PR #1364: URL: https://github.com/apache/servicecomb-service-center/pull/1364 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-service-center] branch master updated: Bump json5 from 1.0.1 to 1.0.2 in /ux (#1369)
This is an automated email from the ASF dual-hosted git repository.
tianxiaoliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
The following commit(s) were added to refs/heads/master by this push:
new 2d48e69f Bump json5 from 1.0.1 to 1.0.2 in /ux (#1369)
2d48e69f is described below
commit 2d48e69f2be9f014a8722cf9dd609f3f3b78434f
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Jan 10 09:11:49 2023 +0800
Bump json5 from 1.0.1 to 1.0.2 in /ux (#1369)
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)
---
updated-dependencies:
- dependency-name: json5
dependency-type: indirect
...
Signed-off-by: dependabot[bot]
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
ux/package-lock.json | 35 ---
1 file changed, 16 insertions(+), 19 deletions(-)
diff --git a/ux/package-lock.json b/ux/package-lock.json
index 0b42b762..db3c64b1 100644
--- a/ux/package-lock.json
+++ b/ux/package-lock.json
@@ -2635,9 +2635,9 @@
},
"dependencies": {
"json5": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz;,
- "integrity":
"sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz;,
+ "integrity":
"sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
"dev": true,
"requires": {
"minimist": "^1.2.0"
@@ -7398,13 +7398,10 @@
"dev": true
},
"json5": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz;,
- "integrity":
"sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
- "dev": true,
- "requires": {
-"minimist": "^1.2.5"
- }
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz;,
+ "integrity":
"sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+ "dev": true
},
"jsonc-parser": {
"version": "3.0.0",
@@ -11590,9 +11587,9 @@
"dev": true
},
"json5": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz;,
- "integrity":
"sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz;,
+ "integrity":
"sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
"dev": true,
"requires": {
"minimist": "^1.2.0"
@@ -14291,9 +14288,9 @@
"dev": true
},
"json5": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz;,
- "integrity":
"sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz;,
+ "integrity":
"sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
"dev": true,
"requires": {
"minimist": "^1.2.0"
@@ -15075,9 +15072,9 @@
},
"dependencies": {
"json5": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz;,
- "integrity":
"sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz;,
+ "integrity":
"sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
"dev": true,
"requires": {
"minimist": "^1.2.0"
[GitHub] [servicecomb-service-center] tianxiaoliang merged pull request #1369: Bump json5 from 1.0.1 to 1.0.2 in /ux
tianxiaoliang merged PR #1369: URL: https://github.com/apache/servicecomb-service-center/pull/1369 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-service-center] branch master updated: bugfix: return 'no permission' when discover provider in specify env (#1370)
This is an automated email from the ASF dual-hosted git repository.
tianxiaoliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
The following commit(s) were added to refs/heads/master by this push:
new bd25fc1e bugfix: return 'no permission' when discover provider in
specify env (#1370)
bd25fc1e is described below
commit bd25fc1e877a1f318763c3ca01428e30382f8203
Author: little-cui
AuthorDate: Tue Jan 10 09:11:24 2023 +0800
bugfix: return 'no permission' when discover provider in specify env (#1370)
---
server/plugin/auth/buildin/parser_test.go | 6 +-
server/plugin/auth/buildin/service_parser.go | 24 -
server/plugin/auth/buildin/service_parser_test.go | 123 ++
3 files changed, 149 insertions(+), 4 deletions(-)
diff --git a/server/plugin/auth/buildin/parser_test.go
b/server/plugin/auth/buildin/parser_test.go
index 0341fc54..eff630eb 100644
--- a/server/plugin/auth/buildin/parser_test.go
+++ b/server/plugin/auth/buildin/parser_test.go
@@ -18,18 +18,18 @@
package buildin_test
import (
- discosvc
"github.com/apache/servicecomb-service-center/server/service/disco"
- _ "github.com/apache/servicecomb-service-center/test"
-
"context"
"net/http"
"strings"
"testing"
+ _ "github.com/apache/servicecomb-service-center/test"
+
"github.com/apache/servicecomb-service-center/pkg/rest"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/plugin/auth"
"github.com/apache/servicecomb-service-center/server/plugin/auth/buildin"
+ discosvc
"github.com/apache/servicecomb-service-center/server/service/disco"
rbacsvc
"github.com/apache/servicecomb-service-center/server/service/rbac"
"github.com/go-chassis/cari/discovery"
"github.com/stretchr/testify/assert"
diff --git a/server/plugin/auth/buildin/service_parser.go
b/server/plugin/auth/buildin/service_parser.go
index b9c68c31..ebe99a96 100644
--- a/server/plugin/auth/buildin/service_parser.go
+++ b/server/plugin/auth/buildin/service_parser.go
@@ -37,6 +37,7 @@ const (
LabelAppID = "appId"
LabelServiceName = "serviceName"
QueryEnv = "env"
+ HeaderConsumerID = "X-ConsumerId"
)
var (
@@ -126,10 +127,15 @@ func ByServiceKey(r *http.Request) (*auth.ResourceScope,
error) {
return nil, ErrCtxMatchPatternNotFound
}
+ env, err := fromServiceKeyEnv(r, query.Get(QueryEnv))
+ if err != nil {
+ return nil, err
+ }
+
return {
Type: rbacmodel.GetResource(apiPath),
Labels: []map[string]string{{
- LabelEnvironment: query.Get(QueryEnv),
+ LabelEnvironment: env,
LabelAppID: query.Get(LabelAppID),
LabelServiceName: query.Get(LabelServiceName),
}},
@@ -137,6 +143,22 @@ func ByServiceKey(r *http.Request) (*auth.ResourceScope,
error) {
}, nil
}
+func fromServiceKeyEnv(r *http.Request, queryEnv string) (string, error) {
+ env := queryEnv
+ if len(env) > 0 {
+ return env, nil
+ }
+ consumerID := r.Header.Get(HeaderConsumerID)
+ if len(consumerID) != 0 {
+ service, err :=
datasource.GetMetadataManager().GetService(r.Context(),
{ServiceId: consumerID})
+ if err != nil {
+ return "", err
+ }
+ env = service.Environment
+ }
+ return env, nil
+}
+
func ByRequestBody(r *http.Request) (*auth.ResourceScope, error) {
if r.Method == http.MethodGet {
// get or list by query string
diff --git a/server/plugin/auth/buildin/service_parser_test.go
b/server/plugin/auth/buildin/service_parser_test.go
new file mode 100644
index ..44311c0e
--- /dev/null
+++ b/server/plugin/auth/buildin/service_parser_test.go
@@ -0,0 +1,123 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package buildin_test
+
+import (
+ "context"
+
[GitHub] [servicecomb-service-center] tianxiaoliang merged pull request #1370: bugfix: return 'no permission' when discover provider in specify env
tianxiaoliang merged PR #1370: URL: https://github.com/apache/servicecomb-service-center/pull/1370 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-service-center] branch nzx created (now 31c14443)
This is an automated email from the ASF dual-hosted git repository. littlecui pushed a change to branch nzx in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git at 31c14443 用于双集群引擎同步debug-v4 (#1358) This branch includes the following new commits: new 31c14443 用于双集群引擎同步debug-v4 (#1358) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[servicecomb-service-center] 01/01: 用于双集群引擎同步debug-v4 (#1358)
This is an automated email from the ASF dual-hosted git repository.
littlecui pushed a commit to branch nzx
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
commit 31c144435da130eb074f3ba1ea2573257c0593be
Author: kkf1 <46839758+k...@users.noreply.github.com>
AuthorDate: Tue Nov 8 23:18:01 2022 +0800
用于双集群引擎同步debug-v4 (#1358)
* 用于双集群引擎同步debug-v3
* 用于双集群引擎同步debug-v4
---
syncer/service/task/manager.go | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/syncer/service/task/manager.go b/syncer/service/task/manager.go
index 93e9d099..867d8ca4 100644
--- a/syncer/service/task/manager.go
+++ b/syncer/service/task/manager.go
@@ -185,18 +185,25 @@ func (m *manager) ListTasks(ctx context.Context)
([]*carisync.Task, error) {
noHandleTasks := make([]*carisync.Task, 0, len(tasks))
skipTaskIDs := make([]string, 0, len(tasks))
+ allTaskIDs := make(map[string]bool)
for _, t := range tasks {
log.Info(fmt.Sprintf("list task id: %v", t.ID))
+ allTaskIDs[t.ID] = true
_, ok := m.cache.Load(t.ID)
if ok {
skipTaskIDs = append(skipTaskIDs, t.ID)
continue
}
m.cache.Store(t.ID, t)
-
noHandleTasks = append(noHandleTasks, t)
log.Info(fmt.Sprintf("no handle task id: %v", t.ID))
}
+ m.cache.Range(func(key, value any) bool {
+ if _, ok := allTaskIDs[key.(string)]; !ok {
+ m.cache.Delete(key)
+ }
+ return true
+ })
log.Info(fmt.Sprintf("load task raw count %d, to handle count %d, skip
ids %v",
len(tasks), len(noHandleTasks), skipTaskIDs))
@@ -274,8 +281,6 @@ func (m *manager) handleResult(res *event.Result) {
log.Error("delete task failed", err)
}
}
-
- m.cache.Delete(res.ID)
}
func (m *manager) handleTasks(sts syncTasks) {
[servicecomb-service-center] branch mod updated (873f6a3d -> 0e2fa607)
This is an automated email from the ASF dual-hosted git repository. littlecui pushed a change to branch mod in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git discard 873f6a3d return 'no permission' when discover provider in specify env add 0e2fa607 bugfix: return 'no permission' when discover provider in specify env This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (873f6a3d) \ N -- N -- N refs/heads/mod (0e2fa607) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: server/plugin/auth/buildin/service_parser.go | 7 +-- server/plugin/auth/buildin/service_parser_test.go | 24 +++ 2 files changed, 29 insertions(+), 2 deletions(-)
[GitHub] [servicecomb-service-center] little-cui opened a new pull request, #1370: return 'no permission' when discover provider in specify env
little-cui opened a new pull request, #1370: URL: https://github.com/apache/servicecomb-service-center/pull/1370 Follow this checklist to help us incorporate your contribution quickly and easily: - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/SCB) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] Format the pull request title like `[SCB-XXX] Fixes bug in ApproximateQuantiles`, where you replace `SCB-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `go build` `go test` `go fmt` `go vet` to make sure basic checks pass. A more thorough check will be performed on your pull request automatically. - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf). - [ ] Never comment source code, delete it. - [ ] UT should has "context, subject, expected result" result as test case name, when you call t.Run(). --- -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[servicecomb-service-center] 01/01: return 'no permission' when discover provider in specify env
This is an automated email from the ASF dual-hosted git repository.
littlecui pushed a commit to branch mod
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
commit 873f6a3db4c89c7cb04b1918c3499949eccb8344
Author: little-cui
AuthorDate: Mon Jan 9 12:05:01 2023 +0800
return 'no permission' when discover provider in specify env
---
server/plugin/auth/buildin/parser_test.go | 6 +-
server/plugin/auth/buildin/service_parser.go | 21 -
server/plugin/auth/buildin/service_parser_test.go | 99 +++
3 files changed, 122 insertions(+), 4 deletions(-)
diff --git a/server/plugin/auth/buildin/parser_test.go
b/server/plugin/auth/buildin/parser_test.go
index 0341fc54..eff630eb 100644
--- a/server/plugin/auth/buildin/parser_test.go
+++ b/server/plugin/auth/buildin/parser_test.go
@@ -18,18 +18,18 @@
package buildin_test
import (
- discosvc
"github.com/apache/servicecomb-service-center/server/service/disco"
- _ "github.com/apache/servicecomb-service-center/test"
-
"context"
"net/http"
"strings"
"testing"
+ _ "github.com/apache/servicecomb-service-center/test"
+
"github.com/apache/servicecomb-service-center/pkg/rest"
"github.com/apache/servicecomb-service-center/pkg/util"
"github.com/apache/servicecomb-service-center/server/plugin/auth"
"github.com/apache/servicecomb-service-center/server/plugin/auth/buildin"
+ discosvc
"github.com/apache/servicecomb-service-center/server/service/disco"
rbacsvc
"github.com/apache/servicecomb-service-center/server/service/rbac"
"github.com/go-chassis/cari/discovery"
"github.com/stretchr/testify/assert"
diff --git a/server/plugin/auth/buildin/service_parser.go
b/server/plugin/auth/buildin/service_parser.go
index b9c68c31..66c730a8 100644
--- a/server/plugin/auth/buildin/service_parser.go
+++ b/server/plugin/auth/buildin/service_parser.go
@@ -37,6 +37,7 @@ const (
LabelAppID = "appId"
LabelServiceName = "serviceName"
QueryEnv = "env"
+ HeaderConsumerID = "X-ConsumerId"
)
var (
@@ -126,10 +127,15 @@ func ByServiceKey(r *http.Request) (*auth.ResourceScope,
error) {
return nil, ErrCtxMatchPatternNotFound
}
+ env, err := fromServiceKeyEnv(r, query.Get(QueryEnv))
+ if err != nil {
+ return nil, err
+ }
+
return {
Type: rbacmodel.GetResource(apiPath),
Labels: []map[string]string{{
- LabelEnvironment: query.Get(QueryEnv),
+ LabelEnvironment: env,
LabelAppID: query.Get(LabelAppID),
LabelServiceName: query.Get(LabelServiceName),
}},
@@ -137,6 +143,19 @@ func ByServiceKey(r *http.Request) (*auth.ResourceScope,
error) {
}, nil
}
+func fromServiceKeyEnv(r *http.Request, def string) (string, error) {
+ env := def
+ consumerID := r.Header.Get(HeaderConsumerID)
+ if len(consumerID) != 0 {
+ service, err :=
datasource.GetMetadataManager().GetService(r.Context(),
{ServiceId: consumerID})
+ if err != nil {
+ return "", err
+ }
+ env = service.Environment
+ }
+ return env, nil
+}
+
func ByRequestBody(r *http.Request) (*auth.ResourceScope, error) {
if r.Method == http.MethodGet {
// get or list by query string
diff --git a/server/plugin/auth/buildin/service_parser_test.go
b/server/plugin/auth/buildin/service_parser_test.go
new file mode 100644
index ..943fd030
--- /dev/null
+++ b/server/plugin/auth/buildin/service_parser_test.go
@@ -0,0 +1,99 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package buildin_test
+
+import (
+ "context"
+ "net/http"
+ "testing"
+
+ "github.com/apache/servicecomb-service-center/pkg/rest"
+
"github.com/apache/servicecomb-service-center/server/plugin/auth/buildin"
+ discosvc
"github.com/apache/servicecomb-service-center/server/service/disco"
+ rbacsvc
[servicecomb-service-center] branch mod created (now 873f6a3d)
This is an automated email from the ASF dual-hosted git repository. littlecui pushed a change to branch mod in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git at 873f6a3d return 'no permission' when discover provider in specify env This branch includes the following new commits: new 873f6a3d return 'no permission' when discover provider in specify env The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[servicecomb-java-chassis] branch 2.8.x updated: [SCB-2751] continueFailure is always validate when setting below zero or zero, cause errorPercentage can not be used (#3563)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch 2.8.x
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/2.8.x by this push:
new ca12e8f9a [SCB-2751] continueFailure is always validate when setting
below zero or zero, cause errorPercentage can not be used (#3563)
ca12e8f9a is described below
commit ca12e8f9af4198e154ce27b3468d780af431d152
Author: Cheng YouLing <97039406+chengyoul...@users.noreply.github.com>
AuthorDate: Mon Jan 9 17:04:01 2023 +0800
[SCB-2751] continueFailure is always validate when setting below zero or
zero, cause errorPercentage can not be used (#3563)
---
.../main/java/org/apache/servicecomb/loadbalance/Configuration.java | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git
a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/Configuration.java
b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/Configuration.java
index d4ea2e661..9becdbc14 100644
---
a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/Configuration.java
+++
b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/Configuration.java
@@ -213,11 +213,7 @@ public final class Configuration {
ROOT + microservice + "." + FILTER_ISOLATION + threshold,
ROOT + FILTER_ISOLATION + threshold);
try {
- int result = Integer.parseInt(p);
- if (result > 0) {
-return result;
- }
- return defaultValue;
+ return Integer.parseInt(p);
} catch (NumberFormatException e) {
return defaultValue;
}
[GitHub] [servicecomb-java-chassis] liubao68 merged pull request #3563: [SCB-2751] continueFailure is always validate when setting below zero…
liubao68 merged PR #3563: URL: https://github.com/apache/servicecomb-java-chassis/pull/3563 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@servicecomb.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
