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

Jump to bottom

update minimun storage capacity size to 32GiB in resource, test, doc #11272

Merged
merged 1 commit into from
Dec 18, 2019
Merged

update minimun storage capacity size to 32GiB in resource, test, doc #11272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion aws/resource_aws_fsx_windows_file_system.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func resourceAwsFsxWindowsFileSystem() *schema.Resource {
Type: schema.TypeInt,
Required: true,
ForceNew: true,
ValidateFunc: validation.IntBetween(300, 65536),
ValidateFunc: validation.IntBetween(32, 65536),
},
"subnet_ids": {
Type: schema.TypeSet,
Expand Down
36 changes: 18 additions & 18 deletions aws/resource_aws_fsx_windows_file_system_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func TestAccAWSFsxWindowsFileSystem_basic(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "security_group_ids.#", "0"),
resource.TestCheckResourceAttr(resourceName, "self_managed_active_directory.#", "0"),
resource.TestCheckResourceAttr(resourceName, "skip_final_backup", "true"),
resource.TestCheckResourceAttr(resourceName, "storage_capacity", "300"),
resource.TestCheckResourceAttr(resourceName, "storage_capacity", "32"),
resource.TestCheckResourceAttr(resourceName, "subnet_ids.#", "1"),
resource.TestCheckResourceAttr(resourceName, "tags.%", "0"),
resource.TestCheckResourceAttr(resourceName, "throughput_capacity", "8"),
Expand Down Expand Up @@ -372,10 +372,10 @@ func TestAccAWSFsxWindowsFileSystem_StorageCapacity(t *testing.T) {
CheckDestroy: testAccCheckFsxWindowsFileSystemDestroy,
Steps: []resource.TestStep{
{
Config: testAccAwsFsxWindowsFileSystemConfigStorageCapacity(301),
Config: testAccAwsFsxWindowsFileSystemConfigStorageCapacity(33),
Check: resource.ComposeTestCheckFunc(
testAccCheckFsxWindowsFileSystemExists(resourceName, &filesystem1),
resource.TestCheckResourceAttr(resourceName, "storage_capacity", "301"),
resource.TestCheckResourceAttr(resourceName, "storage_capacity", "33"),
),
},
{
Expand All @@ -388,11 +388,11 @@ func TestAccAWSFsxWindowsFileSystem_StorageCapacity(t *testing.T) {
},
},
{
Config: testAccAwsFsxWindowsFileSystemConfigStorageCapacity(302),
Config: testAccAwsFsxWindowsFileSystemConfigStorageCapacity(34),
Check: resource.ComposeTestCheckFunc(
testAccCheckFsxWindowsFileSystemExists(resourceName, &filesystem2),
testAccCheckFsxWindowsFileSystemRecreated(&filesystem1, &filesystem2),
resource.TestCheckResourceAttr(resourceName, "storage_capacity", "302"),
resource.TestCheckResourceAttr(resourceName, "storage_capacity", "34"),
),
},
},
Expand Down Expand Up @@ -652,7 +652,7 @@ resource "aws_fsx_windows_file_system" "test" {
active_directory_id = "${aws_directory_service_directory.test.id}"
automatic_backup_retention_days = %[1]d
skip_final_backup = true
storage_capacity = 300
storage_capacity = 32
subnet_ids = ["${aws_subnet.test1.id}"]
throughput_capacity = 8
}
Expand All @@ -665,7 +665,7 @@ resource "aws_fsx_windows_file_system" "test" {
active_directory_id = "${aws_directory_service_directory.test.id}"
copy_tags_to_backups = %[1]t
skip_final_backup = true
storage_capacity = 300
storage_capacity = 32
subnet_ids = ["${aws_subnet.test1.id}"]
throughput_capacity = 8
}
Expand All @@ -678,7 +678,7 @@ resource "aws_fsx_windows_file_system" "test" {
active_directory_id = "${aws_directory_service_directory.test.id}"
daily_automatic_backup_start_time = %[1]q
skip_final_backup = true
storage_capacity = 300
storage_capacity = 32
subnet_ids = ["${aws_subnet.test1.id}"]
throughput_capacity = 8
}
Expand All @@ -696,7 +696,7 @@ resource "aws_fsx_windows_file_system" "test" {
active_directory_id = "${aws_directory_service_directory.test.id}"
kms_key_id = "${aws_kms_key.test1.arn}"
skip_final_backup = true
storage_capacity = 300
storage_capacity = 32
subnet_ids = ["${aws_subnet.test1.id}"]
throughput_capacity = 8
}
Expand All @@ -714,7 +714,7 @@ resource "aws_fsx_windows_file_system" "test" {
active_directory_id = "${aws_directory_service_directory.test.id}"
kms_key_id = "${aws_kms_key.test2.arn}"
skip_final_backup = true
storage_capacity = 300
storage_capacity = 32
subnet_ids = ["${aws_subnet.test1.id}"]
throughput_capacity = 8
}
Expand Down Expand Up @@ -746,7 +746,7 @@ resource "aws_fsx_windows_file_system" "test" {
active_directory_id = "${aws_directory_service_directory.test.id}"
security_group_ids = ["${aws_security_group.test1.id}"]
skip_final_backup = true
storage_capacity = 300
storage_capacity = 32
subnet_ids = ["${aws_subnet.test1.id}"]
throughput_capacity = 8
}
Expand Down Expand Up @@ -797,7 +797,7 @@ resource "aws_fsx_windows_file_system" "test" {
active_directory_id = "${aws_directory_service_directory.test.id}"
security_group_ids = ["${aws_security_group.test1.id}", "${aws_security_group.test2.id}"]
skip_final_backup = true
storage_capacity = 300
storage_capacity = 32
subnet_ids = ["${aws_subnet.test1.id}"]
throughput_capacity = 8
}
Expand All @@ -808,7 +808,7 @@ func testAccAwsFsxWindowsFileSystemConfigSelfManagedActiveDirectory() string {
return testAccAwsFsxWindowsFileSystemConfigBase() + fmt.Sprintf(`
resource "aws_fsx_windows_file_system" "test" {
skip_final_backup = true
storage_capacity = 300
storage_capacity = 32
subnet_ids = ["${aws_subnet.test1.id}"]
throughput_capacity = 8

Expand Down Expand Up @@ -839,7 +839,7 @@ func testAccAwsFsxWindowsFileSystemConfigSubnetIds1() string {
resource "aws_fsx_windows_file_system" "test" {
active_directory_id = "${aws_directory_service_directory.test.id}"
skip_final_backup = true
storage_capacity = 300
storage_capacity = 32
subnet_ids = ["${aws_subnet.test1.id}"]
throughput_capacity = 8
}
Expand All @@ -851,7 +851,7 @@ func testAccAwsFsxWindowsFileSystemConfigTags1(tagKey1, tagValue1 string) string
resource "aws_fsx_windows_file_system" "test" {
active_directory_id = "${aws_directory_service_directory.test.id}"
skip_final_backup = true
storage_capacity = 300
storage_capacity = 32
subnet_ids = ["${aws_subnet.test1.id}"]
throughput_capacity = 8

Expand All @@ -867,7 +867,7 @@ func testAccAwsFsxWindowsFileSystemConfigTags2(tagKey1, tagValue1, tagKey2, tagV
resource "aws_fsx_windows_file_system" "test" {
active_directory_id = "${aws_directory_service_directory.test.id}"
skip_final_backup = true
storage_capacity = 300
storage_capacity = 32
subnet_ids = ["${aws_subnet.test1.id}"]
throughput_capacity = 8

Expand All @@ -884,7 +884,7 @@ func testAccAwsFsxWindowsFileSystemConfigThroughputCapacity(throughputCapacity i
resource "aws_fsx_windows_file_system" "test" {
active_directory_id = "${aws_directory_service_directory.test.id}"
skip_final_backup = true
storage_capacity = 300
storage_capacity = 32
subnet_ids = ["${aws_subnet.test1.id}"]
throughput_capacity = %[1]d
}
Expand All @@ -896,7 +896,7 @@ func testAccAwsFsxWindowsFileSystemConfigWeeklyMaintenanceStartTime(weeklyMainte
resource "aws_fsx_windows_file_system" "test" {
active_directory_id = "${aws_directory_service_directory.test.id}"
skip_final_backup = true
storage_capacity = 300
storage_capacity = 32
subnet_ids = ["${aws_subnet.test1.id}"]
throughput_capacity = 8
weekly_maintenance_start_time = %[1]q
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/fsx_windows_file_system.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ resource "aws_fsx_windows_file_system" "example" {

The following arguments are supported:

* `storage_capacity` - (Required) Storage capacity (GiB) of the file system. Minimum of 300 and maximum of 65536.
* `storage_capacity` - (Required) Storage capacity (GiB) of the file system. Minimum of 32 and maximum of 65536.
* `subnet_ids` - (Required) A list of IDs for the subnets that the file system will be accessible from. File systems support only one subnet. The file server is also launched in that subnet's Availability Zone.
* `throughput_capacity` - (Required) Throughput (megabytes per second) of the file system in power of 2 increments. Minimum of `8` and maximum of `2048`.
* `active_directory_id` - (Optional) The ID for an existing Microsoft Active Directory instance that the file system should join when it's created. Cannot be specified with `self_managed_active_directory`.
Expand Down