-
-
Notifications
You must be signed in to change notification settings - Fork 3.8k
feat: Support S3 Directory Bucket #310
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.
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
Merged
antonbabenko
merged 9 commits into
terraform-aws-modules:master
from
magreenbaum:feat/directory_bucket
Feb 12, 2025
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
855b4c6
feat/support directory bucket
magreenbaum ef6f159
wrappers
magreenbaum ce7bc72
Merge branch 'master' into feat/directory_bucket
magreenbaum 76b2d91
update READMEs
magreenbaum 249fc87
remove comment about tags since tag filters are not supported in S3 E…
magreenbaum 2cf917e
move resource for directory bucket into main module
magreenbaum 7307539
update outputs
magreenbaum f3dfc6a
remove directory-bucket wrapper
magreenbaum b97142a
feedback changes
magreenbaum File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| # S3 directory bucket | ||
|
|
||
| Configuration in this directory creates S3 directory bucket and related resources. | ||
|
|
||
| ## Usage | ||
|
|
||
| To run this example you need to execute: | ||
|
|
||
| ```bash | ||
| $ terraform init | ||
| $ terraform plan | ||
| $ terraform apply | ||
| ``` | ||
|
|
||
| Note that this example may create resources which cost money. Run `terraform destroy` when you don't need these resources. | ||
|
|
||
| <!-- BEGIN_TF_DOCS --> | ||
| ## Requirements | ||
|
|
||
| | Name | Version | | ||
| |------|---------| | ||
| | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 | | ||
| | <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.83 | | ||
| | <a name="requirement_random"></a> [random](#requirement\_random) | >= 2.0 | | ||
|
|
||
| ## Providers | ||
|
|
||
| | Name | Version | | ||
| |------|---------| | ||
| | <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.83 | | ||
| | <a name="provider_random"></a> [random](#provider\_random) | >= 2.0 | | ||
|
|
||
| ## Modules | ||
|
|
||
| | Name | Source | Version | | ||
| |------|--------|---------| | ||
| | <a name="module_complete"></a> [complete](#module\_complete) | ../../ | n/a | | ||
| | <a name="module_simple"></a> [simple](#module\_simple) | ../../ | n/a | | ||
|
|
||
| ## Resources | ||
|
|
||
| | Name | Type | | ||
| |------|------| | ||
| | [aws_kms_key.objects](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/kms_key) | resource | | ||
| | [random_pet.this](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/pet) | resource | | ||
| | [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source | | ||
| | [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source | | ||
| | [aws_iam_policy_document.bucket_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source | | ||
|
|
||
| ## Inputs | ||
|
|
||
| No inputs. | ||
|
|
||
| ## Outputs | ||
|
|
||
| | Name | Description | | ||
| |------|-------------| | ||
| | <a name="output_directory_bucket_arn"></a> [directory\_bucket\_arn](#output\_directory\_bucket\_arn) | ARN of the directory bucket. | | ||
| | <a name="output_directory_bucket_name"></a> [directory\_bucket\_name](#output\_directory\_bucket\_name) | Name of the directory bucket. | | ||
| <!-- END_TF_DOCS --> |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| locals { | ||
| region = "eu-west-1" | ||
| } | ||
|
|
||
| provider "aws" { | ||
| region = local.region | ||
|
|
||
| # Make it faster by skipping something | ||
| skip_metadata_api_check = true | ||
| skip_region_validation = true | ||
| skip_credentials_validation = true | ||
| } | ||
|
|
||
| data "aws_caller_identity" "current" {} | ||
|
|
||
| data "aws_availability_zones" "available" { | ||
| state = "available" | ||
| } | ||
|
|
||
| module "simple" { | ||
| source = "../../" | ||
|
|
||
| is_directory_bucket = true | ||
| bucket = random_pet.this.id | ||
| # https://docs.aws.amazon.com/AmazonS3/latest/userguide/s3-express-Endpoints.html | ||
| availability_zone_id = data.aws_availability_zones.available.zone_ids[1] | ||
| } | ||
|
|
||
| module "complete" { | ||
| source = "../../" | ||
|
|
||
| is_directory_bucket = true | ||
| bucket = "${random_pet.this.id}-complete" | ||
| # https://docs.aws.amazon.com/AmazonS3/latest/userguide/s3-express-Endpoints.html | ||
| availability_zone_id = data.aws_availability_zones.available.zone_ids[1] | ||
| server_side_encryption_configuration = { | ||
| rule = { | ||
| bucket_key_enabled = true # required for directory buckets | ||
| apply_server_side_encryption_by_default = { | ||
| kms_master_key_id = aws_kms_key.objects.arn | ||
| sse_algorithm = "aws:kms" | ||
| } | ||
| } | ||
| } | ||
| lifecycle_rule = [ | ||
| { | ||
| id = "test" | ||
| status = "Enabled" | ||
| expiration = { | ||
| days = 7 | ||
| } | ||
| }, | ||
| { | ||
| id = "logs" | ||
| status = "Enabled" | ||
| expiration = { | ||
| days = 5 | ||
| } | ||
| filter = { | ||
| prefix = "logs/" | ||
| object_size_less_than = 10 | ||
| } | ||
| }, | ||
| { | ||
| id = "other" | ||
| status = "Enabled" | ||
| expiration = { | ||
| days = 2 | ||
| } | ||
| filter = { | ||
| prefix = "other/" | ||
| } | ||
| } | ||
| ] | ||
| attach_policy = true | ||
| policy = data.aws_iam_policy_document.bucket_policy.json | ||
| } | ||
|
|
||
| resource "random_pet" "this" { | ||
| length = 2 | ||
| } | ||
|
|
||
| resource "aws_kms_key" "objects" { | ||
| description = "KMS key is used to encrypt bucket objects" | ||
| deletion_window_in_days = 7 | ||
| } | ||
|
|
||
| data "aws_iam_policy_document" "bucket_policy" { | ||
|
|
||
| statement { | ||
| sid = "ReadWriteAccess" | ||
| effect = "Allow" | ||
|
|
||
| actions = [ | ||
| "s3express:CreateSession", | ||
| ] | ||
|
|
||
| resources = [module.complete.s3_directory_bucket_arn] | ||
|
|
||
| principals { | ||
| identifiers = [data.aws_caller_identity.current.account_id] | ||
| type = "AWS" | ||
| } | ||
| } | ||
|
|
||
| statement { | ||
| sid = "ReadOnlyAccess" | ||
| effect = "Allow" | ||
|
|
||
| actions = [ | ||
| "s3express:CreateSession", | ||
| ] | ||
|
|
||
| resources = [module.complete.s3_directory_bucket_arn] | ||
|
|
||
| principals { | ||
| identifiers = [data.aws_caller_identity.current.account_id] | ||
| type = "AWS" | ||
| } | ||
|
|
||
| condition { | ||
| test = "StringEquals" | ||
| values = ["ReadOnly"] | ||
| variable = "s3express:SessionMode" | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| output "directory_bucket_name" { | ||
| description = "Name of the directory bucket." | ||
| value = module.complete.s3_directory_bucket_name | ||
| } | ||
|
|
||
| output "directory_bucket_arn" { | ||
| description = "ARN of the directory bucket." | ||
| value = module.complete.s3_directory_bucket_arn | ||
| } |
Empty file.
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| terraform { | ||
| required_version = ">= 1.0" | ||
|
|
||
| required_providers { | ||
| aws = { | ||
| source = "hashicorp/aws" | ||
| version = ">= 5.83" | ||
| } | ||
| random = { | ||
| source = "hashicorp/random" | ||
| version = ">= 2.0" | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.