npm - @mapbox/cloudfriend - Versions diffs - 5.0.1 → 5.1.1 - Mend

@mapbox/cloudfriend 5.0.1 → 5.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (30) hide show

package/.travis.yml CHANGED Viewed

@@ -1,8 +1,6 @@
 language: node_js
 node_js:
-- 10
 - 12
-env:
-  global:
-  - secure: ucYs7Z82X7hsIq70GF3dgxmXI+VzBzM22B+jwGcJRQvp1R12fRv/P8/Eb/ScvDCeU9cJvP/FJ8GeGC6kPFHDjCZLyCxFG/SY/O550lE+hkTkQjHG933p3F2a0jCmhlMC2kTI7Dw4yk9dK0tgpnzBmswbgtT/QyvcImcxzBC0hcr9KJ3JCvSpQmi+TFdaDRmqs6H5Qy2owfiD6Ei0y6s3JEygYDHqWTbsrovhUwRvlFh/NgWOZ1lDu0FV71iPE+3LGrkSp+xyEAVQN/1ar/hqTufhSvcxD9Uf2kGUwqg4U2n+k46jd6h1rTDXyh31J62k2AJN0T6p6N5EGBKS/zzvuuhQN/yZdieMdxQpAho8i5TZyXdVp+RHPQxoTNnHL+O6obad13Q+o2iCr/1zaYefjG+23/wGCxdBtkjukGrD+6CwZ8gSwUxqhBUh9Q8oDI92jxd+jWp2VEcs7sXravaHhBWG2oNrb8tksOOElP2iD2iRkUdnvrAORzKWsxi7d3FhQE2TtvvD+icwpMQ6oHZS0PFKC0YzlUp3mfhtOl56UJsYYgEuamloUwsblO+kr5P60ZMevuyx5jNEE05bKi2kJ2kj02P0MD9cXjrWqNvcTBX6CYs/X3XSruBJPQNxbrp+rrsZWw2lFRXGg9+m1kS691TPhgRbMyOWL89zV0PqrGY=
-  - secure: ELtMfU71GlyGC/T1/nDkLubWDovykXSBCbal0EtDKpl/fd3uaWT5M/elW0s7pFlcvgsp+Vw+aPHFEOf3HvjSG4d8tnoB4P3nAFINyw0a6ewJl8v2u+zXLrZr98S9aQI+mFm9xjpHe5G37/MjkfzbwT3Dl3guqqMBiffAecQXge/Gynn59PZypN+9Q/Ih5MgAXMaR3IJMIHQ61A+vL0A6fjeFmgM4uFpXXmoIYqD5Cah742Uv3YdZkbjC+e36jak/4l396+AAvWa21QjtHpy2hJ10NM0FCbxr669aP2Y+J+PLr+rPjqUqqG5xkJijMyDV8lqiZu0NI4Yd5dFjT538GDSXa5RMg+UhhwoK+zcOs6TbUyER7JgF0JFqCRY8A36yX6/aYFABGQhqqlgmcUuxEOLPxp5bVhIKyqehWckcFaS3KbUyMuFJ5ngXcHpI/j0uL20RBRz8W546dXoFh2kQl1bytXAnK9b2ZWfKjt6GAg/c12jg5daNFLXcbSWsyFn0yBXqMZN1XuJvoc8vZ+zDprG8U4ywrHKku3OqbGukwNIrXD2k1zl9hk+KrBj06TwLrsBkB5K8EyKKjPMX5v7fiox5rLt3kVqbcATUqxcF1Qjf3lqCxvi5CgjU4Nc2SWSUzBVRBFbLprWk0GbVoJNJXLSlo748SS35wDT4Fu9B6k8=
+- 14
+before_install:
+- pip install cfn-lint==0.51.0

package/CODEOWNERS ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ # global owners
2	+ * @mapbox/orchestration

package/changelog.md CHANGED Viewed

@@ -1,5 +1,15 @@
 # Changelog
