From 1d2ca21e689165e1524ebc3850709ce8bc34d682 Mon Sep 17 00:00:00 2001
From: Stoyan Rachev <s.rachev@sap.com>
Date: Thu, 4 Nov 2021 15:00:10 +0200
Subject: [PATCH 1/2] Upgrade terraformer to a version that uses terraform 0.13

---
 charts/images.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/images.yaml b/charts/images.yaml
index c204eef36..86c4fd9a3 100644
--- a/charts/images.yaml
+++ b/charts/images.yaml
@@ -2,7 +2,7 @@ images:
 - name: terraformer
   sourceRepository: github.com/gardener/terraformer
   repository: eu.gcr.io/gardener-project/gardener/terraformer-aws
-  tag: "v2.12.1"
+  tag: "v2.13.1"
 
 - name: cloud-controller-manager
   sourceRepository: github.com/kubernetes/kubernetes

From 68f7ecd538541ef8a9b40767e21cfee20724c242 Mon Sep 17 00:00:00 2001
From: Stoyan Rachev <s.rachev@sap.com>
Date: Mon, 20 Dec 2021 14:48:50 +0200
Subject: [PATCH 2/2] Ensure route53 rate limiter has a non-zero timeout

---
 pkg/aws/client/client.go                     | 19 ++++++++++---------
 test/integration/dnsrecord/dnsrecord_test.go |  3 ++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkg/aws/client/client.go b/pkg/aws/client/client.go
index 105cf0faf..83f436d37 100644
--- a/pkg/aws/client/client.go
+++ b/pkg/aws/client/client.go
@@ -86,15 +86,16 @@ func NewClient(accessKeyID, secretAccessKey, region string) (*Client, error) {
 	}
 
 	return &Client{
-		EC2:                ec2.New(s, config),
-		ELB:                elb.New(s, config),
-		ELBv2:              elbv2.New(s, config),
-		IAM:                iam.New(s, config),
-		STS:                sts.New(s, config),
-		S3:                 s3.New(s, config),
-		Route53:            route53.New(s, config),
-		Route53RateLimiter: rate.NewLimiter(rate.Inf, 0),
-		Logger:             log.Log.WithName("aws-client"),
+		EC2:                           ec2.New(s, config),
+		ELB:                           elb.New(s, config),
+		ELBv2:                         elbv2.New(s, config),
+		IAM:                           iam.New(s, config),
+		STS:                           sts.New(s, config),
+		S3:                            s3.New(s, config),
+		Route53:                       route53.New(s, config),
+		Route53RateLimiter:            rate.NewLimiter(rate.Inf, 0),
+		Route53RateLimiterWaitTimeout: 1 * time.Second,
+		Logger:                        log.Log.WithName("aws-client"),
 	}, nil
 }
 
diff --git a/test/integration/dnsrecord/dnsrecord_test.go b/test/integration/dnsrecord/dnsrecord_test.go
index c14c51361..1466bda8d 100644
--- a/test/integration/dnsrecord/dnsrecord_test.go
+++ b/test/integration/dnsrecord/dnsrecord_test.go
@@ -139,7 +139,8 @@ var _ = Describe("DNSRecord tests", func() {
 
 		Expect(dnsrecordctrl.AddToManagerWithOptions(mgr, dnsrecordctrl.AddOptions{
 			RateLimiter: dnsrecordctrl.RateLimiterOptions{
-				Limit: rate.Inf,
+				Limit:       rate.Inf,
+				WaitTimeout: 1 * time.Second,
 			},
 		})).To(Succeed())