@mapbox/cloudfriend 9.2.0-0 → 9.2.1

package/jest.config.js

@@ -0,0 +1,14 @@
+'use strict';
+
+module.exports = {
+  testEnvironment: 'node',
+  testMatch: ['**/test/*.test.js'],
+  collectCoverageFrom: [
+    'index.js',
+    'lib/**/*.js',
+    'bin/**/*.js',
+    '!**/node_modules/**'
+  ],
+  coverageDirectory: 'coverage',
+  verbose: true
+};

package/lib/shortcuts/api.md

@@ -425,6 +425,7 @@ Log Group, a Role, an Alarm on function errors, and the Lambda Function itself.
 | [options.OKActions] | <code>Array.&lt;String&gt;</code> |  | See [AWS documentation](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-okactions). |
 | [options.LogRetentionInDays] | <code>Number</code> | <code>14</code> | How long to retain CloudWatch logs for this Lambda function. See [AWS Documentation](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html) for allowed values. |
 | [options.LogPolicyDeletionPolicy] | <code>String</code> | <code>&#x27;Delete&#x27;</code> | DeletionPolicy on the IAM Policy resource used to access Logs. See [AWS Documentation](https://docs.aws.amazon.com/AWSCloudFormation/latest/TemplateReference/aws-attribute-deletionpolicy.html) for allowed values. |
