From a7f690299666855b4a2d0f2ba3c328363e30ed14 Mon Sep 17 00:00:00 2001 From: Benjamin Jorand Date: Tue, 29 Oct 2019 13:48:26 +0100 Subject: [PATCH 1/2] add retry on resource read for dns.ResourceRecordSetsListResponse --- .../terraform/resources/resource_dns_record_set.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/third_party/terraform/resources/resource_dns_record_set.go b/third_party/terraform/resources/resource_dns_record_set.go index 877a1b178ed4..e031c31b2394 100644 --- a/third_party/terraform/resources/resource_dns_record_set.go +++ b/third_party/terraform/resources/resource_dns_record_set.go @@ -153,8 +153,13 @@ func resourceDnsRecordSetRead(d *schema.ResourceData, meta interface{}) error { name := d.Get("name").(string) dnsType := d.Get("type").(string) - resp, err := config.clientDns.ResourceRecordSets.List( - project, zone).Name(name).Type(dnsType).Do() + var resp *dns.ResourceRecordSetsListResponse + err = retry(func() error { + var reqErr error + resp, reqErr = config.clientDns.ResourceRecordSets.List( + project, zone).Name(name).Type(dnsType).Do() + return reqErr + }) if err != nil { return handleNotFoundError(err, d, fmt.Sprintf("DNS Record Set %q", d.Get("name").(string))) } From 9f05067817d53ef47a4c0af328802958130b8c1c Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Fri, 6 Dec 2019 21:24:58 +0000 Subject: [PATCH 2/2] Update tracked submodules -> HEAD on Fri Dec 6 21:24:58 UTC 2019 Tracked submodules are build/terraform-beta build/terraform-mapper build/terraform build/ansible build/inspec. --- build/terraform | 2 +- build/terraform-beta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/terraform b/build/terraform index a380e6b55d80..789f50dea63f 160000 --- a/build/terraform +++ b/build/terraform @@ -1 +1 @@ -Subproject commit a380e6b55d803391d741e3fbcf68725964c2fa9e +Subproject commit 789f50dea63f395ee4f1161f7c16fb08cf159c56 diff --git a/build/terraform-beta b/build/terraform-beta index d2b00d3fc459..72bdd64371dc 160000 --- a/build/terraform-beta +++ b/build/terraform-beta @@ -1 +1 @@ -Subproject commit d2b00d3fc4591e2261d87058ba28c9ae21819a0a +Subproject commit 72bdd64371dc4dd623377e0f2a2205819c15d04a