Skip to content

[AWSINTS-3744] feat(aws_streams): make metric stream IAM ARNs partition-aware for GovCloud (v1.1.3) #324

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

Draft
ksirrah13 wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −15
Draft

[AWSINTS-3744] feat(aws_streams): make metric stream IAM ARNs partition-aware for GovCloud (v1.1.3) #324

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
28 changes: 14 additions & 14 deletions aws_streams/streams_main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,18 @@ Resources:
Action:
- "s3:*"
Resource:
- "arn:aws:s3:::cf-templates-*"
- !Sub "arn:${AWS::Partition}:s3:::cf-templates-*"
- Effect: Allow
Action:
- "cloudformation:*"
Resource:
- !Sub "arn:aws:cloudformation:*:${AWS::AccountId}:stack/StackSet-DatadogStreams-*"
- !Sub "arn:aws:cloudformation:*:${AWS::AccountId}:stackset/DatadogStreams*"
- !Sub "arn:${AWS::Partition}:cloudformation:*:${AWS::AccountId}:stack/StackSet-DatadogStreams-*"
- !Sub "arn:${AWS::Partition}:cloudformation:*:${AWS::AccountId}:stackset/DatadogStreams*"
- Effect: Allow
Action:
- "sns:Publish"
Resource:
- "arn:aws:sns:*:*:CfnNotificationSNSTopic"
- !Sub "arn:${AWS::Partition}:sns:*:*:CfnNotificationSNSTopic"
- Effect: Allow
Action:
- iam:GetRole
Expand All @@ -115,7 +115,7 @@ Resources:
StringEquals:
"iam:PassedToService": "streams.metrics.cloudwatch.amazonaws.com"
Resource:
- !Sub "arn:aws:iam::${AWS::AccountId}:role/DatadogMetricStreamRole"
- !Sub "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/DatadogMetricStreamRole"
- Effect: Allow
Action:
- iam:GetRole
Expand All @@ -124,7 +124,7 @@ Resources:
StringEquals:
"iam:PassedToService": "firehose.amazonaws.com"
Resource:
- !Sub "arn:aws:iam::${AWS::AccountId}:role/DatadogServiceRole"
- !Sub "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/DatadogServiceRole"
- Effect: Allow
Action:
- s3:CreateBucket
Expand All @@ -134,7 +134,7 @@ Resources:
- s3:PutBucketTagging
- s3:PutObjectTagging
Resource:
- !Sub "arn:aws:s3:::datadog-aws-metric-stream-backup-${AWS::AccountId}-*"
- !Sub "arn:${AWS::Partition}:s3:::datadog-aws-metric-stream-backup-${AWS::AccountId}-*"
- Effect: Allow
Action:
- logs:CreateLogGroup
Expand All @@ -145,15 +145,15 @@ Resources:
- logs:DescribeLogStreams
- logs:TagResource
Resource:
- !Sub "arn:aws:logs:*:${AWS::AccountId}:log-group:datadog-metric-stream*"
- !Sub "arn:${AWS::Partition}:logs:*:${AWS::AccountId}:log-group:datadog-metric-stream*"
- Effect: Allow
Action:
- firehose:CreateDeliveryStream
- firehose:DescribeDeliveryStream
- firehose:DeleteDeliveryStream
- firehose:TagDeliveryStream
Resource:
- !Sub "arn:aws:firehose:*:${AWS::AccountId}:deliverystream/datadog-metrics-stream"
- !Sub "arn:${AWS::Partition}:firehose:*:${AWS::AccountId}:deliverystream/datadog-metrics-stream"
- Effect: Allow
Action:
- cloudwatch:PutMetricStream
Expand All @@ -162,7 +162,7 @@ Resources:
- cloudwatch:DeleteMetricStream
- cloudwatch:TagResource
Resource:
- !Sub "arn:aws:cloudwatch:*:${AWS::AccountId}:metric-stream/datadog-metrics-stream"
- !Sub "arn:${AWS::Partition}:cloudwatch:*:${AWS::AccountId}:metric-stream/datadog-metrics-stream"
ServiceRole:
Type: "AWS::IAM::Role"
Properties:
Expand Down Expand Up @@ -191,8 +191,8 @@ Resources:
- "s3:ListBucketMultipartUploads"
- "s3:PutObject"
Resource:
- !Sub "arn:aws:s3:::datadog-aws-metric-stream-backup-${AWS::AccountId}-*"
- !Sub "arn:aws:s3:::datadog-aws-metric-stream-backup-${AWS::AccountId}-*/*"
- !Sub "arn:${AWS::Partition}:s3:::datadog-aws-metric-stream-backup-${AWS::AccountId}-*"
- !Sub "arn:${AWS::Partition}:s3:::datadog-aws-metric-stream-backup-${AWS::AccountId}-*/*"
DatadogMetricStreamRole:
Type: AWS::IAM::Role
Properties:
Expand All @@ -217,7 +217,7 @@ Resources:
- "firehose:PutRecord"
- "firehose:PutRecordBatch"
Resource:
- !Sub "arn:aws:firehose:*:${AWS::AccountId}:deliverystream/datadog-metrics-stream"
- !Sub "arn:${AWS::Partition}:firehose:*:${AWS::AccountId}:deliverystream/datadog-metrics-stream"
Description: A metric stream role
DatadogStreamStackSet:
Type: AWS::CloudFormation::StackSet
Expand All @@ -231,7 +231,7 @@ Resources:
Accounts:
- !Ref "AWS::AccountId"
Regions: !Ref Regions
TemplateURL: "https://s3.amazonaws.com/<BUCKET_PLACEHOLDER>/aws/streams_single_region.yaml"
TemplateURL: "https://<BUCKET_PLACEHOLDER>.s3.amazonaws.com/aws/streams_single_region.yaml"
Parameters:
- ParameterKey: ApiKey
ParameterValue: !Ref ApiKey
Expand Down
2 changes: 1 addition & 1 deletion aws_streams/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.1.2
v1.1.3
Loading