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.

Sign up for GitHub

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

Jump to bottom

Spring Cloud Azure App Configuration 4.0 #33337

Merged
merged 41 commits into from
Feb 15, 2023
Merged

Spring Cloud Azure App Configuration 4.0 #33337

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
84f5744
Moving Spring Provider to the Spring folder
mrm9084 Feb 6, 2023
cebd01c
Fixing name in external places and updating RevApi
mrm9084 Feb 6, 2023
a8751c9
Removing Dynamic Features as it might not be part of the 4.0
mrm9084 Feb 6, 2023
c612103
Fixing Dependencies, and Dynamic Web
mrm9084 Feb 6, 2023
c7bbe41
Updating Readmes and dependencies
mrm9084 Feb 6, 2023
92df7f4
Fixing Links
mrm9084 Feb 7, 2023
37ecab2
Updated Test Project
mrm9084 Feb 7, 2023
3da321c
Fixing names
mrm9084 Feb 7, 2023
2f4e17a
Code Review Comments + Fix to Feature FIlters
mrm9084 Feb 7, 2023
07cf876
Removing Extra dependency
mrm9084 Feb 8, 2023
f390a75
Merge branch 'main' into 4.0Merge
mrm9084 Feb 8, 2023
563a791
Fixing Dependencies
mrm9084 Feb 8, 2023
3005fa0
Trying to fix pom files
mrm9084 Feb 8, 2023
bcf34f1
Small code review changes. Updated Java Docs, changed a few names. Re…
mrm9084 Feb 9, 2023
51b0d77
updating AppConfigurationKeyVaultClientFactory bean name
mrm9084 Feb 9, 2023
a5d1576
Fixing Provider Properties
mrm9084 Feb 9, 2023
910a38b
Removing extra annotation
mrm9084 Feb 9, 2023
fc2b405
Fixing Property validation
mrm9084 Feb 10, 2023
5738881
Fixing integration tests
mrm9084 Feb 10, 2023
4c700f3
Cleaning up unused @Component s
mrm9084 Feb 10, 2023
4d2e66b
Removing Feature Flag Components
mrm9084 Feb 10, 2023
5dcbfc0
Updating Feature Handler
mrm9084 Feb 10, 2023
2bd2072
Removing unneeded @Component
mrm9084 Feb 10, 2023
69fdc5f
Fixing Pipeline
mrm9084 Feb 10, 2023
6bc7c94
Few renames
mrm9084 Feb 10, 2023
a7ef855
Fixing Auto Configuration and revapi
mrm9084 Feb 13, 2023
187e963
Merge branch 'main' into 4.0Merge
mrm9084 Feb 13, 2023
cfa2b82
Updating RevApi
mrm9084 Feb 13, 2023
a906752
Fixing AutoConfiguration
mrm9084 Feb 13, 2023
5fd7627
Fixing Verify
mrm9084 Feb 13, 2023
4ac3db2
Wrong dependency
mrm9084 Feb 13, 2023
1c6a5fe
Update pom.xml
mrm9084 Feb 13, 2023
a7a40eb
Update pom.xml
mrm9084 Feb 13, 2023
61a9854
Update pom.xml
mrm9084 Feb 13, 2023
d0f9453
Update pom.xml
mrm9084 Feb 13, 2023
1dfe5cd
Moving files to impl, and adding optional
mrm9084 Feb 15, 2023
37d14b5
Merge branch 'main' into 4.0Merge
mrm9084 Feb 15, 2023
b576995
Update tests.yml
mrm9084 Feb 15, 2023
3b55ca3
move app config to the first when provisioning resources
saragluna Feb 15, 2023
71ba16f
Fixing Integration Test
mrm9084 Feb 15, 2023
7e6488c
Fixing Integration Tests
mrm9084 Feb 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions eng/.docsettings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,9 @@ known_content_issues:
- ['sdk/storage/README.md', '#3113']
- ['sdk/tools/azure-sdk-archetype/README.md', '#3113']
- ['sdk/tools/azure-sdk-build-tool/README.md', '#3113']
- ['sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/README.md', '#3113']
- ['sdk/appconfiguration/azure-spring-cloud-appconfiguration-config/README.md', '#3113']
- ['sdk/appconfiguration/azure-spring-cloud-feature-management-web/README.md', '#3113']
- ['sdk/appconfiguration/spring-cloud-azure-appconfiguration-config-web/README.md', '#3113']
- ['sdk/appconfiguration/spring-cloud-azure-appconfiguration-config/README.md', '#3113']
- ['sdk/appconfiguration/spring-cloud-azure-feature-management-web/README.md', '#3113']

