e2e aws network validation test

Author: drewmalin

go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/ec2 v1.251.2
 	github.com/aws/aws-sdk-go-v2/service/eks v1.73.3
 	github.com/aws/aws-sdk-go-v2/service/iam v1.47.5
+	github.com/aws/smithy-go v1.23.0
 	github.com/bojanz/currency v1.3.1
 	github.com/cenkalti/backoff v2.2.1+incompatible
 	github.com/cenkalti/backoff/v4 v4.3.0
@@ -43,7 +44,6 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sso v1.29.3 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.4 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.38.4 // indirect
-	github.com/aws/smithy-go v1.23.0 // indirect
 	github.com/cockroachdb/apd/v3 v3.2.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.12.2 // indirect

internal/validation/suite.go

@@ -130,7 +130,6 @@ func RunInstanceLifecycleValidation(t *testing.T, config ProviderConfig) {
 type NetworkValidationOpts struct {
 	Name                  string
 	RefID                 string
-	Location              string
 	CidrBlock             string
 	PublicSubnetCidrBlock string
 	Tags                  map[string]string
@@ -156,7 +155,6 @@ func RunNetworkValidation(t *testing.T, config ProviderConfig, opts NetworkValid
 		vpc, err := v1.ValidateCreateVPC(ctx, client, v1.CreateVPCArgs{
 			Name:      opts.Name,
 			RefID:     opts.RefID,
-			Location:  opts.Location,
 			CidrBlock: opts.CidrBlock,
 			Subnets: []v1.CreateSubnetArgs{
 				{CidrBlock: opts.PublicSubnetCidrBlock, Type: v1.SubnetTypePublic},
@@ -253,7 +251,6 @@ type KubernetesValidationNodeGroupOpts struct {
 type KubernetesValidationNetworkOpts struct {
 	Name                   string
 	RefID                  string
-	Location               string
 	CidrBlock              string
 	PublicSubnetCidrBlock  string
 	PrivateSubnetCidrBlock string
@@ -286,7 +283,6 @@ func RunKubernetesValidation(t *testing.T, config ProviderConfig, opts Kubernete
 	vpc, err := v1.ValidateCreateVPC(ctx, client, v1.CreateVPCArgs{
 		Name:      opts.NetworkOpts.Name,
 		RefID:     opts.NetworkOpts.RefID,
-		Location:  opts.NetworkOpts.Location,
 		CidrBlock: opts.NetworkOpts.CidrBlock,
 		Subnets: []v1.CreateSubnetArgs{
 			{CidrBlock: opts.NetworkOpts.PublicSubnetCidrBlock, Type: v1.SubnetTypePublic},
@@ -332,7 +328,6 @@ func RunKubernetesValidation(t *testing.T, config ProviderConfig, opts Kubernete
 			VPCID:             vpc.ID,
 			SubnetIDs:         []v1.CloudProviderResourceID{vpc.Subnets[0].ID},
 			KubernetesVersion: opts.KubernetesVersion,
-			Location:          opts.NetworkOpts.Location,
 			Tags:              opts.Tags,
 		})
 		require.NoError(t, err, "ValidateCreateKubernetesCluster should pass")

v1/providers/aws/capabilities.go

@@ -1,15 +1,11 @@
 package v1
 
 import (
-	"context"
-
 	v1 "github.com/brevdev/cloud/v1"
 )
 
-func (c *AWSClient) GetCapabilities(_ context.Context) (v1.Capabilities, error) {
-	capabilities := v1.Capabilities{
+func GetAWSCapabilities() v1.Capabilities {
+	return v1.Capabilities{
 		v1.CapabilityVPC,
 	}
-
-	return capabilities, nil
 }

v1/providers/aws/client.go

@@ -47,38 +47,39 @@ func (c *AWSCredential) GetTenantID() (string, error) {
 }
 
 func (c *AWSCredential) GetCapabilities(ctx context.Context) (v1.Capabilities, error) {
-	client, err := c.MakeClient(ctx, "")
-	if err != nil {
-		return nil, err
-	}
-	return client.GetCapabilities(ctx)
+	return GetAWSCapabilities(), nil
 }
 
-func (c *AWSCredential) MakeClient(_ context.Context, _ string) (v1.CloudClient, error) {
-	return NewAWSClient(c.RefID, c.AccessKeyID, c.SecretAccessKey)
+func (c *AWSCredential) MakeClient(_ context.Context, region string) (v1.CloudClient, error) {
+	return NewAWSClient(c.RefID, c.AccessKeyID, c.SecretAccessKey, region)
 }
 
 type AWSClient struct {
 	v1.NotImplCloudClient
 	refID     string
 	awsConfig aws.Config
+	region    string
 }
 
 var _ v1.CloudClient = &AWSClient{}
 
-func NewAWSClient(refID string, accessKeyID string, secretAccessKey string) (*AWSClient, error) {
+func NewAWSClient(refID string, accessKeyID string, secretAccessKey string, region string) (*AWSClient, error) {
 	ctx := context.Background()
 
 	awsCredentials := credentials.NewStaticCredentialsProvider(accessKeyID, secretAccessKey, "")
 
-	awsConfig, err := config.LoadDefaultConfig(ctx, config.WithCredentialsProvider(awsCredentials))
+	awsConfig, err := config.LoadDefaultConfig(ctx,
+		config.WithCredentialsProvider(awsCredentials),
+		config.WithRegion(region),
+	)
 	if err != nil {
 		return nil, fmt.Errorf("failed to load AWS config: %w", err)
 	}
 
 	return &AWSClient{
 		refID:     refID,
 		awsConfig: awsConfig,
+		region:    region,
 	}, nil
 }
 
@@ -93,3 +94,7 @@ func (c *AWSClient) GetCloudProviderID() v1.CloudProviderID {
 func (c *AWSClient) GetReferenceID() string {
 	return c.refID
 }
+
+func (c *AWSClient) GetCapabilities(_ context.Context) (v1.Capabilities, error) {
+	return GetAWSCapabilities(), nil
+}