From dc45f84a8f37d4d316608b6612370712fef16664 Mon Sep 17 00:00:00 2001 From: Radek Simko Date: Tue, 1 Mar 2016 12:37:36 +0000 Subject: [PATCH] Allow recovering from failed CW Event Target creation in state --- .../aws/resource_aws_cloudwatch_event_target.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/builtin/providers/aws/resource_aws_cloudwatch_event_target.go b/builtin/providers/aws/resource_aws_cloudwatch_event_target.go index a64221f60..031090c5b 100644 --- a/builtin/providers/aws/resource_aws_cloudwatch_event_target.go +++ b/builtin/providers/aws/resource_aws_cloudwatch_event_target.go @@ -8,6 +8,7 @@ import ( "github.com/hashicorp/terraform/helper/schema" "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/awserr" events "github.com/aws/aws-sdk-go/service/cloudwatchevents" ) @@ -94,6 +95,15 @@ func resourceAwsCloudWatchEventTargetRead(d *schema.ResourceData, meta interface d.SetId("") return nil } + if awsErr, ok := err.(awserr.Error); ok { + // This should never happen, but it's useful + // for recovering from https://github.com/hashicorp/terraform/issues/5389 + if awsErr.Code() == "ValidationException" { + log.Printf("[WARN] Removing CloudWatch Event Target %q because it never existed.", d.Id()) + d.SetId("") + return nil + } + } return err } log.Printf("[DEBUG] Found Event Target: %s", t)