package_indexing_exclusion_list:
- azure-loganalytics-sample
Expand Down
95 changes: 45 additions & 50 deletions eng/code-quality-reports/src/main/resources/revapi/revapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,6 @@
"matcher": "java-package",
"match": "/com\\.azure\\.data\\.cosmos(\\..*)?/"
},
"class com\\.azure\\.spring\\.cloud\\.config\\.State",
"class com\\.azure\\.spring\\.cloud\\.config\\.(AppConfigurationRefresh|AppConfigurationBootstrapConfiguration)",
"class com\\.azure\\.spring\\.cloud\\.config\\.properties\\.AppConfigurationProviderProperties",
"class com\\.azure\\.spring\\.cloud\\.config\\.web\\.pushrefresh\\.AppConfigurationRefreshEvent",
"class com\\.azure\\.spring\\.cloud\\.config\\.web\\.AppConfigurationEndpoint",
{
"matcher": "java-package",
"match": "/org\\.apache\\.(avro|commons|qpid)(\\..*)?/"
Expand Down Expand Up @@ -303,40 +298,6 @@
"old": "method void com.azure.spring.cloud.autoconfigure.jms.properties.AzureServiceBusJmsProperties::setUsername(java.lang.String)",
"justification": "Remove some meaningless jms properties"
},
{
"regex": true,
"code": "java.method.numberOfParametersChanged",
"old": "method void com\\.azure\\.spring\\.cloud\\.config\\.stores\\..*",
"justification": "Not a public api"
},
{
"code": "java.method.removed",
"old": "method com.azure.spring.cloud.config.resource.ConnectionPool com.azure.spring.cloud.config.AppConfigurationBootstrapConfiguration::initConnectionString(com.azure.spring.cloud.config.properties.AppConfigurationProperties)",
"justification": "Not a public api"
},
{
"regex": true,
"code": "java.class.removed",
"old": "class com\\.azure\\.spring\\.cloud\\.config\\.resource\\.(Connection|ConnectionPool)",
"justification": "Not a public api"
},
{
"regex": true,
"code": "java.class.removed",
"old": "class com\\.azure\\.spring\\.cloud\\.config\\.(AppConfigurationPropertySource|AppConfigurationPropertySourceLocator)",
"justification": "Not a public api"
},
{
"code": "java.class.removed",
"old": "class com.azure.spring.cloud.config.stores.ClientStore",
"justification": "Not a public api"
},
{
"ignore": true,
"code": "java.class.externalClassExposedInAPI",
"new": "interface com.azure.spring.cloud.config.AppConfigurationRefresh",
"justification": "Thi isn't an external class"
},
{
"regex": true,
"code": "java\\.class\\.externalClassExposedInAPI",
Expand Down Expand Up @@ -381,17 +342,6 @@
"new": "method com.azure.search.documents.indexes.models.(CognitiveServicesAccountKey|ConditionalSkill|CustomEntityLookupSkill|DefaultCognitiveServicesAccount|DistanceScoringFunction|DocumentExtractionSkill|EntityRecognitionSkill|FreshnessScoringFunction|ImageAnalysisSkill|KeyPhraseExtractionSkill|LanguageDetectionSkill|MagnitudeScoringFunction|MergeSkill|OcrSkill|SentimentSkill|ShaperSkill|SplitSkill|TagScoringFunction|TextTranslationSkill|WebApiSkill) .*",
"justification": "Proper support for fluent setters in subtypes."
},
{
"code": "java.method.numberOfParametersChanged",
"old": "method void com.azure.spring.cloud.config.pipline.policies.BaseAppConfigurationPolicy::<init>(java.lang.Boolean, java.lang.Boolean)",
"new": "method void com.azure.spring.cloud.config.pipline.policies.BaseAppConfigurationPolicy::<init>(java.lang.Boolean, java.lang.Boolean, java.lang.Integer)",
"justification": "Not a public api"
},
{
"code": "java.field.removedWithConstant",
"old": "field com.azure.spring.cloud.config.properties.AppConfigurationStoreSelects.LABEL_SEPARATOR",
"justification": "Not a public api"
},
{
"code": "java.method.numberOfParametersChanged",
"new": "method void com.azure.spring.cloud.autoconfigure.aad.AadAuthenticationFilterAutoConfiguration::<init>(com.azure.spring.cloud.autoconfigure.aad.properties.AadAuthenticationProperties, org.springframework.boot.web.client.RestTemplateBuilder)",
Expand Down Expand Up @@ -791,6 +741,51 @@
"old": "field com.azure.messaging.eventgrid.SystemEventNames.SERVICE_BUS_DEADLETTER_MESSAGES_AVAILABLE_WITH_NO_LISTENER",
"new": "field com.azure.messaging.eventgrid.SystemEventNames.SERVICE_BUS_DEADLETTER_MESSAGES_AVAILABLE_WITH_NO_LISTENER",
"justification": "Previous constant value had a typo and was never functional."
},
{
"code": "java.class.externalClassExposedInAPI",
"new": "class com.azure.data.appconfiguration.models.SettingSelector",
"justification": "This is an Azure SDK class that is used in the public API."
},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use one rule as following for them?

  {
          "regex": true,
          "code": "java\\.class\\.externalClassExposedInAPI",
          "new": "(interface|class|enum) com\\.azure\\.(communication\\.common|core|cosmos|data\\.schemaregistry|json|messaging\\.eventgrid|messaging\\.eventhubs|messaging\\.servicebus|resourcemanager|security\\.keyvault|storage).*",
          "justification": "SDK classes are allowed to be exposed by dependencies using them."
        },

