Merge pull request #41 from operasoftware/fix-split-stacks

Switch from Fn::Sub to Fn::Join in CF templates

Author: davidgf

fixtures/1.output.json

@@ -286,7 +286,20 @@
           "IntegrationHttpMethod": "POST",
           "Type": "AWS_PROXY",
           "Uri": {
-            "Fn::Sub": "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${HelloLambdaFunctionAliasLive}/invocations"
+            "Fn::Join": [
+              "",
+              [
+                "arn:aws:apigateway:",
+                {
+                  "Ref": "AWS::Region"
+                },
+                ":lambda:path/2015-03-31/functions/",
+                {
+                  "Ref": "HelloLambdaFunctionAliasLive"
+                },
+                "/invocations"
+              ]
+            ]
           }
         },
         "MethodResponses": []

fixtures/2.output.without-hooks.json

@@ -190,7 +190,20 @@
           "IntegrationHttpMethod": "POST",
           "Type": "AWS_PROXY",
           "Uri": {
-            "Fn::Sub": "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${HelloLambdaFunctionAliasLive}/invocations"
+            "Fn::Join": [
+              "",
+              [
+                "arn:aws:apigateway:",
+                {
+                  "Ref": "AWS::Region"
+                },
+                ":lambda:path/2015-03-31/functions/",
+                {
+                  "Ref": "HelloLambdaFunctionAliasLive"
+                },
+                "/invocations"
+              ]
+            ]
           }
         },
         "MethodResponses": []

fixtures/3.output.with-existing-codedeploy-role.json

@@ -286,7 +286,20 @@
           "IntegrationHttpMethod": "POST",
           "Type": "AWS_PROXY",
           "Uri": {
-            "Fn::Sub": "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${HelloLambdaFunctionAliasLive}/invocations"
+            "Fn::Join": [
+              "",
+              [
+                "arn:aws:apigateway:",
+                {
+                  "Ref": "AWS::Region"
+                },
+                ":lambda:path/2015-03-31/functions/",
+                {
+                  "Ref": "HelloLambdaFunctionAliasLive"
+                },
+                "/invocations"
+              ]
+            ]
           }
         },
         "MethodResponses": []

lib/CfTemplateGenerators/ApiGateway.js

@@ -2,11 +2,13 @@ const _ = require('lodash/fp');
 
 function buildUriForAlias(functionAlias) {
   const aliasArn = [
-    'arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${',
-    functionAlias,
-    '}/invocations'
-  ].join('');
-  return { 'Fn::Sub': aliasArn };
+    'arn:aws:apigateway:',
+    { 'Ref': 'AWS::Region' },
+    ':lambda:path/2015-03-31/functions/',
+    { 'Ref': functionAlias },
+    '/invocations'
+  ];
+  return { 'Fn::Join': [ '', aliasArn ] };
 }
 
 function replaceMethodUriWithAlias(apiGatewayMethod, functionAlias) {

lib/CfTemplateGenerators/ApiGateway.test.js

@@ -33,11 +33,13 @@ describe('ApiGateway', () => {
     it('replaces the method URI with a function alias ARN', () => {
       const functionAlias = 'TheFunctionAlias';
       const uriWithAwsVariables = [
-        'arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${',
-        functionAlias,
-        '}/invocations'
-      ].join('');
-      const uri = { 'Fn::Sub': uriWithAwsVariables };
+        'arn:aws:apigateway:',
+        { Ref: 'AWS::Region' },
+        ':lambda:path/2015-03-31/functions/',
+        { Ref: functionAlias },
+        '/invocations'
+      ];
+      const uri = { 'Fn::Join': [ '', uriWithAwsVariables ] };
       const expected = _.set('Properties.Integration.Uri', uri, apiGatewayMethod);
       const actual = ApiGateway.replaceMethodUriWithAlias(apiGatewayMethod, functionAlias);
       expect(actual).to.deep.equal(expected);