+## v5.1.1
+- Dependency updates to avoid security vulnerabilities (minimist).
+## v5.1.0
+- Lambda shortcuts now support custom Docker images.
+## v5.0.2
+- Fixes handling custom access log formats in hookshot shortcuts.
 ## v5.0.1
 - Improves data type mappings between Glue and Presto when using the `GluePrestoView` shortcut.

package/lib/shortcuts/hookshot.js CHANGED Viewed

@@ -199,7 +199,7 @@ class Passthrough {
         }
       };
-      Resources[`${Prefix}Stage`].Properties.MethodSettings[0].AccessLogSetting = {
+      Resources[`${Prefix}Stage`].Properties.AccessLogSetting = {
         DestinationArn: { 'Fn::GetAtt': [`${Prefix}AccessLogs`, 'Arn'] },
         Format: AccessLogFormat
       };
@@ -373,14 +373,14 @@ class Github extends Passthrough {
           IntegrationHttpMethod: 'POST',
           IntegrationResponses: [
             {
-              StatusCode: 200
+              StatusCode: '200'
             },
             {
-              StatusCode: 500,
+              StatusCode: '500',
               SelectionPattern: '^error.*'
             },
             {
-              StatusCode: 403,
+              StatusCode: '403',
               SelectionPattern: '^invalid.*'
             }
           ],

package/lib/shortcuts/lambda.js CHANGED Viewed

@@ -228,6 +228,12 @@ class Lambda {
       this.Resources[`${LogicalName}`].Properties.Role = { 'Fn::GetAtt': [`${LogicalName}Role`, 'Arn'] };
       this.Resources = merge(this, serviceRole).Resources;
     }
+    if (Code.ImageUri) {
+      this.Resources[`${LogicalName}`].Properties.PackageType = 'Image';
+      delete this.Resources[`${LogicalName}`].Properties.Runtime;
+      delete this.Resources[`${LogicalName}`].Properties.Handler;
+    }
   }
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@mapbox/cloudfriend",
-  "version": "5.0.1",
+  "version": "5.1.1",
   "description": "Helper functions for assembling CloudFormation templates in JavaScript",
   "main": "index.js",
   "engines": {
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "aws-sdk": "^2.829.0",
-    "minimist": "^1.2.5",
+    "minimist": "^1.2.6",
     "redent": "^2.0.0"
   },
   "eslintConfig": {

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

@@ -24,8 +24,8 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::123456789012:policy/fake"
         ],
-        "MaxSessionDuration": 60,
-        "Path": "/fake",
+        "MaxSessionDuration": 3600,
+        "Path": "/fake/",
         "RoleName": "my-role",
         "AssumeRolePolicyDocument": {
           "Statement": [

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

@@ -32,7 +32,7 @@
           },
           "PartitionKeys": [],
           "Retention": 12,
-          "TableType": "TABLE_TYPE",
+          "TableType": "EXTERNAL_TABLE",
           "ViewExpandedText": "/* Presto View */",
           "ViewOriginalText": "/* Presto View: abc123= */",
           "StorageDescriptor": {

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

@@ -32,7 +32,7 @@
           },
           "PartitionKeys": [],
           "Retention": 12,
-          "TableType": "TABLE_TYPE",
+          "TableType": "EXTERNAL_TABLE",
           "ViewExpandedText": "/* Presto View */",
           "ViewOriginalText": "/* Presto View: abc123= */",
           "StorageDescriptor": {

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

@@ -32,7 +32,7 @@
           },
           "PartitionKeys": [],
           "Retention": 12,
-          "TableType": "TABLE_TYPE",
+          "TableType": "EXTERNAL_TABLE",
           "ViewExpandedText": "/* Presto View */",
           "ViewOriginalText": "/* Presto View: abc123= */",
           "StorageDescriptor": {

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

@@ -32,7 +32,7 @@
           },
           "PartitionKeys": [],
           "Retention": 12,
-          "TableType": "TABLE_TYPE",
+          "TableType": "EXTERNAL_TABLE",
           "ViewExpandedText": "/* Presto View */",
           "ViewOriginalText": "/* Presto View: abc123= */",
           "StorageDescriptor": {

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

@@ -32,7 +32,7 @@
           },
           "PartitionKeys": [],
           "Retention": 12,
-          "TableType": "TABLE_TYPE",
+          "TableType": "EXTERNAL_TABLE",
           "ViewExpandedText": "/* Presto View */",
           "ViewOriginalText": {
             "Fn::Sub": [

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

@@ -28,7 +28,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeployment6237c388"
+          "Ref": "PassDeployment0209686b"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -47,7 +47,7 @@
         ]
       }
     },
-    "PassDeployment6237c388": {
+    "PassDeployment0209686b": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {
@@ -89,14 +89,14 @@
           "IntegrationHttpMethod": "POST",
           "IntegrationResponses": [
             {
-              "StatusCode": 200
+              "StatusCode": "200"
             },
             {
-              "StatusCode": 500,
+              "StatusCode": "500",
               "SelectionPattern": "^error.*"
             },
             {
-              "StatusCode": 403,
+              "StatusCode": "403",
               "SelectionPattern": "^invalid.*"
             }
           ],

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

@@ -24,7 +24,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeployment6237c388"
+          "Ref": "PassDeployment0209686b"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -43,7 +43,7 @@
         ]
       }
     },