Or simply modify that rule?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should avoid regex as it increases the revapi time. See Alan's post about it.

Copy link
Member

@saragluna saragluna Feb 8, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this mean we should avoid regex,

When adding many suppressions determine if they can be compacted with existing suppressions for that kind

  • RevApi has regex suppressions
  • Checkstyle uses
  • Spotbugs has regex suppressions

But I checked the PR, he is using code to address the external APIs. See eng/code-quality-reports/src/main/java/com/azure/tools/revapi/transforms/AzureSdkAllowedExternalApis.java in #33130.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can wait until #33130 gets merged.

{
"code": "java.class.externalClassExposedInAPI",
"new": "class com.azure.data.appconfiguration.models.SettingFields",
"justification": "This is an Azure SDK class that is used in the public API."
},
{
"code": "java.class.externalClassExposedInAPI",
"new": "class com.azure.data.appconfiguration.models.ConfigurationSetting",
"justification": "This is an Azure SDK class that is used in the public API."
},
{
"code": "java.class.externalClassExposedInAPI",
"new": "enum com.azure.data.appconfiguration.ConfigurationServiceVersion",
"justification": "This is an Azure SDK class that is used in the public API."
},
{
"code": "java.class.externalClassExposedInAPI",
"new": "class com.azure.data.appconfiguration.ConfigurationClientBuilder",
"justification": "This is an Azure SDK class that is used in the public API."
},
{
"code": "java.class.externalClassExposedInAPI",
"new": "class com.azure.data.appconfiguration.ConfigurationClient",
"justification": "This is an Azure SDK class that is used in the public API."
},
{
"code": "java.class.externalClassExposedInAPI",
"new": "class com.azure.data.appconfiguration.ConfigurationAsyncClient",
"justification": "This is an Azure SDK class that is used in the public API."
},
{
"code": "java.class.externalClassExposedInAPI",
"new": "class com.azure.spring.cloud.feature.manager.FeatureManager",
"justification": "This is an Azure SDK class that is used in the public API."
},
{
"code": "java.class.externalClassExposedInAPI",
"new": "class com.azure.spring.cloud.feature.manager.FilterNotFoundException",
"justification": "This is an Azure SDK class that is used in the public API."
}
]
}
Expand Down
10 changes: 5 additions & 5 deletions eng/versioning/version_client.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,11 @@ com.azure:perf-test-core;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-communication-email;1.0.0-beta.1;1.0.0-beta.2
com.azure:azure-developer-loadtesting;1.0.0-beta.2;1.0.0-beta.3
com.azure:azure-identity-extensions;1.1.0;1.2.0-beta.1
com.azure.spring:azure-spring-cloud-appconfiguration-config-web;2.11.0;2.12.0-beta.1
com.azure.spring:azure-spring-cloud-appconfiguration-config;2.11.0;2.12.0-beta.1
com.azure.spring:azure-spring-cloud-feature-management-web;2.10.0;2.11.0-beta.1
com.azure.spring:azure-spring-cloud-feature-management;2.10.0;2.11.0-beta.1
com.azure.spring:azure-spring-cloud-starter-appconfiguration-config;2.11.0;2.12.0-beta.1
com.azure.spring:spring-cloud-azure-appconfiguration-config-web;2.11.0;4.0.0-beta.1
com.azure.spring:spring-cloud-azure-appconfiguration-config;2.11.0;4.0.0-beta.1
com.azure.spring:spring-cloud-azure-feature-management-web;2.10.0;4.0.0-beta.3
com.azure.spring:spring-cloud-azure-feature-management;2.10.0;4.0.0-beta.3
mrm9084 marked this conversation as resolved.
Show resolved Hide resolved
com.azure.spring:spring-cloud-azure-starter-appconfiguration-config;2.11.0;4.0.0-beta.1
com.azure.spring:spring-cloud-azure-dependencies;4.5.0;4.6.0-beta.1
com.azure.spring:spring-messaging-azure;4.5.0;4.6.0-beta.1
com.azure.spring:spring-messaging-azure-eventhubs;4.5.0;4.6.0-beta.1
Expand Down
100 changes: 0 additions & 100 deletions sdk/appconfiguration/azure-spring-cloud-appconfiguration-config-web/pom.xml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions ...-config-web/src/main/java/com/azure/spring/cloud/config/web/pullrefresh/package-info.java
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions ...nfig-web/src/main/java/com/azure/spring/cloud/config/web/pushbusrefresh/package-info.java
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions ...-config-web/src/main/java/com/azure/spring/cloud/config/web/pushrefresh/package-info.java
View file
Open in desktop

This file was deleted.

Loading