aws_ebs_volume io2 support

aws/resource_aws_ebs_volume.go

@@ -46,7 +46,8 @@ func resourceAwsEbsVolume() *schema.Resource {
 				Optional: true,
 				Computed: true,
 				DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
-					return d.Get("type").(string) != ec2.VolumeTypeIo1 && new == "0"
+					return (d.Get("type").(string) != ec2.VolumeTypeIo1 && new == "0") ||
+					    (d.Get("type").(string) != ec2.VolumeTypeIo2 && new == "0")
 				},
 			},
 			"kms_key_id": {
@@ -114,7 +115,7 @@ func resourceAwsEbsVolumeCreate(d *schema.ResourceData, meta interface{}) error
 		request.OutpostArn = aws.String(value.(string))
 	}
 
-	// IOPs are only valid, and required for, storage type io1. The current minimum
+	// IOPs are only valid, and required for, storage type io1 and io2. The current minimum
 	// is 100. Hard validation in place to return an error if IOPs are provided
 	// for an unsupported storage type.
 	// Reference: https://github.com/terraform-providers/terraform-provider-aws/issues/12667
@@ -125,7 +126,7 @@ func resourceAwsEbsVolumeCreate(d *schema.ResourceData, meta interface{}) error
 	}
 
 	if iops := d.Get("iops").(int); iops > 0 {
-		if t != ec2.VolumeTypeIo1 {
+		if t != ec2.VolumeTypeIo1 && t != ec2.VolumeTypeIo2 {
 			if t == "" {
 				// Volume creation would default to gp2
 				t = ec2.VolumeTypeGp2

aws/resource_aws_ebs_volume_test.go

@@ -199,7 +199,7 @@ func TestAccAWSEBSVolume_updateType(t *testing.T) {
 	})
 }
 
-func TestAccAWSEBSVolume_updateIops(t *testing.T) {
+func TestAccAWSEBSVolume_updateIops_Io1(t *testing.T) {
 	var v ec2.Volume
 	resourceName := "aws_ebs_volume.test"
 
@@ -210,7 +210,7 @@ func TestAccAWSEBSVolume_updateIops(t *testing.T) {
 		CheckDestroy:  testAccCheckVolumeDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccAwsEbsVolumeConfigWithIops,
+				Config: testAccAwsEbsVolumeConfigWithIopsIo1,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckVolumeExists(resourceName, &v),
 					resource.TestCheckResourceAttr(resourceName, "iops", "100"),
@@ -222,7 +222,40 @@ func TestAccAWSEBSVolume_updateIops(t *testing.T) {
 				ImportStateVerify: true,
 			},
 			{
-				Config: testAccAwsEbsVolumeConfigWithIopsUpdated,
+				Config: testAccAwsEbsVolumeConfigWithIopsIo1Updated,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckVolumeExists(resourceName, &v),
+					resource.TestCheckResourceAttr(resourceName, "iops", "200"),
+				),
+			},
+		},
+	})
+}
+
+func TestAccAWSEBSVolume_updateIops_Io2(t *testing.T) {
+	var v ec2.Volume
+	resourceName := "aws_ebs_volume.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:      func() { testAccPreCheck(t) },
+		IDRefreshName: resourceName,
+		Providers:     testAccProviders,
+		CheckDestroy:  testAccCheckVolumeDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAwsEbsVolumeConfigWithIopsIo2,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckVolumeExists(resourceName, &v),
+					resource.TestCheckResourceAttr(resourceName, "iops", "100"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				Config: testAccAwsEbsVolumeConfigWithIopsIo2Updated,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckVolumeExists(resourceName, &v),
 					resource.TestCheckResourceAttr(resourceName, "iops", "200"),
@@ -646,7 +679,7 @@ resource "aws_ebs_volume" "test" {
 }
 `
 
-const testAccAwsEbsVolumeConfigWithIops = `
+const testAccAwsEbsVolumeConfigWithIopsIo1 = `
 data "aws_availability_zones" "available" {
   state = "available"
 
@@ -668,7 +701,7 @@ resource "aws_ebs_volume" "test" {
 }
 `
 
-const testAccAwsEbsVolumeConfigWithIopsUpdated = `
+const testAccAwsEbsVolumeConfigWithIopsIo1Updated = `
 data "aws_availability_zones" "available" {
   state = "available"
 
@@ -690,6 +723,50 @@ resource "aws_ebs_volume" "test" {
 }
 `
 
+const testAccAwsEbsVolumeConfigWithIopsIo2 = `
+data "aws_availability_zones" "available" {
+  state = "available"
+
+  filter {
+    name   = "opt-in-status"
+    values = ["opt-in-not-required"]
+  }
+}
+
+resource "aws_ebs_volume" "test" {
+  availability_zone = data.aws_availability_zones.available.names[0]
+  type              = "io2"
+  size              = 4
+  iops              = 100
+
+  tags = {
+    Name = "tf-acc-test-ebs-volume-test"
+  }
+}
+`
+
+const testAccAwsEbsVolumeConfigWithIopsIo2Updated = `
+data "aws_availability_zones" "available" {
+  state = "available"
+
+  filter {
+    name   = "opt-in-status"
+    values = ["opt-in-not-required"]
+  }
+}
+
+resource "aws_ebs_volume" "test" {
+  availability_zone = data.aws_availability_zones.available.names[0]
+  type              = "io2"
+  size              = 4
+  iops              = 200
+
+  tags = {
+    Name = "tf-acc-test-ebs-volume-test"
+  }
+}
+`
+
 const testAccAwsEbsVolumeConfigWithKmsKey = `
 resource "aws_kms_key" "test" {
   description = "Terraform acc test %d"

website/docs/r/ebs_volume.html.markdown

@@ -36,7 +36,7 @@ The following arguments are supported:
 * `size` - (Optional) The size of the drive in GiBs.
 * `snapshot_id` (Optional) A snapshot to base the EBS volume off of.
 * `outpost_arn` - (Optional) The Amazon Resource Name (ARN) of the Outpost.
-* `type` - (Optional) The type of EBS volume. Can be "standard", "gp2", "io1", "sc1" or "st1" (Default: "gp2").
+* `type` - (Optional) The type of EBS volume. Can be "standard", "gp2", "io1", "io2", "sc1" or "st1" (Default: "gp2").
 * `kms_key_id` - (Optional) The ARN for the KMS encryption key. When specifying `kms_key_id`, `encrypted` needs to be set to true.
 * `tags` - (Optional) A map of tags to assign to the resource.