diff --git a/README.md b/README.md index fa5926f4..131c44b9 100644 --- a/README.md +++ b/README.md @@ -151,7 +151,7 @@ Users of Terragrunt can achieve similar results by using modules provided in the | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.10 | +| [terraform](#requirement\_terraform) | >= 1.5.7 | | [aws](#requirement\_aws) | >= 6.0 | ## Providers diff --git a/examples/complete-legacy/README.md b/examples/complete-legacy/README.md deleted file mode 100644 index ef51fa5d..00000000 --- a/examples/complete-legacy/README.md +++ /dev/null @@ -1,59 +0,0 @@ -# Legacy - Complete S3 bucket with most of supported features enabled - -Configuration in this directory creates S3 bucket using previous (2.x) version of this module to test upgrade process. - -This configuration is similar to the code in [examples/complete](https://github.com/terraform-aws-modules/terraform-aws-s3-bucket/tree/master/examples/complete) but not identical. - -## Usage - -Once this configuration is created, you need to use the newer version of this module (e.g. `~> 3.0`), review/update arguments (see code in [examples/complete](https://github.com/terraform-aws-modules/terraform-aws-s3-bucket/tree/master/examples/complete)) and import existing resources (see [UPGRADE-3.0.md](https://github.com/terraform-aws-modules/terraform-aws-s3-bucket/blob/master/UPGRADE-3.0.md) for more precise commands). - - -## Requirements - -| Name | Version | -|------|---------| -| [terraform](#requirement\_terraform) | >= 1.0 | -| [aws](#requirement\_aws) | ~> 3.69.0 | -| [random](#requirement\_random) | >= 2.0 | - -## Providers - -| Name | Version | -|------|---------| -| [aws](#provider\_aws) | ~> 3.69.0 | -| [random](#provider\_random) | >= 2.0 | - -## Modules - -| Name | Source | Version | -|------|--------|---------| -| [log\_bucket](#module\_log\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 2.0 | -| [s3\_bucket](#module\_s3\_bucket) | terraform-aws-modules/s3-bucket/aws | ~> 2.0 | - -## Resources - -| Name | Type | -|------|------| -| [aws_iam_role.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) | resource | -| [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_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 | -|------|-------------| -| [s3\_bucket\_arn](#output\_s3\_bucket\_arn) | The ARN of the bucket. Will be of format arn:aws:s3:::bucketname. | -| [s3\_bucket\_bucket\_domain\_name](#output\_s3\_bucket\_bucket\_domain\_name) | The bucket domain name. Will be of format bucketname.s3.amazonaws.com. | -| [s3\_bucket\_bucket\_regional\_domain\_name](#output\_s3\_bucket\_bucket\_regional\_domain\_name) | The bucket region-specific domain name. The bucket domain name including the region name, please refer here for format. Note: The AWS CloudFront allows specifying S3 region-specific endpoint when creating S3 origin, it will prevent redirect issues from CloudFront to S3 Origin URL. | -| [s3\_bucket\_hosted\_zone\_id](#output\_s3\_bucket\_hosted\_zone\_id) | The Route 53 Hosted Zone ID for this bucket's region. | -| [s3\_bucket\_id](#output\_s3\_bucket\_id) | The name of the bucket. | -| [s3\_bucket\_region](#output\_s3\_bucket\_region) | The AWS region this bucket resides in. | -| [s3\_bucket\_website\_domain](#output\_s3\_bucket\_website\_domain) | The domain of the website endpoint, if the bucket is configured with a website. If not, this will be an empty string. This is used to create Route 53 alias records. | -| [s3\_bucket\_website\_endpoint](#output\_s3\_bucket\_website\_endpoint) | The website endpoint, if the bucket is configured with a website. If not, this will be an empty string. | - diff --git a/examples/complete-legacy/main.tf b/examples/complete-legacy/main.tf deleted file mode 100644 index 257d109d..00000000 --- a/examples/complete-legacy/main.tf +++ /dev/null @@ -1,219 +0,0 @@ -provider "aws" { - region = local.region - - # Make it faster by skipping something - skip_metadata_api_check = true - skip_region_validation = true - skip_credentials_validation = true -} - -locals { - bucket_name = "s3-bucket-${random_pet.this.id}" - region = "eu-west-1" -} - -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 -} - -resource "aws_iam_role" "this" { - assume_role_policy = < [terraform](#requirement\_terraform) | >= 1.10 | +| [terraform](#requirement\_terraform) | >= 1.5.7 | | [aws](#requirement\_aws) | >= 6.0 | | [random](#requirement\_random) | >= 2.0 | diff --git a/examples/complete/versions.tf b/examples/complete/versions.tf index 9af58496..d2f4f3e8 100644 --- a/examples/complete/versions.tf +++ b/examples/complete/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = { diff --git a/examples/directory-bucket/README.md b/examples/directory-bucket/README.md index 8fa8d849..014b77a6 100644 --- a/examples/directory-bucket/README.md +++ b/examples/directory-bucket/README.md @@ -19,7 +19,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.10 | +| [terraform](#requirement\_terraform) | >= 1.5.7 | | [aws](#requirement\_aws) | >= 6.0 | | [random](#requirement\_random) | >= 2.0 | diff --git a/examples/directory-bucket/versions.tf b/examples/directory-bucket/versions.tf index 9af58496..d2f4f3e8 100644 --- a/examples/directory-bucket/versions.tf +++ b/examples/directory-bucket/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = { diff --git a/examples/notification/README.md b/examples/notification/README.md index 1510530a..0826d128 100644 --- a/examples/notification/README.md +++ b/examples/notification/README.md @@ -19,7 +19,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.10 | +| [terraform](#requirement\_terraform) | >= 1.5.7 | | [aws](#requirement\_aws) | >= 6.0 | | [null](#requirement\_null) | >= 2.0 | | [random](#requirement\_random) | >= 2.0 | diff --git a/examples/notification/versions.tf b/examples/notification/versions.tf index a387cec5..f3849b87 100644 --- a/examples/notification/versions.tf +++ b/examples/notification/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = { diff --git a/examples/object/README.md b/examples/object/README.md index 5c8c6a78..3ad216fd 100644 --- a/examples/object/README.md +++ b/examples/object/README.md @@ -19,7 +19,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.10 | +| [terraform](#requirement\_terraform) | >= 1.5.7 | | [aws](#requirement\_aws) | >= 6.0 | | [random](#requirement\_random) | >= 2.0 | diff --git a/examples/object/versions.tf b/examples/object/versions.tf index 9af58496..d2f4f3e8 100644 --- a/examples/object/versions.tf +++ b/examples/object/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = { diff --git a/examples/s3-analytics/README.md b/examples/s3-analytics/README.md index 295dcb7f..ab6f2a10 100644 --- a/examples/s3-analytics/README.md +++ b/examples/s3-analytics/README.md @@ -9,7 +9,7 @@ Please check [complete example](https://github.com/terraform-aws-modules/terrafo | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.10 | +| [terraform](#requirement\_terraform) | >= 1.5.7 | | [aws](#requirement\_aws) | >= 6.0 | | [random](#requirement\_random) | >= 2.0 | diff --git a/examples/s3-analytics/versions.tf b/examples/s3-analytics/versions.tf index 9af58496..d2f4f3e8 100644 --- a/examples/s3-analytics/versions.tf +++ b/examples/s3-analytics/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = { diff --git a/examples/s3-inventory/README.md b/examples/s3-inventory/README.md index 4b58a1d6..c2d64c30 100644 --- a/examples/s3-inventory/README.md +++ b/examples/s3-inventory/README.md @@ -9,7 +9,7 @@ Please check [complete example](https://github.com/terraform-aws-modules/terrafo | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.10 | +| [terraform](#requirement\_terraform) | >= 1.5.7 | | [aws](#requirement\_aws) | >= 6.0 | | [random](#requirement\_random) | >= 2.0 | diff --git a/examples/s3-inventory/versions.tf b/examples/s3-inventory/versions.tf index 9af58496..d2f4f3e8 100644 --- a/examples/s3-inventory/versions.tf +++ b/examples/s3-inventory/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = { diff --git a/examples/s3-replication/README.md b/examples/s3-replication/README.md index 80662a0d..23933c9e 100644 --- a/examples/s3-replication/README.md +++ b/examples/s3-replication/README.md @@ -21,7 +21,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.10 | +| [terraform](#requirement\_terraform) | >= 1.5.7 | | [aws](#requirement\_aws) | >= 6.0 | | [random](#requirement\_random) | >= 2.0 | diff --git a/examples/s3-replication/versions.tf b/examples/s3-replication/versions.tf index 9af58496..d2f4f3e8 100644 --- a/examples/s3-replication/versions.tf +++ b/examples/s3-replication/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = { diff --git a/examples/table-bucket/README.md b/examples/table-bucket/README.md index 5ab6af70..dff19e52 100644 --- a/examples/table-bucket/README.md +++ b/examples/table-bucket/README.md @@ -19,7 +19,7 @@ Note that this example may create resources which cost money. Run `terraform des | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.10 | +| [terraform](#requirement\_terraform) | >= 1.5.7 | | [aws](#requirement\_aws) | >= 6.0 | | [random](#requirement\_random) | >= 2.0 | diff --git a/examples/table-bucket/versions.tf b/examples/table-bucket/versions.tf index 9af58496..d2f4f3e8 100644 --- a/examples/table-bucket/versions.tf +++ b/examples/table-bucket/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = { diff --git a/modules/account-public-access/README.md b/modules/account-public-access/README.md index 774133e6..722d7ee4 100644 --- a/modules/account-public-access/README.md +++ b/modules/account-public-access/README.md @@ -11,7 +11,7 @@ Each AWS account may only have one S3 Public Access Block configuration. | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.10 | +| [terraform](#requirement\_terraform) | >= 1.5.7 | | [aws](#requirement\_aws) | >= 6.0 | ## Providers diff --git a/modules/account-public-access/versions.tf b/modules/account-public-access/versions.tf index f648e20c..db13b0a8 100644 --- a/modules/account-public-access/versions.tf +++ b/modules/account-public-access/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = { diff --git a/modules/notification/README.md b/modules/notification/README.md index e528fb97..61f1c285 100644 --- a/modules/notification/README.md +++ b/modules/notification/README.md @@ -7,7 +7,7 @@ Creates S3 bucket notification resource with all supported types of deliveries: | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.10 | +| [terraform](#requirement\_terraform) | >= 1.5.7 | | [aws](#requirement\_aws) | >= 6.0 | ## Providers diff --git a/modules/notification/versions.tf b/modules/notification/versions.tf index f648e20c..db13b0a8 100644 --- a/modules/notification/versions.tf +++ b/modules/notification/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = { diff --git a/modules/object/README.md b/modules/object/README.md index 24e8a6dd..e6e8498c 100644 --- a/modules/object/README.md +++ b/modules/object/README.md @@ -7,7 +7,7 @@ Creates S3 bucket objects with different configurations. | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.10 | +| [terraform](#requirement\_terraform) | >= 1.5.7 | | [aws](#requirement\_aws) | >= 6.0 | ## Providers diff --git a/modules/object/versions.tf b/modules/object/versions.tf index f648e20c..db13b0a8 100644 --- a/modules/object/versions.tf +++ b/modules/object/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = { diff --git a/modules/table-bucket/README.md b/modules/table-bucket/README.md index 8ef7ff99..1e857fa5 100644 --- a/modules/table-bucket/README.md +++ b/modules/table-bucket/README.md @@ -7,7 +7,7 @@ Creates S3 Table Bucket and Tables with various configurations. | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.10 | +| [terraform](#requirement\_terraform) | >= 1.5.7 | | [aws](#requirement\_aws) | >= 6.0 | ## Providers diff --git a/modules/table-bucket/versions.tf b/modules/table-bucket/versions.tf index f648e20c..db13b0a8 100644 --- a/modules/table-bucket/versions.tf +++ b/modules/table-bucket/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = { diff --git a/versions.tf b/versions.tf index f648e20c..db13b0a8 100644 --- a/versions.tf +++ b/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = { diff --git a/wrappers/account-public-access/versions.tf b/wrappers/account-public-access/versions.tf index f648e20c..db13b0a8 100644 --- a/wrappers/account-public-access/versions.tf +++ b/wrappers/account-public-access/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = { diff --git a/wrappers/notification/versions.tf b/wrappers/notification/versions.tf index f648e20c..db13b0a8 100644 --- a/wrappers/notification/versions.tf +++ b/wrappers/notification/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = { diff --git a/wrappers/object/versions.tf b/wrappers/object/versions.tf index f648e20c..db13b0a8 100644 --- a/wrappers/object/versions.tf +++ b/wrappers/object/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = { diff --git a/wrappers/table-bucket/versions.tf b/wrappers/table-bucket/versions.tf index f648e20c..db13b0a8 100644 --- a/wrappers/table-bucket/versions.tf +++ b/wrappers/table-bucket/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = { diff --git a/wrappers/versions.tf b/wrappers/versions.tf index f648e20c..db13b0a8 100644 --- a/wrappers/versions.tf +++ b/wrappers/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.10" + required_version = ">= 1.5.7" required_providers { aws = {