fix imds unit tests

Author: isaiahvita

Diff for: feature/ec2/imds/api_op_GetToken.go

@@ -49,6 +49,7 @@ func addGetTokenMiddleware(stack *middleware.Stack, options Options) error {
 	err := addRequestMiddleware(stack,
 		options,
 		"PUT",
+		"GetToken",
 		buildGetTokenPath,
 		buildGetTokenOutput)
 	if err != nil {

Diff for: feature/ec2/imds/request_middleware.go

@@ -21,11 +21,7 @@ func addAPIRequestMiddleware(stack *middleware.Stack,
 	getPath func(interface{}) (string, error),
 	getOutput func(*smithyhttp.Response) (interface{}, error),
 ) (err error) {
-	if err := addProtocolFinalizerMiddlewares(stack, options, operation); err != nil {
-		return fmt.Errorf("add protocol finalizers: %v", err)
-	}
-
-	err = addRequestMiddleware(stack, options, "GET", getPath, getOutput)
+	err = addRequestMiddleware(stack, options, "GET", operation, getPath, getOutput)
 	if err != nil {
 		return err
 	}
@@ -49,6 +45,7 @@ func addAPIRequestMiddleware(stack *middleware.Stack,
 func addRequestMiddleware(stack *middleware.Stack,
 	options Options,
 	method string,
+	operation string,
 	getPath func(interface{}) (string, error),
 	getOutput func(*smithyhttp.Response) (interface{}, error),
 ) (err error) {
@@ -106,6 +103,10 @@ func addRequestMiddleware(stack *middleware.Stack,
 		return err
 	}
 
+	if err := addProtocolFinalizerMiddlewares(stack, options, operation); err != nil {
+		return fmt.Errorf("add protocol finalizers: %v", err)
+	}
+
 	// Retry support
 	return retry.AddRetryMiddlewares(stack, retry.AddRetryMiddlewaresOptions{
 		Retryer:          options.Retryer,

Diff for: feature/ec2/imds/request_middleware_test.go

@@ -33,7 +33,7 @@ func TestAddRequestMiddleware(t *testing.T) {
 		"api request": {
 			AddMiddleware: func(stack *middleware.Stack, options Options) error {
 				return addAPIRequestMiddleware(stack, options,
-					"TestRequest"
+					"TestRequest",
 					func(interface{}) (string, error) {
 						return "/mockPath", nil
 					},
@@ -54,9 +54,13 @@ func TestAddRequestMiddleware(t *testing.T) {
 				"UserAgent",
 			},
 			ExpectFinalize: []string{
+				"ResolveAuthScheme",
+				"GetIdentity",
+				"ResolveEndpointV2",
 				"Retry",
 				"APITokenProvider",
 				"RetryMetricsHeader",
+				"Signing",
 			},
 			ExpectDeserialize: []string{
 				"APITokenProvider",
@@ -67,7 +71,7 @@ func TestAddRequestMiddleware(t *testing.T) {
 
 		"base request": {
 			AddMiddleware: func(stack *middleware.Stack, options Options) error {
-				return addRequestMiddleware(stack, options, "POST",
+				return addRequestMiddleware(stack, options, "POST", "TestRequest",
 					func(interface{}) (string, error) {
 						return "/mockPath", nil
 					},
@@ -88,8 +92,12 @@ func TestAddRequestMiddleware(t *testing.T) {
 				"UserAgent",
 			},
 			ExpectFinalize: []string{
+				"ResolveAuthScheme",
+				"GetIdentity",
+				"ResolveEndpointV2",
 				"Retry",
 				"RetryMetricsHeader",
+				"Signing",
 			},
 			ExpectDeserialize: []string{
 				"OperationDeserializer",
@@ -591,7 +599,7 @@ func TestRequestGetToken(t *testing.T) {
 					func(stack *middleware.Stack, options Options) error {
 						return addAPIRequestMiddleware(stack,
 							client.options.Copy(),
-							"TestRequest"
+							"TestRequest",
 							func(interface{}) (string, error) {
 								return "/latest/foo", nil
 							},