Fix: add proxy ENVs to developement script

Author: typeid

pkg/aws/aws.go

@@ -11,9 +11,6 @@ import (
 
 	// V2 SDK
 	awsv2 "github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/aws/aws-sdk-go-v2/aws/retry"
-	configv2 "github.com/aws/aws-sdk-go-v2/config"
-	credentialsv2 "github.com/aws/aws-sdk-go-v2/credentials"
 	cloudtrailv2 "github.com/aws/aws-sdk-go-v2/service/cloudtrail"
 	cloudtrailv2types "github.com/aws/aws-sdk-go-v2/service/cloudtrail/types"
 	ec2v2 "github.com/aws/aws-sdk-go-v2/service/ec2"
@@ -52,68 +49,33 @@ type Client interface {
 	ListRunningInstances(infraID string) ([]ec2v2types.Instance, error)
 	ListNonRunningInstances(infraID string) ([]ec2v2types.Instance, error)
 	PollInstanceStopEventsFor(instances []ec2v2types.Instance, retryTimes int) ([]cloudtrailv2types.Event, error)
-	GetAWSCredentials() awsv2.Credentials
+	GetBaseConfig() *awsv2.Config
 	GetSecurityGroupID(infraID string) (string, error)
 	GetSubnetID(infraID string) ([]string, error)
 	IsSubnetPrivate(subnet string) (bool, error)
 	GetRouteTableForSubnet(subnetID string) (ec2v2types.RouteTable, error)
 }
 
 type SdkClient struct {
-	Credentials      awsv2.Credentials
+	BaseConfig       *awsv2.Config
 	Region           string
 	CloudtrailClient CloudTrailAPI
 	Ec2Client        EC2API
 	StsClient        StsAPI
 }
 
-func NewClient(accessID, accessSecret, token, region string) (*SdkClient, error) {
-	staticCredentials := awsv2.NewCredentialsCache(credentialsv2.NewStaticCredentialsProvider(accessID, accessSecret, token))
-	config, err := configv2.LoadDefaultConfig(context.TODO(),
-		configv2.WithRegion(region),
-		configv2.WithCredentialsProvider(staticCredentials),
-		configv2.WithRetryer(func() awsv2.Retryer {
-			return retry.AddWithMaxBackoffDelay(retry.AddWithMaxAttempts(retry.NewStandard(), maxRetries), time.Second*5)
-		}),
-	)
-	if err != nil {
-		return nil, err
-	}
-	creds, err := config.Credentials.Retrieve(context.TODO())
-	if err != nil {
-		return nil, err
-	}
+func NewClient(config awsv2.Config) (*SdkClient, error) {
 	return &SdkClient{
-		Credentials:      creds,
-		Region:           region,
+		BaseConfig:       &config,
 		CloudtrailClient: cloudtrailv2.NewFromConfig(config),
 		Ec2Client:        ec2v2.NewFromConfig(config),
 		StsClient:        stsv2.NewFromConfig(config),
 	}, nil
 }
 
 // GetAWSCredentials gets the AWS credentials
-func (c *SdkClient) GetAWSCredentials() awsv2.Credentials {
-	return c.Credentials
-}
-
-// AssumeRole returns you a new client in the account specified in the roleARN
-func (c *SdkClient) AssumeRole(roleARN, region string) (*SdkClient, error) {
-	input := &stsv2.AssumeRoleInput{
-		RoleArn:         &roleARN,
-		RoleSessionName: awsv2.String("CAD"),
-	}
-	out, err := c.StsClient.AssumeRole(context.TODO(), input)
-	if err != nil {
-		return nil, err
-	}
-	if region == "" {
-		region = c.Region
-	}
-	return NewClient(*out.Credentials.AccessKeyId,
-		*out.Credentials.SecretAccessKey,
-		*out.Credentials.SessionToken,
-		region)
+func (c *SdkClient) GetBaseConfig() *awsv2.Config {
+	return c.BaseConfig
 }
 
 // ListRunningInstances lists all running or starting instances that belong to a cluster

pkg/aws/aws_test.go

@@ -46,7 +46,7 @@ func TestSdkClient_IsSubnetPrivate(t *testing.T) {
 		StsClient        StsAPI
 		Ec2Client        EC2API
 		CloudTrailClient CloudTrailAPI
-		Credentials      awsv2.Credentials
+		BaseConfig       awsv2.Config
 	}
 	type args struct {
 		subnet string
@@ -65,7 +65,7 @@ func TestSdkClient_IsSubnetPrivate(t *testing.T) {
 				StsClient:        nil,
 				Ec2Client:        setupSubnetMock(t, nil, false),
 				CloudTrailClient: nil,
-				Credentials:      awsv2.Credentials{},
+				BaseConfig:       awsv2.Config{},
 			},
 			args: args{
 				subnet: "subnet-1",
@@ -80,7 +80,7 @@ func TestSdkClient_IsSubnetPrivate(t *testing.T) {
 				StsClient:        nil,
 				Ec2Client:        setupSubnetMock(t, awsv2.String("igw-1"), true),
 				CloudTrailClient: nil,
-				Credentials:      awsv2.Credentials{},
+				BaseConfig:       awsv2.Config{},
 			},
 			args: args{
 				subnet: "subnet-1",
@@ -95,7 +95,7 @@ func TestSdkClient_IsSubnetPrivate(t *testing.T) {
 				StsClient:        nil,
 				Ec2Client:        setupSubnetMock(t, awsv2.String("vgw-1"), false),
 				CloudTrailClient: nil,
-				Credentials:      awsv2.Credentials{},
+				BaseConfig:       awsv2.Config{},
 			},
 			args: args{
 				subnet: "subnet-1",
@@ -111,7 +111,7 @@ func TestSdkClient_IsSubnetPrivate(t *testing.T) {
 				StsClient:        tt.fields.StsClient,
 				Ec2Client:        tt.fields.Ec2Client,
 				CloudtrailClient: tt.fields.CloudTrailClient,
-				Credentials:      tt.fields.Credentials,
+				BaseConfig:       &tt.fields.BaseConfig,
 			}
 			got, err := c.IsSubnetPrivate(tt.args.subnet)
 			if (err != nil) != tt.wantErr {