*: update SDK dependency, fix VPC deletes (#179)

* vendor: update AWS SDK Go

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>

* eks/cluster/vpc: update "HasMoreThan2Azs"

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>

* eks/cluster/vpc: fix subnet deletion

ref.

DELETE_FAILED

The vpc vpc-028d8568a626d6052 currently has a subnet within CIDR block 10.2.0.0/16 (Service: AmazonEC2; Status Code: 400; Error Code: InvalidCidrBlock.InUse; Request ID: 61cfbfa2-e53b-406d-81ed-3b216cd01a99; Proxy: null)

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>

Author: gyuho

CHANGELOG/CHANGELOG-1.5.md

@@ -3,7 +3,7 @@
 <hr>
 
 
-## [v1.5.3](https://github.com/aws/aws-k8s-tester/releases/tag/v1.5.3) (2020-10-14)
+## [v1.5.3](https://github.com/aws/aws-k8s-tester/releases/tag/v1.5.3) (2020-10-20)
 
 See [code changes](https://github.com/aws/aws-k8s-tester/compare/v1.5.2...v1.5.3).
 
@@ -27,7 +27,7 @@ See [code changes](https://github.com/aws/aws-k8s-tester/compare/v1.5.2...v1.5.3
 
 ### Dependency
 
-- Upgrade [`github.com/aws/aws-sdk-go`](https://github.com/aws/aws-sdk-go/releases) from [`v1.34.22`](https://github.com/aws/aws-sdk-go/releases/tag/v1.34.22) to [`v1.35.8`](https://github.com/aws/aws-sdk-go/releases/tag/v1.35.8).
+- Upgrade [`github.com/aws/aws-sdk-go`](https://github.com/aws/aws-sdk-go/releases) from [`v1.34.22`](https://github.com/aws/aws-sdk-go/releases/tag/v1.34.22) to [`v1.35.10`](https://github.com/aws/aws-sdk-go/releases/tag/v1.35.10).
 
 ### Go
 

eks/cluster/vpc.go

@@ -148,30 +148,16 @@ Parameters:
     Description: The IPv4 addresses of up to four domain name servers, or AmazonProvidedDNS.
 
 Conditions:
-  Has2Azs:
-    Fn::Or:
-      - Fn::Equals:
-        - {Ref: 'AWS::Region'}
-        - ap-south-1
-      - Fn::Equals:
-        - {Ref: 'AWS::Region'}
-        - ap-northeast-2
-      - Fn::Equals:
-        - {Ref: 'AWS::Region'}
-        - ca-central-1
-      - Fn::Equals:
-        - {Ref: 'AWS::Region'}
-        - cn-north-1
-      - Fn::Equals:
-        - {Ref: 'AWS::Region'}
-        - sa-east-1
-      - Fn::Equals:
-        - {Ref: 'AWS::Region'}
-        - us-west-1
 
   HasMoreThan2Azs:
     Fn::Not:
-      - Condition: Has2Azs
+      - Fn::Or:
+        - Fn::Equals:
+          - Ref: AWS::Region
+          - cn-north-1
+        - Fn::Equals:
+          - Ref: AWS::Region
+          - us-isob-east-1
 
   HasDHCPOptionsOnlyDomainName:
     Fn::And:
@@ -234,11 +220,13 @@ Resources:
     Properties:
       VpcId: !Ref VPC
       CidrBlock: !Ref VPCBlock2
+
   VPCCIDRBlock3:
     Type: AWS::EC2::VPCCidrBlock
     Properties:
       VpcId: !Ref VPC
       CidrBlock: !Ref VPCBlock3
+
   VPCCIDRBlock4:
     Type: AWS::EC2::VPCCidrBlock
     Properties:
@@ -259,6 +247,9 @@ Resources:
     DependsOn:
     - VPC
     - VPCGatewayAttachment
+    - VPCCIDRBlock2
+    - VPCCIDRBlock3
+    - VPCCIDRBlock4
     Metadata:
       Comment: Public Subnet 1, https://docs.aws.amazon.com/eks/latest/userguide/alb-ingress.html
     Properties:
@@ -281,6 +272,9 @@ Resources:
     DependsOn:
     - VPC
     - VPCGatewayAttachment
+    - VPCCIDRBlock2
+    - VPCCIDRBlock3
+    - VPCCIDRBlock4
     Metadata:
       Comment: Public Subnet 2, https://docs.aws.amazon.com/eks/latest/userguide/alb-ingress.html
     Properties:
@@ -304,6 +298,9 @@ Resources:
     DependsOn:
     - VPC
     - VPCGatewayAttachment
+    - VPCCIDRBlock2
+    - VPCCIDRBlock3
+    - VPCCIDRBlock4
     Metadata:
       Comment: Public Subnet 3, https://docs.aws.amazon.com/eks/latest/userguide/alb-ingress.html
     Properties:
@@ -379,6 +376,9 @@ Resources:
     DependsOn:
     - VPC
     - VPCGatewayAttachment
+    - VPCCIDRBlock2
+    - VPCCIDRBlock3
+    - VPCCIDRBlock4
     Metadata:
       Comment: Private Subnet 1
     Properties:
@@ -397,6 +397,9 @@ Resources:
     DependsOn:
     - VPC
     - VPCGatewayAttachment
+    - VPCCIDRBlock2
+    - VPCCIDRBlock3
+    - VPCCIDRBlock4
     Metadata:
       Comment: Private Subnet 2
     Properties:

go.mod

@@ -43,7 +43,7 @@ replace (
 )
 
 require (
-	github.com/aws/aws-sdk-go v1.35.8
+	github.com/aws/aws-sdk-go v1.35.10
 	github.com/briandowns/spinner v1.11.1
 	github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575
 	github.com/davecgh/go-spew v1.1.1

go.sum

@@ -102,8 +102,8 @@ github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod h1:
 github.com/aws/aws-sdk-go v1.6.10/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k=
 github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
 github.com/aws/aws-sdk-go v1.28.2/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go v1.35.8 h1:+S3BTWePYImKLh7DUJxMVm+/FQUnmHADsMzo/psHFr4=
-github.com/aws/aws-sdk-go v1.35.8/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
+github.com/aws/aws-sdk-go v1.35.10 h1:FsJtrOS7P+Qmq1rPTGgS/+qC1Y9eGuAJHvAZpZlhmb4=
+github.com/aws/aws-sdk-go v1.35.10/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
 github.com/bazelbuild/bazel-gazelle v0.18.2/go.mod h1:D0ehMSbS+vesFsLGiD6JXu3mVEzOlfUl8wNnq+x/9p0=
 github.com/bazelbuild/bazel-gazelle v0.19.1-0.20191105222053-70208cbdc798/go.mod h1:rPwzNHUqEzngx1iVBfO/2X2npKaT3tqPqqHW6rVsn/A=
 github.com/bazelbuild/buildtools v0.0.0-20190731111112-f720930ceb60/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU=

vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go

@@ -84,7 +84,7 @@ github.com/andybalholm/brotli
 github.com/armon/circbuf
 # github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496
 github.com/asaskevich/govalidator
-# github.com/aws/aws-sdk-go v1.35.8
+# github.com/aws/aws-sdk-go v1.35.10
 ## explicit
 github.com/aws/aws-sdk-go/aws
 github.com/aws/aws-sdk-go/aws/arn