fix the request parameter parsing, the value can contain dots (aws#1975)

moelasmar · qingchm · commit 777fcfc7c497 · 2021-05-13T15:21:54.000-07:00
* fix the request parameter parsing, the value can contain dots

* fix the unit test for python 2.7

* use built in split, instead of concatenating the string
diff --git a/samtranslator/swagger/swagger.py b/samtranslator/swagger/swagger.py
@@ -1134,7 +1134,8 @@ def add_request_parameters_to_method(self, path, method_name, request_parameters
 
                 parameter_name = request_parameter["Name"]
                 location_name = parameter_name.replace("method.request.", "")
-                location, name = location_name.split(".")
+
+                location, name = location_name.split(".", 1)
 
                 if location == "querystring":
                     location = "query"
diff --git a/tests/translator/input/function_with_request_parameters.yaml b/tests/translator/input/function_with_request_parameters.yaml
@@ -38,3 +38,4 @@ Resources:
             RequestParameters:
               - method.request.querystring.type
               - method.request.path.id
+              - method.request.querystring.full.type
diff --git a/tests/translator/output/aws-cn/function_with_request_parameters.json b/tests/translator/output/aws-cn/function_with_request_parameters.json
@@ -53,13 +53,13 @@
         }
       }
     },
-    "ServerlessRestApiDeploymentc2741b5220": {
+    "ServerlessRestApiDeployment32042a0513": {
       "Type": "AWS::ApiGateway::Deployment",
       "Properties": {
         "RestApiId": {
           "Ref": "ServerlessRestApi"
         },
-        "Description": "RestApi deployment id: c2741b5220c940a753e3d1e18da6763aaba1c19b",
+        "Description": "RestApi deployment id: 32042a0513cd1c4e5c14794b306c4de10ca5c4af",
         "StageName": "Stage"
       }
     },
@@ -118,7 +118,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "ServerlessRestApiDeploymentc2741b5220"
+          "Ref": "ServerlessRestApiDeployment32042a0513"
         },
         "RestApiId": {
           "Ref": "ServerlessRestApi"
@@ -247,6 +247,12 @@
                     "type": "string",
                     "name": "id",
                     "in": "path"
+                  },
+                  {
+                    "required": false,
+                    "type": "string",
+                    "name": "full.type",
+                    "in": "query"
                   }
                 ]
               }
diff --git a/tests/translator/output/aws-us-gov/function_with_request_parameters.json b/tests/translator/output/aws-us-gov/function_with_request_parameters.json
@@ -53,13 +53,13 @@
         }
       }
     },
-    "ServerlessRestApiDeployment7c706bcd56": {
+    "ServerlessRestApiDeploymentbe3a929cf9": {
       "Type": "AWS::ApiGateway::Deployment",
       "Properties": {
         "RestApiId": {
           "Ref": "ServerlessRestApi"
         },
-        "Description": "RestApi deployment id: 7c706bcd56e685afb5882e0219515c9413bcd13b",
+        "Description": "RestApi deployment id: be3a929cf90555789f2865fc4a96eb9a11ff7a81",
         "StageName": "Stage"
       }
     },
@@ -128,7 +128,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "ServerlessRestApiDeployment7c706bcd56"
+          "Ref": "ServerlessRestApiDeploymentbe3a929cf9"
         },
         "RestApiId": {
           "Ref": "ServerlessRestApi"
@@ -247,6 +247,12 @@
                     "type": "string",
                     "name": "id",
                     "in": "path"
+                  },
+                  {
+                    "required": false,
+                    "type": "string",
+                    "name": "full.type",
+                    "in": "query"
                   }
                 ]
               }
diff --git a/tests/translator/output/function_with_request_parameters.json b/tests/translator/output/function_with_request_parameters.json
@@ -53,13 +53,13 @@
         }
       }
     },
-    "ServerlessRestApiDeployment2223b43914": {
+    "ServerlessRestApiDeployment104b236830": {
       "Type": "AWS::ApiGateway::Deployment",
       "Properties": {
         "RestApiId": {
           "Ref": "ServerlessRestApi"
         },
-        "Description": "RestApi deployment id: 2223b439142974b7a3aad1381ddd39027077ce52",
+        "Description": "RestApi deployment id: 104b236830d26d2515909073d13fa9c58ad6db49",
         "StageName": "Stage"
       }
     },
@@ -118,7 +118,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "ServerlessRestApiDeployment2223b43914"
+          "Ref": "ServerlessRestApiDeployment104b236830"
         },
         "RestApiId": {
           "Ref": "ServerlessRestApi"
@@ -239,6 +239,12 @@
                     "type": "string",
                     "name": "id",
                     "in": "path"
+                  },
+                  {
+                    "required": false,
+                    "type": "string",
+                    "name": "full.type",
+                    "in": "query"
                   }
                 ]
               }
@@ -272,4 +278,4 @@
       }
     }
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -53,13 +53,13 @@`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`},`
`56`		`- "ServerlessRestApiDeployment2223b43914": {`
	`56`	`+ "ServerlessRestApiDeployment104b236830": {`
`57`	`57`	`"Type": "AWS::ApiGateway::Deployment",`
`58`	`58`	`"Properties": {`
`59`	`59`	`"RestApiId": {`
`60`	`60`	`"Ref": "ServerlessRestApi"`
`61`	`61`	`},`
`62`		`- "Description": "RestApi deployment id: 2223b439142974b7a3aad1381ddd39027077ce52",`
	`62`	`+ "Description": "RestApi deployment id: 104b236830d26d2515909073d13fa9c58ad6db49",`
`63`	`63`	`"StageName": "Stage"`
`64`	`64`	`}`
`65`	`65`	`},`
`@@ -118,7 +118,7 @@`
`118`	`118`	`"Type": "AWS::ApiGateway::Stage",`
`119`	`119`	`"Properties": {`
`120`	`120`	`"DeploymentId": {`
`121`		`- "Ref": "ServerlessRestApiDeployment2223b43914"`
	`121`	`+ "Ref": "ServerlessRestApiDeployment104b236830"`
`122`	`122`	`},`
`123`	`123`	`"RestApiId": {`
`124`	`124`	`"Ref": "ServerlessRestApi"`
`@@ -239,6 +239,12 @@`
`239`	`239`	`"type": "string",`
`240`	`240`	`"name": "id",`
`241`	`241`	`"in": "path"`
	`242`	`+ },`
	`243`	`+ {`
	`244`	`+ "required": false,`
	`245`	`+ "type": "string",`
	`246`	`+ "name": "full.type",`
	`247`	`+ "in": "query"`
`242`	`248`	`}`
`243`	`249`	`]`
`244`	`250`	`}`
`@@ -272,4 +278,4 @@`
`272`	`278`	`}`
`273`	`279`	`}`
`274`	`280`	`}`
`275`		`-}`
	`281`	`+}`