From 97964a12fb5013a573f4f492bb68eb1e04a9eea3 Mon Sep 17 00:00:00 2001 From: Lucas Telles Date: Thu, 13 Apr 2023 15:52:50 -0300 Subject: [PATCH 1/3] Make var awsCloudInstances public and create func to initialize it --- upup/pkg/fi/cloudup/awsup/aws_cloud.go | 10 +++++++--- upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/upup/pkg/fi/cloudup/awsup/aws_cloud.go b/upup/pkg/fi/cloudup/awsup/aws_cloud.go index 6d1f556c65b56..0e133c310ff65 100644 --- a/upup/pkg/fi/cloudup/awsup/aws_cloud.go +++ b/upup/pkg/fi/cloudup/awsup/aws_cloud.go @@ -234,10 +234,14 @@ func (c *awsCloudImplementation) Region() string { return c.region } -var awsCloudInstances map[string]AWSCloud = make(map[string]AWSCloud) +var AWSCloudInstances = NewAWSCloudInstances() + +func NewAWSCloudInstances() map[string]AWSCloud { + return make(map[string]AWSCloud) +} func NewAWSCloud(region string, tags map[string]string) (AWSCloud, error) { - raw := awsCloudInstances[region] + raw := AWSCloudInstances[region] if raw == nil { c := &awsCloudImplementation{ region: region, @@ -375,7 +379,7 @@ func NewAWSCloud(region string, tags map[string]string) (AWSCloud, error) { c.ssm.Handlers.Send.PushFront(requestLogger) c.addHandlers(region, &c.ssm.Handlers) - awsCloudInstances[region] = c + AWSCloudInstances[region] = c raw = c } diff --git a/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go b/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go index 05bce6dd5b558..708280844ddef 100644 --- a/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go +++ b/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go @@ -55,7 +55,7 @@ var _ fi.Cloud = (*MockAWSCloud)(nil) func InstallMockAWSCloud(region string, zoneLetters string) *MockAWSCloud { i := BuildMockAWSCloud(region, zoneLetters) - awsCloudInstances[region] = i + AWSCloudInstances[region] = i allRegions = []*ec2.Region{ {RegionName: aws.String(region)}, } From 0bacc2b6dab32e4d60893511f85db2fc04c13dfd Mon Sep 17 00:00:00 2001 From: Lucas Telles Date: Thu, 27 Apr 2023 11:52:49 -0300 Subject: [PATCH 2/3] Create func to reset awsCloudInstances --- upup/pkg/fi/cloudup/awsup/aws_cloud.go | 10 +++++----- upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/upup/pkg/fi/cloudup/awsup/aws_cloud.go b/upup/pkg/fi/cloudup/awsup/aws_cloud.go index 0e133c310ff65..9aaf55ab742f9 100644 --- a/upup/pkg/fi/cloudup/awsup/aws_cloud.go +++ b/upup/pkg/fi/cloudup/awsup/aws_cloud.go @@ -234,14 +234,14 @@ func (c *awsCloudImplementation) Region() string { return c.region } -var AWSCloudInstances = NewAWSCloudInstances() +var aWSCloudInstances map[string]AWSCloud = make(map[string]AWSCloud) -func NewAWSCloudInstances() map[string]AWSCloud { - return make(map[string]AWSCloud) +func ResetAWSCloudInstances() { + aWSCloudInstances = make(map[string]AWSCloud) } func NewAWSCloud(region string, tags map[string]string) (AWSCloud, error) { - raw := AWSCloudInstances[region] + raw := aWSCloudInstances[region] if raw == nil { c := &awsCloudImplementation{ region: region, @@ -379,7 +379,7 @@ func NewAWSCloud(region string, tags map[string]string) (AWSCloud, error) { c.ssm.Handlers.Send.PushFront(requestLogger) c.addHandlers(region, &c.ssm.Handlers) - AWSCloudInstances[region] = c + aWSCloudInstances[region] = c raw = c } diff --git a/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go b/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go index 708280844ddef..d13e6b7b3f239 100644 --- a/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go +++ b/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go @@ -55,7 +55,7 @@ var _ fi.Cloud = (*MockAWSCloud)(nil) func InstallMockAWSCloud(region string, zoneLetters string) *MockAWSCloud { i := BuildMockAWSCloud(region, zoneLetters) - AWSCloudInstances[region] = i + aWSCloudInstances[region] = i allRegions = []*ec2.Region{ {RegionName: aws.String(region)}, } From 39639f9a32c9d55643a42f4e5e236d9bcf4519c9 Mon Sep 17 00:00:00 2001 From: Lucas Telles Date: Thu, 27 Apr 2023 11:53:52 -0300 Subject: [PATCH 3/3] fix typo --- upup/pkg/fi/cloudup/awsup/aws_cloud.go | 8 ++++---- upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/upup/pkg/fi/cloudup/awsup/aws_cloud.go b/upup/pkg/fi/cloudup/awsup/aws_cloud.go index 9aaf55ab742f9..7693fb9482a9f 100644 --- a/upup/pkg/fi/cloudup/awsup/aws_cloud.go +++ b/upup/pkg/fi/cloudup/awsup/aws_cloud.go @@ -234,14 +234,14 @@ func (c *awsCloudImplementation) Region() string { return c.region } -var aWSCloudInstances map[string]AWSCloud = make(map[string]AWSCloud) +var awsCloudInstances map[string]AWSCloud = make(map[string]AWSCloud) func ResetAWSCloudInstances() { - aWSCloudInstances = make(map[string]AWSCloud) + awsCloudInstances = make(map[string]AWSCloud) } func NewAWSCloud(region string, tags map[string]string) (AWSCloud, error) { - raw := aWSCloudInstances[region] + raw := awsCloudInstances[region] if raw == nil { c := &awsCloudImplementation{ region: region, @@ -379,7 +379,7 @@ func NewAWSCloud(region string, tags map[string]string) (AWSCloud, error) { c.ssm.Handlers.Send.PushFront(requestLogger) c.addHandlers(region, &c.ssm.Handlers) - aWSCloudInstances[region] = c + awsCloudInstances[region] = c raw = c } diff --git a/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go b/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go index d13e6b7b3f239..05bce6dd5b558 100644 --- a/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go +++ b/upup/pkg/fi/cloudup/awsup/mock_aws_cloud.go @@ -55,7 +55,7 @@ var _ fi.Cloud = (*MockAWSCloud)(nil) func InstallMockAWSCloud(region string, zoneLetters string) *MockAWSCloud { i := BuildMockAWSCloud(region, zoneLetters) - aWSCloudInstances[region] = i + awsCloudInstances[region] = i allRegions = []*ec2.Region{ {RegionName: aws.String(region)}, }