Switch from stack-* to environment prefix for secrets

nulib · Sep 18, 2024 · bad6215 · bad6215
1 parent 8a11223
commit bad6215
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 3 deletions.
diff --git a/core/outputs.tf b/core/outputs.tf
@@ -27,6 +27,7 @@ output "stack" {
     environment   = local.environment
     name          = var.stack_name
     namespace     = local.namespace
+    prefix        = terraform.workspace
     tags          = merge(var.tags, local.common_tags)
   }
 }

diff --git a/data_services/main.tf b/data_services/main.tf
@@ -18,6 +18,7 @@ provider "aws" { }
 locals {
 #  environment   = module.core.outputs.stack.environment
   namespace     = module.core.outputs.stack.namespace
+  prefix        = module.core.outputs.stack.prefix
   tags          = merge(
     module.core.outputs.stack.tags, 
     {

diff --git a/data_services/secrets.tf b/data_services/secrets.tf
@@ -25,7 +25,7 @@ locals {
 
 resource "aws_secretsmanager_secret" "data_services" {
   for_each    = local.secrets
-  name        = "${local.namespace}/infrastructure/${each.key}"
+  name        = "${local.prefix}/infrastructure/${each.key}"
   description = "${each.key} secrets for ${local.namespace}"
 }
 

diff --git a/fcrepo/main.tf b/fcrepo/main.tf
@@ -30,6 +30,7 @@ provider "aws" {
 locals {
 #  environment   = module.core.outputs.stack.environment
   namespace     = module.core.outputs.stack.namespace
+  prefix        = module.core.outputs.stack.prefix
   tags          = merge(
     module.core.outputs.stack.tags, 
     {

diff --git a/fcrepo/secrets.tf b/fcrepo/secrets.tf
@@ -8,7 +8,7 @@ locals {
 
 resource "aws_secretsmanager_secret" "data_services" {
   for_each    = local.secrets
-  name        = "${local.namespace}/infrastructure/${each.key}"
+  name        = "${local.prefix}/infrastructure/${each.key}"
   description = "${each.key} secrets for ${local.namespace}"
 }
 

diff --git a/solrcloud/main.tf b/solrcloud/main.tf
@@ -21,6 +21,7 @@ provider "aws" {
 locals {
 #  environment   = module.core.outputs.stack.environment
   namespace     = module.core.outputs.stack.namespace
+  prefix        = module.core.outputs.stack.prefix
   tags          = merge(
     module.core.outputs.stack.tags, 
     {

diff --git a/solrcloud/secrets.tf b/solrcloud/secrets.tf
@@ -9,7 +9,7 @@ locals {
 
 resource "aws_secretsmanager_secret" "data_services" {
   for_each    = local.secrets
-  name        = "${local.namespace}/infrastructure/${each.key}"
+  name        = "${local.prefix}/infrastructure/${each.key}"
   description = "${each.key} secrets for ${local.namespace}"
 }