feedback changes

Author: magreenbaum

README.md

@@ -168,7 +168,6 @@ No modules.
 | [aws_s3_bucket_versioning.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_versioning) | resource |
 | [aws_s3_bucket_website_configuration.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_website_configuration) | resource |
 | [aws_s3_directory_bucket.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_directory_bucket) | resource |
-| [aws_availability_zone.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zone) | data source |
 | [aws_caller_identity.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) | data source |
 | [aws_canonical_user_id.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/canonical_user_id) | data source |
 | [aws_iam_policy_document.access_log_delivery](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
@@ -211,7 +210,7 @@ No modules.
 | <a name="input_attach_policy"></a> [attach\_policy](#input\_attach\_policy) | Controls if S3 bucket should have bucket policy attached (set to `true` to use value of `policy` as bucket policy) | `bool` | `false` | no |
 | <a name="input_attach_public_policy"></a> [attach\_public\_policy](#input\_attach\_public\_policy) | Controls if a user defined public bucket policy will be attached (set to `false` to allow upstream to apply defaults to the bucket) | `bool` | `true` | no |
 | <a name="input_attach_require_latest_tls_policy"></a> [attach\_require\_latest\_tls\_policy](#input\_attach\_require\_latest\_tls\_policy) | Controls if S3 bucket should require the latest version of TLS | `bool` | `false` | no |
-| <a name="input_availability_zone"></a> [availability\_zone](#input\_availability\_zone) | Availability Zone ID or Local Zone ID | `string` | `null` | no |
+| <a name="input_availability_zone_id"></a> [availability\_zone\_id](#input\_availability\_zone\_id) | Availability Zone ID or Local Zone ID | `string` | `null` | no |
 | <a name="input_block_public_acls"></a> [block\_public\_acls](#input\_block\_public\_acls) | Whether Amazon S3 should block public ACLs for this bucket. | `bool` | `true` | no |
 | <a name="input_block_public_policy"></a> [block\_public\_policy](#input\_block\_public\_policy) | Whether Amazon S3 should block public bucket policies for this bucket. | `bool` | `true` | no |
 | <a name="input_bucket"></a> [bucket](#input\_bucket) | (Optional, Forces new resource) The name of the bucket. If omitted, Terraform will assign a random, unique name. | `string` | `null` | no |

examples/directory-bucket/README.md

@@ -43,6 +43,7 @@ Note that this example may create resources which cost money. Run `terraform des
 |------|------|
 | [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 |
 

examples/directory-bucket/main.tf

@@ -13,20 +13,26 @@ provider "aws" {
 
 data "aws_caller_identity" "current" {}
 
+data "aws_availability_zones" "available" {
+  state = "available"
+}
+
 module "simple" {
   source = "../../"
 
   is_directory_bucket = true
   bucket              = random_pet.this.id
-  availability_zone   = "${local.region}b"
+  # 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"
-  availability_zone   = "${local.region}b"
+  # 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

main.tf

@@ -6,12 +6,6 @@ data "aws_canonical_user_id" "this" {
 
 data "aws_caller_identity" "current" {}
 
-data "aws_availability_zone" "current" {
-  count = local.create_bucket && var.is_directory_bucket ? 1 : 0
-
-  name = var.availability_zone
-}
-
 data "aws_partition" "current" {}
 locals {
   create_bucket = var.create_bucket && var.putin_khuylo
@@ -42,13 +36,13 @@ resource "aws_s3_bucket" "this" {
 resource "aws_s3_directory_bucket" "this" {
   count = local.create_bucket && var.is_directory_bucket ? 1 : 0
 
-  bucket          = "${var.bucket}--${data.aws_availability_zone.current[0].zone_id}--x-s3"
+  bucket          = "${var.bucket}--${var.availability_zone_id}--x-s3"
   data_redundancy = var.data_redundancy
   force_destroy   = var.force_destroy
   type            = var.type
 
   location {
-    name = data.aws_availability_zone.current[0].zone_id
+    name = var.availability_zone_id
     type = var.location_type
   }
 }

variables.tf

@@ -341,7 +341,7 @@ variable "type" {
   default     = "Directory"
 }
 
-variable "availability_zone" {
+variable "availability_zone_id" {
   description = "Availability Zone ID or Local Zone ID"
   type        = string
   default     = null

wrappers/main.tf

@@ -25,7 +25,7 @@ module "wrapper" {
   attach_policy                              = try(each.value.attach_policy, var.defaults.attach_policy, false)
   attach_public_policy                       = try(each.value.attach_public_policy, var.defaults.attach_public_policy, true)
   attach_require_latest_tls_policy           = try(each.value.attach_require_latest_tls_policy, var.defaults.attach_require_latest_tls_policy, false)
-  availability_zone                          = try(each.value.availability_zone, var.defaults.availability_zone, null)
+  availability_zone_id                       = try(each.value.availability_zone_id, var.defaults.availability_zone_id, null)
   block_public_acls                          = try(each.value.block_public_acls, var.defaults.block_public_acls, true)
   block_public_policy                        = try(each.value.block_public_policy, var.defaults.block_public_policy, true)
   bucket                                     = try(each.value.bucket, var.defaults.bucket, null)