Merge #3767: Tolerate ElastiCache clusters being deleted.
This commit is contained in:
commit
d72084ed93
|
@ -44,6 +44,7 @@ BUG FIXES:
|
||||||
* provider/aws: Allow cluster name, not only ARN for `aws_ecs_service` [GH-3668]
|
* provider/aws: Allow cluster name, not only ARN for `aws_ecs_service` [GH-3668]
|
||||||
* provider/aws: ignore association not exist on route table destroy [GH-3615]
|
* provider/aws: ignore association not exist on route table destroy [GH-3615]
|
||||||
* provider/aws: Fix policy encoding issue with SNS Topics [GH-3700]
|
* provider/aws: Fix policy encoding issue with SNS Topics [GH-3700]
|
||||||
|
* provider/aws: Tolerate ElastiCache clusters being deleted outside Terraform [GH-3767]
|
||||||
* provider/azure: various bugfixes [GH-3695]
|
* provider/azure: various bugfixes [GH-3695]
|
||||||
* provider/digitalocean: fix issue preventing SSH fingerprints from working [GH-3633]
|
* provider/digitalocean: fix issue preventing SSH fingerprints from working [GH-3633]
|
||||||
* provider/openstack: Fix several issues causing unresolvable diffs [GH-3440]
|
* provider/openstack: Fix several issues causing unresolvable diffs [GH-3440]
|
||||||
|
|
|
@ -241,6 +241,12 @@ func resourceAwsElasticacheClusterRead(d *schema.ResourceData, meta interface{})
|
||||||
|
|
||||||
res, err := conn.DescribeCacheClusters(req)
|
res, err := conn.DescribeCacheClusters(req)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
if eccErr, ok := err.(awserr.Error); ok && eccErr.Code() == "CacheClusterNotFound" {
|
||||||
|
log.Printf("[WARN] ElastiCache Cluster (%s) not found", d.Id())
|
||||||
|
d.SetId("")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue