Add enabled flag to Secrets Manager integration.

Fixes #1005
awspring · Jan 3, 2024 · 10b589b · 10b589b
1 parent b3030ad
commit 10b589b
Show file tree

Hide file tree

Showing 6 changed files with 628 additions and 774 deletions.
diff --git a/...io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoader.java b/...io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoader.java
@@ -16,14 +16,17 @@
 package io.awspring.cloud.autoconfigure.config.secretsmanager;
 
 import io.awspring.cloud.autoconfigure.config.BootstrapLoggingHelper;
-import io.awspring.cloud.secretsmanager.SecretsManagerPropertySource;
 import java.util.Collections;
+import java.util.Map;
 import org.springframework.boot.context.config.ConfigData;
 import org.springframework.boot.context.config.ConfigDataLoader;
 import org.springframework.boot.context.config.ConfigDataLoaderContext;
 import org.springframework.boot.context.config.ConfigDataResourceNotFoundException;
 import org.springframework.boot.logging.DeferredLogFactory;
+import org.springframework.core.env.MapPropertySource;
 import org.springframework.lang.Nullable;
+
+import io.awspring.cloud.secretsmanager.SecretsManagerPropertySource;
 import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
 
 /**
@@ -46,14 +49,23 @@ public SecretsManagerConfigDataLoader(DeferredLogFactory logFactory) {
 	@Nullable
 	public ConfigData load(ConfigDataLoaderContext context, SecretsManagerConfigDataResource resource) {
 		try {
-			SecretsManagerClient sm = context.getBootstrapContext().get(SecretsManagerClient.class);
-			SecretsManagerPropertySource propertySource = resource.getPropertySources()
-					.createPropertySource(resource.getContext(), resource.isOptional(), sm);
-			if (propertySource != null) {
-				return new ConfigData(Collections.singletonList(propertySource));
+			// resource is disabled if secrets manager integration is disabled via
+			// spring.cloud.aws.secretsmanager.enabled=false
+			if (resource.isEnabled()) {
+				SecretsManagerClient sm = context.getBootstrapContext().get(SecretsManagerClient.class);
+				SecretsManagerPropertySource propertySource = resource.getPropertySources()
+						.createPropertySource(resource.getContext(), resource.isOptional(), sm);
+				if (propertySource != null) {
+					return new ConfigData(Collections.singletonList(propertySource));
+				}
+				else {
+					return null;
+				}
 			}
 			else {
-				return null;
+				// create dummy empty config data
+				return new ConfigData(
+						Collections.singletonList(new MapPropertySource("aws-secretsmanager:" + context, Map.of())));
 			}
 		}
 		catch (Exception e) {

diff --git a/...g/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLocationResolver.java b/...g/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLocationResolver.java
@@ -62,25 +62,35 @@ protected String getPrefix() {
 	public List<SecretsManagerConfigDataResource> resolve(ConfigDataLocationResolverContext resolverContext,
 			ConfigDataLocation location)
 			throws ConfigDataLocationNotFoundException, ConfigDataResourceNotFoundException {
-		registerBean(resolverContext, AwsProperties.class, loadAwsProperties(resolverContext.getBinder()));
-		registerBean(resolverContext, SecretsManagerProperties.class, loadProperties(resolverContext.getBinder()));
-		registerBean(resolverContext, CredentialsProperties.class,
-				loadCredentialsProperties(resolverContext.getBinder()));
-		registerBean(resolverContext, RegionProperties.class, loadRegionProperties(resolverContext.getBinder()));
-
-		registerAndPromoteBean(resolverContext, SecretsManagerClient.class, this::createAwsSecretsManagerClient);
-
-		SecretsManagerPropertySources propertySources = new SecretsManagerPropertySources();
+		SecretsManagerProperties secretsManagerProperties = loadProperties(resolverContext.getBinder());
 
 		List<String> contexts = getCustomContexts(location.getNonPrefixedValue(PREFIX));
-
 		List<SecretsManagerConfigDataResource> locations = new ArrayList<>();
-		contexts.forEach(propertySourceContext -> locations.add(
-				new SecretsManagerConfigDataResource(propertySourceContext, location.isOptional(), propertySources)));
+		SecretsManagerPropertySources propertySources = new SecretsManagerPropertySources();
 
-		if (!location.isOptional() && locations.isEmpty()) {
-			throw new SecretsManagerKeysMissingException(
-					"No Secrets Manager keys provided in `spring.config.import=aws-secretsmanager:` configuration.");
+		if (secretsManagerProperties.isEnabled()) {
+			registerBean(resolverContext, AwsProperties.class, loadAwsProperties(resolverContext.getBinder()));
+			registerBean(resolverContext, SecretsManagerProperties.class, secretsManagerProperties);
+			registerBean(resolverContext, CredentialsProperties.class,
+					loadCredentialsProperties(resolverContext.getBinder()));
+			registerBean(resolverContext, RegionProperties.class, loadRegionProperties(resolverContext.getBinder()));
+			registerAndPromoteBean(resolverContext, SecretsManagerClient.class, this::createAwsSecretsManagerClient);
+
+			contexts.forEach(
+					propertySourceContext -> locations.add(new SecretsManagerConfigDataResource(propertySourceContext,
+							location.isOptional(), propertySources)));
+
+			if (!location.isOptional() && locations.isEmpty()) {
+				throw new SecretsManagerKeysMissingException(
+						"No Secrets Manager keys provided in `spring.config.import=aws-secretsmanager:` configuration.");
+			}
+		}
+		else {
+			// create dummy resources with enabled flag set to false,
+			// because returned locations cannot be empty
+			contexts.forEach(
+					propertySourceContext -> locations.add(new SecretsManagerConfigDataResource(propertySourceContext,
+							location.isOptional(), false, propertySources)));
 		}
 
 		return locations;

diff --git a/.../awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataResource.java b/.../awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerConfigDataResource.java
@@ -32,15 +32,26 @@ public class SecretsManagerConfigDataResource extends ConfigDataResource {
 
 	private final boolean optional;
 
+	/**
+	 * If resource should be resolved. This flag has the same value as {@link SecretsManagerProperties#isEnabled()}.
+	 */
+	private final boolean enabled;
+
 	private final SecretsManagerPropertySources propertySources;
 
