Skip to content

Commit 647e8e9

Browse files
jim80netQingping Hou
authored andcommitted
fix: use AWS Secrets Manager instead of supplying API Key parameter
- Avoids always reapplying changes due to this bug: hashicorp/terraform-provider-aws#55
1 parent fa93d8b commit 647e8e9

File tree

2 files changed

+636
-2
lines changed

2 files changed

+636
-2
lines changed

logs_monitoring.tf

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,27 @@
1+
data "local_file" "template_yaml" {
2+
filename = "${path.module}/logs_monitoring_template.yaml"
3+
}
4+
15
resource "aws_cloudformation_stack" "datadog-forwarder" {
26
name = "datadog-forwarder"
37
capabilities = ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM", "CAPABILITY_AUTO_EXPAND"]
48
parameters = {
5-
DdApiKey = var.datadog_api_key
9+
DdApiKeySecret = aws_secretsmanager_secret.datadog_api_key.arn
610
DdTags = "namespace:${var.namespace},env:${var.env}"
711
ExcludeAtMatch = var.log_exclude_at_match
812
FunctionName = "datadog-forwarder"
913
}
10-
template_url = "https://datadog-cloudformation-template.s3.amazonaws.com/aws/forwarder/3.6.0.yaml"
14+
#template_url = "https://datadog-cloudformation-template.s3.amazonaws.com/aws/forwarder/3.6.0.yaml"
15+
template_body = data.local_file.template_yaml.content
16+
17+
}
18+
19+
resource "aws_secretsmanager_secret" "datadog_api_key" {
20+
name = "datadog_api_key"
21+
description = "Datadog API Key"
22+
}
23+
24+
resource "aws_secretsmanager_secret_version" "datadog_api_key" {
25+
secret_id = aws_secretsmanager_secret.datadog_api_key.id
26+
secret_string = var.datadog_api_key
1127
}

0 commit comments

Comments
 (0)