Skip to content

Commit 956af93

Browse files
authored
fix naming for infra vault (#298)
1 parent ca3af15 commit 956af93

File tree

6 files changed

+13
-14
lines changed

6 files changed

+13
-14
lines changed

iam/iam-policy-for-secrets/locals.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ locals {
1515

1616
secretmanager_arns = concat(
1717
values(data.aws_secretsmanager_secret.app)[*].arn,
18-
values(data.aws_secretsmanager_secret.terraform)[*].arn,
18+
values(data.aws_secretsmanager_secret.infra)[*].arn,
1919
)
2020

2121
kms_ids = concat(
2222
values(data.aws_secretsmanager_secret.app)[*].kms_key_id,
23-
values(data.aws_secretsmanager_secret.terraform)[*].kms_key_id,
23+
values(data.aws_secretsmanager_secret.infra)[*].kms_key_id,
2424
)
2525
}

iam/iam-policy-for-secrets/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ data "aws_secretsmanager_secret" "app" {
66
name = "${each.value.name}/app/${each.value.environment}"
77
}
88

9-
data "aws_secretsmanager_secret" "terraform" {
9+
data "aws_secretsmanager_secret" "infra" {
1010
for_each = {
1111
for project in local.admin_access_projects : "${project.name}-${project.environment}" => project
1212
}
1313

14-
name = "${each.value.name}/app/${each.value.environment}"
14+
name = "${each.value.name}/infra/${each.value.environment}"
1515
}
1616

1717
data "aws_kms_key" "secrets" {

script/database-roles/main.tf

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ data "aws_db_instance" "main" {
22
db_instance_identifier = var.db_identifier
33
}
44

5-
data "aws_secretsmanager_secret_version" "terraform" {
6-
secret_id = "${var.project}/terraform/${var.environment}"
5+
data "aws_secretsmanager_secret_version" "infra" {
6+
secret_id = "${var.project}/infra/${var.environment}"
77
}
88

99
locals {
1010
credentials = jsondecode(
11-
data.aws_secretsmanager_secret_version.terraform.secret_string
11+
data.aws_secretsmanager_secret_version.infra.secret_string
1212
)
1313
}
1414

@@ -39,4 +39,3 @@ resource "null_resource" "database_script" {
3939
working_dir = path.module
4040
}
4141
}
42-

stack/app/secrets.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
locals {
22
credentials = jsondecode(
3-
data.aws_secretsmanager_secret_version.terraform.secret_string
3+
data.aws_secretsmanager_secret_version.infra.secret_string
44
)
55
}
66

7-
data "aws_secretsmanager_secret_version" "terraform" {
7+
data "aws_secretsmanager_secret_version" "infra" {
88
secret_id = "${var.project}/infra/${var.environment}"
99
}
1010

stack/setup/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ resource "aws_secretsmanager_secret_version" "app" {
3939
secret_string = file("${path.cwd}/app-secrets.json")
4040
}
4141

42-
resource "aws_secretsmanager_secret_version" "terraform" {
43-
secret_id = module.secrets["terraform"].id
42+
resource "aws_secretsmanager_secret_version" "infra" {
43+
secret_id = module.secrets["infra"].id
4444
secret_string = file("${path.cwd}/infra-secrets.json")
4545
}
4646

stack/setup/outputs.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ output "app_secrets_arn" {
33
}
44

55
output "terraform_secrets_arn" {
6-
value = module.secrets["terraform"].arn
6+
value = module.secrets["infra"].arn
77
}
88

99
output "app_secrets-kms-key" {
1010
value = module.secrets-kms-key["app"].arn
1111
}
1212

1313
output "terraform_secrets-kms-key" {
14-
value = module.secrets-kms-key["terraform"].arn
14+
value = module.secrets-kms-key["infra"].arn
1515
}
1616

1717
output "eips-nat" {

0 commit comments

Comments
 (0)