Merge pull request #8559 from joelthompson/emr_domain_join_user

Not retrieve EMR AD Domain Join User from AWS API
hashicorp · Jul 1, 2019 · bcbf76c · bcbf76c
2 parents 16a3cb6 + 1d26666
commit bcbf76c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/aws/resource_aws_emr_cluster.go b/aws/resource_aws_emr_cluster.go
@@ -1552,6 +1552,7 @@ func flattenEmrKerberosAttributes(d *schema.ResourceData, kerberosAttributes *em
 
 	// Do not set from API:
 	// * ad_domain_join_password
+	// * ad_domain_join_user
 	// * cross_realm_trust_principal_password
 	// * kdc_admin_password
 
@@ -1564,8 +1565,8 @@ func flattenEmrKerberosAttributes(d *schema.ResourceData, kerberosAttributes *em
 		m["ad_domain_join_password"] = v.(string)
 	}
 
-	if kerberosAttributes.ADDomainJoinUser != nil {
-		m["ad_domain_join_user"] = *kerberosAttributes.ADDomainJoinUser
+	if v, ok := d.GetOk("kerberos_attributes.0.ad_domain_join_user"); ok {
+		m["ad_domain_join_user"] = v.(string)
 	}
 
 	if v, ok := d.GetOk("kerberos_attributes.0.cross_realm_trust_principal_password"); ok {