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

Reduce minimum file system throughput for aws_fsx_ontap_file_system #22898

Merged
merged 3 commits into from
Feb 2, 2022
Merged

Reduce minimum file system throughput for aws_fsx_ontap_file_system #22898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9f6cc6
Reduce minimum file system throughput for aws_fsx_ontap_file_system
lvthillo Feb 2, 2022
98769f1
Add CHANGELOG entry.
ewbankkit Feb 2, 2022
f35d328
Add documentation for the 'throughput_capacity' argument.
ewbankkit Feb 2, 2022
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
3 changes: 3 additions & 0 deletions .changelog/22898.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
```
2 changes: 1 addition & 1 deletion internal/service/fsx/ontap_file_system.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
28 changes: 14 additions & 14 deletions internal/service/fsx/ontap_file_system_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down Expand Up @@ -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
}
`)
Expand All @@ -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

Expand All @@ -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"

Expand All @@ -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 {
Expand Down Expand Up @@ -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]

Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 = {
Expand All @@ -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 = {
Expand All @@ -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 = {
Expand All @@ -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

Expand All @@ -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
Expand All @@ -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

Expand All @@ -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

Expand Down
1 change: 1 addition & 0 deletions website/docs/r/fsx_ontap_file_system.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down