Merge pull request #25255 from daftkid/f-emr_abs_config_add_sc1_type

r/aws_emr_cluster: Add sc1 as EBS allowed volume type for AWS EMR cluster resource
hashicorp · Jul 5, 2022 · d69df6d · d69df6d
2 parents cdead70 + d3dd786
commit d69df6d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/.changelog/25255.txt b/.changelog/25255.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_emr_cluster: Add `sc1` EBS volume support
+```
diff --git a/internal/service/emr/cluster_test.go b/internal/service/emr/cluster_test.go
@@ -3552,7 +3552,7 @@ resource "aws_emr_cluster" "test" {
   }
 
   master_instance_group {
-    instance_type = "m4.large"
+    instance_type = "m5.xlarge"
     ebs_config {
       size                 = 32
       type                 = "gp2"
@@ -3567,12 +3567,17 @@ resource "aws_emr_cluster" "test" {
   }
   core_instance_group {
     instance_count = 1
-    instance_type  = "m4.large"
+    instance_type  = "m5.xlarge"
     ebs_config {
       size                 = 32
       type                 = "gp2"
       volumes_per_instance = %[2]d
     }
+    ebs_config {
+      size                 = 125
+      type                 = "sc1"
+      volumes_per_instance = %[2]d
+    }
   }
 
   depends_on = [aws_route_table_association.test]

diff --git a/internal/service/emr/validate.go b/internal/service/emr/validate.go
@@ -29,5 +29,6 @@ func validEBSVolumeType() schema.SchemaValidateFunc {
 		"io1",
 		"standard",
 		"st1",
+		"sc1",
 	}, false)
 }
diff --git a/website/docs/r/emr_cluster.html.markdown b/website/docs/r/emr_cluster.html.markdown
@@ -734,7 +734,7 @@ The launch specification for Spot instances in the fleet, which determines the d
 
 * `iops` - (Optional) Number of I/O operations per second (IOPS) that the volume supports.
 * `size` - (Required) Volume size, in gibibytes (GiB).
-* `type` - (Required) Volume type. Valid options are `gp3`, `gp2`, `io1`, `standard` and `st1`. See [EBS Volume Types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html).
+* `type` - (Required) Volume type. Valid options are `gp3`, `gp2`, `io1`, `standard`, `st1` and `sc1`. See [EBS Volume Types](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html).
 * `throughput` - (Optional) The throughput, in mebibyte per second (MiB/s).
 * `volumes_per_instance` - (Optional) Number of EBS volumes with this configuration to attach to each EC2 instance in the instance group (default is 1).
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,5 +29,6 @@ func validEBSVolumeType() schema.SchemaValidateFunc { @@
     		"io1",
     		"standard",
     		"st1",
+    		"sc1",
     	}, false)
     }