-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Add support for reading configuration from a Secrets Manager
- Loading branch information
1 parent
569e8d8
commit 3632727
Showing
20 changed files
with
773 additions
and
11 deletions.
There are no files selected for viewing
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
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
10 changes: 9 additions & 1 deletion
10
...t/src/main/java/io/quarkus/amazon/common/deployment/AmazonClientAsyncResultBuildItem.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,27 @@ | ||
| package io.quarkus.amazon.common.deployment; | ||
|
|
||
| import io.quarkus.builder.item.MultiBuildItem; | ||
| import io.quarkus.runtime.RuntimeValue; | ||
| import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder; | ||
|
|
||
| /* | ||
| * Describes what async clients are provided by a given extension | ||
| */ | ||
| public final class AmazonClientAsyncResultBuildItem extends MultiBuildItem { | ||
|
|
||
| private final String awsClientName; | ||
| private RuntimeValue<AwsClientBuilder> asyncClientBuilder; | ||
|
|
||
| public AmazonClientAsyncResultBuildItem(String awsClientName) { | ||
| public AmazonClientAsyncResultBuildItem(String awsClientName, RuntimeValue<AwsClientBuilder> asyncClientBuilder) { | ||
| this.awsClientName = awsClientName; | ||
| this.asyncClientBuilder = asyncClientBuilder; | ||
| } | ||
|
|
||
| public String getAwsClientName() { | ||
| return awsClientName; | ||
| } | ||
|
|
||
| public RuntimeValue<AwsClientBuilder> getAsyncClientBuilder() { | ||
| return asyncClientBuilder; | ||
| } | ||
| } |
10 changes: 9 additions & 1 deletion
10
...nt/src/main/java/io/quarkus/amazon/common/deployment/AmazonClientSyncResultBuildItem.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,27 @@ | ||
| package io.quarkus.amazon.common.deployment; | ||
|
|
||
| import io.quarkus.builder.item.MultiBuildItem; | ||
| import io.quarkus.runtime.RuntimeValue; | ||
| import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder; | ||
|
|
||
| /* | ||
| * Describes what sync clients are provided by a given extension | ||
| */ | ||
| public final class AmazonClientSyncResultBuildItem extends MultiBuildItem { | ||
|
|
||
| private final String awsClientName; | ||
| private RuntimeValue<AwsClientBuilder> syncClientBuilder; | ||
|
|
||
| public AmazonClientSyncResultBuildItem(String awsClientName) { | ||
| public AmazonClientSyncResultBuildItem(String awsClientName, RuntimeValue<AwsClientBuilder> syncClientBuilder) { | ||
| this.awsClientName = awsClientName; | ||
| this.syncClientBuilder = syncClientBuilder; | ||
| } | ||
|
|
||
| public String getAwsClientName() { | ||
| return awsClientName; | ||
| } | ||
|
|
||
| public RuntimeValue<AwsClientBuilder> getSyncClientBuilder() { | ||
| return syncClientBuilder; | ||
| } | ||
| } |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
|
|
||
| <parent> | ||
| <groupId>io.quarkiverse.amazonservices</groupId> | ||
| <artifactId>quarkus-amazon-secretsmanager-config-parent</artifactId> | ||
| <version>999-SNAPSHOT</version> | ||
| </parent> | ||
|
|
||
| <artifactId>quarkus-amazon-secretsmanager-config-deployment</artifactId> | ||
| <name>Quarkus - Amazon Services - Secrets Manager Config - Deployment</name> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>io.quarkiverse.amazonservices</groupId> | ||
| <artifactId>quarkus-amazon-common-deployment</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.quarkiverse.amazonservices</groupId> | ||
| <artifactId>quarkus-amazon-common-deployment-spi</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-credentials-deployment</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.quarkiverse.amazonservices</groupId> | ||
| <artifactId>quarkus-amazon-secretsmanager-config</artifactId> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>software.amazon.awssdk</groupId> | ||
| <artifactId>url-connection-client</artifactId> | ||
| </dependency> | ||
|
|
||
| <!-- Test dependencies --> | ||
| <dependency> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-junit5-internal</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>io.rest-assured</groupId> | ||
| <artifactId>rest-assured</artifactId> | ||
| <scope>test</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-compiler-plugin</artifactId> | ||
| <configuration> | ||
| <annotationProcessorPaths> | ||
| <path> | ||
| <groupId>io.quarkus</groupId> | ||
| <artifactId>quarkus-extension-processor</artifactId> | ||
| <version>${quarkus.version}</version> | ||
| </path> | ||
| </annotationProcessorPaths> | ||
| </configuration> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
| </project> |
54 changes: 54 additions & 0 deletions
54
...kus/amazon/secretsmanager/config/deployment/SecretsManagerConfigDevServicesProcessor.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| package io.quarkus.amazon.secretsmanager.config.deployment; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| import org.testcontainers.containers.localstack.LocalStackContainer; | ||
| import org.testcontainers.containers.localstack.LocalStackContainer.Service; | ||
|
|
||
| import io.quarkus.amazon.common.deployment.spi.AbstractDevServicesLocalStackProcessor; | ||
| import io.quarkus.amazon.common.deployment.spi.DevServicesLocalStackProviderBuildItem; | ||
| import io.quarkus.amazon.common.runtime.DevServicesBuildTimeConfig; | ||
| import io.quarkus.amazon.secretsmanager.config.runtime.SecretsManagerConfigBuildTimeConfig; | ||
| import io.quarkus.amazon.secretsmanager.config.runtime.SecretsManagerDevServicesBuildTimeConfig; | ||
| import io.quarkus.deployment.annotations.BuildStep; | ||
| import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; | ||
| import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; | ||
| import software.amazon.awssdk.http.urlconnection.UrlConnectionHttpClient; | ||
| import software.amazon.awssdk.regions.Region; | ||
| import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient; | ||
|
|
||
| public class SecretsManagerConfigDevServicesProcessor extends AbstractDevServicesLocalStackProcessor { | ||
|
|
||
| @BuildStep | ||
| DevServicesLocalStackProviderBuildItem setupSecretsManager(SecretsManagerConfigBuildTimeConfig clientBuildTimeConfig) { | ||
| return this.setup(Service.SECRETSMANAGER, clientBuildTimeConfig.devservices); | ||
| } | ||
|
|
||
| @Override | ||
| protected void overrideDefaultConfig(Map<String, String> defaultConfig) { | ||
| for (String key : defaultConfig.keySet().toArray(new String[0])) { | ||
| defaultConfig.put(key.replace(Service.SECRETSMANAGER.getName(), Service.SECRETSMANAGER.getName() + "-config"), | ||
| defaultConfig.remove(key)); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected void prepareLocalStack(DevServicesBuildTimeConfig clientBuildTimeConfig, | ||
| LocalStackContainer localstack) { | ||
| createSecrets(localstack, (SecretsManagerDevServicesBuildTimeConfig) clientBuildTimeConfig); | ||
| } | ||
|
|
||
| public void createSecrets(LocalStackContainer localstack, SecretsManagerDevServicesBuildTimeConfig configuration) { | ||
| try (SecretsManagerClient client = SecretsManagerClient.builder() | ||
| .endpointOverride(localstack.getEndpointOverride(LocalStackContainer.Service.S3)) | ||
| .region(Region.of(localstack.getRegion())) | ||
| .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials | ||
| .create(localstack.getAccessKey(), localstack.getSecretKey()))) | ||
| .httpClientBuilder(UrlConnectionHttpClient.builder()) | ||
| .build()) { | ||
| configuration.secrets.forEach((key, value) -> { | ||
| client.createSecret(r -> r.name(key).secretString(value)); | ||
| }); | ||
| } | ||
| } | ||
| } |
136 changes: 136 additions & 0 deletions
136
...ava/io/quarkus/amazon/secretsmanager/config/deployment/SecretsManagerConfigProcessor.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| package io.quarkus.amazon.secretsmanager.config.deployment; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| import org.jboss.jandex.DotName; | ||
|
|
||
| import io.quarkus.amazon.common.deployment.AbstractAmazonServiceProcessor; | ||
| import io.quarkus.amazon.common.deployment.AmazonClientBuildItem; | ||
| import io.quarkus.amazon.common.deployment.AmazonClientInterceptorsPathBuildItem; | ||
| import io.quarkus.amazon.common.deployment.AmazonClientSyncResultBuildItem; | ||
| import io.quarkus.amazon.common.deployment.AmazonClientSyncTransportBuildItem; | ||
| import io.quarkus.amazon.common.deployment.RequireAmazonClientBuildItem; | ||
| import io.quarkus.amazon.common.runtime.AmazonClientRecorder; | ||
| import io.quarkus.amazon.common.runtime.AmazonClientUrlConnectionTransportRecorder; | ||
| import io.quarkus.amazon.common.runtime.SyncHttpClientBuildTimeConfig; | ||
| import io.quarkus.amazon.common.runtime.SyncHttpClientBuildTimeConfig.SyncClientType; | ||
| import io.quarkus.amazon.secretsmanager.config.runtime.SecretsManagerConfigBuildTimeConfig; | ||
| import io.quarkus.amazon.secretsmanager.config.runtime.SecretsManagerConfigConfig; | ||
| import io.quarkus.amazon.secretsmanager.config.runtime.SecretsManagerConfigRecorder; | ||
| import io.quarkus.arc.deployment.SyntheticBeanBuildItem; | ||
| import io.quarkus.deployment.annotations.BuildProducer; | ||
| import io.quarkus.deployment.annotations.BuildStep; | ||
| import io.quarkus.deployment.annotations.ExecutionTime; | ||
| import io.quarkus.deployment.annotations.Record; | ||
| import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem; | ||
| import io.quarkus.deployment.builditem.FeatureBuildItem; | ||
| import io.quarkus.deployment.builditem.RunTimeConfigurationSourceValueBuildItem; | ||
| import io.quarkus.runtime.RuntimeValue; | ||
| import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder; | ||
| import software.amazon.awssdk.services.secretsmanager.SecretsManagerAsyncClientBuilder; | ||
| import software.amazon.awssdk.services.secretsmanager.SecretsManagerClient; | ||
| import software.amazon.awssdk.services.secretsmanager.SecretsManagerClientBuilder; | ||
|
|
||
| public class SecretsManagerConfigProcessor extends AbstractAmazonServiceProcessor { | ||
|
|
||
| private static final String AMAZON_SECRETS_MANAGER_CONFIG = "amazon-secretsmanager-config"; | ||
|
|
||
| SecretsManagerConfigBuildTimeConfig buildTimeConfig; | ||
|
|
||
| @Override | ||
| protected String amazonServiceClientName() { | ||
| return AMAZON_SECRETS_MANAGER_CONFIG; | ||
| } | ||
|
|
||
| @Override | ||
| protected String configName() { | ||
| return "secretsmanager-config"; | ||
| } | ||
|
|
||
| @Override | ||
| protected DotName syncClientName() { | ||
| return DotName.createSimple(SecretsManagerClient.class.getName()); | ||
| } | ||
|
|
||
| @Override | ||
| protected DotName asyncClientName() { | ||
| throw new UnsupportedOperationException(); | ||
| } | ||
|
|
||
| @Override | ||
| protected String builtinInterceptorsPath() { | ||
| return "software/amazon/awssdk/services/secretsmanager/execution.interceptors"; | ||
| } | ||
|
|
||
| @BuildStep | ||
| @Record(ExecutionTime.RUNTIME_INIT) | ||
| public RunTimeConfigurationSourceValueBuildItem configure(SecretsManagerConfigRecorder recorder, | ||
| SecretsManagerConfigConfig config, SecretsManagerConfigBuildTimeConfig buildTimeConfig, | ||
| List<AmazonClientSyncResultBuildItem> syncClientBuilders) { | ||
|
|
||
| String configName = configName(); | ||
|
|
||
| RuntimeValue<AwsClientBuilder> syncClientBuilder = (RuntimeValue<AwsClientBuilder>) syncClientBuilders | ||
| .stream().filter(s -> configName.equals(s.getAwsClientName())).findFirst().get().getSyncClientBuilder(); | ||
|
|
||
| return new RunTimeConfigurationSourceValueBuildItem( | ||
| recorder.configSources(config, buildTimeConfig, syncClientBuilder)); | ||
| } | ||
|
|
||
| @BuildStep | ||
| void setup(List<RequireAmazonClientBuildItem> clientRequirements, | ||
| BuildProducer<ExtensionSslNativeSupportBuildItem> extensionSslNativeSupport, | ||
| BuildProducer<FeatureBuildItem> feature, | ||
| BuildProducer<AmazonClientInterceptorsPathBuildItem> interceptors, | ||
| BuildProducer<AmazonClientBuildItem> clientProducer) { | ||
|
|
||
| SyncHttpClientBuildTimeConfig syncClientConfig = new SyncHttpClientBuildTimeConfig(); | ||
| syncClientConfig.type = SyncClientType.URL; | ||
|
|
||
| setupExtension(List.of(new RequireAmazonClientBuildItem(Optional.of(syncClientName()), Optional.empty())), | ||
| extensionSslNativeSupport, feature, interceptors, clientProducer, | ||
| buildTimeConfig.sdk, syncClientConfig); | ||
| } | ||
|
|
||
| @BuildStep | ||
| @Record(ExecutionTime.RUNTIME_INIT) | ||
| void setupUrlConnectionSyncTransport(List<AmazonClientBuildItem> amazonClients, SecretsManagerConfigRecorder recorder, | ||
| AmazonClientUrlConnectionTransportRecorder transportRecorder, | ||
| SecretsManagerConfigConfig runtimeConfig, BuildProducer<AmazonClientSyncTransportBuildItem> syncTransports) { | ||
| SyncHttpClientBuildTimeConfig syncClientConfig = new SyncHttpClientBuildTimeConfig(); | ||
| syncClientConfig.type = SyncClientType.URL; | ||
|
|
||
| createUrlConnectionSyncTransportBuilder(amazonClients, | ||
| transportRecorder, | ||
| syncClientConfig, | ||
| recorder.getSyncConfig(runtimeConfig), | ||
| syncTransports); | ||
| } | ||
|
|
||
| @BuildStep | ||
| @Record(ExecutionTime.RUNTIME_INIT) | ||
| void createClientBuilders(SecretsManagerConfigRecorder recorder, | ||
| AmazonClientRecorder commonRecorder, | ||
| SecretsManagerConfigConfig runtimeConfig, | ||
| List<AmazonClientSyncTransportBuildItem> syncTransports, | ||
| BuildProducer<SyntheticBeanBuildItem> syntheticBeans, | ||
| BuildProducer<AmazonClientSyncResultBuildItem> clientSync) { | ||
|
|
||
| createClientBuilders(commonRecorder, | ||
| recorder.getAwsConfig(runtimeConfig), | ||
| recorder.getSdkConfig(runtimeConfig), | ||
| buildTimeConfig.sdk, | ||
| syncTransports, | ||
| List.of(), | ||
| SecretsManagerClientBuilder.class, | ||
| (syncTransport) -> recorder.createSyncBuilder(runtimeConfig, syncTransport), | ||
| SecretsManagerAsyncClientBuilder.class, | ||
| null, | ||
| null, | ||
| null, | ||
| syntheticBeans, | ||
| clientSync, | ||
| null); | ||
| } | ||
| } |
Oops, something went wrong.