Merge pull request #3 from mrm9084/4.0ReviewUpdates

App Configuration Config 4.0 Review Changes
saragluna · Jan 13, 2023 · 4493272 · 4493272
2 parents 406c5da + 3677d6a
commit 4493272
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 45 deletions.
diff --git a/...nfig/ConfigurationClientBuilderSetup.java → ...config/ConfigurationClientCustomizer.java b/...nfig/ConfigurationClientBuilderSetup.java → ...config/ConfigurationClientCustomizer.java
@@ -8,7 +8,7 @@
 /**
  * Creates Custom CustomClientBuilder for connecting to Azure App Configuration.
  */
-public interface ConfigurationClientBuilderSetup {
+public interface ConfigurationClientCustomizer {
 
     /**
      * Updates the ConfigurationClientBuilder for connecting to the given App Configuration.

diff --git a/...a/com/azure/spring/cloud/config/implementation/AppConfigurationReplicaClientsBuilder.java b/...a/com/azure/spring/cloud/config/implementation/AppConfigurationReplicaClientsBuilder.java
@@ -24,7 +24,7 @@
 import com.azure.data.appconfiguration.ConfigurationClientBuilder;
 import com.azure.identity.ManagedIdentityCredentialBuilder;
 import com.azure.spring.cloud.config.AppConfigurationCredentialProvider;
-import com.azure.spring.cloud.config.ConfigurationClientBuilderSetup;
+import com.azure.spring.cloud.config.ConfigurationClientCustomizer;
 import com.azure.spring.cloud.config.implementation.pipline.policies.BaseAppConfigurationPolicy;
 import com.azure.spring.cloud.config.implementation.properties.ConfigStore;
 import com.azure.spring.cloud.core.provider.ClientOptionsProvider;
@@ -60,7 +60,7 @@ public class AppConfigurationReplicaClientsBuilder extends ConfigurationClientBu
 
     private AppConfigurationCredentialProvider tokenCredentialProvider;
 
-    private ConfigurationClientBuilderSetup clientProvider;
+    private ConfigurationClientCustomizer clientProvider;
 
     private boolean isDev = false;
 
@@ -106,7 +106,7 @@ public void setTokenCredentialProvider(AppConfigurationCredentialProvider tokenC
     /**
      * @param clientProvider the clientProvider to set
      */
-    public void setClientProvider(ConfigurationClientBuilderSetup clientProvider) {
+    public void setClientProvider(ConfigurationClientCustomizer clientProvider) {
         this.clientProvider = clientProvider;
     }
 

diff --git a/...om/azure/spring/cloud/config/implementation/config/AppConfigurationAutoConfiguration.java b/...om/azure/spring/cloud/config/implementation/config/AppConfigurationAutoConfiguration.java
@@ -29,7 +29,7 @@ public class AppConfigurationAutoConfiguration {
      */
     @Configuration
     @ConditionalOnClass(RefreshEndpoint.class)
-    static class AppConfigurationWatchAutoConfiguration {
+    public static class AppConfigurationWatchAutoConfiguration {
 
         @Bean
         @ConditionalOnMissingBean

diff --git a/...ure/spring/cloud/config/implementation/config/AppConfigurationBootstrapConfiguration.java b/...ure/spring/cloud/config/implementation/config/AppConfigurationBootstrapConfiguration.java
@@ -14,7 +14,7 @@
 import org.springframework.context.annotation.Configuration;
 
 import com.azure.spring.cloud.config.AppConfigurationCredentialProvider;
-import com.azure.spring.cloud.config.ConfigurationClientBuilderSetup;
+import com.azure.spring.cloud.config.ConfigurationClientCustomizer;
 import com.azure.spring.cloud.config.KeyVaultCredentialProvider;
 import com.azure.spring.cloud.config.KeyVaultSecretProvider;
 import com.azure.spring.cloud.config.SecretClientBuilderSetup;
@@ -109,7 +109,7 @@ AppConfigurationReplicaClientsBuilder replicaClientBuilder(AppConfigurationProvi
         clientBuilder.setTokenCredentialProvider(
             context.getBeanProvider(AppConfigurationCredentialProvider.class).getIfAvailable());
         clientBuilder
-            .setClientProvider(context.getBeanProvider(ConfigurationClientBuilderSetup.class)
+            .setClientProvider(context.getBeanProvider(ConfigurationClientCustomizer.class)
                 .getIfAvailable());
 
         clientBuilder.setIsKeyVaultConfigured(keyVaultClientFactory.isConfigured());

diff --git a/...om/azure/spring/cloud/config/implementation/AppConfigurationReplicaClientBuilderTest.java b/...om/azure/spring/cloud/config/implementation/AppConfigurationReplicaClientBuilderTest.java
@@ -29,7 +29,7 @@
 import com.azure.data.appconfiguration.ConfigurationClientBuilder;
 import com.azure.data.appconfiguration.ConfigurationServiceVersion;
 import com.azure.spring.cloud.config.AppConfigurationCredentialProvider;
-import com.azure.spring.cloud.config.ConfigurationClientBuilderSetup;
+import com.azure.spring.cloud.config.ConfigurationClientCustomizer;
 import com.azure.spring.cloud.config.implementation.properties.ConfigStore;
 import com.azure.spring.cloud.service.implementation.appconfiguration.ConfigurationClientProperties;
 
@@ -45,7 +45,7 @@ public class AppConfigurationReplicaClientBuilderTest {
     private TokenCredential credentialMock;
 
     @Mock
-    private ConfigurationClientBuilderSetup modifierMock;
+    private ConfigurationClientCustomizer modifierMock;
 
     AppConfigurationReplicaClientsBuilder clientBuilder;
 

diff --git a/...src/test/java/com/azure/spring/cloud/config/implementation/stores/KeyVaultClientTest.java b/...src/test/java/com/azure/spring/cloud/config/implementation/stores/KeyVaultClientTest.java
@@ -52,27 +52,6 @@ public void cleanup() throws Exception {
         MockitoAnnotations.openMocks(this).close();
     }
 
-    @Test
-    public void multipleArguments() throws URISyntaxException {
-        String keyVaultUri = "https://keyvault.vault.azure.net";
-
-        KeyVaultCredentialProvider provider = new KeyVaultCredentialProvider() {
-
-            @Override
-            public TokenCredential getKeyVaultCredential(String uri) {
-                assertEquals("https://keyvault.vault.azure.net", uri);
-                return credentialMock;
-            }
-        };
-
-        clientStore = new AppConfigurationSecretClientManager(keyVaultUri, provider, null, null);
-
-        AppConfigurationSecretClientManager test = Mockito.spy(clientStore);
-        Mockito.doReturn(builderMock).when(test).getBuilder();
-
-        Assertions.assertThrows(IllegalArgumentException.class, test::build);
-    }
-
     @Test
     public void configProviderAuth() throws URISyntaxException {
         String keyVaultUri = "https://keyvault.vault.azure.net";

diff --git a/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml b/sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml
@@ -72,6 +72,12 @@
       <version>1.3.9</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;dependency} -->
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>com.azure.spring</groupId>
+      <artifactId>spring-cloud-azure-appconfiguration-config</artifactId>
+      <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config;dependency} -->
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs</artifactId>

diff --git a/...ConfigurationHealthAutoConfiguration.java → ...nfigurationConfigHealthConfiguration.java b/...ConfigurationHealthAutoConfiguration.java → ...nfigurationConfigHealthConfiguration.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.config.implementation.config;
+package com.azure.spring.cloud.actuator.autoconfigure.appconfiguration;
 
 import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.actuate.health.HealthIndicator;
@@ -10,9 +10,9 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import com.azure.spring.cloud.actuator.appconfiguration.AppConfigurationConfigHealthIndicator;
 import com.azure.spring.cloud.config.AppConfigurationRefresh;
 import com.azure.spring.cloud.config.implementation.config.AppConfigurationAutoConfiguration.AppConfigurationWatchAutoConfiguration;
-import com.azure.spring.cloud.config.implementation.health.AppConfigurationHealthIndicator;
 
 /**
  * Health Indicator for Azure App Configuration store connections.
@@ -21,12 +21,12 @@
 @ConditionalOnClass({ HealthIndicator.class })
 @ConditionalOnEnabledHealthIndicator("azure-app-configuration")
 @AutoConfigureAfter(AppConfigurationWatchAutoConfiguration.class)
-public class AppConfigurationHealthAutoConfiguration {
+public class AppConfigurationConfigHealthConfiguration {
 
     @Bean
     @ConditionalOnBean(AppConfigurationRefresh.class)
-    AppConfigurationHealthIndicator appConfigurationHealthIndicator(AppConfigurationRefresh refresh) {
-        return new AppConfigurationHealthIndicator(refresh);
+    AppConfigurationConfigHealthIndicator appConfigurationHealthIndicator(AppConfigurationRefresh refresh) {
+        return new AppConfigurationConfigHealthIndicator(refresh);
     }
 
 }
diff --git a/sdk/spring/spring-cloud-azure-actuator/pom.xml b/sdk/spring/spring-cloud-azure-actuator/pom.xml
@@ -66,6 +66,12 @@
       <version>1.3.9</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;dependency} -->
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>com.azure.spring</groupId>
+      <artifactId>spring-cloud-azure-appconfiguration-config</artifactId>
+      <version>4.0.0-beta.1</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-appconfiguration-config;dependency} -->
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs</artifactId>

diff --git a/...alth/AppConfigurationHealthIndicator.java → ...ppConfigurationConfigHealthIndicator.java b/...alth/AppConfigurationHealthIndicator.java → ...ppConfigurationConfigHealthIndicator.java
@@ -1,24 +1,25 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.config.implementation.health;
+package com.azure.spring.cloud.actuator.appconfiguration;
 
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.health.HealthIndicator;
 
 import com.azure.spring.cloud.config.AppConfigurationRefresh;
+import com.azure.spring.cloud.config.implementation.health.AppConfigurationStoreHealth;
 
 /**
  * Indicator class of App Configuration 
  */
-public final class AppConfigurationHealthIndicator implements HealthIndicator {
+public final class AppConfigurationConfigHealthIndicator implements HealthIndicator {
 
     private final AppConfigurationRefresh refresh;
 
     /**
      * Indicator for the Health endpoint for connections to App Configurations.
      * @param refresh App Configuration store refresher
      */
-    public AppConfigurationHealthIndicator(AppConfigurationRefresh refresh) {
+    public AppConfigurationConfigHealthIndicator(AppConfigurationRefresh refresh) {
         this.refresh = refresh;
     }
 

diff --git a/.../AppConfigurationHealthIndicatorTest.java → ...nfigurationConfigHealthIndicatorTest.java b/.../AppConfigurationHealthIndicatorTest.java → ...nfigurationConfigHealthIndicatorTest.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure.spring.cloud.config.implementation;
+package com.azure.spring.cloud.actuator.appconfiguration;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.when;
@@ -18,12 +18,11 @@
 import org.springframework.boot.actuate.health.Status;
 
 import com.azure.spring.cloud.config.AppConfigurationRefresh;
-import com.azure.spring.cloud.config.implementation.health.AppConfigurationHealthIndicator;
 import com.azure.spring.cloud.config.implementation.health.AppConfigurationStoreHealth;
 import com.azure.spring.cloud.config.implementation.properties.AppConfigurationProperties;
 import com.azure.spring.cloud.config.implementation.properties.ConfigStore;
 
-public class AppConfigurationHealthIndicatorTest {
+public class AppConfigurationConfigHealthIndicatorTest {
 
     @Mock
     private AppConfigurationRefresh refreshMock;
@@ -35,7 +34,7 @@ public void setup() {
 
     @Test
     public void noConfigurationStores() {
-        AppConfigurationHealthIndicator indicator = new AppConfigurationHealthIndicator(refreshMock);
+        AppConfigurationConfigHealthIndicator indicator = new AppConfigurationConfigHealthIndicator(refreshMock);
         Map<String, AppConfigurationStoreHealth> storeHealth = new HashMap<>();
 
         when(refreshMock.getAppConfigurationStoresHealth()).thenReturn(storeHealth);
@@ -49,7 +48,7 @@ public void noConfigurationStores() {
     public void heathlyConfigurationStore() {
         String storeName = "singleHealthyStoreIndicatorTest";
 
-        AppConfigurationHealthIndicator indicator = new AppConfigurationHealthIndicator(refreshMock);
+        AppConfigurationConfigHealthIndicator indicator = new AppConfigurationConfigHealthIndicator(refreshMock);
         Map<String, AppConfigurationStoreHealth> storeHealth = new HashMap<>();
 
         storeHealth.put(storeName, AppConfigurationStoreHealth.UP);
@@ -76,7 +75,7 @@ public void unloadedConfigurationStore() {
 
         properties.setStores(stores);
 
-        AppConfigurationHealthIndicator indicator = new AppConfigurationHealthIndicator(refreshMock);
+        AppConfigurationConfigHealthIndicator indicator = new AppConfigurationConfigHealthIndicator(refreshMock);
 
         Map<String, AppConfigurationStoreHealth> mockHealth = new HashMap<>();
 
@@ -94,7 +93,7 @@ public void unloadedConfigurationStore() {
     public void unheathlyConfigurationStore() {
         String storeName = "singleUnhealthyStoreIndicatorTest";
 
-        AppConfigurationHealthIndicator indicator = new AppConfigurationHealthIndicator(refreshMock);
+        AppConfigurationConfigHealthIndicator indicator = new AppConfigurationConfigHealthIndicator(refreshMock);
 
         Map<String, AppConfigurationStoreHealth> healthStatus = new HashMap<>();