-    "PassDeployment6237c388": {
+    "PassDeployment0209686b": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {
@@ -85,14 +85,14 @@
           "IntegrationHttpMethod": "POST",
           "IntegrationResponses": [
             {
-              "StatusCode": 200
+              "StatusCode": "200"
             },
             {
-              "StatusCode": 500,
+              "StatusCode": "500",
               "SelectionPattern": "^error.*"
             },
             {
-              "StatusCode": 403,
+              "StatusCode": "403",
               "SelectionPattern": "^invalid.*"
             }
           ],

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

@@ -24,7 +24,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeployment6237c388"
+          "Ref": "PassDeployment0209686b"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -43,7 +43,7 @@
         ]
       }
     },
-    "PassDeployment6237c388": {
+    "PassDeployment0209686b": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {
@@ -85,14 +85,14 @@
           "IntegrationHttpMethod": "POST",
           "IntegrationResponses": [
             {
-              "StatusCode": 200
+              "StatusCode": "200"
             },
             {
-              "StatusCode": 500,
+              "StatusCode": "500",
               "SelectionPattern": "^error.*"
             },
             {
-              "StatusCode": 403,
+              "StatusCode": "403",
               "SelectionPattern": "^invalid.*"
             }
           ],

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

@@ -24,7 +24,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeployment6237c388"
+          "Ref": "PassDeployment0209686b"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -38,21 +38,21 @@
             "ThrottlingRateLimit": 5,
             "LoggingLevel": "OFF",
             "DataTraceEnabled": false,
-            "MetricsEnabled": false,
-            "AccessLogSetting": {
-              "DestinationArn": {
-                "Fn::GetAtt": [
-                  "PassAccessLogs",
-                  "Arn"
-                ]
-              },
-              "Format": "{ \"requestId\":\"$context.requestId\" }"
-            }
+            "MetricsEnabled": false
           }
-        ]
+        ],
+        "AccessLogSetting": {
+          "DestinationArn": {
+            "Fn::GetAtt": [
+              "PassAccessLogs",
+              "Arn"
+            ]
+          },
+          "Format": "{ \"requestId\":\"$context.requestId\" }"
+        }
       }
     },
-    "PassDeployment6237c388": {
+    "PassDeployment0209686b": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {

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

@@ -24,7 +24,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeployment6237c388"
+          "Ref": "PassDeployment0209686b"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -43,7 +43,7 @@
         ]
       }
     },
-    "PassDeployment6237c388": {
+    "PassDeployment0209686b": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {

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

@@ -24,7 +24,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeployment6237c388"
+          "Ref": "PassDeployment0209686b"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -43,7 +43,7 @@
         ]
       }
     },
