Bridge azure properties to spring starter to authenticate

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

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.spring;
+
+import com.azure.core.credential.TokenCredential;
+import com.azure.spring.autoconfigure.unity.CredentialProperties;
+import com.azure.spring.autoconfigure.unity.EnvironmentProperties;
+import com.azure.spring.identity.CredentialPropertiesProvider;
+
+/**
+ * An interface to provide all credential related properties based on the properties subclass.
+ */
+public interface MappingCredentialPropertiesProvider extends CredentialPropertiesProvider {
+
+    void mapAzureProperties(CredentialProperties credentialProperties, EnvironmentProperties environment);
+
+    TokenCredential mappingTokenCredential();
+}

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

@@ -0,0 +1,82 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.spring;
+
+import com.azure.core.credential.TokenCredential;
+import com.azure.spring.autoconfigure.unity.AzureProperties;
+import com.azure.spring.autoconfigure.unity.CredentialProperties;
+import com.azure.spring.autoconfigure.unity.EnvironmentProperties;
+import com.azure.spring.identity.SpringEnvironmentCredentialBuilder;
+
+import java.util.Optional;
+
+/**
+ * An implementation to provide all credential related properties based on properties subclass.
+ */
+public class SpringMappingCredentialPropertiesProvider implements MappingCredentialPropertiesProvider {
+
+    CredentialProperties credentialProperties;
+    EnvironmentProperties environment;
+
+    public SpringMappingCredentialPropertiesProvider(AzureProperties azureProperties) {
+        if (azureProperties != null) {
+            mapAzureProperties(azureProperties.getCredential(), azureProperties.getEnvironment());
+        }
+    }
+
+    @Override
+    public void mapAzureProperties(CredentialProperties credentialProperties,
+                                   EnvironmentProperties environment) {
+        this.credentialProperties = credentialProperties;
+        this.environment = environment;
+    }
+
+
+    @Override
+    public TokenCredential mappingTokenCredential() {
+        SpringEnvironmentCredentialBuilder mapEnvironmentCredentialBuilder =
+            new SpringEnvironmentCredentialBuilder().credentialPropertiesProvider(this);
+        return mapEnvironmentCredentialBuilder.build();
+    }
+
+    @Override
+    public String getTenantId() {
+        return Optional.ofNullable(credentialProperties).map(CredentialProperties::getTenantId).orElse(null);
+    }
+
+    @Override
+    public String getClientId() {
+        return Optional.ofNullable(credentialProperties).map(CredentialProperties::getClientId).orElse(null);
+    }
+
+    @Override
+    public String getClientSecret() {
+        return Optional.ofNullable(credentialProperties).map(CredentialProperties::getClientSecret).orElse(null);
+    }
+
+    @Override
+    public String getClientCertificatePath() {
+        return Optional.ofNullable(credentialProperties).map(CredentialProperties::getCertificatePath).orElse(null);
+    }
+
+    @Override
+    public String getCertificatePassword() {
+        return Optional.ofNullable(credentialProperties).map(CredentialProperties::getCertificatePassword).orElse(null);
+    }
+
+    @Override
+    public String getUsername() {
+        return null;
+    }
+
+    @Override
+    public String getPassword() {
+        return null;
+    }
+
+    @Override
+    public String getAuthorityHost() {
+        return Optional.ofNullable(environment).map(EnvironmentProperties::getAuthorityHost).orElse(null);
+    }
+}

sdk/spring/azure-spring-cloud-autoconfigure/src/main/java/com/azure/spring/autoconfigure/cosmos/CosmosAutoConfiguration.java

@@ -4,21 +4,32 @@
 package com.azure.spring.autoconfigure.cosmos;
 
 import com.azure.core.credential.AzureKeyCredential;
+import com.azure.core.credential.TokenCredential;
 import com.azure.cosmos.ConnectionMode;
 import com.azure.cosmos.CosmosAsyncClient;
 import com.azure.cosmos.CosmosClientBuilder;
