Revert "Tighten substitution pattern for Fn::Sub (#842)"

This reverts commit fd5731f.
smithy-lang · Jul 12, 2021 · 85a7f39 · 85a7f39
1 parent 4b37343
commit 85a7f39
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 20 deletions.
diff --git a/...c/main/java/software/amazon/smithy/aws/apigateway/openapi/CloudFormationSubstitution.java b/...c/main/java/software/amazon/smithy/aws/apigateway/openapi/CloudFormationSubstitution.java
@@ -45,7 +45,7 @@ final class CloudFormationSubstitution implements ApiGatewayMapper {
 
     private static final Logger LOGGER = Logger.getLogger(CloudFormationSubstitution.class.getName());
     private static final String SUBSTITUTION_KEY = "Fn::Sub";
-    private static final Pattern SUBSTITUTION_PATTERN = Pattern.compile("\\$\\{[A-Za-z0-9.:]+}");
+    private static final Pattern SUBSTITUTION_PATTERN = Pattern.compile("\\$\\{.+}");
 
     /**
      * This is a hardcoded list of paths that are known to contain ARNs or identifiers

diff --git a/...st/java/software/amazon/smithy/aws/apigateway/openapi/CloudFormationSubstitutionTest.java b/...st/java/software/amazon/smithy/aws/apigateway/openapi/CloudFormationSubstitutionTest.java
@@ -69,6 +69,6 @@ public void pluginCanBeDisabled() {
                 .config(config)
                 .convertToNode(model);
 
-        Node.assertEquals(actual, expected);
+        Node.assertEquals(expected, actual);
     }
 }
diff --git a/...resources/software/amazon/smithy/aws/apigateway/openapi/cloudformation-substitutions.json b/...resources/software/amazon/smithy/aws/apigateway/openapi/cloudformation-substitutions.json
@@ -25,12 +25,6 @@
                 "smithy.api#http": {
                     "uri": "/foo",
                     "method": "GET"
-                },
-                "aws.apigateway#integration": {
-                    "httpMethod": "POST",
-                    "payloadFormatVersion": "2.0",
-                    "type": "aws_proxy",
-                    "uri": "arn:${Token[AWS.Partition.9]}:apigateway:us-east-1:lambda:path/2015-03-31/functions/${Token[TOKEN.108]}/invocations"
                 }
             }
         }

diff --git a/...t/resources/software/amazon/smithy/aws/apigateway/openapi/substitution-not-performed.json b/...t/resources/software/amazon/smithy/aws/apigateway/openapi/substitution-not-performed.json
@@ -12,12 +12,6 @@
           "200": {
             "description": "MyOperation response"
           }
-        },
-        "x-amazon-apigateway-integration": {
-          "httpMethod": "POST",
-          "payloadFormatVersion": "2.0",
-          "type": "aws_proxy",
-          "uri": "arn:${Token[AWS.Partition.9]}:apigateway:us-east-1:lambda:path/2015-03-31/functions/${Token[TOKEN.108]}/invocations"
         }
       }
     }

diff --git a/.../test/resources/software/amazon/smithy/aws/apigateway/openapi/substitution-performed.json b/.../test/resources/software/amazon/smithy/aws/apigateway/openapi/substitution-performed.json
@@ -12,12 +12,6 @@
           "200": {
             "description": "MyOperation response"
           }
-        },
-        "x-amazon-apigateway-integration": {
-          "httpMethod": "POST",
-          "payloadFormatVersion": "2.0",
-          "type": "aws_proxy",
-          "uri": "arn:${Token[AWS.Partition.9]}:apigateway:us-east-1:lambda:path/2015-03-31/functions/${Token[TOKEN.108]}/invocations"
         }
       }
     }