diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index 65c50db965c..35e7e6d50d0 100644 --- a/pkg/cloudprovider/providers/aws/aws.go +++ b/pkg/cloudprovider/providers/aws/aws.go @@ -615,14 +615,14 @@ func (cfg *CloudConfig) validateOverrides() error { ovrd.Region = region url := strings.TrimSpace(ovrd.URL) - if url== "" { + if url == "" { return fmt.Errorf("url is missing [URL is \"\"] in override %s", onum) } signingRegion := strings.TrimSpace(ovrd.SigningRegion) if signingRegion == "" { return fmt.Errorf("signingRegion is missing [SigningRegion is \"\"] in override %s", onum) } - signature := name+"_"+region + signature := name + "_" + region if set[signature] { return fmt.Errorf("duplicate entry found for service override [%s] (%s in %s)", onum, name, region) } diff --git a/pkg/cloudprovider/providers/aws/aws_test.go b/pkg/cloudprovider/providers/aws/aws_test.go index 66256760320..1a6333764df 100644 --- a/pkg/cloudprovider/providers/aws/aws_test.go +++ b/pkg/cloudprovider/providers/aws/aws_test.go @@ -187,8 +187,8 @@ func TestReadAWSCloudConfig(t *testing.T) { } type ServiceDescriptor struct { - name string - region string + name string + region string signingRegion, signingMethod string } @@ -309,7 +309,7 @@ func TestOverridesActiveConfig(t *testing.T) { SigningMethod = v4`), nil, false, true, - []ServiceDescriptor{{name:"s3", region: "sregion1", signingRegion: "sregion1", signingMethod: "v4"}, + []ServiceDescriptor{{name: "s3", region: "sregion1", signingRegion: "sregion1", signingMethod: "v4"}, {name: "ec2", region: "sregion2", signingRegion: "sregion2", signingMethod: "v4"}}, }, { @@ -356,7 +356,7 @@ func TestOverridesActiveConfig(t *testing.T) { nil, false, true, []ServiceDescriptor{{name: "s3", region: "region1", signingRegion: "sregion1", signingMethod: ""}, - {name:"ec2", region: "region2", signingRegion: "sregion", signingMethod: "v4"}}, + {name: "ec2", region: "region2", signingRegion: "sregion", signingMethod: "v4"}}, }, { "Multiple regions, Same Service", @@ -380,8 +380,8 @@ func TestOverridesActiveConfig(t *testing.T) { `), nil, false, true, - []ServiceDescriptor{{name:"s3", region: "region1", signingRegion: "sregion1", signingMethod: "v3"}, - {name:"s3", region: "region2", signingRegion: "sregion1", signingMethod: "v4"}}, + []ServiceDescriptor{{name: "s3", region: "region1", signingRegion: "sregion1", signingMethod: "v3"}, + {name: "s3", region: "region2", signingRegion: "sregion1", signingMethod: "v4"}}, }, }