-import com.azure.spring.autoconfigure.unity.AzureProperties;
+import com.azure.identity.ChainedTokenCredential;
+import com.azure.identity.ChainedTokenCredentialBuilder;
+import com.azure.spring.SpringMappingCredentialPropertiesProvider;
+import com.azure.spring.autoconfigure.unity.identity.AzureDefaultTokenCredentialAutoConfiguration;
 import com.azure.spring.data.cosmos.config.AbstractCosmosConfiguration;
 import com.azure.spring.data.cosmos.config.CosmosConfig;
 import com.azure.spring.data.cosmos.core.CosmosTemplate;
+import com.azure.spring.identity.AzureKeyCredentialClientBuilderCustomizer;
+import com.azure.spring.identity.TokenCredentialClientBuilderCustomizer;
+import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Qualifier;
+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.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnResource;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import static com.azure.spring.autoconfigure.unity.AzureProperties.AZURE_PROPERTY_BEAN_NAME;
+import static com.azure.spring.autoconfigure.unity.identity.AzureDefaultTokenCredentialAutoConfiguration.DEFAULT_CHAINED_TOKEN_CREDENTIAL_BEAN_NAME;
 
 /**
  * Auto Configure Cosmos properties and connection policy.
@@ -27,44 +38,93 @@
 @ConditionalOnClass({ CosmosAsyncClient.class, CosmosTemplate.class })
 @ConditionalOnResource(resources = "classpath:cosmos.enable.config")
 @EnableConfigurationProperties(CosmosProperties.class)
+@AutoConfigureAfter(AzureDefaultTokenCredentialAutoConfiguration.class)
 public class CosmosAutoConfiguration extends AbstractCosmosConfiguration {
-    private final CosmosProperties cosmosProperties;
-    private final AzureProperties azureProperties;
+    private final CosmosProperties properties;
+    private static final String COSMOS_CHAINED_TOKEN_CREDENTIAL_BEAN_NAME = "cosmosChainedTokenCredential";
+    private static final String COSMOS_AZURE_KEY_CREDENTIAL_BEAN_NAME = "cosmosAzureKeyCredential";
 
-
-    public CosmosAutoConfiguration(CosmosProperties cosmosProperties,
-                                   @Qualifier(AZURE_PROPERTY_BEAN_NAME) AzureProperties azureProperties) {
-        this.cosmosProperties = cosmosProperties;
-        this.azureProperties = azureProperties;
+    public CosmosAutoConfiguration(CosmosProperties properties) {
+        this.properties = properties;
     }
 
     @Override
     protected String getDatabaseName() {
-        return cosmosProperties.getDatabase();
+        return properties.getDatabase();
+    }
+
+    @Bean(COSMOS_AZURE_KEY_CREDENTIAL_BEAN_NAME)
+    @ConditionalOnMissingBean(name = COSMOS_AZURE_KEY_CREDENTIAL_BEAN_NAME)
+    @ConditionalOnProperty("spring.cloud.azure.cosmos.key")
+    public AzureKeyCredential cosmosAzureKeyCredential() {
+        return new AzureKeyCredential(properties.getKey());
+    }
+
+    @Bean(COSMOS_CHAINED_TOKEN_CREDENTIAL_BEAN_NAME)
+    @ConditionalOnMissingBean(name = COSMOS_CHAINED_TOKEN_CREDENTIAL_BEAN_NAME)
+    public ChainedTokenCredential cosmosChainedTokenCredential(
+        @Qualifier(DEFAULT_CHAINED_TOKEN_CREDENTIAL_BEAN_NAME) TokenCredential defaultTokenCredential) {
+        SpringMappingCredentialPropertiesProvider provider = new SpringMappingCredentialPropertiesProvider(properties);
+        final ChainedTokenCredentialBuilder chainedTokenCredentialBuilder = new ChainedTokenCredentialBuilder();
+        chainedTokenCredentialBuilder.addLast(provider.mappingTokenCredential())
+                                     .addLast(defaultTokenCredential);
+        return chainedTokenCredentialBuilder.build();
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    @ConditionalOnBean(name = COSMOS_AZURE_KEY_CREDENTIAL_BEAN_NAME)
+    public AzureKeyCredentialClientBuilderCustomizer<CosmosClientBuilder> azureKeyCredentialCustomizer(
+        AzureKeyCredential cosmosAzureKeyCredential) {
+        return builder -> builder.credential(cosmosAzureKeyCredential);
+    }
+
+    @Bean
+    @ConditionalOnMissingBean
+    public TokenCredentialClientBuilderCustomizer<CosmosClientBuilder> tokenCredentialCustomizer(
+        @Qualifier(COSMOS_CHAINED_TOKEN_CREDENTIAL_BEAN_NAME) ChainedTokenCredential cosmosChainedTokenCredential) {
+        return builder -> builder.credential(cosmosChainedTokenCredential);
     }
 
+    /**
+     * Cosmos client builder configurer
+     * @param azureKeyCredentialCustomizers Customize key credential
+     * @param tokenCredentialCustomizers Customize token credential.
+     * @return Cosmos client builder configurer
+     */
     @Bean
