@rlyle1179/serverless-aws-batch 1.1.19 → 1.1.21

package/lib/schedule.js

@@ -1,91 +1,100 @@
-// This file replaces the lambda function code and can be used to schedule the batch task.
-// Requires the following environment variables:
-//  - EVENT_LOGGING_ENABLED
-//  - JOB_DEFINITION_ARN
-//  - FUNCTION_NAME
-//  - JOB_QUEUE_ARN
-
-'use strict';
-const process = require("process");
-const { BatchClient, SubmitJobCommand } = require('@aws-sdk/client-batch')
-const batch = new BatchClient();
-
-function zeroPad(n) {
-    return n <= 9 ? "0" + n : n;
-}
-
-function getFormattedNow() {
-    let currentDate = new Date();
-    return currentDate.getFullYear()
-        + "-" + zeroPad(currentDate.getMonth() + 1)
-        + "-" + zeroPad(currentDate.getDate())
-        + "-" + zeroPad(currentDate.getHours())
-        + "-" + zeroPad(currentDate.getMinutes())
-        + "-" + zeroPad(currentDate.getSeconds());
-}
-
-module.exports.schedule = (event, context, callback) => {
-
-    if (process.env.EVENT_LOGGING_ENABLED === 'true') {
-        console.log(`Received event: ${JSON.stringify(event, null, 2)}`);
-    }
-
-    const jobDefinition = process.env.JOB_DEFINITION_ARN;
-    const jobName = `${process.env.FUNCTION_NAME}-${getFormattedNow()}`;
-    const jobQueue = process.env.JOB_QUEUE_ARN;
-
-    console.log(`Submitting job: ${jobName} with jobDefinition: ${jobDefinition} to queue: ${jobQueue}`);
-
-    // delete headers from the event, we are exceeding the 8092 limit for container overrides
-    delete event.headers;
-    delete event.multiValueHeaders;
-
-    let params = {
-        jobDefinition: jobDefinition,
-        jobName: jobName,
-        jobQueue: jobQueue,
-        parameters: {
-            event: JSON.stringify(event)
-        },
-        containerOverrides: {
-            environment: [
-                { name: "AWS_LAMBDA_FUNCTION_NAME", value: process.env.AWS_LAMBDA_FUNCTION_NAME },
-                { name: "AWS_LAMBDA_FUNCTION_VERSION", value: process.env.AWS_LAMBDA_FUNCTION_VERSION },
-                { name: "AWS_REQUEST_ID", value: context.awsRequestId }
-            ]
-        }
-    };
-
-    batch.send( new SubmitJobCommand(params), function(err, data) {
-        let response;
-
-        const jsonHeaders = {
-            'Content-Type': 'application/json',
-            'Access-Control-Allow-Origin': '*',        // Required for CORS support to work
-            'Access-Control-Allow-Credentials': true   // Required for cookies, authorization headers with HTTPS 
-        }
-        
-        if (err) {
-            console.log(`Error submitting job: ${err}`, err.stack);
-            response = {
-                statusCode: 500,
-                headers: jsonHeaders,
-                body: JSON.stringify({
-                    'error': err
-                })
-            }
-        }
-        else {
-            console.log(`Submitted job: ${JSON.stringify(data, null, 2)}`);
-            response = {
-                statusCode: 200,
-                headers: jsonHeaders,
-                body: JSON.stringify({
-                    data
-                })
-            }
-        }
-
-        callback(null, response);
-    });
+// This file replaces the lambda function code and can be used to schedule the batch task.
+// Requires the following environment variables:
+//  - EVENT_LOGGING_ENABLED
+//  - JOB_DEFINITION_ARN
+//  - FUNCTION_NAME
+//  - JOB_QUEUE_ARN
+
+'use strict';
+const process = require("process");
+const { BatchClient, SubmitJobCommand } = require('@aws-sdk/client-batch')
+const batch = new BatchClient();
+
+function zeroPad(n) {
+    return n <= 9 ? "0" + n : n;
+}
+
+function getFormattedNow() {
+    let currentDate = new Date();
+    return currentDate.getFullYear()
+        + "-" + zeroPad(currentDate.getMonth() + 1)
+        + "-" + zeroPad(currentDate.getDate())
+        + "-" + zeroPad(currentDate.getHours())
+        + "-" + zeroPad(currentDate.getMinutes())
+        + "-" + zeroPad(currentDate.getSeconds());
+}
+
+// JOB_DEFINITION_ARN is baked at deploy time as the full ARN including :revision. Reduce it to the
+// bare job-definition name so SubmitJob resolves the latest ACTIVE revision: a deploy can leave the
+// env pinned to a revision it just deregistered, which fails with "is not in ACTIVE status".
+function toJobDefinitionName(arn) {
+    if (! arn) return arn;
+    const name = arn.includes('/') ? arn.slice(arn.lastIndexOf('/') + 1) : arn;
+    return name.replace(/:\d+$/, '');
+}
+
+module.exports.schedule = (event, context, callback) => {
+
+    if (process.env.EVENT_LOGGING_ENABLED === 'true') {
+        console.log(`Received event: ${JSON.stringify(event, null, 2)}`);
+    }
+
+    const jobDefinition = toJobDefinitionName(process.env.JOB_DEFINITION_ARN);
+    const jobName = `${process.env.FUNCTION_NAME}-${getFormattedNow()}`;
+    const jobQueue = process.env.JOB_QUEUE_ARN;
+
+    console.log(`Submitting job: ${jobName} with jobDefinition: ${jobDefinition} to queue: ${jobQueue}`);
+
+    // delete headers from the event, we are exceeding the 8092 limit for container overrides
+    delete event.headers;
+    delete event.multiValueHeaders;
+
+    let params = {
+        jobDefinition: jobDefinition,
+        jobName: jobName,
+        jobQueue: jobQueue,
+        parameters: {
+            event: JSON.stringify(event)
+        },
+        containerOverrides: {
+            environment: [
+                { name: "AWS_LAMBDA_FUNCTION_NAME", value: process.env.AWS_LAMBDA_FUNCTION_NAME },
+                { name: "AWS_LAMBDA_FUNCTION_VERSION", value: process.env.AWS_LAMBDA_FUNCTION_VERSION },
+                { name: "AWS_REQUEST_ID", value: context.awsRequestId }
+            ]
+        }
+    };
+
+    batch.send( new SubmitJobCommand(params), function(err, data) {
+        let response;
+
+        const jsonHeaders = {
+            'Content-Type': 'application/json',
+            'Access-Control-Allow-Origin': '*',        // Required for CORS support to work
+            'Access-Control-Allow-Credentials': true   // Required for cookies, authorization headers with HTTPS 
+        }
+        
+        if (err) {
+            console.log(`Error submitting job: ${err}`, err.stack);
+            response = {
+                statusCode: 500,
+                headers: jsonHeaders,
+                body: JSON.stringify({
+                    'error': err
+                })
+            }
+        }
+        else {
+            console.log(`Submitted job: ${JSON.stringify(data, null, 2)}`);
+            response = {
+                statusCode: 200,
+                headers: jsonHeaders,
+                body: JSON.stringify({
+                    data
+                })
+            }
+        }
+
+        callback(null, response);
+    });
 };

package/package.json

@@ -1,35 +1,35 @@
-{
-  "name": "@rlyle1179/serverless-aws-batch",
-  "version": "1.1.19",
-  "description": "Serverless Framework Plugin for interacting with AWS Batch",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/rlyle/serverless-aws-batch.git"
-  },
-  "keywords": [
-    "serverless",
-    "aws",
-    "batch",
-    "python"
-  ],
-  "author": "Justin Ramsey",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/rlyle/serverless-aws-batch/issues"
-  },
-  "homepage": "https://github.com/rlyle/serverless-aws-batch#readme",
-  "dependencies": {
-    "@aws-sdk/client-batch": "^3.609.0",
-    "bluebird": "^3.7.2",
-    "cross-spawn": "^6.0.5",
-    "fs-extra": "^7.0.1",
-    "jszip": "^3.4.0",
-    "lodash": "^4.17.13",
-    "serverless": "^1.70.0"
-  },
-  "devDependencies": {}
-}
+{
+  "name": "@rlyle1179/serverless-aws-batch",
+  "version": "1.1.21",
+  "description": "Serverless Framework Plugin for interacting with AWS Batch",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/rlyle/serverless-aws-batch.git"
+  },
+  "keywords": [
+    "serverless",
+    "aws",
+    "batch",
+    "python"
+  ],
+  "author": "Justin Ramsey",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/rlyle/serverless-aws-batch/issues"
+  },
+  "homepage": "https://github.com/rlyle/serverless-aws-batch#readme",
+  "dependencies": {
+    "@aws-sdk/client-batch": "^3.609.0",
+    "bluebird": "^3.7.2",
+    "cross-spawn": "^6.0.5",
+    "fs-extra": "^7.0.1",
+    "jszip": "^3.4.0",
+    "lodash": "^4.17.13",
+    "serverless": "^1.70.0"
+  },
+  "devDependencies": {}
+}