Add app configuration health indicator

sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuate/autoconfigure/appconfiguration/AppConfigurationHealthConfiguration.java

@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.spring.cloud.actuate.autoconfigure.appconfiguration;
+
+import com.azure.data.appconfiguration.ConfigurationClient;
+import com.azure.spring.cloud.actuate.appconfiguration.AppConfigurationHealthIndicator;
+import com.azure.spring.cloud.autoconfigure.appconfiguration.AzureAppConfigurationAutoConfiguration;
+import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
+import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Configuration class of App Configuration Health
+ */
+@Configuration
+@ConditionalOnClass({ ConfigurationClient.class, HealthIndicator.class })
+@ConditionalOnBean(ConfigurationClient.class)
+@AutoConfigureAfter(AzureAppConfigurationAutoConfiguration.class)
+@ConditionalOnEnabledHealthIndicator("azure-app-configuration")
+@ConditionalOnProperty(value = "spring.cloud.azure.appconfiguration.enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnAnyProperty(prefix = "spring.cloud.azure.appconfiguration", name = {"endpoint", "connection-string"})
+public class AppConfigurationHealthConfiguration {
+
+    @Bean
+    AppConfigurationHealthIndicator appConfigurationHealthIndicator(ConfigurationClient configurationClient) {
+        return new AppConfigurationHealthIndicator(configurationClient);
+    }
+}

sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuate/autoconfigure/cosmos/CosmosHealthConfiguration.java

@@ -5,14 +5,14 @@
 
 import com.azure.cosmos.CosmosAsyncClient;
 import com.azure.spring.cloud.actuate.cosmos.CosmosHealthIndicator;
+import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
 import com.azure.spring.cloud.autoconfigure.cosmos.AzureCosmosAutoConfiguration;
 import com.azure.spring.cloud.autoconfigure.cosmos.AzureCosmosProperties;
 import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -24,12 +24,12 @@
 @ConditionalOnClass({ CosmosAsyncClient.class, HealthIndicator.class})
 @ConditionalOnBean(CosmosAsyncClient.class)
 @AutoConfigureAfter(AzureCosmosAutoConfiguration.class)
-@ConditionalOnExpression("${spring.cloud.azure.cosmos.enabled:true}")
-@ConditionalOnProperty(prefix = "spring.cloud.azure.cosmos", name = { "endpoint", "database" })
+@ConditionalOnEnabledHealthIndicator("azure-cosmos")
+@ConditionalOnProperty(value = "spring.cloud.azure.cosmos.enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnAnyProperty(prefix = "spring.cloud.azure.cosmos", name = "endpoint")
 public class CosmosHealthConfiguration {
 
     @Bean
-    @ConditionalOnEnabledHealthIndicator("azure-cosmos")
     public HealthIndicator cosmosHealthContributor(AzureCosmosProperties azureCosmosProperties,
                                                    CosmosAsyncClient cosmosAsyncClient) {
         return new CosmosHealthIndicator(cosmosAsyncClient,

sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuate/autoconfigure/eventhubs/EventHubHealthConfiguration.java

@@ -7,13 +7,15 @@
 import com.azure.messaging.eventhubs.EventHubConsumerAsyncClient;
 import com.azure.messaging.eventhubs.EventHubProducerAsyncClient;
 import com.azure.spring.cloud.actuate.eventhubs.EventHubHealthIndicator;
+import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
 import com.azure.spring.cloud.autoconfigure.eventhubs.AzureEventHubAutoConfiguration;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -23,11 +25,13 @@
 @Configuration
 @ConditionalOnClass({ EventHubClientBuilder.class, HealthIndicator.class })
 @AutoConfigureAfter(AzureEventHubAutoConfiguration.class)
+@ConditionalOnEnabledHealthIndicator("azure-eventhubs")
+@ConditionalOnProperty(value = "spring.cloud.azure.eventhubs.enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnAnyProperty(prefix = "spring.cloud.azure.eventhubs", name = { "connection-string", "namespace" })
 public class EventHubHealthConfiguration {
 
     @Bean
     @ConditionalOnBean(EventHubClientBuilder.class)
-    @ConditionalOnEnabledHealthIndicator("azure-eventhub")
     public EventHubHealthIndicator eventHubHealthIndicator(
         ObjectProvider<EventHubProducerAsyncClient> producerAsyncClients,
         ObjectProvider<EventHubConsumerAsyncClient> consumerAsyncClients) {

sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuate/autoconfigure/keyvault/KeyVaultHealthConfiguration.java

@@ -6,12 +6,14 @@
 import com.azure.security.keyvault.secrets.SecretAsyncClient;
 import com.azure.security.keyvault.secrets.SecretClient;
 import com.azure.spring.cloud.actuate.keyvault.KeyVaultSecretHealthIndicator;
+import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
 import com.azure.spring.cloud.autoconfigure.keyvault.secrets.AzureKeyVaultSecretAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -22,10 +24,12 @@
 @ConditionalOnClass({ SecretClient.class, HealthIndicator.class })
 @ConditionalOnBean(SecretAsyncClient.class)
 @AutoConfigureAfter(AzureKeyVaultSecretAutoConfiguration.class)
+@ConditionalOnEnabledHealthIndicator("azure-key-vault")
+@ConditionalOnProperty(value = "spring.cloud.azure.keyvault.secret.enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnAnyProperty(prefix = "spring.cloud.azure.keyvault.secret", name = "endpoint")
 public class KeyVaultHealthConfiguration {
 
     @Bean
-    @ConditionalOnEnabledHealthIndicator("azure-key-vault")
     KeyVaultSecretHealthIndicator keyVaultHealthIndicator(SecretAsyncClient secretAsyncClient) {
         return new KeyVaultSecretHealthIndicator(secretAsyncClient);
     }

sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuate/autoconfigure/storage/StorageBlobHealthConfiguration.java

@@ -4,13 +4,15 @@
 package com.azure.spring.cloud.actuate.autoconfigure.storage;
 
 import com.azure.spring.cloud.actuate.storage.StorageBlobHealthIndicator;
+import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
 import com.azure.spring.cloud.autoconfigure.storage.blob.AzureStorageBlobAutoConfiguration;
 import com.azure.storage.blob.BlobServiceAsyncClient;
 import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -21,10 +23,12 @@
 @ConditionalOnClass({ BlobServiceAsyncClient.class, HealthIndicator.class })
 @ConditionalOnBean(BlobServiceAsyncClient.class)
 @AutoConfigureAfter(AzureStorageBlobAutoConfiguration.class)
+@ConditionalOnEnabledHealthIndicator("azure-storage")
+@ConditionalOnProperty(value = "spring.cloud.azure.storage.blob.enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnAnyProperty(prefix = "spring.cloud.azure.storage.blob", name = { "account-name", "endpoint", "connection-string" })
 public class StorageBlobHealthConfiguration {
 
     @Bean
-    @ConditionalOnEnabledHealthIndicator("azure-storage")
     @ConditionalOnBean(BlobServiceAsyncClient.class)
     public StorageBlobHealthIndicator storageBlobHealthIndicator(BlobServiceAsyncClient blobServiceAsyncClient) {
         return new StorageBlobHealthIndicator(blobServiceAsyncClient);

sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuate/autoconfigure/storage/StorageFileHealthConfiguration.java

@@ -4,13 +4,15 @@
 package com.azure.spring.cloud.actuate.autoconfigure.storage;
 
 import com.azure.spring.cloud.actuate.storage.StorageFileHealthIndicator;
+import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
 import com.azure.spring.cloud.autoconfigure.storage.fileshare.AzureStorageFileShareAutoConfiguration;
 import com.azure.storage.file.share.ShareServiceAsyncClient;
 import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -21,10 +23,12 @@
 @ConditionalOnClass({ ShareServiceAsyncClient.class, HealthIndicator.class })
 @AutoConfigureAfter(AzureStorageFileShareAutoConfiguration.class)
 @ConditionalOnBean(ShareServiceAsyncClient.class)
+@ConditionalOnEnabledHealthIndicator("azure-storage")
+@ConditionalOnProperty(value = "spring.cloud.azure.storage.fileshare.enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnAnyProperty(prefix = "spring.cloud.azure.storage.fileshare", name = { "account-name", "endpoint", "connection-string" })
 public class StorageFileHealthConfiguration {
 
     @Bean
-    @ConditionalOnEnabledHealthIndicator("azure-storage")
     public StorageFileHealthIndicator storageFileHealthIndicator(ShareServiceAsyncClient shareServiceAsyncClient) {
         return new StorageFileHealthIndicator(shareServiceAsyncClient);
     }

sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/java/com/azure/spring/cloud/actuate/autoconfigure/storage/StorageQueueHealthConfiguration.java

@@ -4,13 +4,15 @@
 package com.azure.spring.cloud.actuate.autoconfigure.storage;
 
 import com.azure.spring.cloud.actuate.storage.StorageQueueHealthIndicator;
+import com.azure.spring.cloud.autoconfigure.condition.ConditionalOnAnyProperty;
 import com.azure.spring.cloud.autoconfigure.storage.queue.AzureStorageQueueAutoConfiguration;
 import com.azure.storage.queue.QueueServiceAsyncClient;
 import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -21,10 +23,12 @@
 @ConditionalOnClass({ QueueServiceAsyncClient.class, HealthIndicator.class })
 @ConditionalOnBean(QueueServiceAsyncClient.class)
 @AutoConfigureAfter(AzureStorageQueueAutoConfiguration.class)
+@ConditionalOnEnabledHealthIndicator("azure-storage")
+@ConditionalOnProperty(value = "spring.cloud.azure.storage.queue.enabled", havingValue = "true", matchIfMissing = true)
+@ConditionalOnAnyProperty(prefix = "spring.cloud.azure.storage.queue", name = { "account-name", "endpoint", "connection-string" })
 public class StorageQueueHealthConfiguration {
 
     @Bean
-    @ConditionalOnEnabledHealthIndicator("azure-storage")
     @ConditionalOnBean(QueueServiceAsyncClient.class)
     public StorageQueueHealthIndicator storageQueueHealthIndicator(QueueServiceAsyncClient queueServiceAsyncClient) {
         return new StorageQueueHealthIndicator(queueServiceAsyncClient);

sdk/spring/spring-cloud-azure-actuator-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -1,4 +1,5 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.azure.spring.cloud.actuate.autoconfigure.appconfiguration.AppConfigurationHealthConfiguration,\
 com.azure.spring.cloud.actuate.autoconfigure.cosmos.CosmosHealthConfiguration,\
 com.azure.spring.cloud.actuate.autoconfigure.eventhubs.EventHubHealthConfiguration,\
 com.azure.spring.cloud.actuate.autoconfigure.keyvault.KeyVaultHealthConfiguration,\

sdk/spring/spring-cloud-azure-actuator/pom.xml

@@ -86,6 +86,12 @@
       <optional>true</optional>
     </dependency>
 
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-data-appconfiguration</artifactId>
+      <version>1.2.3</version> <!-- {x-version-update;com.azure:azure-data-appconfiguration;dependency} -->
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 
   <build>

sdk/spring/spring-cloud-azure-actuator/src/main/java/com/azure/spring/cloud/actuate/appconfiguration/AppConfigurationHealthIndicator.java

@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.spring.cloud.actuate.appconfiguration;
+
+import com.azure.core.exception.ResourceNotFoundException;
+import com.azure.data.appconfiguration.ConfigurationClient;
+import org.springframework.boot.actuate.health.AbstractHealthIndicator;
+import org.springframework.boot.actuate.health.Health;
+
+/**
+ * Indicator class of App Configuration
+ */
+public class AppConfigurationHealthIndicator extends AbstractHealthIndicator {
+
+    private final ConfigurationClient configurationClient;
+
+    public AppConfigurationHealthIndicator(ConfigurationClient configurationClient) {
+        this.configurationClient = configurationClient;
+    }
+
+    @Override
+    protected void doHealthCheck(Health.Builder builder) throws Exception {
+        try {
+            this.configurationClient.getConfigurationSetting("azure-spring-none-existing-setting", null);
+            builder.up();
+        } catch (Exception e) {
+            if (e instanceof ResourceNotFoundException) {
+                builder.up();
+            } else {
+                builder.down(e);
+            }
+        }
+    }
+}

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/appconfiguration/AzureAppConfigurationAutoConfiguration.java

@@ -22,7 +22,7 @@
  */
 @ConditionalOnClass(ConfigurationClientBuilder.class)
 @ConditionalOnProperty(value = "spring.cloud.azure.appconfiguration.enabled", havingValue = "true", matchIfMissing = true)
-@ConditionalOnAnyProperty(prefix = "spring.cloud.azure.appconfiguration", name = "endpoint")
+@ConditionalOnAnyProperty(prefix = "spring.cloud.azure.appconfiguration", name = {"endpoint", "connection-string"})
 public class AzureAppConfigurationAutoConfiguration extends AzureServiceConfigurationBase {
 
     public AzureAppConfigurationAutoConfiguration(AzureGlobalProperties azureGlobalProperties) {

sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/appconfiguration/AzureAppConfigurationProperties.java

@@ -19,6 +19,7 @@ public class AzureAppConfigurationProperties extends AbstractAzureHttpCP
     private String connectionString;
     private ConfigurationServiceVersion serviceVersion;
 
+    @Override
     public String getEndpoint() {
         return endpoint;
     }
@@ -27,6 +28,7 @@ public void setEndpoint(String endpoint) {
         this.endpoint = endpoint;
     }
 
+    @Override
     public String getConnectionString() {
         return connectionString;
     }

sdk/spring/spring-cloud-azure-service/src/main/java/com/azure/spring/service/appconfiguration/AppConfigurationProperties.java

@@ -4,17 +4,16 @@
 package com.azure.spring.service.appconfiguration;
 
 import com.azure.data.appconfiguration.ConfigurationServiceVersion;
+import com.azure.spring.core.aware.authentication.ConnectionStringAware;
 import com.azure.spring.core.properties.AzureProperties;
 
 /**
  * Properties for Azure App Configuration.
  */
-public interface AppConfigurationProperties extends AzureProperties {
+public interface AppConfigurationProperties extends AzureProperties, ConnectionStringAware {
 
     String getEndpoint();
 
-    String getConnectionString();
-
     ConfigurationServiceVersion getServiceVersion();
 
 }