-    public AzureKeyCredential azureKeyCredential() {
-        return new AzureKeyCredential(cosmosProperties.getKey());
+    @ConditionalOnMissingBean
+    public CosmosClientBuilderConfigurer cosmosClientBuilderConfigurer(
+        ObjectProvider<AzureKeyCredentialClientBuilderCustomizer<CosmosClientBuilder>> azureKeyCredentialCustomizers,
+        ObjectProvider<TokenCredentialClientBuilderCustomizer<CosmosClientBuilder>> tokenCredentialCustomizers) {
+        CosmosClientBuilderConfigurer configurer = new CosmosClientBuilderConfigurer();
+        configurer.setAzureKeyCredentialCustomizer(azureKeyCredentialCustomizers.orderedStream().findFirst().orElse(null));
+        configurer.setTokenCredentialCustomizer(tokenCredentialCustomizers.orderedStream().findFirst().orElse(null));
+        return configurer;
     }
 
+    /**
+     * Create default CosmosClientBuilder
+     * @param cosmosClientBuilderConfigurer Cosmos client builder configurer bean.
+     * @return Default CosmosClientBuilder
+     */
     @Bean
-    public CosmosClientBuilder cosmosClientBuilder(AzureKeyCredential azureKeyCredential) {
-        CosmosClientBuilder cosmosClientBuilder = new CosmosClientBuilder();
-        cosmosClientBuilder.credential(azureKeyCredential)
-                           .consistencyLevel(cosmosProperties.getConsistencyLevel())
-                           .endpoint(cosmosProperties.getUri());
-        if (ConnectionMode.GATEWAY == cosmosProperties.getConnectionMode()) {
-            cosmosClientBuilder.gatewayMode();
+    @ConditionalOnMissingBean
+    public CosmosClientBuilder cosmosClientBuilderCustomizer(CosmosClientBuilderConfigurer cosmosClientBuilderConfigurer) {
+        CosmosClientBuilder builder = new CosmosClientBuilder();
+        builder.consistencyLevel(properties.getConsistencyLevel())
+               .endpoint(properties.getUri());
+        if (ConnectionMode.GATEWAY == properties.getConnectionMode()) {
+            builder.gatewayMode();
         }
-        return cosmosClientBuilder;
+        return cosmosClientBuilderConfigurer.configure(builder);
     }
 
     @Override
     public CosmosConfig cosmosConfig() {
         return CosmosConfig.builder()
-                           .enableQueryMetrics(cosmosProperties.isPopulateQueryMetrics())
-                           .responseDiagnosticsProcessor(cosmosProperties.getResponseDiagnosticsProcessor())
+                           .enableQueryMetrics(properties.isPopulateQueryMetrics())
+                           .responseDiagnosticsProcessor(properties.getResponseDiagnosticsProcessor())
                            .build();
     }
 }

sdk/spring/azure-spring-cloud-autoconfigure/src/main/java/com/azure/spring/autoconfigure/cosmos/CosmosClientBuilderConfigurer.java

@@ -0,0 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.spring.autoconfigure.cosmos;
+
+import com.azure.cosmos.CosmosClientBuilder;
+import com.azure.spring.identity.AbstractClientBuilderConfigurer;
+import com.azure.spring.identity.AzureKeyCredentialClientBuilderCustomizer;
+
+/**
+ * Configurer for extending Azure Cosmos service client builder configuration.
+ */
+public class CosmosClientBuilderConfigurer extends AbstractClientBuilderConfigurer<CosmosClientBuilder> {
+
+    private AzureKeyCredentialClientBuilderCustomizer<CosmosClientBuilder> azureKeyCredentialCustomizer;
+
+    public void setAzureKeyCredentialCustomizer(AzureKeyCredentialClientBuilderCustomizer<CosmosClientBuilder> azureKeyCredentialCustomizer) {
+        this.azureKeyCredentialCustomizer = azureKeyCredentialCustomizer;
+    }
+
+    @Override
+    public CosmosClientBuilder configure(CosmosClientBuilder builder) {
+        super.configure(builder);
+        if (azureKeyCredentialCustomizer != null) {
+            azureKeyCredentialCustomizer.keyCredential(builder);
+        }
+        return builder;
+    }
+}

sdk/spring/azure-spring-cloud-autoconfigure/src/main/java/com/azure/spring/autoconfigure/cosmos/CosmosProperties.java

@@ -34,7 +34,6 @@ public class CosmosProperties extends AzureProperties {
     /**
      * Document DB key.
      */
-    @NotEmpty
     private String key;
 
     /**

sdk/spring/azure-spring-cloud-autoconfigure/src/main/java/com/azure/spring/autoconfigure/cosmos/CosmosRepositoriesAutoConfiguration.java

@@ -12,14 +12,16 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
+import static com.azure.spring.autoconfigure.cosmos.CosmosProperties.PREFIX;
+
 /**
  * Import {@link CosmosRepositoriesAutoConfigureRegistrar} class as a Bean in Spring.
  */
 @Configuration
 @ConditionalOnClass({ CosmosRepository.class })
 @ConditionalOnMissingBean({ CosmosRepositoryFactoryBean.class,
     CosmosRepositoryConfigurationExtension.class })
-@ConditionalOnProperty(prefix = "azure.cosmos.repositories",
+@ConditionalOnProperty(prefix = PREFIX + ".repositories",
         name = "enabled",
         havingValue = "true",
         matchIfMissing = true)

sdk/spring/azure-spring-cloud-autoconfigure/src/main/java/com/azure/spring/autoconfigure/jms/AzureServiceBusJMSProperties.java

@@ -3,7 +3,6 @@
 
 package com.azure.spring.autoconfigure.jms;
 
-import com.azure.spring.autoconfigure.unity.AzureProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
@@ -15,7 +14,7 @@
  */
 @Validated
 @ConfigurationProperties(AzureServiceBusJMSProperties.PREFIX)
-public class AzureServiceBusJMSProperties extends AzureProperties {
+public class AzureServiceBusJMSProperties {
 
     public static final String PREFIX = "spring.jms.servicebus";
 
@@ -30,6 +29,11 @@ public class AzureServiceBusJMSProperties extends AzureProperties {
 
     private String pricingTier;
 
+    public AzureServiceBusJMSProperties() {
+        super();
+        this.pricingTier = null;
+    }
+
     public String getConnectionString() {
         return connectionString;
     }