AppConfig 4.0 Updating Feature Management Version Schema (Azure#33531)

* Clearing up todos * Update ci.yml
azure-sdk · Feb 16, 2023 · 3712ee9 · 3712ee9
1 parent 53c15c5
commit 3712ee9
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 48 deletions.
diff --git a/sdk/spring/ci.yml b/sdk/spring/ci.yml
@@ -548,20 +548,20 @@ extends:
       - name: spring-cloud-azure-appconfiguration-config
         groupId: com.azure.spring
         safeName: springcloudazureappconfigurationconfig
-        releaseInBatch: ${{ parameters.release_azurespringcloudappconfigurationconfig }}
+        releaseInBatch: ${{ parameters.release_springcloudazureappconfigurationconfig }}
       - name: spring-cloud-azure-appconfiguration-config-web
         groupId: com.azure.spring
         safeName: springcloudazureappconfigurationconfigweb
-        releaseInBatch: ${{ parameters.release_azurespringcloudappconfigurationconfigweb }}
+        releaseInBatch: ${{ parameters.release_springcloudazureappconfigurationconfigweb }}
       - name: spring-cloud-azure-feature-management
         groupId: com.azure.spring
         safeName: springcloudazurefeaturemanagement
-        releaseInBatch: ${{ parameters.release_azurespringcloudfeaturemanagement }}
+        releaseInBatch: ${{ parameters.release_springcloudazurefeaturemanagement }}
       - name: spring-cloud-azure-feature-management-web
         groupId: com.azure.spring
         safeName: springcloudazurefeaturemanagementweb
-        releaseInBatch: ${{ parameters.release_azurespringcloudfeaturemanagementweb }}
+        releaseInBatch: ${{ parameters.release_springcloudazurefeaturemanagementweb }}
       - name: spring-cloud-azure-starter-appconfiguration-config
         groupId: com.azure.spring
         safeName: springcloudazurestarterappconfigurationconfig
-        releaseInBatch: ${{ parameters.release_azurespringcloudstarterappconfigurationconfig }}
+        releaseInBatch: ${{ parameters.release_springcloudazurestarterappconfigurationconfig }}
diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config-web/CHANGELOG.md b/sdk/spring/spring-cloud-azure-appconfiguration-config-web/CHANGELOG.md
@@ -1,14 +1,19 @@
 # Release History
 
-## 4.0.0-beta.1 (Unreleased)
+## 4.0.0-beta.1 (2023-02-16)
 
 ### Features Added
+* Global Configuration support
+* Geo-Replication support
+* Feature Flags now support multiple selects
 
 ### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+* Libraries have been renamed from azure-spring-cloud-appconfiguration-config to spring-cloud-azure-appconfiguration-config
+* Switched to the SDK style for RevApi
+* Removed AppConfigurationCredentialProvider, KeyVaultCredentialProvider
+* Renamed ConfigurationClientBuilderSetup to ConfigurationClientCustomizer
+* Renamed SecretClientBuilderSetup to SecretClientCustomizer
+* Feature Flags can now be loaded from multiple stores, duplicate key names result in last wins.
 
 ## 2.11.0 (2023-01-18)
 Upgrade Spring Boot dependencies version to 2.7.7 and Spring Cloud dependencies version to 2021.0.5

diff --git a/sdk/spring/spring-cloud-azure-appconfiguration-config/CHANGELOG.md b/sdk/spring/spring-cloud-azure-appconfiguration-config/CHANGELOG.md
@@ -1,14 +1,8 @@
 # Release History
 
-## 4.0.0-beta.1 (Unreleased)
+## 4.0.0-beta.1 (2023-02-16)
 
-### Features Added
-
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+This first beta release of Spring Cloud Azure App Configuration Config as part of Spring Cloud Azure. 
 
 ## 2.11.0 (2023-01-18)
 Upgrade Spring Boot dependencies version to 2.7.7 and Spring Cloud dependencies version to 2021.0.5

diff --git a/...src/main/java/com/azure/spring/cloud/config/implementation/AppConfigurationConstants.java b/...src/main/java/com/azure/spring/cloud/config/implementation/AppConfigurationConstants.java
@@ -20,7 +20,7 @@ public class AppConfigurationConstants {
     /**
      * Feature Management Key Prefix
      */
-    public static final String FEATURE_MANAGEMENT_KEY = "feature-management.featureManagement.";
+    public static final String FEATURE_MANAGEMENT_KEY = "feature-management.";
 
     /**
      * Feature Flag Prefix

diff --git a/...e/spring/cloud/config/implementation/AppConfigurationFeatureManagementPropertySource.java b/...e/spring/cloud/config/implementation/AppConfigurationFeatureManagementPropertySource.java
@@ -107,7 +107,7 @@ public void initProperties() {
                     featureConfigurationSettings.add(setting);
                     Object feature = createFeature((FeatureFlagConfigurationSetting) setting);
 
-                    String configName = FEATURE_MANAGEMENT_KEY // TODO (mametcal) This is Wrong/Needs to be updated with Feature Management 4.0
+                    String configName = FEATURE_MANAGEMENT_KEY      
                         + setting.getKey().trim().substring(FEATURE_FLAG_PREFIX.length());
 
                     properties.put(configName, feature);

diff --git a/...va/com/azure/spring/cloud/config/implementation/AppConfigurationReplicaClientFactory.java b/...va/com/azure/spring/cloud/config/implementation/AppConfigurationReplicaClientFactory.java
@@ -41,13 +41,6 @@ public Map<String, ConnectionManager> getConnections() {
         return CONNECTIONS;
     }
 
-    /**
-     * @return the configStores
-     */
-    List<ConfigStore> getConfigStores() { // TODO (mametcal) This is never used?
-        return configStores;
-    }
-
     /**
      * Returns the current used endpoint for a given config store.
      * @param originEndpoint identifier of the store. The identifier is the primary endpoint of the store.

diff --git a/sdk/spring/spring-cloud-azure-feature-management-web/CHANGELOG.md b/sdk/spring/spring-cloud-azure-feature-management-web/CHANGELOG.md
@@ -1,14 +1,8 @@
 # Release History
 
-## 4.0.0-beta.3 (Unreleased)
+## 4.0.0-beta.3 (2023-02-16)
 
-### Features Added
-
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+Updated to use latest dependencies.
 
 ## 4.0.0-beta.2 (2022-10-06)
 

diff --git a/sdk/spring/spring-cloud-azure-feature-management/CHANGELOG.md b/sdk/spring/spring-cloud-azure-feature-management/CHANGELOG.md
@@ -1,14 +1,8 @@
 # Release History
 
-## 4.0.0-beta.3 (Unreleased)
+## 4.0.0-beta.3 (2023-02-16)
 
-### Features Added
-
-### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+Updated to use latest dependencies.
 
 ## 4.0.0-beta.2 (2022-10-06)
 

diff --git a/sdk/spring/spring-cloud-azure-starter-appconfiguration-config/CHANGELOG.md b/sdk/spring/spring-cloud-azure-starter-appconfiguration-config/CHANGELOG.md
@@ -1,14 +1,19 @@
 # Release History
 
-## 4.0.0-beta.1 (Unreleased)
+## 4.0.0-beta.1 (2023-02-16)
 
 ### Features Added
+* Global Configuration support
+* Geo-Replication support
+* Feature Flags now support multiple selects
 
 ### Breaking Changes
-
-### Bugs Fixed
-
-### Other Changes
+* Libraries have been renamed from azure-spring-cloud-appconfiguration-config to spring-cloud-azure-appconfiguration-config
+* Switched to the SDK style for RevApi
+* Removed AppConfigurationCredentialProvider, KeyVaultCredentialProvider
+* Renamed ConfigurationClientBuilderSetup to ConfigurationClientCustomizer
+* Renamed SecretClientBuilderSetup to SecretClientCustomizer
+* Feature Flags can now be loaded from multiple stores, duplicate key names result in last wins.
 
 ## 2.10.0 (2022-11-24)
 - This release is compatible with Spring Boot 2.5.0-2.5.14, 2.6.0-2.6.13, 2.7.0-2.7.5. (Note: 2.5.x (x>14), 2.6.y (y>13) and 2.7.z (z>5) should be supported, but they aren't tested with this release.)