Update resource manager auto config and add testcases #25206
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
added
the
moarychan
requested review from
backwind1233,
chenrujun,
saragluna,
stliu,
yiliuTo and
zhichengliu12581
as code owners
saragluna
requested changes
Nov 9, 2021
Comment on lines
68
to
98
| @Test | ||
| void testAzureProfileWithAzureDefault() { | ||
| this.contextRunner | ||
| .withUserConfiguration(AzureGlobalPropertiesAutoConfiguration.class) | ||
| .withBean(AzureResourceManager.class, AzureResourceManagerExt::getAzureResourceManager) | ||
| .withPropertyValues( | ||
| "spring.cloud.azure.profile.tenant-id=test-tenant-id", | ||
| "spring.cloud.azure.profile.subscription-id=test-subscription-id" | ||
| ) | ||
| .run(context -> { | ||
| assertThat(context).hasSingleBean(AzureProfile.class); | ||
| AzureProfile azureProfile = context.getBean(AzureProfile.class); | ||
| Assertions.assertEquals(azureProfile.getEnvironment().getActiveDirectoryEndpoint(), | ||
| AZURE.getActiveDirectoryEndpoint()); | ||
| }); | ||
| } | ||
|
|
||
| @Test | ||
| void testAzureProfileWithAzureChina() { | ||
| this.contextRunner | ||
| .withUserConfiguration(AzureGlobalPropertiesAutoConfiguration.class) | ||
| .withBean(AzureResourceManager.class, AzureResourceManagerExt::getAzureResourceManager) | ||
| .withPropertyValues( | ||
| "spring.cloud.azure.profile.tenant-id=test-tenant-id", | ||
| "spring.cloud.azure.profile.subscription-id=test-subscription-id", | ||
| "spring.cloud.azure.profile.cloud=AZURE_CHINA" | ||
| ) | ||
| .run(context -> { | ||
| assertThat(context).hasSingleBean(AzureProfile.class); | ||
| AzureProfile azureProfile = context.getBean(AzureProfile.class); | ||
| Assertions.assertEquals(azureProfile.getEnvironment().getActiveDirectoryEndpoint(), |
There was a problem hiding this comment.
I assume these two properties are not relevant to resource manager?
There was a problem hiding this comment.
You mean the tenant-id and subscription-id? it's required for AzureResourceManagerAutoConfiguration,
| private final String connectionString = "connection-string=Endpoint=sb://test.servicebus.windows.net/;" | ||
| + "SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=ByyyxxxUw="; | ||
|
|
||
| @Test |
There was a problem hiding this comment.
There should also be a test case where the resource manager bean be auto-configured correctly?
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| public class AzureStorageQueueResourceManagerAutoConfigurationTest { |
There was a problem hiding this comment.
Same for this one, also same for the eh resource manager.
|
/azp run java - spring - tests |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #21593
Changelog:
TODO:
The property 'spring.cloud.azure.xxx.profile.cloud=azure_china' in each service properties is not working yet.