diff --git a/.changelog/22898.txt b/.changelog/22898.txt new file mode 100644 index 00000000000..f9df94a396e --- /dev/null +++ b/.changelog/22898.txt @@ -0,0 +1,3 @@ +```release-note:enhancement +resource/aws_fsx_ontap_file_system: Reduce the minimum valid value of the `throughput_capacity` argument to `128` (128 MB/s) +``` \ No newline at end of file diff --git a/internal/service/fsx/ontap_file_system.go b/internal/service/fsx/ontap_file_system.go index 6cda2a5907d..858d1b4698b 100644 --- a/internal/service/fsx/ontap_file_system.go +++ b/internal/service/fsx/ontap_file_system.go @@ -207,7 +207,7 @@ func ResourceOntapFileSystem() *schema.Resource { Type: schema.TypeInt, Required: true, ForceNew: true, - ValidateFunc: validation.IntInSlice([]int{512, 1024, 2048}), + ValidateFunc: validation.IntInSlice([]int{128, 512, 1024, 2048}), }, "vpc_id": { Type: schema.TypeString, diff --git a/internal/service/fsx/ontap_file_system_test.go b/internal/service/fsx/ontap_file_system_test.go index 04176083602..5b407575993 100644 --- a/internal/service/fsx/ontap_file_system_test.go +++ b/internal/service/fsx/ontap_file_system_test.go @@ -48,7 +48,7 @@ func TestAccFSxOntapFileSystem_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "endpoint_ip_address_range"), resource.TestCheckResourceAttr(resourceName, "route_table_ids.#", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "route_table_ids.*", "aws_vpc.test", "default_route_table_id"), - resource.TestCheckResourceAttr(resourceName, "throughput_capacity", "512"), + resource.TestCheckResourceAttr(resourceName, "throughput_capacity", "128"), resource.TestCheckResourceAttrPair(resourceName, "preferred_subnet_id", "aws_subnet.test1", "id"), resource.TestCheckResourceAttr(resourceName, "endpoints.#", "1"), resource.TestCheckResourceAttr(resourceName, "endpoints.0.intercluster.#", "1"), @@ -549,7 +549,7 @@ resource "aws_fsx_ontap_file_system" "test" { storage_capacity = 1024 subnet_ids = [aws_subnet.test1.id, aws_subnet.test2.id] deployment_type = "MULTI_AZ_1" - throughput_capacity = 512 + throughput_capacity = 128 preferred_subnet_id = aws_subnet.test1.id } `) @@ -561,7 +561,7 @@ resource "aws_fsx_ontap_file_system" "test" { storage_capacity = 1024 subnet_ids = [aws_subnet.test1.id, aws_subnet.test2.id] deployment_type = "MULTI_AZ_1" - throughput_capacity = 512 + throughput_capacity = 128 preferred_subnet_id = aws_subnet.test1.id fsx_admin_password = %[2]q @@ -578,7 +578,7 @@ resource "aws_fsx_ontap_file_system" "test" { storage_capacity = 1024 subnet_ids = [aws_subnet.test1.id, aws_subnet.test2.id] deployment_type = "MULTI_AZ_1" - throughput_capacity = 512 + throughput_capacity = 128 preferred_subnet_id = aws_subnet.test1.id endpoint_ip_address_range = "198.19.255.0/24" @@ -595,7 +595,7 @@ resource "aws_fsx_ontap_file_system" "test" { storage_capacity = 1024 subnet_ids = [aws_subnet.test1.id, aws_subnet.test2.id] deployment_type = "MULTI_AZ_1" - throughput_capacity = 512 + throughput_capacity = 128 preferred_subnet_id = aws_subnet.test1.id disk_iops_configuration { @@ -637,7 +637,7 @@ resource "aws_fsx_ontap_file_system" "test" { storage_capacity = 1024 subnet_ids = [aws_subnet.test1.id, aws_subnet.test2.id] deployment_type = "MULTI_AZ_1" - throughput_capacity = 512 + throughput_capacity = 128 preferred_subnet_id = aws_subnet.test1.id route_table_ids = [aws_route_table.test.id] @@ -678,7 +678,7 @@ resource "aws_fsx_ontap_file_system" "test" { storage_capacity = 1024 subnet_ids = [aws_subnet.test1.id, aws_subnet.test2.id] deployment_type = "MULTI_AZ_1" - throughput_capacity = 512 + throughput_capacity = 128 preferred_subnet_id = aws_subnet.test1.id tags = { @@ -741,7 +741,7 @@ resource "aws_fsx_ontap_file_system" "test" { storage_capacity = 1024 subnet_ids = [aws_subnet.test1.id, aws_subnet.test2.id] deployment_type = "MULTI_AZ_1" - throughput_capacity = 512 + throughput_capacity = 128 preferred_subnet_id = aws_subnet.test1.id tags = { @@ -757,7 +757,7 @@ resource "aws_fsx_ontap_file_system" "test" { storage_capacity = 1024 subnet_ids = [aws_subnet.test1.id, aws_subnet.test2.id] deployment_type = "MULTI_AZ_1" - throughput_capacity = 512 + throughput_capacity = 128 preferred_subnet_id = aws_subnet.test1.id tags = { @@ -773,7 +773,7 @@ resource "aws_fsx_ontap_file_system" "test" { storage_capacity = 1024 subnet_ids = [aws_subnet.test1.id, aws_subnet.test2.id] deployment_type = "MULTI_AZ_1" - throughput_capacity = 512 + throughput_capacity = 128 preferred_subnet_id = aws_subnet.test1.id tags = { @@ -790,7 +790,7 @@ resource "aws_fsx_ontap_file_system" "test" { storage_capacity = 1024 subnet_ids = [aws_subnet.test1.id, aws_subnet.test2.id] deployment_type = "MULTI_AZ_1" - throughput_capacity = 512 + throughput_capacity = 128 preferred_subnet_id = aws_subnet.test1.id weekly_maintenance_start_time = %[2]q @@ -807,7 +807,7 @@ resource "aws_fsx_ontap_file_system" "test" { storage_capacity = 1024 subnet_ids = [aws_subnet.test1.id, aws_subnet.test2.id] deployment_type = "MULTI_AZ_1" - throughput_capacity = 512 + throughput_capacity = 128 preferred_subnet_id = aws_subnet.test1.id daily_automatic_backup_start_time = %[2]q automatic_backup_retention_days = 1 @@ -825,7 +825,7 @@ resource "aws_fsx_ontap_file_system" "test" { storage_capacity = 1024 subnet_ids = [aws_subnet.test1.id, aws_subnet.test2.id] deployment_type = "MULTI_AZ_1" - throughput_capacity = 512 + throughput_capacity = 128 preferred_subnet_id = aws_subnet.test1.id automatic_backup_retention_days = %[2]d @@ -847,7 +847,7 @@ resource "aws_fsx_ontap_file_system" "test" { storage_capacity = 1024 subnet_ids = [aws_subnet.test1.id, aws_subnet.test2.id] deployment_type = "MULTI_AZ_1" - throughput_capacity = 512 + throughput_capacity = 128 preferred_subnet_id = aws_subnet.test1.id kms_key_id = aws_kms_key.test.arn diff --git a/website/docs/r/fsx_ontap_file_system.html.markdown b/website/docs/r/fsx_ontap_file_system.html.markdown index 68e6a92c4e4..1498ad2d4b3 100644 --- a/website/docs/r/fsx_ontap_file_system.html.markdown +++ b/website/docs/r/fsx_ontap_file_system.html.markdown @@ -43,6 +43,7 @@ The following arguments are supported: * `fsx_admin_password` - (Optional) The ONTAP administrative password for the fsxadmin user that you can use to administer your file system using the ONTAP CLI and REST API. * `route_table_ids` - (Optional) Specifies the VPC route tables in which your file system's endpoints will be created. You should specify all VPC route tables associated with the subnets in which your clients are located. By default, Amazon FSx selects your VPC's default route table. * `tags` - (Optional) A map of tags to assign to the file system. If configured with a provider [`default_tags` configuration block](/docs/providers/aws/index.html#default_tags-configuration-block) present, tags with matching keys will overwrite those defined at the provider-level. +* `throughput_capacity` - (Required) Sets the throughput capacity (in MBps) for the file system that you're creating. Valid values are `128`, `256`, `512`, `1024`, and `2048`. ### Disk Iops Configuration