-    "PassDeployment6237c388": {
+    "PassDeployment0209686b": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {

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

@@ -24,7 +24,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeployment6237c388"
+          "Ref": "PassDeployment0209686b"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -43,7 +43,7 @@
         ]
       }
     },
-    "PassDeployment6237c388": {
+    "PassDeployment0209686b": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {

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

@@ -24,7 +24,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeployment6237c388"
+          "Ref": "PassDeployment0209686b"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -43,7 +43,7 @@
         ]
       }
     },
-    "PassDeployment6237c388": {
+    "PassDeployment0209686b": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {

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

@@ -24,7 +24,7 @@
       "Type": "AWS::ApiGateway::Stage",
       "Properties": {
         "DeploymentId": {
-          "Ref": "PassDeployment6237c388"
+          "Ref": "PassDeployment0209686b"
         },
         "StageName": "hookshot",
         "RestApiId": {
@@ -43,7 +43,7 @@
         ]
       }
     },
-    "PassDeployment6237c388": {
+    "PassDeployment0209686b": {
       "Type": "AWS::ApiGateway::Deployment",
       "DependsOn": "PassMethod",
       "Properties": {

package/test/fixtures/shortcuts/lambda-docker.json ADDED Viewed

@@ -0,0 +1,131 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Metadata": {},
+  "Parameters": {},
+  "Rules": {},
+  "Mappings": {},
+  "Conditions": {},
+  "Resources": {
+    "MyLambdaLogs": {
+      "Type": "AWS::Logs::LogGroup",
+      "Properties": {
+        "LogGroupName": {
+          "Fn::Sub": [
+            "/aws/lambda/${name}",
+            {
+              "name": {
+                "Fn::Sub": "${AWS::StackName}-MyLambda"
+              }
+            }
+          ]
+        },
+        "RetentionInDays": 14
+      }
+    },
+    "MyLambda": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "PackageType": "Image",
+        "Code": {
+          "ImageUri": "MyImage"
+        },
+        "Description": {
+          "Fn::Sub": "MyLambda in the ${AWS::StackName} stack"
+        },
+        "FunctionName": {
+          "Fn::Sub": "${AWS::StackName}-MyLambda"
+        },
+        "MemorySize": 128,
+        "Timeout": 300,
+        "Role": {
+          "Fn::GetAtt": [
+            "MyLambdaRole",
+            "Arn"
+          ]
+        }
+      }
+    },
+    "MyLambdaErrorAlarm": {
+      "Type": "AWS::CloudWatch::Alarm",
+      "Properties": {
+        "AlarmName": {
+          "Fn::Sub": "${AWS::StackName}-MyLambda-Errors-${AWS::Region}"
+        },
+        "AlarmDescription": {
+          "Fn::Sub": [
+            "Error alarm for ${name} lambda function in ${AWS::StackName} stack",
+            {
+              "name": {
+                "Fn::Sub": "${AWS::StackName}-MyLambda"
+              }
+            }
+          ]
+        },
+        "AlarmActions": [],
+        "Period": 60,
+        "EvaluationPeriods": 5,
+        "DatapointsToAlarm": 1,
+        "Statistic": "Sum",
+        "Threshold": 0,
+        "ComparisonOperator": "GreaterThanThreshold",
+        "TreatMissingData": "notBreaching",
+        "Namespace": "AWS/Lambda",
+        "Dimensions": [
+          {
+            "Name": "FunctionName",
+            "Value": {
+              "Ref": "MyLambda"
+            }
+          }
+        ],
+        "MetricName": "Errors"
+      }
+    },
+    "MyLambdaLogPolicy": {
+      "Type": "AWS::IAM::Policy",
+      "DependsOn": "MyLambdaRole",
+      "Properties": {
+        "PolicyName": "lambda-log-access",
+        "Roles": [
+          {
+            "Ref": "MyLambdaRole"
+          }
+        ],
+        "PolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": "logs:*",
+              "Resource": {
+                "Fn::GetAtt": [
+                  "MyLambdaLogs",
+                  "Arn"
+                ]
+              }
+            }
+          ]
+        }
+      }
+    },
+    "MyLambdaRole": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "AssumeRolePolicyDocument": {
+          "Statement": [
+            {
+              "Effect": "Allow",
+              "Action": "sts:AssumeRole",
+              "Principal": {
+                "Service": {
+                  "Fn::Sub": "lambda.amazonaws.com"
+                }
+              }
+            }
+          ]
+        }
+      }
+    }
+  },
+  "Outputs": {}
+}

