Skip to content

Commit ff7733a

Browse files
committed
fix: add count to kms data/resources to avoid creation errors when creation is disabled
1 parent 243acc8 commit ff7733a

File tree

2 files changed

+20
-8
lines changed
  • modules

2 files changed

+20
-8
lines changed

modules/rds_enhanced_monitoring_forwarder/main.tf

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ resource "aws_iam_policy" "this" {
5959
"${path.module}/policy.tmpl",
6060
{
6161
vpc_check = var.subnet_ids != null
62-
kms_arn = data.aws_kms_key.this.arn
62+
kms_arn = data.aws_kms_key.this[0].arn
6363
}
6464
)
6565
}
@@ -127,7 +127,7 @@ resource "aws_lambda_function" "this" {
127127
variables = merge(
128128
{
129129
DD_SITE = var.dd_site
130-
kmsEncryptedKeys = aws_kms_ciphertext.this.ciphertext_blob
130+
kmsEncryptedKeys = aws_kms_ciphertext.this[0].ciphertext_blob
131131
},
132132
var.environment_variables,
133133
local.version_tag
@@ -159,19 +159,25 @@ resource "aws_cloudwatch_log_group" "this" {
159159
}
160160

161161
data "aws_kms_key" "this" {
162+
count = var.create ? 1 : 0
163+
162164
key_id = var.kms_alias
163165
}
164166

165167
data "aws_secretsmanager_secret_version" "datadog_api_key" {
168+
count = var.create ? 1 : 0
169+
166170
secret_id = var.dd_api_key_secret_arn
167171
}
168172

169173
resource "aws_kms_ciphertext" "this" {
170-
key_id = data.aws_kms_key.this.id
174+
count = var.create ? 1 : 0
175+
176+
key_id = data.aws_kms_key.this[0].id
171177

172178
plaintext = <<EOF
173179
{
174-
"api_key": ${data.aws_secretsmanager_secret_version.datadog_api_key.secret_string},
180+
"api_key": ${data.aws_secretsmanager_secret_version.datadog_api_key[0].secret_string},
175181
"app_key": ${var.dd_app_key}
176182
}
177183
EOF

modules/vpc_flow_log_forwarder/main.tf

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ resource "aws_iam_policy" "this" {
6161
vpc_check = var.subnet_ids != null
6262
s3_check = length(var.s3_log_bucket_arns) > 0
6363
s3_log_bucket_arns = jsonencode(var.s3_log_bucket_arns)
64-
kms_arn = data.aws_kms_key.this.arn
64+
kms_arn = data.aws_kms_key.this[0].arn
6565
}
6666
)
6767
}
@@ -129,7 +129,7 @@ resource "aws_lambda_function" "this" {
129129
variables = merge(
130130
{
131131
DD_SITE = var.dd_site
132-
kmsEncryptedKeys = aws_kms_ciphertext.this.ciphertext_blob
132+
kmsEncryptedKeys = aws_kms_ciphertext.this[0].ciphertext_blob
133133
},
134134
var.environment_variables,
135135
local.version_tag
@@ -171,19 +171,25 @@ resource "aws_cloudwatch_log_group" "this" {
171171
}
172172

173173
data "aws_kms_key" "this" {
174+
count = var.create ? 1 : 0
175+
174176
key_id = var.kms_alias
175177
}
176178

177179
data "aws_secretsmanager_secret_version" "datadog_api_key" {
180+
count = var.create ? 1 : 0
181+
178182
secret_id = var.dd_api_key_secret_arn
179183
}
180184

181185
resource "aws_kms_ciphertext" "this" {
182-
key_id = data.aws_kms_key.this.id
186+
count = var.create ? 1 : 0
187+
188+
key_id = data.aws_kms_key.this[0].id
183189

184190
plaintext = <<EOF
185191
{
186-
"api_key": ${data.aws_secretsmanager_secret_version.datadog_api_key.secret_string},
192+
"api_key": ${data.aws_secretsmanager_secret_version.datadog_api_key[0].secret_string},
187193
"app_key": ${var.dd_app_key}
188194
}
189195
EOF

0 commit comments

Comments
 (0)