github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-23 10:32:03 +00:00
Code Issues Projects Releases Wiki Activity

Fail early, helps readability

Browse Source 
responding to a comment in the PR
This commit is contained in:
ampsingram 2019-01-16 18:47:09 -05:00
parent 2a6ed9a698
commit 6f60d57dab
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -643,7 +643,9 @@ func loadCustomResolver() func(service, region string, optFns ...func(*endpoints
defaultResolverFn := func(service, region string, optFns ...func(*endpoints.Options)) (endpoints.ResolvedEndpoint, error) { defaultResolverFn := func(service, region string, optFns ...func(*endpoints.Options)) (endpoints.ResolvedEndpoint, error) {
return defaultResolver.EndpointFor(service, region, optFns...) return defaultResolver.EndpointFor(service, region, optFns...)
} }
if overridesActive { if !overridesActive {
return defaultResolverFn
}
customResolverFn := func(service, region string, optFns ...func(*endpoints.Options)) (endpoints.ResolvedEndpoint, error) { customResolverFn := func(service, region string, optFns ...func(*endpoints.Options)) (endpoints.ResolvedEndpoint, error) {
signature := makeRegionEndpointSignature(service, region) signature := makeRegionEndpointSignature(service, region)
if ep, ok := overrides[signature]; ok { if ep, ok := overrides[signature]; ok {
@ -656,8 +658,6 @@ func loadCustomResolver() func(service, region string, optFns ...func(*endpoints
} }
return customResolverFn return customResolverFn
} }
return defaultResolverFn
}
// awsSdkEC2 is an implementation of the EC2 interface, backed by aws-sdk-go // awsSdkEC2 is an implementation of the EC2 interface, backed by aws-sdk-go
type awsSdkEC2 struct { type awsSdkEC2 struct {