Fix service connection support to azure storage instead of group id c…

…om.azure.spring
spring-io · Sep 12, 2024 · 26dc878 · 26dc878
1 parent 5762b63
commit 26dc878
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 154 deletions.
diff --git a/...rt/site/extension/dependency/springazure/ConditionalOnRequestedSpringAzureDependency.java b/...rt/site/extension/dependency/springazure/ConditionalOnRequestedSpringAzureDependency.java
diff --git a/...tart/site/extension/dependency/springazure/OnRequestedSpringAzureDependencyCondition.java b/...tart/site/extension/dependency/springazure/OnRequestedSpringAzureDependencyCondition.java
diff --git a/...ension/dependency/springazure/SpringAzureDockerComposeProjectGenerationConfiguration.java b/...ension/dependency/springazure/SpringAzureDockerComposeProjectGenerationConfiguration.java
@@ -31,11 +31,11 @@
  * @author Eddú Meléndez
  */
 @ProjectGenerationConfiguration
-@ConditionalOnRequestedDependency("docker-compose")
-@ConditionalOnRequestedSpringAzureDependency
+@ConditionalOnRequestedDependency("azure-storage")
 class SpringAzureDockerComposeProjectGenerationConfiguration {
 
 	@Bean
+	@ConditionalOnRequestedDependency("docker-compose")
 	BuildCustomizer<Build> springAzureDockerComposeBuildCustomizer() {
 		return (build) -> build.dependencies()
 			.add("spring-azure-docker-compose",

diff --git a/...nsion/dependency/springazure/SpringAzureTestcontainersProjectGenerationConfiguration.java b/...nsion/dependency/springazure/SpringAzureTestcontainersProjectGenerationConfiguration.java
@@ -31,11 +31,11 @@
  * @author Eddú Meléndez
  */
 @ProjectGenerationConfiguration
-@ConditionalOnRequestedDependency("testcontainers")
-@ConditionalOnRequestedSpringAzureDependency
+@ConditionalOnRequestedDependency("azure-storage")
 class SpringAzureTestcontainersProjectGenerationConfiguration {
 
 	@Bean
+	@ConditionalOnRequestedDependency("testcontainers")
 	BuildCustomizer<Build> springAzureTestcontainersBuildCustomizer() {
 		return (build) -> build.dependencies()
 			.add("spring-azure-testcontainers",

diff --git a/...site/extension/dependency/springazure/OnRequestedSpringAzureDependencyConditionTests.java b/...site/extension/dependency/springazure/OnRequestedSpringAzureDependencyConditionTests.java
diff --git a/.../dependency/springazure/SpringAzureTestcontainersProjectGenerationConfigurationTests.java b/.../dependency/springazure/SpringAzureTestcontainersProjectGenerationConfigurationTests.java
@@ -38,7 +38,7 @@ void springAzureTestcontainersDependencyIsAdded() {
 
 	@Test
 	void shouldNotAddSpringAzureTestcontainersDependencyIfNoSpringAzureDependencyIsSelected() {
-		ProjectRequest projectRequest = createProjectRequest("testcontainers", "web");
+		ProjectRequest projectRequest = createProjectRequest("testcontainers", "azure-keyvault");
 		assertThat(mavenPom(projectRequest)).doesNotHaveDependency("com.azure.spring",
 				"spring-cloud-azure-testcontainers");
 	}