Skip to content
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

Jump to bottom

TME-2291: Update stackset expel principal arn #45

Merged
merged 2 commits into from
Jul 18, 2023
Merged

TME-2291: Update stackset expel principal arn #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da727a5
TME-2291: Update stackset expel principal arn
bachu20 Jul 18, 2023
4b9b958
move ignore block
bachu20 Jul 18, 2023
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
2 changes: 2 additions & 0 deletions s3.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ resource "aws_s3_bucket_logging" "cloudtrail_bucket_logging" {
target_prefix = "log/"
}

# ignoring as the logging block is deprecated in favor of aws_s3_bucket_logging
# tfsec:ignore:aws-s3-enable-bucket-logging
resource "aws_s3_bucket" "cloudtrail_access_log_bucket" {
count = var.existing_cloudtrail_bucket_name == null && var.enable_bucket_access_logging ? 1 : 0

Expand Down
4 changes: 2 additions & 2 deletions stackset.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ resource "aws_cloudformation_stack_set" "permeate_account_policy" {
}

parameters = {
ExpelCustomerOrganizationGUID = var.expel_customer_organization_guid,
ExpelAssumeRoleARN = aws_iam_role.expel_assume_role.arn
ExpelCustomerOrganizationGUID = var.expel_customer_organization_guid
ExpelAccountARN = var.expel_aws_account_arn
ExpelRoleName = aws_iam_role.expel_assume_role.name
bachu20 marked this conversation as resolved.
Show resolved Hide resolved
}

Expand Down
4 changes: 2 additions & 2 deletions stackset_template.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ locals {
"ExpelCustomerOrganizationGUID" : {
"Type" : "String"
},
"ExpelAssumeRoleARN" : {
"ExpelAccountARN" : {
"Type" : "String"
},
"ExpelRoleName" : {
Expand All @@ -30,7 +30,7 @@ locals {
{
"Effect": "Allow",
"Principal": {
"AWS": { "Ref": "ExpelAssumeRoleARN" }
"AWS": { "Ref": "ExpelAccountARN" }
},
"Action": "sts:AssumeRole",
"Condition": {
Expand Down