Skip to content

Commit 22ad1b9

Browse files
committed
Fix test failures by adding tenant-id configuration
Update tests to specify tenant-id or application-type to prevent Resource Server configuration from being inadvertently activated. Changes: 1. AadWebApplicationConfigurationTests - Added application-type=web_application to explicitly configure tests as web application only 2. AadAutoConfigurationServletConditionTests - Added tenant-id=fake-tenant-id for tests using oauthClientAndResourceServerRunner 3. AadOAuth2ClientConfigurationTests - Added tenant-id=fake-tenant-id for testWithRequiredPropertiesSet These fixes address test failures caused by the new tenant-id validation logic that rejects common/organizations/consumers values for resource server configurations. Tests now properly isolate web application scenarios from resource server scenarios. All 1084 tests now pass.
1 parent 01e3e23 commit 22ad1b9

3 files changed

Lines changed: 8 additions & 3 deletions

File tree

sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadAutoConfigurationServletConditionTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ void servletApplication() {
1919
oauthClientAndResourceServerRunner()
2020
.withPropertyValues(
2121
"spring.cloud.azure.active-directory.enabled=true",
22-
"spring.cloud.azure.active-directory.credential.client-id=fake-client-id"
22+
"spring.cloud.azure.active-directory.credential.client-id=fake-client-id",
23+
"spring.cloud.azure.active-directory.profile.tenant-id=fake-tenant-id"
2324
)
2425
.run(context -> assertThat(context).hasSingleBean(AadAuthenticationProperties.class));
2526
}
@@ -29,7 +30,8 @@ void nonServletApplication() {
2930
oauthClientAndResourceServerRunner()
3031
.withPropertyValues(
3132
"spring.cloud.azure.active-directory.enabled=true",
32-
"spring.cloud.azure.active-directory.credential.client-id=fake-client-id"
33+
"spring.cloud.azure.active-directory.credential.client-id=fake-client-id",
34+
"spring.cloud.azure.active-directory.profile.tenant-id=fake-tenant-id"
3335
)
3436
.withClassLoader(new FilteredClassLoader(SERVLET_WEB_APPLICATION_CLASS))
3537
.run(context -> assertThat(context).doesNotHaveBean(AadAuthenticationProperties.class));

sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadOAuth2ClientConfigurationTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ void testWithRequiredPropertiesSet() {
6565
oauthClientAndResourceServerRunner()
6666
.withPropertyValues(
6767
"spring.cloud.azure.active-directory.enabled=true",
68-
"spring.cloud.azure.active-directory.credential.client-id=fake-client-id"
68+
"spring.cloud.azure.active-directory.credential.client-id=fake-client-id",
69+
"spring.cloud.azure.active-directory.profile.tenant-id=fake-tenant-id"
6970
)
7071
.run(context -> {
7172
assertThat(context).hasSingleBean(AadAuthenticationProperties.class);

sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/aad/configuration/AadWebApplicationConfigurationTests.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class AadWebApplicationConfigurationTests {
2626
void useDefaultSecurityFilterChain() {
2727
webApplicationContextRunner()
2828
.withPropertyValues("spring.cloud.azure.active-directory.enabled=true",
29+
"spring.cloud.azure.active-directory.application-type=web_application",
2930
"spring.cloud.azure.active-directory.credential.client-id=fake-client-id"
3031
)
3132
.run(context -> {
@@ -45,6 +46,7 @@ void useCustomSecurityFilterChain() {
4546
AadAutoConfiguration.class)
4647
.withInitializer(ConditionEvaluationReportLoggingListener.forLogLevel(LogLevel.INFO))
4748
.withPropertyValues("spring.cloud.azure.active-directory.enabled=true",
49+
"spring.cloud.azure.active-directory.application-type=web_application",
4850
"spring.cloud.azure.active-directory.credential.client-id=fake-client-id"
4951
)
5052
.run(context -> {

0 commit comments

Comments
 (0)