Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE #12017] Merge remote develop branch #12789

Merged

Conversation

RickonZhang0929
Copy link

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

For 12017](#12017)

Merge remote develop branch

Brief changelog

  • Merge remote develop branch

Verifying this change

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

Sunrisea and others added 30 commits July 23, 2024 16:42
…y with SPI (alibaba#12367)

* 历史配置清理逻辑SPI改造

* 添加单元测试

* 单元测试fix

* 单元测试fix

* 优化spi实现

* 优化日志打印
…alibaba#12376)

* [IT]Adjust core module auth integration tests to meet checkstyle requirements.

* [IT]Adjust config module base integration tests to meet checkstyle requirements.
* 删除console多余的@EnableScheduling

* 删除console多余的@EnableScheduling
* 修复mem计算逻辑

* 修复mem计算逻辑单测

* fix ci
* Try to fix codecov lose for PR.

* Try to fix codecov lose for PR.

* Try to fix codecov lose for PR.

* Try to fix codecov lose for PR.

* Try to fix codecov lose for PR.

* Try to fix codecov lose for PR.

* Try to fix codecov lose for PR.
…libaba#12477)

* FIX [ISSUE alibaba#12446] macInstance 补充日志

* UPDATE [ISSUE alibaba#12466] serviceMetadata environment variables config

* fixed DefaultParamChecker and DefaultParamCheckerTest codeStyle
* Remove KvStorage and ConsistencyService.

* Fix switch manager dead lock until timeout.

* Ignore env vote leader effect in IT.

* Wait leader voted before start do test case.
…libaba#12491)

* ✨Configuration type display and advanced search by type added to configuration list

* ✨Generate static files

* ✨Add license
* Fix unit test error.

* Fix unit test error.
…libaba#12502)

* FIX [ISSUE alibaba#12093] fix reset password success but no message

* [ISSUE alibaba#12093] fix reset password success but no message

* [ISSUE alibaba#12093] fix reset password success but no message

* [ISSUE alibaba#12093] fix reset password success but no message
* Fix param checker filter invalid problem.

* Add Unit test for CheckConfigurationTest
shiyiyue1102 and others added 26 commits September 18, 2024 14:12
* fix derby usage filed

* code style

* code style

* code style

* code style
* fix: upgrade upload-artifact version

* fix: upgrade upload-artifact version
…history dynamically on the front end (alibaba#12616)

* Display the number of days to retain the configuration history dynamically on the front end

* checkstyle

* Display the number of days to retain the configuration history dynamically on the front end
Bumps commons-io:commons-io from 2.7 to 2.14.0.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix:shade时,全局排除模块化描述文件,避免使用到其他依赖的描述文件

* Revert "fix:shade时,全局排除模块化描述文件,避免使用到其他依赖的描述文件"

This reverts commit 7d4603a.

* fix:shade时,全局排除模块化描述文件,避免使用到其他依赖的描述文件

* Revert "fix:shade时,全局排除模块化描述文件,避免使用到其他依赖的描述文件"

This reverts commit e1fba9c.

* fix:shade时,全局排除模块化描述文件,避免使用到其他依赖的描述文件
…#12673)

Bumps [com.google.protobuf:protobuf-java](https://github.com/protocolbuffers/protobuf) from 3.22.3 to 3.25.5.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](protocolbuffers/protobuf@v3.22.3...v3.25.5)

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* grpc invoke source control

* grpc invoke source control

* metrics controller param check enhancement

* check style and pmd
* Add unit test for sys module.

* Add unit test for sys module.

* Fix unit test.

* Make unit test more stable.

* Make unit test more stable.
…ba#12274)

* refactor: Unified Nacos Client address module code, and provide custom expansion capabilities

* refactor: Adjust the priority of endpoint and server addr

* refactor: adjust code for code review

* refactor: adjust code for code review

* refactor: adjust code for code review

* refactor: adjust code for code review

* refactor: adjust code for code review

* refactor: adjust code for code review

* refactor: add new line

* refactor: adjust code for review

* refactor: adjust code for review

* refactor: adjust code for review

* refactor: merge develop and fix test

* refactor: revert test code

* refactor: adjust for code review

* refactor: fix checkstyle
* feat: - support e2e write url to pr
      - support java auth test
      - fix cpp bug cased by mirror error

* feat: - support e2e write url to pr
      - support java auth test
      - fix cpp bug cased by mirror error

* feat: - support e2e write url to pr
      - support java auth test
      - fix cpp bug cased by mirror error
* fix: upgrade upload-artifact version

* fix: upgrade upload-artifact version

* feat: support e2e write to pr
…ger. (alibaba#12746)

* Refactor server list manager and server list provider.
And Add unit test for these classes.

* Little refactor and enhance for ConfigServerListManager and NamingServerListManager.
Add unit test for these.
* Make unit test more stable.

* update comment。

* update comment。

* change repo to alibaba/nacos.

* 尝试添加评论PR的权限。

* 尝试添加评论PR的权限。

* 尝试添加评论PR的权限。

* comment on pr action by pull_request_target.

* use github.repository variable replace repository
* Add some check in DiskUtil and add unit test.

* simply DiskUtils in control plugin.
…2764)

* Support custom client configuration timeout.(alibaba#12748)

* Add UT.(alibaba#12748
…017-ui-fix

# Conflicts:
#	console-ui/src/pages/ConfigurationManagement/ConfigurationManagement/ConfigurationManagement.js
#	console-ui/src/reducers/authority.js
Copy link

Thanks for your this PR. 🙏
Please check again for your PR changes whether contains any usage/api/configuration change such as Add new API , Add new configuration, Change default value of configuration.
If so, please add or update documents(markdown type) in docs/next/ for repository nacos-group/nacos-group.github.io


感谢您提交的PR。 🙏
请再次查看您的PR内容,确认是否包含任何使用方式/API/配置参数的变更,如:新增API新增配置参数修改默认配置等操作。
如果是,请确保在提交之前,在仓库nacos-group/nacos-group.github.io中的docs/next/目录下添加或更新文档(markdown格式)。

@RickonZhang0929 RickonZhang0929 changed the base branch from develop to summer-ospp#12017 October 28, 2024 12:21
@wuyfee
Copy link

wuyfee commented Oct 28, 2024

$\color{red}{FAILURE}$
DETAILS
✅ - docker: success
✅ - deploy (standalone & cluster & standalone_auth): success
✅ - e2e-java-test (standalone & cluster & standalone_auth): success
❌ - e2e-go-test (standalone & cluster): failure
✅ - e2e-cpp-test (standalone & cluster): success
✅ - e2e-csharp-test (standalone & cluster): success
✅ - e2e-nodejs-test (standalone & cluster): success
✅ - e2e-python-test (standalone & cluster): success
✅ - clean (standalone & cluster & standalone_auth): success

@KomachiSion KomachiSion merged commit 4fc7ec2 into alibaba:summer-ospp#12017 Oct 29, 2024
3 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.