From 6f60d57dab51b132b8d2ce7840492accf959ef69 Mon Sep 17 00:00:00 2001 From: ampsingram Date: Wed, 16 Jan 2019 18:47:09 -0500 Subject: [PATCH] Fail early, helps readability responding to a comment in the PR --- pkg/cloudprovider/providers/aws/aws.go | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go index 86fcf0edd1c..34b137947f9 100644 --- a/pkg/cloudprovider/providers/aws/aws.go +++ b/pkg/cloudprovider/providers/aws/aws.go @@ -643,20 +643,20 @@ func loadCustomResolver() func(service, region string, optFns ...func(*endpoints defaultResolverFn := func(service, region string, optFns ...func(*endpoints.Options)) (endpoints.ResolvedEndpoint, error) { return defaultResolver.EndpointFor(service, region, optFns...) } - if overridesActive { - customResolverFn := func(service, region string, optFns ...func(*endpoints.Options)) (endpoints.ResolvedEndpoint, error) { - signature := makeRegionEndpointSignature(service, region) - if ep, ok := overrides[signature]; ok { - return endpoints.ResolvedEndpoint{ - URL: ep.Endpoint, - SigningRegion: ep.SigningRegion, - }, nil - } - return defaultResolver.EndpointFor(service, region, optFns...) - } - return customResolverFn + if !overridesActive { + return defaultResolverFn } - return defaultResolverFn + customResolverFn := func(service, region string, optFns ...func(*endpoints.Options)) (endpoints.ResolvedEndpoint, error) { + signature := makeRegionEndpointSignature(service, region) + if ep, ok := overrides[signature]; ok { + return endpoints.ResolvedEndpoint{ + URL: ep.Endpoint, + SigningRegion: ep.SigningRegion, + }, nil + } + return defaultResolver.EndpointFor(service, region, optFns...) + } + return customResolverFn } // awsSdkEC2 is an implementation of the EC2 interface, backed by aws-sdk-go