github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

format changes

Browse Source
This commit is contained in:
ampsingram 2019-01-25 18:16:48 -05:00
parent 28d3774004
commit 1ab6569da2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cloudprovider/providers/aws/aws.go
View File

@ -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)
}

12
pkg/cloudprovider/providers/aws/aws_test.go
View File

@ -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"}},
},
}