Fix CloudFormation generation

Author: devpow112

README.md

@@ -42,30 +42,25 @@ functions:
     ...
 ```
 
-During pre-processing the `${fn.*}` related items will be resolved resulting in
-the below CloudFormation snippet.
-
-```yaml
-service: test
-
-plugins:
-  - serverless-plugin-function-value
-
-provider:
-  name: aws
-  ...
-
-resources:
-  Resources:
-    LambdaFunctionExecutor:
-        Type: Custom::LambdaFunctionExecutor
-        Properties:
-          ServiceToken: !GetAtt HealthLambdaFunction.Arn # resolved
-          Name: !Ref HealthLambdaFunction # resolved
-
-functions:
-  health:
-    ...
+During processing the `${fn.*}` related items will be resolved to either the
+`Fn::GetAtt` for `${fn.arn:*}` or `Ref` for `${fn.name:*}`. The custom resource
+above would look like the below in the generated CloudForamtion template.
+
+```json
+"LambdaFunctionExecutor": {
+    "Type": "Custom::LambdaFunctionExecutor",
+    "Properties": {
+        "ServiceToken": {
+            "Fn::GetAtt": [
+                "HealthLambdaFunction",
+                "Arn"
+            ]
+        },
+        "Name": {
+            "Ref": "HealthLambdaFunction"
+        }
+    }
+}
 ```
 
 ## Development

package.json

@@ -1,6 +1,6 @@
 {
   "name": "serverless-plugin-function-value",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Serverless framework plugin that will automatically generate CloudFormation snippets to reference a functions name or arn value based on the generated logical ID used during creation of the CloudFormation templates",
   "main": "dist/index.js",
   "scripts": {

src/function-value-plugin.js

@@ -21,10 +21,12 @@ export class FunctionValuePlugin {
   }
 
   getFunctionArnStatement(value) {
-    return Promise.resolve(`!GetAtt ${this.getFunctionLogicalId(value)}.Arn`);
+    return Promise.resolve({
+      'Fn::GetAtt': [this.getFunctionLogicalId(value), 'Arn']
+    });
   }
 
   getFunctionNameStatement(value) {
-    return Promise.resolve(`!Ref ${this.getFunctionLogicalId(value)}`);
+    return Promise.resolve({ Ref: this.getFunctionLogicalId(value) });
   }
 }

test/function-value-plugin.spec.js

@@ -20,15 +20,15 @@ describe('plugin', () => {
   });
 
   [
-    { type: 'arn', expected: `!GetAtt ${logicalId}.Arn` },
-    { type: 'name', expected: `!Ref ${logicalId}` }
+    { type: 'arn', expected: { 'Fn::GetAtt': [logicalId, 'Arn'] } },
+    { type: 'name', expected: { Ref: logicalId } }
   ].forEach(test => {
     it(`will generate function ${test.type} snippet`, async () => {
       const resolver = `fn.${test.type}`;
       const value = `${resolver}:${functionName}`;
       const result = await variableResolvers[resolver](value);
 
-      expect(result).to.equal(test.expected);
+      expect(result).to.deep.equal(test.expected);
     });
   });