Skip to content

Fix: Add aws_partition data source. #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Add aws_partition data source. #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions logs_monitoring_cloudwatch_log.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ resource "aws_lambda_permission" "allow_cloudwatch_logs_to_call_dd_lambda_handle
function_name = aws_cloudformation_stack.datadog-forwarder.outputs.DatadogForwarderArn
principal = "logs.${var.aws_region}.amazonaws.com"
source_arn = (length(var.log_group_prefixes) > 0 ?
"arn:aws:logs:${var.aws_region}:${var.aws_account_id}:log-group:${each.value}*" :
"arn:aws:logs:${var.aws_region}:${var.aws_account_id}:log-group:${each.value}:*")
"arn:${data.aws_partition.current.partition}:logs:${var.aws_region}:${var.aws_account_id}:log-group:${each.value}*" :
"arn:${data.aws_partition.current.partition}:logs:${var.aws_region}:${var.aws_account_id}:log-group:${each.value}:*")
}
2 changes: 1 addition & 1 deletion logs_monitoring_elb.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ data "aws_iam_policy_document" "elb_logs" {
"s3:PutObject"
]
resources = [
"arn:aws:s3:::${local.elb_logs_s3_bucket}/*",
"arn:${data.aws_partition.current.partition}:s3:::${local.elb_logs_s3_bucket}/*",
]
principals {
type = "AWS"
Expand Down
4 changes: 3 additions & 1 deletion main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## This tf file will setup Datadog AWS integration

data "aws_partition" "current" {}

resource "datadog_integration_aws" "core" {
count = var.enable_datadog_aws_integration ? 1 : 0
account_id = var.aws_account_id
Expand All @@ -26,7 +28,7 @@ resource "aws_iam_role" "datadog-integration" {
{
"Effect": "Allow",
"Principal": {
"AWS": "arn:aws:iam::464622532012:root"
"AWS": "arn:${data.aws_partition.current.partition}:iam::464622532012:root"
},
"Action": "sts:AssumeRole",
"Condition": {
Expand Down