ec2,eks: handle duplicate key creation error

Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
aws · Jul 9, 2020 · 3dcaaa7 · 3dcaaa7
1 parent 7c668ff
commit 3dcaaa7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/ec2/key-pair.go b/ec2/key-pair.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/aws/aws-k8s-tester/pkg/fileutil"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/request"
@@ -43,7 +44,11 @@ func (ts *Tester) createKeyPair() (err error) {
 		KeyName: aws.String(ts.cfg.RemoteAccessKeyName),
 	})
 	if err != nil {
-		return err
+		ev, ok := err.(awserr.Error)
+		if ok && ev.Code() == "InvalidKeyPair.Duplicate" && fileutil.Exist(ts.cfg.RemoteAccessPrivateKeyPath) {
+			ts.lg.Warn("key pair already created, private key locally exists, skipping EC2 key pair creation")
+			return nil
+		}
 	}
 	if aws.StringValue(output.KeyName) != ts.cfg.RemoteAccessKeyName {
 		return fmt.Errorf("unexpected key name %q, expected %q", aws.StringValue(output.KeyName), ts.cfg.RemoteAccessKeyName)

diff --git a/eks/key-pair.go b/eks/key-pair.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/aws/aws-k8s-tester/pkg/fileutil"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/aws/request"
@@ -43,6 +44,11 @@ func (ts *Tester) createKeyPair() (err error) {
 		KeyName: aws.String(ts.cfg.RemoteAccessKeyName),
 	})
 	if err != nil {
+		ev, ok := err.(awserr.Error)
+		if ok && ev.Code() == "InvalidKeyPair.Duplicate" && fileutil.Exist(ts.cfg.RemoteAccessPrivateKeyPath) {
+			ts.lg.Warn("key pair already created, private key locally exists, skipping EC2 key pair creation")
+			return nil
+		}
 		return err
 	}
 	if aws.StringValue(output.KeyName) != ts.cfg.RemoteAccessKeyName {