+| [options.LogPolicyName] | <code>String</code> | <code>&#x27;${stack-name}-${logical-name}-lambda-log-access&#x27;</code> | The name of the IAM Policy used to access CloudWatch Logs. |
 
 **Example**  
 ```js

package/lib/shortcuts/lambda.js

@@ -49,6 +49,7 @@ const ServiceRole = require('./service-role');
  * @param {Array<String>} [options.OKActions=undefined] - See [AWS documentation](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-okactions).
  * @param {Number} [options.LogRetentionInDays=14] - How long to retain CloudWatch logs for this Lambda function. See [AWS Documentation](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html) for allowed values.
  * @param {String} [options.LogPolicyDeletionPolicy='Delete'] - DeletionPolicy on the IAM Policy resource used to access Logs. See [AWS Documentation](https://docs.aws.amazon.com/AWSCloudFormation/latest/TemplateReference/aws-attribute-deletionpolicy.html) for allowed values.
+ * @param {String} [options.LogPolicyName='${stack-name}-${logical-name}-lambda-log-access'] - The name of the IAM Policy used to access CloudWatch Logs.
  * @example
  * const cf = require('@mapbox/cloudfriend');
  *
@@ -109,7 +110,8 @@ class Lambda {
       ExtendedStatistic,
       OKActions,
       LogRetentionInDays = 14,
-      LogPolicyDeletionPolicy = 'Delete'
+      LogPolicyDeletionPolicy = 'Delete',
+      LogPolicyName = { 'Fn::Sub': `\${AWS::StackName}-${LogicalName}-lambda-log-access` }
     } = options;
 
     if (options.EvaluationPeriods < Math.ceil(Timeout / Period))
@@ -205,7 +207,7 @@ class Lambda {
         DependsOn: (RoleArn) ? undefined : `${LogicalName}Role`,
         DeletionPolicy: LogPolicyDeletionPolicy,
         Properties: {
-          PolicyName: { 'Fn::Sub': `\${AWS::StackName}-${LogicalName}-lambda-log-access` },
+          PolicyName: LogPolicyName,
           Roles: [roleName],
           PolicyDocument: {
             Version: '2012-10-17',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapbox/cloudfriend",
-  "version": "9.2.0-0",
+  "version": "9.2.1",
   "description": "Helper functions for assembling CloudFormation templates in JavaScript",
   "main": "index.js",
   "engines": {
@@ -8,11 +8,10 @@
   },
   "scripts": {
     "pretest": "npm run lint && npm run shortcuts-api-doc",
-    "lint": "eslint index.js test lib bin cloudformation",
+    "lint": "eslint index.js test lib bin",
     "lint:fix": "npm run lint -- --fix",
-    "test": "nyc tape test/*.test.js | tap-spec",
-    "test:update": "UPDATE=1 npm run test",
-    "coverage": "nyc --reporter html tape test/*.test.js && opener coverage/index.html",
+    "test": "jest --coverage",
+    "test:update": "jest --updateSnapshot",
     "build-ci-template": "bin/build-template.js cloudformation/ci.template.js > cloudformation/ci.template.json",
     "shortcuts-api-doc": "jsdoc2md lib/shortcuts/*.js > lib/shortcuts/api.md"
   },
@@ -35,14 +34,11 @@
   },
   "homepage": "https://github.com/mapbox/cloudfriend#readme",
   "devDependencies": {
-    "@mapbox/eslint-config-mapbox": "^1.2.1",
-    "eslint": "^4.18.2",
+    "@mapbox/eslint-config-mapbox": "^5.0.1",
+    "eslint": "^8.57.0",
     "eslint-plugin-node": "^6.0.1",
-    "jsdoc-to-markdown": "^7.1.1",
-    "nyc": "^14.1.0",
-    "opener": "^1.4.1",
-    "tap-spec": "^5.0.0",
-    "tape": "^4.6.0"
+    "jest": "^29.7.0",
+    "jsdoc-to-markdown": "^7.1.1"
   },
   "dependencies": {
     "@aws-sdk/client-cloudformation": "^3.848.0",
@@ -50,6 +46,12 @@
     "redent": "^2.0.0"
   },
   "eslintConfig": {
-    "extends": "@mapbox/eslint-config-mapbox"
+    "extends": "@mapbox/eslint-config-mapbox",
+    "env": {
+      "jest": true
+    },
+    "ignorePatterns": [
+      "test/fixtures/malformed.json"
+    ]
   }
 }

package/readme.md

@@ -1,6 +1,6 @@
 # cloudfriend
 
-[![Build Status](https://travis-ci.com/mapbox/cloudfriend.svg?branch=master)](https://travis-ci.com/mapbox/cloudfriend)
+[![mapbox/cloudfriend](https://github.com/mapbox/cloudfriend/actions/workflows/test.yml/badge.svg)](https://github.com/mapbox/cloudfriend/actions/workflows/test.yml)
 
 Helper functions for assembling CloudFormation templates in JavaScript.
 

package/test/bin.test.js

@@ -1,22 +1,26 @@
 'use strict';
 
 const path = require('path');
-const exec = require('child_process').exec;
-const test = require('tape');
+const { execFile } = require('child_process');
+const { promisify } = require('util');
 
-test('bin/build-template', (t) => {
+const execFileAsync = promisify(execFile);
+
+describe('bin/build-template', () => {
   const script = path.normalize(__dirname + '/../bin/build-template.js');
   const template = path.normalize(__dirname + '/fixtures/sync-args.js');
-  t.test('outputs expected', (q) => {
-    exec([script, template, '--this', 'that', '-r', 'cn-north-1'].join(' '), (err, stdout, stderr) => {
-      q.error(err);
-      q.error(stderr);
-      const result = JSON.parse(stdout);
-      q.equal('that', result.this);
-      q.equal('cn-north-1', result.region);
-      q.end();
-    });
+
+  test('outputs expected', async () => {
+    const { stdout, stderr } = await execFileAsync(script, [
+      template,
+      '--this',
+      'that',
+      '-r',
+      'cn-north-1'
+    ]);
+    expect(stderr).toBeFalsy();
+    const result = JSON.parse(stdout);
+    expect(result.this).toBe('that');
+    expect(result.region).toBe('cn-north-1');
   });
-  t.end();
 });
-

package/test/fixtures/shortcuts/cross-account-role-defaults.json

@@ -30,4 +30,4 @@
     }
   },
   "Outputs": {}
-}
+}

package/test/fixtures/shortcuts/cross-account-role-no-defaults.json

@@ -63,4 +63,4 @@
     }
   },
   "Outputs": {}
-}
+}

package/test/fixtures/shortcuts/event-lambda-defaults.json

@@ -88,7 +88,9 @@
       "DependsOn": "MyLambdaRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-MyLambda-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-MyLambda-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "MyLambdaRole"

package/test/fixtures/shortcuts/event-lambda-full.json

@@ -88,7 +88,9 @@
       "DependsOn": "MyLambdaRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-MyLambda-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-MyLambda-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "MyLambdaRole"

package/test/fixtures/shortcuts/firehose-defaults.json

@@ -197,4 +197,4 @@
     }
   },
   "Outputs": {}
-}
+}

package/test/fixtures/shortcuts/firehose-with-stream.json

@@ -231,4 +231,4 @@
     }
   },
   "Outputs": {}
-}
+}

package/test/fixtures/shortcuts/glue-database-defaults.json

@@ -22,4 +22,4 @@
     }
   },
   "Outputs": {}
-}
+}

package/test/fixtures/shortcuts/glue-database-no-defaults.json

@@ -34,4 +34,4 @@
     }
   },
   "Outputs": {}
-}
+}

package/test/fixtures/shortcuts/glue-json-table-defaults.json

@@ -45,4 +45,4 @@
     }
   },
   "Outputs": {}
-}
+}

package/test/fixtures/shortcuts/glue-json-table-no-defaults.json

@@ -69,4 +69,4 @@
     }
   },
   "Outputs": {}
-}
+}

package/test/fixtures/shortcuts/glue-orc-table-defaults.json

@@ -45,4 +45,4 @@
     }
   },
   "Outputs": {}
-}
+}

package/test/fixtures/shortcuts/glue-orc-table-no-defaults.json

@@ -69,4 +69,4 @@
     }
   },
   "Outputs": {}
-}
+}

package/test/fixtures/shortcuts/glue-parquet-table-defaults.json

@@ -49,4 +49,4 @@
     }
   },
   "Outputs": {}
-}
+}

package/test/fixtures/shortcuts/glue-parquet-table-no-defaults.json

@@ -69,4 +69,4 @@
     }
   },
   "Outputs": {}
-}
+}

package/test/fixtures/shortcuts/glue-table-defaults.json

@@ -37,4 +37,4 @@
     }
   },
   "Outputs": {}
-}
+}

package/test/fixtures/shortcuts/glue-table-no-defaults.json

@@ -69,4 +69,4 @@
     }
   },
   "Outputs": {}
-}
+}

package/test/fixtures/shortcuts/glue-view-defaults.json

@@ -60,4 +60,4 @@
     }
   },
   "Outputs": {}
-}
+}

package/test/fixtures/shortcuts/glue-view-no-defaults.json

@@ -88,4 +88,4 @@
     }
   },
   "Outputs": {}
-}
+}

package/test/fixtures/shortcuts/hookshot-github-secret-ref.json

@@ -28,7 +28,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeploymentbdbc0f16"
+          "Ref": "PassDeployment6d7d2c50"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -47,7 +47,7 @@
         ]
       }
     },
-    "PassDeploymentbdbc0f16": {
+    "PassDeployment6d7d2c50": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {
@@ -232,7 +232,9 @@
       "DependsOn": "PassFunctionRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "PassFunctionRole"
@@ -374,7 +376,9 @@
       "DependsOn": "DestinationRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "DestinationRole"

package/test/fixtures/shortcuts/hookshot-github-secret-string.json

@@ -24,7 +24,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeploymentbdbc0f16"
+          "Ref": "PassDeployment6d7d2c50"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -43,7 +43,7 @@
         ]
       }
     },
-    "PassDeploymentbdbc0f16": {
+    "PassDeployment6d7d2c50": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {
@@ -226,7 +226,9 @@
       "DependsOn": "PassFunctionRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "PassFunctionRole"
@@ -368,7 +370,9 @@
       "DependsOn": "DestinationRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "DestinationRole"

package/test/fixtures/shortcuts/hookshot-github.json

@@ -24,7 +24,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeploymentbdbc0f16"
+          "Ref": "PassDeployment6d7d2c50"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -43,7 +43,7 @@
         ]
       }
     },
-    "PassDeploymentbdbc0f16": {
+    "PassDeployment6d7d2c50": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {
@@ -234,7 +234,9 @@
       "DependsOn": "PassFunctionRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "PassFunctionRole"
@@ -376,7 +378,9 @@
       "DependsOn": "DestinationRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "DestinationRole"

package/test/fixtures/shortcuts/hookshot-passthrough-access-log-format.json

@@ -24,7 +24,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeploymentbdbc0f16"
+          "Ref": "PassDeployment6d7d2c50"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -52,7 +52,7 @@
         }
       }
     },
-    "PassDeploymentbdbc0f16": {
+    "PassDeployment6d7d2c50": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {
@@ -230,7 +230,9 @@
       "DependsOn": "PassFunctionRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "PassFunctionRole"
@@ -372,7 +374,9 @@
       "DependsOn": "DestinationRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "DestinationRole"

package/test/fixtures/shortcuts/hookshot-passthrough-alarms.json

@@ -24,7 +24,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeploymentbdbc0f16"
+          "Ref": "PassDeployment6d7d2c50"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -43,7 +43,7 @@
         ]
       }
     },
-    "PassDeploymentbdbc0f16": {
+    "PassDeployment6d7d2c50": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {
@@ -214,7 +214,9 @@
       "DependsOn": "PassFunctionRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "PassFunctionRole"
@@ -356,7 +358,9 @@
       "DependsOn": "DestinationRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "DestinationRole"

package/test/fixtures/shortcuts/hookshot-passthrough-enhanced-logging.json

@@ -24,7 +24,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeploymentbdbc0f16"
+          "Ref": "PassDeployment6d7d2c50"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -43,7 +43,7 @@
         ]
       }
     },
-    "PassDeploymentbdbc0f16": {
+    "PassDeployment6d7d2c50": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {
@@ -212,7 +212,9 @@
       "DependsOn": "PassFunctionRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "PassFunctionRole"
@@ -354,7 +356,9 @@
       "DependsOn": "DestinationRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "DestinationRole"

package/test/fixtures/shortcuts/hookshot-passthrough-full-blown-logging.json

@@ -24,7 +24,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeploymentbdbc0f16"
+          "Ref": "PassDeployment6d7d2c50"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -43,7 +43,7 @@
         ]
       }
     },
-    "PassDeploymentbdbc0f16": {
+    "PassDeployment6d7d2c50": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {
@@ -212,7 +212,9 @@
       "DependsOn": "PassFunctionRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "PassFunctionRole"
@@ -354,7 +356,9 @@
       "DependsOn": "DestinationRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "DestinationRole"

package/test/fixtures/shortcuts/hookshot-passthrough-logging.json

@@ -24,7 +24,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeploymentbdbc0f16"
+          "Ref": "PassDeployment6d7d2c50"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -43,7 +43,7 @@
         ]
       }
     },
-    "PassDeploymentbdbc0f16": {
+    "PassDeployment6d7d2c50": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {
@@ -212,7 +212,9 @@
       "DependsOn": "PassFunctionRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "PassFunctionRole"
@@ -354,7 +356,9 @@
       "DependsOn": "DestinationRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "DestinationRole"

package/test/fixtures/shortcuts/hookshot-passthrough.json

@@ -24,7 +24,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeploymentbdbc0f16"
+          "Ref": "PassDeployment6d7d2c50"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -43,7 +43,7 @@
         ]
       }
     },
-    "PassDeploymentbdbc0f16": {
+    "PassDeployment6d7d2c50": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {
@@ -212,7 +212,9 @@
       "DependsOn": "PassFunctionRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-PassFunction-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "PassFunctionRole"
@@ -354,7 +356,9 @@
       "DependsOn": "DestinationRole",
       "DeletionPolicy": "Delete",
       "Properties": {
-        "PolicyName": { "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access" },
+        "PolicyName": {
+          "Fn::Sub": "${AWS::StackName}-Destination-lambda-log-access"
+        },
         "Roles": [
           {
             "Ref": "DestinationRole"