-	public SecretsManagerConfigDataResource(String context, boolean optional,
+	public SecretsManagerConfigDataResource(String context, boolean optional, boolean enabled,
 			SecretsManagerPropertySources propertySources) {
 		this.context = context;
 		this.optional = optional;
+		this.enabled = enabled;
 		this.propertySources = propertySources;
 	}
 
+	public SecretsManagerConfigDataResource(String context, boolean optional,
+			SecretsManagerPropertySources propertySources) {
+		this(context, optional, true, propertySources);
+	}
+
 	/**
 	 * Returns context which is equal to Secret Manager secret name.
 	 * @return the context
@@ -57,30 +68,33 @@ public boolean isOptional() {
 		return this.optional;
 	}
 
+	boolean isEnabled() {
+		return enabled;
+	}
+
 	public SecretsManagerPropertySources getPropertySources() {
 		return this.propertySources;
 	}
 
 	@Override
 	public boolean equals(Object o) {
-		if (this == o) {
+		if (this == o)
 			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
+		if (o == null || getClass() != o.getClass())
 			return false;
-		}
 		SecretsManagerConfigDataResource that = (SecretsManagerConfigDataResource) o;
-		return this.optional == that.optional && this.context.equals(that.context);
+		return optional == that.optional && enabled == that.enabled && Objects.equals(context, that.context);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(this.optional, this.context);
+		return Objects.hash(context, optional, enabled);
 	}
 
 	@Override
 	public String toString() {
-		return new ToStringCreator(this).append("context", context).append("optional", optional).toString();
+		return new ToStringCreator(this).append("context", context).append("optional", optional)
+				.append("skipped", enabled).toString();
 
 	}
 

diff --git a/.../java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerProperties.java b/.../java/io/awspring/cloud/autoconfigure/config/secretsmanager/SecretsManagerProperties.java
@@ -45,6 +45,19 @@ public class SecretsManagerProperties extends AwsClientProperties {
 	@NestedConfigurationProperty
 	private ReloadProperties reload = new ReloadProperties();
 
+	/**
+	 * Enables Secrets Manager integration.
+	 */
+	private boolean enabled = true;
+
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	public void setEnabled(boolean enabled) {
+		this.enabled = enabled;
+	}
+
 	public ReloadProperties getReload() {
 		return reload;
 	}

diff --git a/...d/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java b/...d/autoconfigure/config/secretsmanager/SecretsManagerConfigDataLoaderIntegrationTests.java
@@ -272,6 +272,20 @@ void endpointCanBeOverwrittenWithGlobalAwsProperties() {
 		}
 	}
 
+	@Test
+	void propertyIsNotResolvedWhenIntegrationIsDisabled() {
+		SpringApplication application = new SpringApplication(SecretsManagerConfigDataLoaderIntegrationTests.App.class);
+		application.setWebApplicationType(WebApplicationType.NONE);
+
+		try (ConfigurableApplicationContext context = application.run(
+				"--spring.config.import=aws-secretsmanager:/config/spring;/config/second",
+				"--spring.cloud.aws.secretsmanager.enabled=false",
+				"--spring.cloud.aws.credentials.secret-key=noop")) {
+			assertThat(context.getEnvironment().getProperty("message")).isNull();
+			assertThat(context.getBeanProvider(SecretsManagerClient.class).getIfAvailable()).isNull();
+		}
+	}
+
 	@Test
 	void serviceSpecificEndpointTakesPrecedenceOverGlobalAwsRegion() {
 		SpringApplication application = new SpringApplication(SecretsManagerConfigDataLoaderIntegrationTests.App.class);