From 4e48aebfe7a21ad22aa5a204a98b765765714128 Mon Sep 17 00:00:00 2001 From: stack72 Date: Thu, 5 Nov 2015 14:31:55 +0000 Subject: [PATCH 1/2] Fixing the Read method to take into account that an elasticache cluster may have been deleted manually --- builtin/providers/aws/resource_aws_elasticache_cluster.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/builtin/providers/aws/resource_aws_elasticache_cluster.go b/builtin/providers/aws/resource_aws_elasticache_cluster.go index 3460fb292ff8..90356631d337 100644 --- a/builtin/providers/aws/resource_aws_elasticache_cluster.go +++ b/builtin/providers/aws/resource_aws_elasticache_cluster.go @@ -241,6 +241,11 @@ func resourceAwsElasticacheClusterRead(d *schema.ResourceData, meta interface{}) res, err := conn.DescribeCacheClusters(req) if err != nil { + if eccErr, ok := err.(awserr.Error); ok && eccErr.Code() == "CacheClusterNotFound" { + d.SetId("") + return nil + } + return err } From fab4da6f57aafe97c4fa60d89ee944cc31591e99 Mon Sep 17 00:00:00 2001 From: stack72 Date: Thu, 5 Nov 2015 16:35:43 +0000 Subject: [PATCH 2/2] Logging that an ElastiCache cluster was not found before removing it from the state --- builtin/providers/aws/resource_aws_elasticache_cluster.go | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/providers/aws/resource_aws_elasticache_cluster.go b/builtin/providers/aws/resource_aws_elasticache_cluster.go index 90356631d337..f2410dcd509a 100644 --- a/builtin/providers/aws/resource_aws_elasticache_cluster.go +++ b/builtin/providers/aws/resource_aws_elasticache_cluster.go @@ -242,6 +242,7 @@ func resourceAwsElasticacheClusterRead(d *schema.ResourceData, meta interface{}) res, err := conn.DescribeCacheClusters(req) 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 }