github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add SigningName as optional parameter

Browse Source 
Makes AWS testing simpler
This commit is contained in:
ampsingram 2019-01-29 09:45:03 -05:00
parent 1ab6569da2
commit 5daa004105
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -590,6 +590,7 @@ type CloudConfig struct {
URL string URL string
SigningRegion string SigningRegion string
SigningMethod string SigningMethod string
SigningName string
} }
} }
@ -649,6 +650,7 @@ func (cfg *CloudConfig) getResolver() endpoints.ResolverFunc {
URL: override.URL, URL: override.URL,
SigningRegion: override.SigningRegion, SigningRegion: override.SigningRegion,
SigningMethod: override.SigningMethod, SigningMethod: override.SigningMethod,
SigningName: override.SigningName,
}, nil }, nil
} }
} }

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

@ -190,6 +190,7 @@ type ServiceDescriptor struct {
name string name string
region string region string
signingRegion, signingMethod string signingRegion, signingMethod string
signingName string
} }
func TestOverridesActiveConfig(t *testing.T) { func TestOverridesActiveConfig(t *testing.T) {
@ -376,12 +377,12 @@ func TestOverridesActiveConfig(t *testing.T) {
URL=https://s3.foo.bar URL=https://s3.foo.bar
SigningRegion=sregion1 SigningRegion=sregion1
SigningMethod = v4 SigningMethod = v4
SigningName = "name"
`), `),
nil, nil,
false, true, false, true,
[]ServiceDescriptor{{name: "s3", region: "region1", signingRegion: "sregion1", signingMethod: "v3"}, []ServiceDescriptor{{name: "s3", region: "region1", signingRegion: "sregion1", signingMethod: "v3"},
{name: "s3", region: "region2", signingRegion: "sregion1", signingMethod: "v4"}}, {name: "s3", region: "region2", signingRegion: "sregion1", signingMethod: "v4", signingName: "name"}},
}, },
} }
@ -411,6 +412,7 @@ func TestOverridesActiveConfig(t *testing.T) {
URL string URL string
SigningRegion string SigningRegion string
SigningMethod string SigningMethod string
SigningName string
} }
for _, v := range cfg.ServiceOverride { for _, v := range cfg.ServiceOverride {
if v.Service == sd.name && v.Region == sd.region { if v.Service == sd.name && v.Region == sd.region {
@ -435,6 +437,10 @@ func TestOverridesActiveConfig(t *testing.T) {
t.Errorf("Expected Endpoint '%s', received '%s' for case %s", t.Errorf("Expected Endpoint '%s', received '%s' for case %s",
targetName, found.URL, test.name) targetName, found.URL, test.name)
} }
if found.SigningName != sd.signingName {
t.Errorf("Expected signing name '%s', received '%s' for case %s",
sd.signingName, found.SigningName, test.name)
}
fn := cfg.getResolver() fn := cfg.getResolver()
ep1, e := fn(sd.name, sd.region, nil) ep1, e := fn(sd.name, sd.region, nil)