package/test/fixtures/shortcuts/lambda-provided-role.json CHANGED Viewed

@@ -124,7 +124,9 @@
     },
     "CustomLambdaRole": {
       "Type": "AWS::IAM::Role",
-      "Properties": {}
+      "Properties": {
+        "AssumeRolePolicyDocument": {}
+      }
     }
   },
   "Outputs": {}

package/test/fixtures/shortcuts/role-no-defaults.json CHANGED Viewed

@@ -24,8 +24,8 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::123456789012:policy/fake"
         ],
-        "MaxSessionDuration": 60,
-        "Path": "/fake",
+        "MaxSessionDuration": 3600,
+        "Path": "/fake/",
         "RoleName": "my-role",
         "Tags": [
           {

package/test/fixtures/shortcuts/service-role-no-defaults.json CHANGED Viewed

@@ -24,8 +24,8 @@
         "ManagedPolicyArns": [
           "arn:aws:iam::123456789012:policy/fake"
         ],
-        "MaxSessionDuration": 60,
-        "Path": "/fake",
+        "MaxSessionDuration": 3600,
+        "Path": "/fake/",
         "RoleName": "my-role",
         "AssumeRolePolicyDocument": {
           "Statement": [

package/test/fixtures/shortcuts/stream-lambda-defaults.json CHANGED Viewed

@@ -145,12 +145,12 @@
                     "kinesis:ListStreams"
                   ],
                   "Resource": [
-                    "arn:aws:sqs:us-east-1:123456789012:queue/fake",
+                    "arn:aws:kinesis:us-east-1:123456789012:stream/fake",
                     {
                       "Fn::Sub": [
                         "${arn}/*",
                         {
-                          "arn": "arn:aws:sqs:us-east-1:123456789012:queue/fake"
+                          "arn": "arn:aws:kinesis:us-east-1:123456789012:stream/fake"
                         }
                       ]
                     }
@@ -167,7 +167,7 @@
       "Properties": {
         "BatchSize": 1,
         "Enabled": true,
-        "EventSourceArn": "arn:aws:sqs:us-east-1:123456789012:queue/fake",
+        "EventSourceArn": "arn:aws:kinesis:us-east-1:123456789012:stream/fake",
         "FunctionName": {
           "Ref": "MyLambda"
         },

package/test/fixtures/shortcuts/stream-lambda-no-defaults.json CHANGED Viewed

@@ -145,12 +145,12 @@
                     "kinesis:ListStreams"
                   ],
                   "Resource": [
-                    "arn:aws:sqs:us-east-1:123456789012:queue/fake",
+                    "arn:aws:kinesis:us-east-1:123456789012:stream/fake",
                     {
                       "Fn::Sub": [
                         "${arn}/*",
                         {
-                          "arn": "arn:aws:sqs:us-east-1:123456789012:queue/fake"
+                          "arn": "arn:aws:kinesis:us-east-1:123456789012:stream/fake"
                         }
                       ]
                     }
@@ -168,7 +168,7 @@
         "BatchSize": 10000,
         "MaximumBatchingWindowInSeconds": 300,
         "Enabled": false,
-        "EventSourceArn": "arn:aws:sqs:us-east-1:123456789012:queue/fake",
+        "EventSourceArn": "arn:aws:kinesis:us-east-1:123456789012:stream/fake",
         "FunctionName": {
           "Ref": "MyLambda"
         },

package/test/index.test.js CHANGED Viewed

@@ -102,19 +102,6 @@ test('build', (assert) => {
     });
 });
-test('validate', (assert) => {
-  assert.plan(2);
-  cloudfriend.validate(path.join(fixtures, 'static.json'))
-    .then(() => {
-      assert.ok(true, 'valid');
-      return cloudfriend.validate(path.join(fixtures, 'invalid.json'));
-    })
-    .catch((err) => {
-      assert.ok(/Template format error: Unrecognized resource type/.test(err.message), 'invalid');
-    });
-});
 test('merge', (assert) => {
   const a = {
     Metadata: { Instances: { Description: 'Information about the instances' } },

package/test/shortcuts.test.js CHANGED Viewed

@@ -1,5 +1,6 @@
 'use strict';
+const cp = require('child_process');
 const path = require('path');
 const fs = require('fs');
 const test = require('tape');
@@ -13,6 +14,15 @@ const update = !!process.env.UPDATE;
 const noUndefined = (template) => JSON.parse(JSON.stringify(template));
 test('[shortcuts] fixture validation', async (assert) => {
+  // Runs cfn-lint, ignoring "warnings". Install via pip or Homebrew to run these
+  // tests locally.
+  const cfnLint = (filepath) => new Promise((resolve, reject) => {
+    cp.exec(`cfn-lint ${filepath} --ignore-checks W`, (err, stdout) => {
+      if (err) return reject(new Error(stdout));
+      return resolve();
+    });
+  });
   const toValidate = fs
     .readdirSync(path.join(__dirname, 'fixtures', 'shortcuts'))
     .filter((filename) => path.extname(filename) === '.json');
@@ -20,9 +30,12 @@ test('[shortcuts] fixture validation', async (assert) => {
   while (toValidate.length) {
     const filename = toValidate.shift();
     await Promise.all([
-      cf.validate(path.join(__dirname, 'fixtures', 'shortcuts', filename))
+      cfnLint(path.join(__dirname, 'fixtures', 'shortcuts', filename))
         .then(() => assert.pass(`${filename} fixture passed validation`))
-        .catch((err) => assert.fail(`${filename} fixture fails validation: ${err.message}`)),
+        .catch((err) => {
+          assert.fail(`${filename} fixture fails validation`);
+          console.log(err.message);
+        }),
       sleep(1000)
     ]);
   }
@@ -76,6 +89,21 @@ test('[shortcuts] lambda', (assert) => {
     'expected resources generated using all default values'
   );
+  lambda = new cf.shortcuts.Lambda({
+    LogicalName: 'MyLambda',
+    Code: {
+      ImageUri: 'MyImage'
+    }
+  });
+  template = cf.merge(lambda);
+  if (update) fixtures.update('lambda-docker', template);
+  assert.deepEqual(
+    noUndefined(template),
+    fixtures.get('lambda-docker'),
+    'expected resources generated using all default values and a docker image'
+  );
   lambda = new cf.shortcuts.Lambda({
     LogicalName: 'MyLambda',
     Code: {
@@ -104,7 +132,9 @@ test('[shortcuts] lambda', (assert) => {
     Resources: {
       'CustomLambdaRole': {
         Type: 'AWS::IAM::Role',
-        Properties: {}
+        Properties: {
+          AssumeRolePolicyDocument: {}
+        }
       }
     }
   });
@@ -425,7 +455,7 @@ test('[shortcuts] stream-lambda', (assert) => {
       S3Bucket: 'my-code-bucket',
       S3Key: 'path/to/code.zip'
     },
-    EventSourceArn: 'arn:aws:sqs:us-east-1:123456789012:queue/fake'
+    EventSourceArn: 'arn:aws:kinesis:us-east-1:123456789012:stream/fake'
   });
   let template = cf.merge(lambda);
@@ -442,7 +472,7 @@ test('[shortcuts] stream-lambda', (assert) => {
       S3Bucket: 'my-code-bucket',
       S3Key: 'path/to/code.zip'
     },
-    EventSourceArn: 'arn:aws:sqs:us-east-1:123456789012:queue/fake',
+    EventSourceArn: 'arn:aws:kinesis:us-east-1:123456789012:stream/fake',
     BatchSize: 10000,
     MaximumBatchingWindowInSeconds: 300,
     Enabled: false,
@@ -734,8 +764,8 @@ test('[shortcuts] role', (assert) => {
       }
     ],
     ManagedPolicyArns: ['arn:aws:iam::123456789012:policy/fake'],
-    MaxSessionDuration: 60,
-    Path: '/fake',
+    MaxSessionDuration: 3600,
+    Path: '/fake/',
     RoleName: 'my-role',
     Tags: [{ Key: 'pipeline-name', Value: 'test' }],
     Condition: 'Always',
@@ -801,8 +831,8 @@ test('[shortcuts] cross-account role', (assert) => {
       }
     ],
     ManagedPolicyArns: ['arn:aws:iam::123456789012:policy/fake'],
-    MaxSessionDuration: 60,
-    Path: '/fake',
+    MaxSessionDuration: 3600,
+    Path: '/fake/',
     RoleName: 'my-role',
     Condition: 'Always',
     DependsOn: 'AnotherThing'
@@ -899,8 +929,8 @@ test('[shortcuts] service role', (assert) => {
       }
     ],
     ManagedPolicyArns: ['arn:aws:iam::123456789012:policy/fake'],
-    MaxSessionDuration: 60,
-    Path: '/fake',
+    MaxSessionDuration: 3600,
+    Path: '/fake/',
     RoleName: 'my-role',
     Condition: 'Always',
     DependsOn: 'AnotherThing'
@@ -1013,7 +1043,7 @@ test('[shortcuts] glue table', (assert) => {
     Parameters: { table: 'params' },
     Description: 'my_table description',
     Retention: 12,
-    TableType: 'TABLE_TYPE',
+    TableType: 'EXTERNAL_TABLE',
     ViewExpandedText: '/* Presto View */',
     ViewOriginalText: '/* Presto View: abc123= */',
     BucketColumns: ['column'],
@@ -1095,7 +1125,7 @@ test('[shortcuts] glue json table', (assert) => {
     Parameters: { table: 'params' },
     Description: 'my_table description',
     Retention: 12,
-    TableType: 'TABLE_TYPE',
+    TableType: 'EXTERNAL_TABLE',
     ViewExpandedText: '/* Presto View */',
     ViewOriginalText: '/* Presto View: abc123= */',
     BucketColumns: ['column'],
@@ -1177,7 +1207,7 @@ test('[shortcuts] glue orc table', (assert) => {
     Parameters: { table: 'params' },
     Description: 'my_table description',
     Retention: 12,
-    TableType: 'TABLE_TYPE',
+    TableType: 'EXTERNAL_TABLE',
     ViewExpandedText: '/* Presto View */',
     ViewOriginalText: '/* Presto View: abc123= */',
     BucketColumns: ['column'],
@@ -1259,7 +1289,7 @@ test('[shortcuts] glue parquet table', (assert) => {
     Parameters: { table: 'params' },
     Description: 'my_table description',
     Retention: 12,
-    TableType: 'TABLE_TYPE',
+    TableType: 'EXTERNAL_TABLE',
     ViewExpandedText: '/* Presto View */',
     ViewOriginalText: '/* Presto View: abc123= */',
     BucketColumns: ['column'],
@@ -1342,7 +1372,7 @@ test('[shortcuts] glue view', (assert) => {
     Parameters: { table: 'params' },
     Description: 'my_view description',
     Retention: 12,
-    TableType: 'TABLE_TYPE',
+    TableType: 'EXTERNAL_TABLE',
     BucketColumns: ['column'],
     Compressed: true,
     Location: 's3://fake/location',

package/cloudformation/ci.template.js DELETED Viewed

@@ -1,5 +0,0 @@
-'use strict';
-const cloudfriend = require('..');
-module.exports = cloudfriend.permissions;