Support multiple data source prop passwordless and new prop of credential bean name #42486

moarychan · 2024-10-21T07:01:55Z

Description

Fixes #41977

Changelogs:

Fix primitive type prop (isManagedIdentityEnabled) copy issue
Support multiple data source prop passwordless
Add new prop of credential bean name, it's suitable for all SDK client, JMS passworless, Redis passwordless, JDBC passwordless, Spring Integration for Service Bus.

All SDK Contribution checklist:

The pull request does not introduce [breaking changes]
CHANGELOG is updated for new features, bug fixes or other significant changes.
I have read the contribution guidelines.

General Guidelines and Best Practices

Title of the pull request is clear and informative.
There are a small number of commits, each of which have an informative message. This means that previously merged commits do not appear in the history of the PR. For more information on cleaning up the commits in your PR, see this page.

Testing Guidelines

Pull request includes test coverage for the included changes.

…manager uses the correct token credential bean

… scenario

…r Spring credential provider

azure-sdk · 2024-10-21T07:10:45Z

API change check

API changes are not detected in this pull request.

saragluna · 2024-10-21T07:51:44Z

...re/implementation/context/SpringTokenCredentialProviderContextProviderAutoConfiguration.java

+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnClass(AzureAuthenticationTemplate.class)
+public class SpringTokenCredentialProviderContextProviderAutoConfiguration {


Suggested change

public class SpringTokenCredentialProviderContextProviderAutoConfiguration {

class SpringTokenCredentialProviderContextProviderAutoConfiguration {

saragluna · 2024-10-21T07:52:54Z

...re/implementation/context/SpringTokenCredentialProviderContextProviderAutoConfiguration.java

+
+    @Bean
+    @ConditionalOnMissingBean
+    static SpringTokenCredentialProviderContextProvider springTokenCredentialProviderContextProvider() {


Why is this static?

saragluna · 2024-10-21T07:54:00Z

...cloud/autoconfigure/implementation/data/redis/AzureLettucePasswordlessAutoConfiguration.java

@@ -51,10 +59,11 @@ AzureRedisPasswordlessProperties redisPasswordlessProperties() {

    @Bean(name = "azureRedisCredentials")
    @ConditionalOnMissingBean
+    @DependsOn("springTokenCredentialProviderContextProvider")


Do we have other better choice here, if feels like not correct to depends on this class.

Any good suggestions?

saragluna · 2024-10-21T07:54:34Z

...zure/spring/cloud/autoconfigure/implementation/data/redis/lettuce/AzureRedisCredentials.java

+        this(null, null, username, passwordlessProperties);
+    }
+
+    public AzureRedisCredentials(GenericApplicationContext applicationContext,


The AzureRedisCredentials should be independent of any Spring APIs.

This class should pass in a credential provider, instead of the context.

saragluna · 2024-10-22T08:45:27Z

...zure/spring/cloud/autoconfigure/implementation/data/redis/lettuce/AzureRedisCredentials.java

+    public AzureRedisCredentials(String username,
+                                 TokenCredentialProvider tokenCredentialProvider,
+                                 PasswordlessProperties passwordlessProperties) {


Suggested change

public AzureRedisCredentials(String username,

TokenCredentialProvider tokenCredentialProvider,

PasswordlessProperties passwordlessProperties) {

public AzureRedisCredentials(String username,

PasswordlessProperties passwordlessProperties,

TokenCredentialProvider tokenCredentialProvider) {

saragluna · 2024-10-22T08:47:29Z

...zure/spring/cloud/autoconfigure/implementation/data/redis/lettuce/AzureRedisCredentials.java

+        azureAuthenticationTemplate.init(properties);
+        this.username = resolveUsername(azureAuthenticationTemplate, username);
+    }
+
    public AzureRedisCredentials(String username, PasswordlessProperties passwordlessProperties, TokenCredential tokenCredential) {


Can we call the newly added ctor in from this method?

saragluna · 2024-10-22T08:54:23Z

...ring/cloud/autoconfigure/implementation/jms/ServiceBusJmsConnectionFactoryConfiguration.java

            factoryCustomizers.orderedStream().collect(Collectors.toList()))
            .createConnectionFactory(ServiceBusJmsConnectionFactory.class);
    }

+    private TokenCredentialProvider getPasswordlessTokenCredentialProvider(AzureServiceBusJmsProperties serviceBusJmsProperties) {


can we leverage the authenticate template instead?

We should put all the same logic into the same place, instead of writing it everywhere

Will improve the logic

saragluna · 2024-10-22T08:56:36Z

...configure/implementation/resourcemanager/AzureEventHubsResourceManagerAutoConfiguration.java

+        AzureGlobalProperties.PREFIX + ".credential.token-credential-bean-name",
+        AzureEventHubsProperties.PREFIX + ".credential.token-credential-bean-name"
+    })


But the credential can come from all the other spring.cloud.azure.credential.xxx properties

Yes, not covered all the credentials, we should add all credential types here, right?

saragluna · 2024-10-22T08:57:12Z

...cloud/autoconfigure/implementation/servicebus/AzureServiceBusMessagingAutoConfiguration.java

@@ -80,8 +84,19 @@ static class ProcessorContainerConfiguration {
        @ConditionalOnMissingBean
        ServiceBusProcessorFactory defaultServiceBusNamespaceProcessorFactory(
            NamespaceProperties properties,
-            ObjectProvider<PropertiesSupplier<ConsumerIdentifier, ProcessorProperties>> suppliers) {
-            return new DefaultServiceBusNamespaceProcessorFactory(properties, suppliers.getIfAvailable());
+            ObjectProvider<PropertiesSupplier<ConsumerIdentifier, ProcessorProperties>> suppliers,


What are these for?

For Service Bus Integration scenario, it's used to custom the Service Bus builder factory in DefaultServiceBusNamespaceProcessorFactory.

moarychan added 8 commits October 21, 2024 10:47

Fix primitive type copy issue

c0de5df

Support enhance multiple datasource properties

acc1255

Avoid configuring conn string if credential has been configured.

3cad5ad

Avoid overriding service bus client credential and make the resource …

fa32e5a

…manager uses the correct token credential bean

Support customizing the credential for Service Bus sPRING Integration…

433f082

… scenario

Support customizing the credential for Service Bus sPRING Integration…

28ac8cd

… scenario

Support customizing the credential for Redis passwordless scenario

f3abae4

Fix ut failures: duplicate global properties beans, new dependency fo…

052537a

…r Spring credential provider

github-actions bot added the azure-spring All azure-spring related issues label Oct 21, 2024

moarychan added 2 commits October 21, 2024 15:11

Update change log

52263a7

Fix code smells

ba4f2f9

moarychan marked this pull request as ready for review October 21, 2024 07:34

moarychan requested review from rujche, Netyyyy and saragluna as code owners October 21, 2024 07:34

Update revapi: addedToInterface

5591dec

moarychan requested review from mssfang, JonathanGiles, alzimmermsft and srnagar as code owners October 21, 2024 08:26

Decouple application context for AzureRedisCredentials

0a68acb

saragluna reviewed Oct 22, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support multiple data source prop passwordless and new prop of credential bean name #42486

Support multiple data source prop passwordless and new prop of credential bean name #42486

moarychan commented Oct 21, 2024 •

edited

Loading

azure-sdk commented Oct 21, 2024 •

edited

Loading

saragluna Oct 21, 2024

saragluna Oct 21, 2024

saragluna Oct 21, 2024

moarychan Oct 24, 2024

saragluna Oct 21, 2024

saragluna Oct 22, 2024

saragluna Oct 22, 2024

saragluna Oct 22, 2024

saragluna Oct 22, 2024

saragluna Oct 22, 2024

moarychan Oct 24, 2024

saragluna Oct 22, 2024

moarychan Oct 24, 2024

saragluna Oct 22, 2024

moarychan Oct 24, 2024

	public class SpringTokenCredentialProviderContextProviderAutoConfiguration {
	class SpringTokenCredentialProviderContextProviderAutoConfiguration {

Support multiple data source prop passwordless and new prop of credential bean name #42486

Are you sure you want to change the base?

Support multiple data source prop passwordless and new prop of credential bean name #42486

Conversation

moarychan commented Oct 21, 2024 • edited Loading

Description

All SDK Contribution checklist:

azure-sdk commented Oct 21, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

moarychan commented Oct 21, 2024 •

edited

Loading

azure-sdk commented Oct 21, 2024 •

edited

Loading