Merge pull request #5527 from punkwalker/fix-unmanaged-e2e

🐛  Fix session creation in e2e test suite

Author: k8s-ci-robot

test/e2e/shared/aws.go

@@ -368,25 +368,6 @@ func (i *AWSInfrastructure) DeleteInfrastructure() {
 	}
 }
 
-func NewAWSConfig(ctx context.Context) awsv2.Config {
-	By("Getting an AWS config using SDK v2 - from environment")
-
-	region, err := credentials.ResolveRegion("")
-	Expect(err).NotTo(HaveOccurred())
-
-	cfg, err := config.LoadDefaultConfig(ctx,
-		config.WithRegion(region),
-		config.WithClientLogMode(awsv2.LogSigning),
-		config.WithSharedConfigProfile(""),
-	)
-	Expect(err).NotTo(HaveOccurred())
-
-	_, err = cfg.Credentials.Retrieve(ctx)
-	Expect(err).NotTo(HaveOccurred())
-
-	return cfg
-}
-
 func NewAWSSession() client.ConfigProvider {
 	By("Getting an AWS IAM session - from environment")
 	region, err := credentials.ResolveRegion("")

test/e2e/shared/context.go

@@ -69,9 +69,9 @@ type E2EContext struct {
 	AWSSessionV2 *awsv2.Config
 	// BootstrapUserAWSSession is the AWS session for the bootstrap user.
 	BootstrapUserAWSSession client.ConfigProvider
-	// BootstrapUserAWSSessionV2 is the AWS SDK V2 session for the bootstrap user.
+	// BootstrapUserAWSSessionV2 is the AWS SDK V2 session for the bootstrap user. This is until the V2 migration is done.
 	BootstrapUserAWSSessionV2 *awsv2.Config
-	// IsManaged indicates that this is for the managed part of the provider. This is until the V2 migration is done.
+	// IsManaged indicates that this is for the managed part of the provider.
 	IsManaged bool
 	// CloudFormationTemplate is the rendered template created for the test.
 	CloudFormationTemplate *cloudformation.Template

test/e2e/shared/suite.go

@@ -157,12 +157,7 @@ func Node1BeforeSuite(e2eCtx *E2EContext) []byte {
 	ensureSSHKeyPair(e2eCtx.AWSSession, DefaultSSHKeyPairName)
 	e2eCtx.Environment.BootstrapAccessKey = newUserAccessKey(context.TODO(), e2eCtx.AWSSessionV2, bootstrapTemplate.Spec.BootstrapUser.UserName)
 	e2eCtx.BootstrapUserAWSSession = NewAWSSessionWithKey(e2eCtx.Environment.BootstrapAccessKey)
-	//TODO: v2AccessKey can be removed after AWS SDK V2 Migration
-	v2AccessKey := &iamtypes.AccessKey{
-		AccessKeyId:     e2eCtx.Environment.BootstrapAccessKey.AccessKeyId,
-		SecretAccessKey: e2eCtx.Environment.BootstrapAccessKey.SecretAccessKey,
-	}
-	e2eCtx.BootstrapUserAWSSessionV2 = NewAWSSessionWithKeyV2(v2AccessKey)
+	e2eCtx.BootstrapUserAWSSessionV2 = NewAWSSessionWithKeyV2(e2eCtx.Environment.BootstrapAccessKey)
 	Expect(ensureTestImageUploaded(e2eCtx)).NotTo(HaveOccurred())
 
 	// Image ID is needed when using a CI Kubernetes version. This is used in conformance test and upgrade to main test.
@@ -231,12 +226,7 @@ func AllNodesBeforeSuite(e2eCtx *E2EContext, data []byte) {
 	e2eCtx.Environment.BootstrapClusterProxy = framework.NewClusterProxy("bootstrap", conf.KubeconfigPath, e2eCtx.Environment.Scheme)
 	e2eCtx.E2EConfig = &conf.E2EConfig
 	e2eCtx.BootstrapUserAWSSession = NewAWSSessionWithKey(conf.BootstrapAccessKey)
-	//TODO: v2AccessKey can be removed after AWS SDK V2 Migration
-	v2AccessKey := &iamtypes.AccessKey{
-		AccessKeyId:     e2eCtx.Environment.BootstrapAccessKey.AccessKeyId,
-		SecretAccessKey: e2eCtx.Environment.BootstrapAccessKey.SecretAccessKey,
-	}
-	e2eCtx.BootstrapUserAWSSessionV2 = NewAWSSessionWithKeyV2(v2AccessKey)
+	e2eCtx.BootstrapUserAWSSessionV2 = NewAWSSessionWithKeyV2(conf.BootstrapAccessKey)
 	e2eCtx.Settings.FileLock = flock.New(ResourceQuotaFilePath)
 	e2eCtx.Settings.KubetestConfigFilePath = conf.KubetestConfigFilePath
 	e2eCtx.Settings.UseCIArtifacts = conf.UseCIArtifacts