From b6a54bb14f7c55690d3512c1ccd8b6c1b16ae913 Mon Sep 17 00:00:00 2001 From: Clint Date: Wed, 28 Dec 2016 10:45:07 -0600 Subject: [PATCH] provider/aws: Guard against nil change output (#10798) --- builtin/providers/aws/resource_aws_route53_zone.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/builtin/providers/aws/resource_aws_route53_zone.go b/builtin/providers/aws/resource_aws_route53_zone.go index 69f74cec62..9faa716a12 100644 --- a/builtin/providers/aws/resource_aws_route53_zone.go +++ b/builtin/providers/aws/resource_aws_route53_zone.go @@ -324,7 +324,11 @@ func deleteAllRecordsInHostedZoneId(hostedZoneId, hostedZoneName string, conn *r resp, lastDeleteErr = deleteRoute53RecordSet(conn, req) if out, ok := resp.(*route53.ChangeResourceRecordSetsOutput); ok { log.Printf("[DEBUG] Waiting for change batch to become INSYNC: %#v", out) - lastErrorFromWaiter = waitForRoute53RecordSetToSync(conn, cleanChangeID(*out.ChangeInfo.Id)) + if out.ChangeInfo != nil && out.ChangeInfo.Id != nil { + lastErrorFromWaiter = waitForRoute53RecordSetToSync(conn, cleanChangeID(*out.ChangeInfo.Id)) + } else { + log.Printf("[DEBUG] Change info was empty") + } } else { log.Printf("[DEBUG] Unable to wait for change batch because of an error: %s", lastDeleteErr) }