From 5daa004105b124248045971ec5414d13271251f6 Mon Sep 17 00:00:00 2001
From: ampsingram <steve.ingram@ampsight.com>
Date: Tue, 29 Jan 2019 09:45:03 -0500
Subject: [PATCH] Add SigningName as optional parameter

Makes AWS testing simpler
---
 pkg/cloudprovider/providers/aws/aws.go      |  2 ++
 pkg/cloudprovider/providers/aws/aws_test.go | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkg/cloudprovider/providers/aws/aws.go b/pkg/cloudprovider/providers/aws/aws.go
index 35e7e6d50d..7cd44c739d 100644
--- a/pkg/cloudprovider/providers/aws/aws.go
+++ b/pkg/cloudprovider/providers/aws/aws.go
@@ -590,6 +590,7 @@ type CloudConfig struct {
 		URL           string
 		SigningRegion string
 		SigningMethod string
+		SigningName   string
 	}
 }
 
@@ -649,6 +650,7 @@ func (cfg *CloudConfig) getResolver() endpoints.ResolverFunc {
 					URL:           override.URL,
 					SigningRegion: override.SigningRegion,
 					SigningMethod: override.SigningMethod,
+					SigningName:   override.SigningName,
 				}, nil
 			}
 		}
diff --git a/pkg/cloudprovider/providers/aws/aws_test.go b/pkg/cloudprovider/providers/aws/aws_test.go
index 1a6333764d..62f7186af0 100644
--- a/pkg/cloudprovider/providers/aws/aws_test.go
+++ b/pkg/cloudprovider/providers/aws/aws_test.go
@@ -190,6 +190,7 @@ type ServiceDescriptor struct {
 	name                         string
 	region                       string
 	signingRegion, signingMethod string
+	signingName                  string
 }
 
 func TestOverridesActiveConfig(t *testing.T) {
@@ -376,12 +377,12 @@ func TestOverridesActiveConfig(t *testing.T) {
                  URL=https://s3.foo.bar
                  SigningRegion=sregion1
 				 SigningMethod = v4
-                 
+                 SigningName = "name"
                  `),
 			nil,
 			false, true,
 			[]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
 						SigningRegion string
 						SigningMethod string
+						SigningName   string
 					}
 					for _, v := range cfg.ServiceOverride {
 						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",
 								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()
 						ep1, e := fn(sd.name, sd.region, nil)