Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix EMR is not valid for managed_scaling_policy #23029

Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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