@mapbox/cloudfriend 5.0.2 → 5.1.2-SNAPSHOT-1

package/.travis.yml

@@ -3,4 +3,4 @@ node_js:
 - 12
 - 14
 before_install:
-- pip install cfn-lint
+- pip install cfn-lint==0.51.0

package/CODEOWNERS

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

package/changelog.md

@@ -1,5 +1,12 @@
 # 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.
 

package/lib/shortcuts/lambda.js

@@ -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

@@ -1,6 +1,6 @@
 {
   "name": "@mapbox/cloudfriend",
-  "version": "5.0.2",
+  "version": "5.1.2-SNAPSHOT-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/lambda-docker.json

@@ -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/shortcuts.test.js

@@ -89,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: {

package/.vscode/launch.json

@@ -1,17 +0,0 @@
-{
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "pwa-node",
-      "request": "launch",
-      "name": "Launch Program",
-      "skipFiles": [
-        "<node_internals>/**"
-      ],
-      "program": "${workspaceFolder}/test/some.test.js"
-    }
-  ]
-}