Skip to content

Commit

Permalink
Fix EMR is not valid for managed_scaling_policy
Browse files Browse the repository at this point in the history
Fix aws_emr_managed_scaling_policy for compatibility with the behavior of emr_cluster that was fixed as a part of the next problem:

hashicorp#16924
hashicorp#7783
  • Loading branch information
ArtsiomAntropau authored Feb 8, 2022
1 parent 863b24c commit f040b65
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion internal/service/emr/managed_scaling_policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,12 @@ func resourceManagedScalingPolicyRead(d *schema.ResourceData, meta interface{})
d.SetId("")
return nil
}

if tfawserr.ErrMessageContains(err, "ValidationException", "is not valid") {
log.Printf("[WARN] EMR Cluster (%s) not found", d.Id())
d.SetId("")
return nil
}

if tfawserr.ErrMessageContains(err, "InvalidRequestException", "does not exist") {
log.Printf("[WARN] EMR Managed Scaling Policy (%s) not found, removing from state", d.Id())
Expand Down Expand Up @@ -152,7 +158,13 @@ func resourceManagedScalingPolicyDelete(d *schema.ResourceData, meta interface{}
if tfawserr.ErrMessageContains(err, "ValidationException", "A job flow that is shutting down, terminated, or finished may not be modified") {
return nil
}


if tfawserr.ErrMessageContains(err, "ValidationException", "is not valid") {
log.Printf("[WARN] EMR Cluster (%s) not found", d.Id())
d.SetId("")
return nil
}

if tfawserr.ErrMessageContains(err, "InvalidRequestException", "does not exist") {
return nil
}
Expand Down

0 comments on commit f040b65

Please sign in to comment.