Merge pull request #17706 from nikhil-goenka/f/aws_emr_cluster

F/aws emr cluster
hashicorp · Oct 5, 2021 · a3d854a · a3d854a
2 parents bf09414 + 45e76ad
commit a3d854a
Show file tree

Hide file tree

Showing 4 changed files with 1,448 additions and 1,326 deletions.
diff --git a/.changelog/17706.txt b/.changelog/17706.txt
@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_emr_cluster: Add `log_encryption_kms_key_id` argument
+```
diff --git a/aws/resource_aws_emr_cluster.go b/aws/resource_aws_emr_cluster.go
@@ -65,6 +65,11 @@ func resourceAwsEMRCluster() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"log_encryption_kms_key_id": {
+				Type:     schema.TypeString,
+				ForceNew: true,
+				Optional: true,
+			},
 			"log_uri": {
 				Type:     schema.TypeString,
 				ForceNew: true,
@@ -856,6 +861,10 @@ func resourceAwsEMRClusterCreate(d *schema.ResourceData, meta interface{}) error
 		params.AdditionalInfo = aws.String(info)
 	}
 
+	if v, ok := d.GetOk("log_encryption_kms_key_id"); ok {
+		params.LogEncryptionKmsKeyId = aws.String(v.(string))
+	}
+
 	if v, ok := d.GetOk("log_uri"); ok {
 		params.LogUri = aws.String(v.(string))
 	}
@@ -1093,6 +1102,7 @@ func resourceAwsEMRClusterRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("security_configuration", cluster.SecurityConfiguration)
 	d.Set("autoscaling_role", cluster.AutoScalingRole)
 	d.Set("release_label", cluster.ReleaseLabel)
+	d.Set("log_encryption_kms_key_id", cluster.LogEncryptionKmsKeyId)
 	d.Set("log_uri", cluster.LogUri)
 	d.Set("master_public_dns", cluster.MasterPublicDnsName)
 	d.Set("visible_to_all_users", cluster.VisibleToAllUsers)