Merge pull request #790 from tsub/support-kube-aws-iam-controller

k8s-ci-robot · web-flow · commit 370f7dfcb768 · 2019-01-07T09:31:39.000-08:00
Bump aws-sdk-go version to v1.16.11 to support kube-aws-iam-controller
diff --git a/go.mod b/go.mod
@@ -1,7 +1,7 @@
 module github.com/kubernetes-sigs/aws-alb-ingress-controller
 
 require (
-	github.com/aws/aws-sdk-go v1.15.39
+	github.com/aws/aws-sdk-go v1.16.11
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/cenkalti/backoff v2.0.0+incompatible // indirect
 	github.com/eapache/channels v1.1.0 // indirect
diff --git a/go.sum b/go.sum
@@ -5,6 +5,8 @@ github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrU
 github.com/aws/aws-sdk-go v1.15.39 h1:MUxm375zGxxVhgL5NNCIDuwn4SkMQsX8CQWD+zLULcw=
 github.com/aws/aws-sdk-go v1.15.39/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
 github.com/aws/aws-sdk-go v1.15.39/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
+github.com/aws/aws-sdk-go v1.16.11 h1:g/c7gJeVyHoXCxM2fddS85bPGVkBF8s2q8t3fyElegc=
+github.com/aws/aws-sdk-go v1.16.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -186,6 +188,7 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8 h1:12VvqtR6Aowv3l/EQUlocDHW2Cp4G9WJVH7uyH8QFJE=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be h1:AHimNtVIpiBjPUhEF5KNCkrUyqTSA5zWUl8sQ2bfGBE=
 github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v0.0.0-20180701071628-ab8a2e0c74be/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
diff --git a/internal/aws/acm.go b/internal/aws/acm.go
@@ -35,6 +35,6 @@ func (c *Cloud) StatusACM() func() error {
 
 func (c *Cloud) ACMAvailable() bool {
 	resolver := endpoints.DefaultResolver()
-	_, err := resolver.EndpointFor(endpoints.AcmServiceID, c.region)
+	_, err := resolver.EndpointFor(acm.EndpointsID, c.region)
 	return err == nil
 }
diff --git a/internal/aws/wafregional.go b/internal/aws/wafregional.go
@@ -74,6 +74,6 @@ func (c *Cloud) DisassociateWAF(ctx context.Context, resourceArn *string) (*wafr
 
 func (c *Cloud) WAFRegionalAvailable() bool {
 	resolver := endpoints.DefaultResolver()
-	_, err := resolver.EndpointFor(endpoints.WafRegionalServiceID, c.region)
+	_, err := resolver.EndpointFor(wafregional.EndpointsID, c.region)
 	return err == nil
 }
diff --git a/mocks/EC2API.go b/mocks/EC2API.go
diff --git a/mocks/IAMAPI.go b/mocks/IAMAPI.go

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ func (c *Cloud) StatusACM() func() error {`
`35`	`35`
`36`	`36`	`func (c *Cloud) ACMAvailable() bool {`
`37`	`37`	`resolver := endpoints.DefaultResolver()`
`38`		`- _, err := resolver.EndpointFor(endpoints.AcmServiceID, c.region)`
	`38`	`+ _, err := resolver.EndpointFor(acm.EndpointsID, c.region)`
`39`	`39`	`return err == nil`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,6 @@ func (c Cloud) DisassociateWAF(ctx context.Context, resourceArn string) (*wafr`
`74`	`74`
`75`	`75`	`func (c *Cloud) WAFRegionalAvailable() bool {`
`76`	`76`	`resolver := endpoints.DefaultResolver()`
`77`		`- _, err := resolver.EndpointFor(endpoints.WafRegionalServiceID, c.region)`
	`77`	`+ _, err := resolver.EndpointFor(wafregional.EndpointsID, c.region)`
`78`	`78`	`return err == nil`
`79`	`79`	`}`