Skip to content
Merged
Changes from all commits
Commits
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
18 changes: 8 additions & 10 deletions modules/log_ingestion.s3.cft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Metadata:
- KMSAccountId
- BucketAccountId
- TopicAccountId
- OrganizationalUnitIds
- RootOUID
- CreateTopic
- TopicARN
- Endpoint
Expand All @@ -40,8 +40,8 @@ Metadata:
default: Bucket Account ID
TopicAccountId:
default: SNS Topic Account ID
OrganizationalUnitIds:
default: Organizational Unit IDs
RootOUID:
default: Root Organization Unit ID
CreateTopic:
default: Create SNS Topic
TopicARN:
Expand Down Expand Up @@ -84,11 +84,9 @@ Parameters:
Type: String
Description: The AWS Account ID that owns the SNS topic.
AllowedPattern: '^[0-9]{12}$'
OrganizationalUnitIds:
Type: String
Description: Comma-separated list of AWS Organizations organizational unit (OU) IDs for cross-account deployments.
Default: "r-root"
AllowedPattern: '^(ou-[a-z0-9]{4,32}-[a-z0-9]{8,32}|r-[a-z0-9]{4,32})(,\s*(ou-[a-z0-9]{4,32}-[a-z0-9]{8,32}|r-[a-z0-9]{4,32}))*$'
RootOUID:
Type: CommaDelimitedList
Description: Root Organizational Unit ID of your AWS organization
CreateTopic:
Type: String
AllowedValues:
Expand Down Expand Up @@ -246,12 +244,12 @@ Resources:
ParameterValue: !Ref TopicRegion
StackInstancesGroup:
- DeploymentTargets:
OrganizationalUnitIds: !Split [",", !Ref OrganizationalUnitIds]
OrganizationalUnitIds: !Ref RootOUID
Accounts: [!Ref BucketAccountId]
AccountFilterType: INTERSECTION
Regions: [!Ref "AWS::Region"]
- DeploymentTargets:
OrganizationalUnitIds: !Split [",", !Ref OrganizationalUnitIds]
OrganizationalUnitIds: !Ref RootOUID
Accounts: [!Ref TopicAccountId]
AccountFilterType: INTERSECTION
Regions: [!Ref TopicRegion]
Expand Down
Loading