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

Fix bucket ACL error #160

Merged
merged 5 commits into from
Apr 11, 2023
Merged

Fix bucket ACL error #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92e967d
fix bucket acl error
zack-is-cool Apr 11, 2023
43cc800
sure
zack-is-cool Apr 11, 2023
f736021
add a bunch of depends_on
zack-is-cool Apr 11, 2023
d72c19b
force upgrade
zack-is-cool Apr 11, 2023
27a3c44
Merge branch 'main' into bug/fix-bucket-acl
RothAndrew Apr 11, 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
1 change: 1 addition & 0 deletions modules/bastion/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ No modules.
| [aws_s3_bucket_logging.access_logging_on_session_logs_bucket](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_logging) | resource |
| [aws_s3_bucket_notification.access_log_bucket_notification](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_notification) | resource |
| [aws_s3_bucket_notification.session_logs_bucket_notification](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_notification) | resource |
| [aws_s3_bucket_ownership_controls.session_logs_bucket](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_ownership_controls) | resource |
| [aws_s3_bucket_policy.cloudwatch-s3-policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_policy) | resource |
| [aws_s3_bucket_public_access_block.access_log_bucket](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_public_access_block) | resource |
| [aws_s3_bucket_public_access_block.session_logs_bucket](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_public_access_block) | resource |
Expand Down
26 changes: 21 additions & 5 deletions modules/bastion/s3-buckets.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ resource "aws_s3_bucket_lifecycle_configuration" "access_log_bucket" {
days = var.access_log_expire_days
}
}
depends_on = [
aws_s3_bucket_versioning.access_log_bucket
]
}

resource "aws_s3_bucket_notification" "access_log_bucket_notification" {
Expand All @@ -146,10 +149,24 @@ resource "aws_s3_bucket" "session_logs_bucket" {

}

resource "aws_s3_bucket_ownership_controls" "session_logs_bucket" {
bucket = aws_s3_bucket.session_logs_bucket.id
rule {
object_ownership = "BucketOwnerPreferred"
}
depends_on = [
aws_s3_bucket.session_logs_bucket,
aws_s3_bucket_public_access_block.session_logs_bucket
]
}

resource "aws_s3_bucket_acl" "session_logs_bucket" {
bucket = aws_s3_bucket.session_logs_bucket.id
acl = "private"

acl = "private"
depends_on = [
aws_s3_bucket_ownership_controls.session_logs_bucket
]
}

resource "aws_s3_bucket_versioning" "session_logs_bucket" {
Expand Down Expand Up @@ -177,10 +194,6 @@ resource "aws_s3_bucket_public_access_block" "session_logs_bucket" {
block_public_policy = true
ignore_public_acls = true
restrict_public_buckets = true

# The ACL needs to be added before this public access block can be applied. If the public access block gets applied first, then the ACL gets is not able to be added, leading to a race condition.
# https://stackoverflow.com/questions/71080354/getting-the-bucket-does-not-allow-acls-error
depends_on = [aws_s3_bucket_acl.session_logs_bucket]
}

resource "aws_s3_bucket_lifecycle_configuration" "session_logs_bucket" {
Expand All @@ -199,6 +212,9 @@ resource "aws_s3_bucket_lifecycle_configuration" "session_logs_bucket" {
days = var.log_expire_days
}
}
depends_on = [
aws_s3_bucket_versioning.session_logs_bucket
]
}

resource "aws_s3_bucket_notification" "session_logs_bucket_notification" {
Expand Down
9 changes: 5 additions & 4 deletions test/e2e/examples_complete_secure_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ package e2e_test

import (
"fmt"
"os/exec"
"testing"
"time"

"github.com/gruntwork-io/terratest/modules/logger"
"github.com/gruntwork-io/terratest/modules/terraform"
teststructure "github.com/gruntwork-io/terratest/modules/test-structure"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"os/exec"
"testing"
"time"
)

// This test deploys the complete example in "secure mode". Secure mode is:
Expand All @@ -26,7 +27,7 @@ func TestExamplesCompleteSecure(t *testing.T) {
tempFolder := teststructure.CopyTerraformFolderToTemp(t, "../..", "examples/complete")
terraformOptionsNoTargets := &terraform.Options{
TerraformDir: tempFolder,
Upgrade: false,
Upgrade: true,
VarFiles: []string{
"fixtures.common.tfvars",
"fixtures.secure.tfvars",
Expand Down