providers/aws: not an error if route53 record is already destroy
[GH-342]
This commit is contained in:
parent
ca99811357
commit
014bde64c4
|
@ -51,6 +51,7 @@ BUG FIXES:
|
||||||
* providers/aws: not an error when RDS instance is deleted manually. [GH-307]
|
* providers/aws: not an error when RDS instance is deleted manually. [GH-307]
|
||||||
* providers/aws: Retry deleting subnet for some time while AWS eventually
|
* providers/aws: Retry deleting subnet for some time while AWS eventually
|
||||||
destroys dependencies. [GH-357]
|
destroys dependencies. [GH-357]
|
||||||
|
* providers/aws: More robust destroy for route53 records. [GH-342]
|
||||||
|
|
||||||
## 0.2.2 (September 9, 2014)
|
## 0.2.2 (September 9, 2014)
|
||||||
|
|
||||||
|
|
|
@ -165,13 +165,18 @@ func resource_aws_r53_record_destroy(
|
||||||
if strings.Contains(err.Error(), "PriorRequestNotComplete") {
|
if strings.Contains(err.Error(), "PriorRequestNotComplete") {
|
||||||
// There is some pending operation, so just retry
|
// There is some pending operation, so just retry
|
||||||
// in a bit.
|
// in a bit.
|
||||||
return nil, "rejected", nil
|
return 42, "rejected", nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil, "failure", err
|
if strings.Contains(err.Error(), "InvalidChangeBatch") {
|
||||||
|
// This means that the record is already gone.
|
||||||
|
return 42, "accepted", nil
|
||||||
|
}
|
||||||
|
|
||||||
|
return 42, "failure", err
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil, "accepted", nil
|
return 42, "accepted", nil
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
if _, err := wait.WaitForState(); err != nil {
|
if _, err := wait.WaitForState(); err != nil {
|
||||||
|
|
Loading…
Reference in New Issue