Add support for AWS Secrets Manager

qualitive · Sep 25, 2024 · 02fc144 · 02fc144
1 parent 4bc8a26
commit 02fc144
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 20 deletions.
diff --git a/.env.example b/.env.example
@@ -10,4 +10,9 @@ MSID_SECRET=
 MSID_TENANT=common
 
 KEYSTORE_PRIVATE_KEY_PASSWORD=pk-password
-KEYSTORE_PASSWORD=keystore-password
+KEYSTORE_PASSWORD=keystore-password
+
+AWS_REGION=
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+ENABLE_SECRETS_MANAGER=false
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
 FROM amazoncorretto:21
 
-ADD build/distributions/heimdall-optimized-0.1.tar ./
-RUN chmod a+rw heimdall-optimized-0.1
-WORKDIR ./heimdall-optimized-0.1
+ADD build/distributions/heimdall-0.1.tar ./
+RUN chmod a+rw heimdall-0.1
+WORKDIR ./heimdall-0.1
 EXPOSE 8080
 
 ENV TZ="UTC"

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
     alias(libs.plugins.ksp)
     alias(libs.plugins.johnrengelman.shadow)
     alias(libs.plugins.micronaut.application)
-    alias(libs.plugins.micronaut.aot)
     alias(libs.plugins.kotlinter)
 }
 
@@ -21,6 +20,7 @@ dependencies {
     compileOnly(libs.micronaut.http.client)
     implementation(libs.micronaut.jackson.databind)
     implementation(libs.micronaut.kotlin.runtime)
+    implementation(libs.micronaut.aws.secretsmanager)
 
     implementation(libs.kotlin.reflect)
     implementation(libs.kotlin.stdlib)
@@ -57,18 +57,6 @@ micronaut {
         incremental(true)
         annotations("com.qualitive.*")
     }
-    aot {
-    // Please review carefully the optimizations enabled below
-    // Check https://micronaut-projects.github.io/micronaut-aot/latest/guide/ for more details
-        optimizeServiceLoading = false
-        convertYamlToJava = false
-        precomputeOperations = true
-        cacheEnvironment = true
-        optimizeClassLoading = true
-        deduceEnvironment = true
-        optimizeNetty = true
-        replaceLogbackXml = true
-    }
 }
 
 tasks.test {

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -15,5 +15,9 @@ services:
       - HEIMDALL_MSID_TENANT=${MSID_TENANT}
       - KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD}
       - KEYSTORE_PRIVATE_KEY_PASSWORD=${KEYSTORE_PRIVATE_KEY_PASSWORD}
+      - AWS_REGION=${AWS_REGION}
+      - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
+      - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
+      - ENABLE_SECRETS_MANAGER=${ENABLE_SECRETS_MANAGER}
     volumes:
       - ./heimdall-storage:/var/lib/heimdall
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,6 +11,7 @@ micronaut-http-validation = { module = "io.micronaut:micronaut-http-validation",
 micronaut-jackson-databind = { module = "io.micronaut:micronaut-jackson-databind", version.ref = "micronautVersion" }
 micronaut-kotlin-runtime = { module = "io.micronaut.kotlin:micronaut-kotlin-runtime", version.ref = "micronautVersion" }
 micronaut-http-client = { module = "io.micronaut:micronaut-http-client", version.ref = "micronautVersion" }
+micronaut-aws-secretsmanager = { module = "io.micronaut.aws:micronaut-aws-secretsmanager", version.ref = "micronautVersion" }
 
 kotlin-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kotlinVersion" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlinVersion" }

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,6 +1,4 @@
 #Fri Jun 07 20:58:35 UTC 2024
-micronaut.application.name=heimdall
-
 heimdall.url=${HEIMDALL_URL}
 heimdall.success-url=${HEIMDALL_SUCCESS}
 heimdall.failure-url=${HEIMDALL_FAILURE}

diff --git a/src/main/resources/bootstrap.properties b/src/main/resources/bootstrap.properties
@@ -0,0 +1,10 @@
+micronaut.application.name=heimdall
+
+micronaut.config-client.enabled=true
+aws.distributed-configuration.search-active-environments=false
+aws.distributed-configuration.search-common-application=false
+
+# If enabled, will resolve secret with name /config/heimdall/secrets
+aws.secretsmanager.enabled=${ENABLE_SECRETS_MANAGER:false}
+aws.secretsmanager.secrets[0].prefix=""
+aws.secretsmanager.secrets[0].secret-name="secrets"
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -6,4 +6,5 @@
         <appender-ref ref="jsonstdout"/>
     </root>
     <logger name="io.netty" level="INFO"/>
+    <logger name="io.micronaut.aws.distributedconfiguration" level="TRACE"/>
 </configuration>
diff --git a/src/test/resources/application-test.properties b/src/test/resources/application-test.properties
@@ -12,4 +12,6 @@ heimdall.msid.secret=secret
 heimdall.msid.tenant=common
 
 keystore.private-key-password=private-key-password
-keystore.keystore-password=keystore-password
+keystore.keystore-password=keystore-password
+
+micronaut.config-client.enabled=false