PLT-355 switch resource block to data block #96
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
June 14, 2024 17:18
gsf
reviewed
Jun 26, 2024
terraform/modules/bucket/main.tf
Outdated
| versioning_configuration { | ||
| status = "Enabled" | ||
| } | ||
| data "aws_s3_bucket" "bucket-access_logs" { |
There was a problem hiding this comment.
Suggested change
| data "aws_s3_bucket" "bucket-access_logs" { | |
| data "aws_s3_bucket" "bucket_access_logs" { |
terraform/modules/bucket/outputs.tf
Outdated
| output "access_log_bucket_arn" { | ||
| description = "The ARN of the access log S3 bucket" | ||
| value = data.aws_s3_bucket.bucket-access_logs.arn | ||
| } |
There was a problem hiding this comment.
I don't think we need these outputs
terraform/modules/bucket/main.tf
Outdated
| target_bucket = aws_s3_bucket.access_logs.id | ||
| target_prefix = "log/" | ||
| target_bucket = data.aws_s3_bucket.bucket-access_logs.id | ||
| target_prefix = "${var.name}/log/" |
There was a problem hiding this comment.
Suggested change
| target_prefix = "${var.name}/log/" | |
| target_prefix = "${var.name}/" |
|
Looks good! We'll have to get #95 merged and applied before we get good plan checks here. |
gsf
reviewed
Jul 11, 2024
terraform/modules/bucket/main.tf
Outdated
| status = "Enabled" | ||
| } | ||
| data "aws_s3_bucket" "bucket_access_logs" { | ||
| bucket = "${var.app}-${var.env}-bucket-access-log" |
There was a problem hiding this comment.
With the change suggested in https://github.com/CMSgov/ab2d-bcda-dpc-platform/pull/95/files#r1674341305 we'll be able to drop app and env variables and reference the account ID as we did there.
gsf
reviewed
Jul 23, 2024
terraform/modules/function/main.tf
Outdated
| @@ -145,6 +145,7 @@ module "zip_bucket" { | |||
| "arn:aws:iam::${data.aws_ssm_parameter.prod_account[0].value}:role/delegatedadmin/developer/${var.app}-prod-github-actions", | |||
| "arn:aws:iam::${data.aws_ssm_parameter.sbx_account[0].value}:role/delegatedadmin/developer/${var.app}-sbx-github-actions", | |||
| ] : [] | |||
|
|
|||
There was a problem hiding this comment.
Sorry to nit pick but could this blank line addition be removed?
There was a problem hiding this comment.
blank line addition has been removed
gsf
approved these changes
Jul 23, 2024
gsf
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🎫 Ticket
PLT-355
🛠 Changes
Resource block for access-log removed and data block added to reference access log bucket
ℹ️ Context
Our shared terraform currently creates an access log bucket for each bucket. We've recently hit the 100-bucket limit in the BCDA account (quota increase pending) so there is a reason not to create buckets unnecessarily. A terraform service for an access-log-bucket was created and points all bucket-logging to prefixes within that bucket.
🧪 Validation
terraform ran locally. only error was Error: reading S3 Bucket (bcda-access-logs): couldn't find resource because infra creating access log bucket is yet to be deployed and is being use here as a data block.
all workflows fail due to the fact that the data source being used is yet to be deployed and so terraform can't find centralized bucket