Merge pull request #8228 from terraform-providers/td-aws_emr_cluster-…

…ConfigMode resource/aws_emr_cluster: Set SchemaConfigModeAttr on step configuration block attribute
hashicorp · Apr 9, 2019 · 27c8a8b · 27c8a8b
2 parents 35e7062 + 468536d
commit 27c8a8b
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 9 deletions.
diff --git a/aws/resource_aws_emr_cluster.go b/aws/resource_aws_emr_cluster.go
@@ -352,10 +352,11 @@ func resourceAwsEMRCluster() *schema.Resource {
 				},
 			},
 			"step": {
-				Type:     schema.TypeList,
-				Optional: true,
-				Computed: true,
-				ForceNew: true,
+				Type:       schema.TypeList,
+				Optional:   true,
+				Computed:   true,
+				ForceNew:   true,
+				ConfigMode: schema.SchemaConfigModeAttr,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"action_on_failure": {
@@ -370,10 +371,11 @@ func resourceAwsEMRCluster() *schema.Resource {
 							}, false),
 						},
 						"hadoop_jar_step": {
-							Type:     schema.TypeList,
-							MaxItems: 1,
-							Required: true,
-							ForceNew: true,
+							Type:       schema.TypeList,
+							MaxItems:   1,
+							Required:   true,
+							ForceNew:   true,
+							ConfigMode: schema.SchemaConfigModeAttr,
 							Elem: &schema.Resource{
 								Schema: map[string]*schema.Schema{
 									"args": {

diff --git a/aws/resource_aws_emr_cluster_test.go b/aws/resource_aws_emr_cluster_test.go
@@ -380,6 +380,59 @@ func TestAccAWSEMRCluster_Step_Basic(t *testing.T) {
 	})
 }
 
+func TestAccAWSEMRCluster_Step_ConfigMode(t *testing.T) {
+	var cluster1, cluster2, cluster3 emr.Cluster
+	rInt := acctest.RandInt()
+	resourceName := "aws_emr_cluster.tf-test-cluster"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckAWSEmrDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccAWSEmrClusterConfig_Step_Single(rInt),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAWSEmrClusterExists(resourceName, &cluster1),
+					resource.TestCheckResourceAttr(resourceName, "step.#", "1"),
+				),
+			},
+			{
+				ResourceName:            resourceName,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"cluster_state", "configurations", "keep_job_flow_alive_when_no_steps"},
+			},
+			{
+				Config: testAccAWSEmrClusterConfig_Step_NoBlocks(rInt),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAWSEmrClusterExists(resourceName, &cluster2),
+					resource.TestCheckResourceAttr(resourceName, "step.#", "1"),
+				),
+			},
+			{
+				ResourceName:            resourceName,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"cluster_state", "configurations", "keep_job_flow_alive_when_no_steps"},
+			},
+			{
+				Config: testAccAWSEmrClusterConfig_Step_Zeroed(rInt),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckAWSEmrClusterExists(resourceName, &cluster3),
+					resource.TestCheckResourceAttr(resourceName, "step.#", "0"),
+				),
+			},
+			{
+				ResourceName:            resourceName,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"cluster_state", "configurations", "keep_job_flow_alive_when_no_steps"},
+			},
+		},
+	})
+}
+
 func TestAccAWSEMRCluster_Step_Multiple(t *testing.T) {
 	var cluster emr.Cluster
 	rInt := acctest.RandInt()
@@ -2504,10 +2557,18 @@ func testAccAWSEmrClusterConfig_Step_Multiple(rInt int) string {
 	return testAccAWSEmrClusterConfig_Step(rInt, stepConfig)
 }
 
+func testAccAWSEmrClusterConfig_Step_NoBlocks(rInt int) string {
+	return testAccAWSEmrClusterConfig_Step(rInt, "")
+}
+
 func testAccAWSEmrClusterConfig_Step_Single(rInt int) string {
 	return testAccAWSEmrClusterConfig_Step(rInt, testAccAWSEmrClusterConfig_Step_DebugLoggingStep)
 }
 
+func testAccAWSEmrClusterConfig_Step_Zeroed(rInt int) string {
+	return testAccAWSEmrClusterConfig_Step(rInt, "step = []")
+}
+
 func testAccAWSEmrClusterConfig_Step(rInt int, stepConfig string) string {
 	return fmt.Sprintf(`
 provider "aws" {

diff --git a/website/docs/r/emr_cluster.html.markdown b/website/docs/r/emr_cluster.html.markdown
@@ -217,7 +217,7 @@ EOF
 
 * `visible_to_all_users` - (Optional) Whether the job flow is visible to all IAM users of the AWS account associated with the job flow. Default `true`
 * `autoscaling_role` - (Optional) An IAM role for automatic scaling policies. The IAM role provides permissions that the automatic scaling feature requires to launch and terminate EC2 instances in an instance group.
-* `step` - (Optional) List of steps to run when creating the cluster. Defined below. It is highly recommended to utilize the [lifecycle configuration block](/docs/configuration/resources.html) with `ignore_changes` if other steps are being managed outside of Terraform.
+* `step` - (Optional) List of steps to run when creating the cluster. Defined below. It is highly recommended to utilize the [lifecycle configuration block](/docs/configuration/resources.html) with `ignore_changes` if other steps are being managed outside of Terraform. This argument is processed in [attribute-as-blocks mode](/docs/configuration/attr-as-blocks.html).
 * `tags` - (Optional) list of tags to apply to the EMR Cluster
 
 ## ec2_attributes