Fixed issues with incorrect work directory and missing environment variables.

lib/batchenvironment.js

@@ -233,6 +233,28 @@ function generateLambdaScheduleExecutionRole() {
             "PolicyDocument": {
               "Version": "2012-10-17",
               "Statement": [
+                {
+                    "Effect": "Allow",
+                    "Action": [
+                        "xray:PutTraceSegments",
+                        "xray:PutTelemetryRecords"
+                    ],
+                    "Resource": [
+                        "*"
+                    ]                    
+                },
+                {
+                    "Effect": "Allow",
+                    "Action": [
+                        "ec2:CreateNetworkInterface",
+                        "ec2:DescribeNetworkInterfaces",
+                        "ec2:DetachNetworkInterface",
+                        "ec2:DeleteNetworkInterface"
+                    ],
+                    "Resource": [
+                        "*"
+                    ]                    
+                },
                 {
                   "Effect": "Allow",
                   "Action": [

lib/batchtask.js

@@ -27,6 +27,8 @@ function getBatchJobExecutionRoleLogicalId(functionName) {
       : logicalId;
 }
 
+let dependsOnFunction = undefined;
+
 /**
  * Transforms a function object into a "JobDefinition" object that can be used to run this function inside a Batch task
  */
@@ -54,14 +56,26 @@ function compileBatchTask(functionName) {
   updateRetryStrategy.bind(this)(newFunction, functionObject);
   updateTimeout.bind(this)(newFunction, functionObject);
 
+  const logicalId = getJobDefinitionLogicalId(functionName);
+
   // generate role for a batchjob execution based on custom iam statements
   const newBatchJobExecutionRoleObject = generateBatchJobExecutionRole.bind(this)(functionName, functionObject)
 
+  // FIX: CloudFormation is blowing up trying to create all the JobDefinitions in parallel,
+  // so to fix we make each JobDefinition depend on the prior one being created to solve this issue.
+  if ( dependsOnFunction !== undefined ) {
+    for(let k in newBatchJobExecutionRoleObject) {
+        newBatchJobExecutionRoleObject[k]["DependsOn"] = dependsOnFunction;
+    }
+    newFunction["DependsOn"] = dependsOnFunction;
+  }
+  dependsOnFunction = logicalId;
+
   // Add it to our compiled cloud formation templates
   _.merge(
       this.serverless.service.provider.compiledCloudFormationTemplate.Resources,
       {
-        [getJobDefinitionLogicalId(functionName)]: newFunction
+        [logicalId]: newFunction
       },
       newBatchJobExecutionRoleObject
   );
@@ -77,7 +91,7 @@ function compileBatchTask(functionName) {
           name: functionObject.name,
           memorySize: 128,
           timeout: 6,
-          runtime: 'nodejs10.x',
+          runtime:  _.get(this.serverless.service,"custom.runtime", "nodejs18.x" ),
           package: {
             artifact: `${path.join(this.serverless.config.servicePath, '.serverless', functionName)}.zip`
           },
@@ -124,7 +138,7 @@ function updateContainerProperties(newFunction, functionObject, functionName) {
       throw new this.serverless.classes.Error(`Could not find handler for batch task ${functionObject.name}`);
     }
     newFunction.Properties.ContainerProperties.Command = [
-        `${this.serverless.service.service}/${functionObject.handler}`,
+        `${functionObject.handler}`,
         "Ref::event"
     ]
   }
@@ -148,7 +162,9 @@ function updateContainerProperties(newFunction, functionObject, functionName) {
       {
         'AWS_LAMBDA_FUNCTION_TIMEOUT': getTimeout(functionObject),
         'AWS_LAMBDA_FUNCTION_MEMORY_SIZE': getMemorySize(functionObject),
-        'AWS_REGION': this.serverless.service.provider.region || 'us-east-1'
+        'AWS_REGION': this.serverless.service.provider.region || 'us-east-1',
+        'AWS_SECRET_ACCESS_KEY': process.env.AWS_SECRET_ACCESS_KEY,
+        'AWS_ACCESS_KEY_ID': process.env.AWS_ACCESS_KEY_ID
       },
       this.serverless.service.provider.environment,
       functionObject.environment,
@@ -190,6 +206,17 @@ function updateContainerProperties(newFunction, functionObject, functionName) {
         });
       }
   );
+
+  const logGroupName = _.get(this.serverless.service,"custom.awsBatch.logGroupName");
+  if ( logGroupName ) {
+    newFunction.Properties.ContainerProperties.LogConfiguration = {
+        LogDriver: 'awslogs',
+        Options: {
+            "awslogs-group": logGroupName,
+            "awslogs-stream-prefix": "batch"
+        }
+    }
+  }
 }
 
 /**

lib/docker.js

@@ -6,11 +6,13 @@ const path = require('path');
 const util = require('util');
 const { getDockerLoginToECRCommand } = require('./awscli');
 
+const DOCKER_TAG = `${Date.now()}`;
+
 /**
  * @returns {string} "<ECR Repo Name>:latest"
  */
 function getDockerImageName() {
-    return `${this.provider.naming.getECRRepositoryURL()}:latest`;
+    return `${this.provider.naming.getECRRepositoryURL()}:${DOCKER_TAG}`;
 }
 
 /**
@@ -31,13 +33,17 @@ function dockerCommand(options, cwd = null, stdio = null) {
         spawnOptions.stdio = stdio;
     }
 
+    //console.error("dockerCommand:", options, spawnOptions);
     const ps = spawnSync(cmd, options, spawnOptions);
     if (ps.error) {
         if (ps.error.code === 'ENOENT') {
             throw new Error('docker not found! Please install it.');
         }
         throw new Error(ps.error);
     } else if (ps.status !== 0) {
+        //console.error("docker output:", ps.output);
+        //console.error("docker stdout:", ps.stdout);
+        //console.error("docker stderr:", ps.stderr)
         throw new Error(ps.stderr);
     }
     return ps;
@@ -51,50 +57,64 @@ function dockerCommand(options, cwd = null, stdio = null) {
  * https://hub.docker.com/r/lambci/lambda/
  */
 function buildDockerImage() {
-    this.serverless.cli.log(`Building docker image: "${this.provider.naming.getDockerImageName()}"...`);
+    let image = this.provider.naming.getDockerImageName();
+    this.serverless.cli.log(`Building docker image: "${image}"...`);
 
     // Get any additional run commands we'd like to include in the docker image
-    let additionalRunCommands = "";
+    let addtionalBuildCommands = "";
+    if (this.serverless.service.custom
+        && this.serverless.service.custom.awsBatch
+        && this.serverless.service.custom.awsBatch.addtionalBuildCommands) {
+
+        _.forEach(
+            this.serverless.service.custom.awsBatch.addtionalBuildCommands,
+            runCommand => {
+                addtionalBuildCommands += `${runCommand}\n`;
+            }
+        )
+    }
+
+    let additionalCommands = "";
     if (this.serverless.service.custom
         && this.serverless.service.custom.awsBatch
-        && this.serverless.service.custom.awsBatch.additionalDockerRunCommands) {
+        && this.serverless.service.custom.awsBatch.additionalCommands) {
 
         _.forEach(
-            this.serverless.service.custom.awsBatch.additionalDockerRunCommands,
+            this.serverless.service.custom.awsBatch.additionalCommands,
             runCommand => {
-                additionalRunCommands += `RUN ${runCommand}\n`;
+                additionalCommands += `${runCommand}\n`;
             }
         )
     }
 
+    let buildImage = _.get(this.serverless.service,"custom.awsBatch.buildImage", "368461407828.dkr.ecr.us-east-1.amazonaws.com/build-batch-image-base:latest" );
+    let batchImage = _.get(this.serverless.service,"custom.awsBatch.batchImage", "368461407828.dkr.ecr.us-east-1.amazonaws.com/batch-image-base:latest" );
+
     // Override some of the default lambci environmental variables.
     //   - Function Timeout and Function Memory are set by Env Variables on the Job Definition
     //   - Access Key and Secret are unset to that we use the role on the container that AWS provides
     const dockerFileContents = `
-    FROM justinram11/lambda:build-${this.serverless.service.provider.runtime} AS builder
+    FROM ${buildImage} AS builder
     USER root
-
-    ${additionalRunCommands}
-    COPY ${this.serverless.service.service}.zip /tmp
-    RUN cd /tmp && unzip -q ${this.serverless.service.service}.zip && rm ${this.serverless.service.service}.zip
-
-    FROM justinram11/lambda:${this.serverless.service.provider.runtime}
-    COPY --from=builder /tmp /var/task/${this.serverless.service.service}/
+    RUN mkdir -p /tmp/task/
+    COPY ${this.serverless.service.service}.zip /tmp/task
+    RUN cd /tmp/task && unzip -q ${this.serverless.service.service}.zip && rm ${this.serverless.service.service}.zip
+    ${addtionalBuildCommands}
+
+    FROM ${batchImage}
+    USER root
+    COPY --from=builder /tmp/task /var/task/
+    ${additionalCommands}
     RUN rm -rf /tmp/*
+    USER sbx_user1051
     `;
-    // custom ENTRYPOINT due to heap setting - entrypoint copied from original
-    if (this.serverless.service.provider.runtime === 'nodejs8.10') dockerFileContents.concat(
-        'ENTRYPOINT ["/var/lang/bin/node", "--expose-gc", "--max-semi-space-size=150", "--max-old-space-size=30000", "/var/runtime/node_modules/awslambda/index.js"]\n'
-    );
-    if (this.serverless.service.provider.runtime === 'nodejs10.x') dockerFileContents.concat(
-        'ENV NODE_OPTIONS="--max-old-space-size=30000"\n'
-    );
+
     const servicePath = this.serverless.config.servicePath || '';
     const packagePath = path.join(servicePath || '.', '.serverless');
     const dockerFile = path.join(packagePath, 'Dockerfile');
     fse.writeFileSync(dockerFile, dockerFileContents);
 
-    const dockerOptions = ['build', '-f', dockerFile, '-t', this.provider.naming.getDockerImageName(), '.'];
+    const dockerOptions = ['build', '-f', dockerFile, '-t', image, '.'];
     dockerCommand(dockerOptions, packagePath, 'inherit');
 
     return BbPromise.resolve();
@@ -111,7 +131,7 @@ function pushDockerImageToECR() {
 
     // Then perform the upload
     this.serverless.cli.log("Uploading to ECR...");
-    dockerCommand(['push', this.provider.naming.getECRRepositoryURL()], null, 'inherit');
+    dockerCommand(['push', '--all-tags', this.provider.naming.getECRRepositoryURL()], null, 'inherit');
 
     return BbPromise.resolve();
 }

lib/ecr.js

@@ -16,7 +16,7 @@ function getECRRepositoryName() {
 
 
 /**
- * @type {string} "<awsAccountID>.dkr.ecr.us-east-1.amazonaws.com/<serviceName>-<stage>"
+ * @type {string} "<awsAccountID>.dkr.ecr.us-east-1.amazonaws.com/<serviceName>-<stage>:<tag>"
  */
 
 function getECRRepositoryURL() {

lib/generateCoreTemplate.js

@@ -7,48 +7,115 @@ const path = require('path');
 const _ = require('lodash');
 var util = require('util');
 
+const lifeCyclePolicies = {
+    "rules": [
+        {
+            "rulePriority": 1,
+            "description": "Remove images over 90 days old",
+            "selection": {
+                "tagStatus": "any",
+                "countType": "sinceImagePushed",
+                "countUnit": "days",
+                "countNumber": 90
+            },
+            "action": {
+                "type": "expire"
+            }
+        }
+    ]
+};
+
 /**
  * Adds the ECR repository to the "create" template so that we have a repository we can upload our docker image to
  * during deployment.
  */
 function generateCoreTemplate() {
-  // Setup our ECR Repository to delete untagged images after 1 day
-  const ecrTemplate = `
+    // Setup our ECR Repository to delete untagged images after 1 day
+    // const ecrTemplate = `
+    //   {
+    //     "Type" : "AWS::ECR::Repository",
+    //     "Properties" : {
+    //       "LifecyclePolicy" : {
+    //         "LifecyclePolicyText" : ${JSON.stringify(JSON.stringify(lifeCyclePolicies))}
+    //       },
+    //       "RepositoryName" : "${this.provider.naming.getECRRepositoryName()}"
+    //     }
+    //   }
+    // `;
+    const ecrTemplate = `
       {
         "Type" : "AWS::ECR::Repository",
         "Properties" : {
-          "LifecyclePolicy" : {
-            "LifecyclePolicyText" : "{\\"rules\\":[{\\"rulePriority\\":1,\\"description\\":\\"Remove untagged images\\",\\"selection\\":{\\"tagStatus\\":\\"untagged\\",\\"countType\\":\\"sinceImagePushed\\",\\"countUnit\\":\\"days\\",\\"countNumber\\":1},\\"action\\":{\\"type\\":\\"expire\\"}}]}"
-          },
           "RepositoryName" : "${this.provider.naming.getECRRepositoryName()}"
         }
       }
     `;
 
-  const newECRObject = {
-    [this.provider.naming.getECRLogicalId()]: JSON.parse(ecrTemplate)
-  };
+    const newECRObject = {
+        [this.provider.naming.getECRLogicalId()]: JSON.parse(ecrTemplate)
+    };
 
-  // Add it to our initial compiled cloud formation templates
-  _.merge(
-    this.serverless.service.provider.compiledCloudFormationTemplate.Resources,
-    newECRObject
-  );
+    // Add it to our initial compiled cloud formation templates
+    _.merge(
+        this.serverless.service.provider.compiledCloudFormationTemplate.Resources,
+        newECRObject
+    );
+
+    // Look for the serverless-log-forwarding custom parameters, if found, then forward the logs
+    // from our batch jobs to the same ARN...
+    const logGroupName = _.get(this.serverless.service,"custom.awsBatch.logGroupName");
+    const logDestinationArn = _.get(this.serverless.service,"custom.logForwarding.destinationARN" );
+    if ( logDestinationArn && logGroupName ) {
+        const batchLogGroupTemplate = {
+            "BatchLogGroupLambdaPermission": {
+                "Type": "AWS::Lambda::Permission",
+                "Properties": {
+                    "FunctionName": logDestinationArn,
+                    "Action": "lambda:InvokeFunction",
+                    "Principal": "logs.us-east-1.amazonaws.com"
+                }
+            },
+            "BatchLogGroup": {
+                "Type": "AWS::Logs::LogGroup",
+                "Properties": {
+                    "LogGroupName": logGroupName,
+                    "RetentionInDays": 7
+                }
+            },
+            "BatchLogGroupSubscriptionFilter": {
+                "Type": "AWS::Logs::SubscriptionFilter",
+                "Properties": {
+                    "DestinationArn": logDestinationArn,
+                    "FilterPattern": "",
+                    "LogGroupName": logGroupName
+                },
+                "DependsOn": [
+                    "BatchLogGroupLambdaPermission",
+                    "BatchLogGroup"
+                ]
+            }
+        }
+
+        _.merge(
+            this.serverless.service.provider.compiledCloudFormationTemplate.Resources,
+            batchLogGroupTemplate
+        );
+    }
 
-  // Then write it back out to the file
-  const coreTemplateFileName = this.provider.naming.getCoreTemplateFileName();
+    // Then write it back out to the file
+    const coreTemplateFileName = this.provider.naming.getCoreTemplateFileName();
 
-  const coreTemplateFilePath = path.join(this.serverless.config.servicePath,
-    '.serverless',
-    coreTemplateFileName);
+    const coreTemplateFilePath = path.join(this.serverless.config.servicePath,
+        '.serverless',
+        coreTemplateFileName);
 
-  this.serverless.utils.writeFileSync(coreTemplateFilePath,
-    this.serverless.service.provider.compiledCloudFormationTemplate);
+    this.serverless.utils.writeFileSync(coreTemplateFilePath,
+        this.serverless.service.provider.compiledCloudFormationTemplate);
 
-  this.serverless.service.provider.coreCloudFormationTemplate =
-    _.cloneDeep(this.serverless.service.provider.compiledCloudFormationTemplate);
+    this.serverless.service.provider.coreCloudFormationTemplate =
+        _.cloneDeep(this.serverless.service.provider.compiledCloudFormationTemplate);
 
-  return BbPromise.resolve();
+    return BbPromise.resolve();
 }
 
 module.exports = { generateCoreTemplate };