@rlyle1179/serverless-aws-batch 1.1.19 → 1.1.21

package/index.js

@@ -1,66 +1,66 @@
-'use strict';
-
-const BbPromise = require('bluebird');
-const fse = require('fs-extra');
-const generateCoreTemplate = require('./lib/generateCoreTemplate');
-const ecr = require('./lib/ecr');
-const docker = require('./lib/docker');
-const batchenvironment = require('./lib/batchenvironment');
-const batchtask = require('./lib/batchtask');
-const awscli = require('./lib/awscli');
-const _ = require('lodash');
-
-BbPromise.promisifyAll(fse);
-
-class ServerlessAWSBatch {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-    this.provider = this.serverless.getProvider('aws');
-
-    // Make sure that we add the names for our ECR, docker, and batch resources to the provider
-    _.merge(
-      this.provider.naming,
-      {
-        'getECRLogicalId': ecr.getECRLogicalId,
-        'getECRRepositoryName': ecr.getECRRepositoryName,
-        'getECRRepositoryURL': ecr.getECRRepositoryURL,
-        'getDockerImageName': docker.getDockerImageName,
-        'getBatchServiceRoleLogicalId': batchenvironment.getBatchServiceRoleLogicalId,
-        'getBatchInstanceManagementRoleLogicalId': batchenvironment.getBatchInstanceManagementRoleLogicalId,
-        'getBatchInstanceManagementProfileLogicalId': batchenvironment.getBatchInstanceManagementProfileLogicalId,
-        'getBatchSpotFleetManagementRoleLogicalId': batchenvironment.getBatchSpotFleetManagementRoleLogicalId,
-        'getBatchJobExecutionRoleLogicalId': batchtask.getBatchJobExecutionRoleLogicalId,
-        'getLambdaScheduleExecutionRoleLogicalId': batchenvironment.getLambdaScheduleExecutionRoleLogicalId,
-        'getBatchComputeEnvironmentLogicalId': batchenvironment.getBatchComputeEnvironmentLogicalId,
-        'getBatchJobQueueLogicalId': batchenvironment.getBatchJobQueueLogicalId,
-        'getBatchJobQueueName': batchenvironment.getBatchJobQueueName,
-        'getJobDefinitionLogicalId': batchtask.getJobDefinitionLogicalId
-      }
-    );
-
-    // Define inner lifecycles
-    this.commands = {}
-
-    this.hooks = {
-      'after:package:initialize': () => BbPromise.bind(this)
-        .then(generateCoreTemplate.generateCoreTemplate),
-
-      'before:package:compileFunctions': () => BbPromise.bind(this)
-        .then(batchenvironment.validateAWSBatchServerlessConfig)
-        .then(batchenvironment.generateAWSBatchTemplate)
-        .then(batchtask.compileBatchTasks),
-
-      'after:package:createDeploymentArtifacts': () => BbPromise.bind(this)
-        .then(docker.buildDockerImage),
-
-      'after:aws:deploy:deploy:updateStack': () => BbPromise.bind(this)
-        .then(docker.pushDockerImageToECR),
-
-      'before:remove:remove': () => BbPromise.bind(this)
-        .then(awscli.deleteAllDockerImagesInECR)
-    }
-  }
-}
-
-module.exports = ServerlessAWSBatch;
+'use strict';
+
+const BbPromise = require('bluebird');
+const fse = require('fs-extra');
+const generateCoreTemplate = require('./lib/generateCoreTemplate');
+const ecr = require('./lib/ecr');
+const docker = require('./lib/docker');
+const batchenvironment = require('./lib/batchenvironment');
+const batchtask = require('./lib/batchtask');
+const awscli = require('./lib/awscli');
+const _ = require('lodash');
+
+BbPromise.promisifyAll(fse);
+
+class ServerlessAWSBatch {
+  constructor(serverless, options) {
+    this.serverless = serverless;
+    this.options = options;
+    this.provider = this.serverless.getProvider('aws');
+
+    // Make sure that we add the names for our ECR, docker, and batch resources to the provider
+    _.merge(
+      this.provider.naming,
+      {
+        'getECRLogicalId': ecr.getECRLogicalId,
+        'getECRRepositoryName': ecr.getECRRepositoryName,
+        'getECRRepositoryURL': ecr.getECRRepositoryURL,
+        'getDockerImageName': docker.getDockerImageName,
+        'getBatchServiceRoleLogicalId': batchenvironment.getBatchServiceRoleLogicalId,
+        'getBatchInstanceManagementRoleLogicalId': batchenvironment.getBatchInstanceManagementRoleLogicalId,
+        'getBatchInstanceManagementProfileLogicalId': batchenvironment.getBatchInstanceManagementProfileLogicalId,
+        'getBatchSpotFleetManagementRoleLogicalId': batchenvironment.getBatchSpotFleetManagementRoleLogicalId,
+        'getBatchJobExecutionRoleLogicalId': batchtask.getBatchJobExecutionRoleLogicalId,
+        'getLambdaScheduleExecutionRoleLogicalId': batchenvironment.getLambdaScheduleExecutionRoleLogicalId,
+        'getBatchComputeEnvironmentLogicalId': batchenvironment.getBatchComputeEnvironmentLogicalId,
+        'getBatchJobQueueLogicalId': batchenvironment.getBatchJobQueueLogicalId,
+        'getBatchJobQueueName': batchenvironment.getBatchJobQueueName,
+        'getJobDefinitionLogicalId': batchtask.getJobDefinitionLogicalId
+      }
+    );
+
+    // Define inner lifecycles
+    this.commands = {}
+
+    this.hooks = {
+      'after:package:initialize': () => BbPromise.bind(this)
+        .then(generateCoreTemplate.generateCoreTemplate),
+
+      'before:package:compileFunctions': () => BbPromise.bind(this)
+        .then(batchenvironment.validateAWSBatchServerlessConfig)
+        .then(batchenvironment.generateAWSBatchTemplate)
+        .then(batchtask.compileBatchTasks),
+
+      'after:package:createDeploymentArtifacts': () => BbPromise.bind(this)
+        .then(docker.buildDockerImage),
+
+      'after:aws:deploy:deploy:updateStack': () => BbPromise.bind(this)
+        .then(docker.pushDockerImageToECR),
+
+      'before:remove:remove': () => BbPromise.bind(this)
+        .then(awscli.deleteAllDockerImagesInECR)
+    }
+  }
+}
+
+module.exports = ServerlessAWSBatch;

package/lib/awscli.js

@@ -1,107 +1,107 @@
-const { spawnSync } = require('child_process');
-const fse = require('fs-extra');
-const path = require('path');
-const util = require('util');
-const _ = require('lodash');
-
-/**
- * Helper function to run an AWS CLI command
- * @param {string[]} options
- * @return {Object}
- */
-function awsCommand(options) {
-    const cmd = 'aws';
-    const ps = spawnSync(cmd, options, { encoding: 'utf-8' });
-    if (ps.error) {
-        if (ps.error.code === 'ENOENT') {
-            throw new Error('aws cli not found! Please install it.');
-        }
-        throw new Error(ps.error);
-    } else if (ps.status !== 0) {
-        throw new Error(ps.stderr);
-    }
-    return ps;
-}
-
-/**
- * Uses the AWS CLI to generate a pre-authenticated docker command that can be
- * used to login to the Elastic Container Registry (ECR) from docker.
- *
- * @return {string} login -u AWS -p <password> https://<account_id>.dkr.ecr.<region>.amazonaws.com
- */
-function getDockerLoginToECRCommand() {
-    const awsCliVersion = awsCommand(['--version']);
-
-    // AWS CLI v2+ doesn't support "get-login" command any more - https://github.com/aws/aws-cli/issues/2875
-    if (awsCliVersion.stdout.trim().indexOf('aws-cli/2') >= 0) {
-        const passwordResult = awsCommand(['ecr', 'get-login-password', '--region', this.options.region]);
-        // Getting account ID
-        const accountIdResult = awsCommand([
-            'sts', 'get-caller-identity',
-            '--region', this.options.region,
-            '--query', 'Account',
-            '--output', 'text',
-            ...(this.options.awsProfile ? ['--profile', this.options.awsProfile] : []),
-        ]);
-
-        return 'login -u AWS -p ' + passwordResult.stdout + ' ' +
-            accountIdResult.stdout.trim() + '.dkr.ecr.' + this.options.region + '.amazonaws.com';
-    }
-
-    const result = awsCommand(['ecr', 'get-login', '--region', this.options.region, '--no-include-email']);
-    // AWS CLI returns the full command with "docker " out front. Remove it since we don't need it.
-    return result.stdout.replace('docker ', '').replace(/[\n\r]/g, '');
-}
-
-/**
- * Deletes all of our docker images in the remote ECR registry
- */
-function deleteAllDockerImagesInECR() {
-    try {
-        const result = awsCommand(['ecr', 'list-images', '--repository-name', this.provider.naming.getECRRepositoryName()]);
-        const images = JSON.parse(result.stdout);
-
-        this.serverless.cli.log(`Found ${images['imageIds'].length} existing ECR images. Deleting...`)
-
-        // Delete individually instead of batch so we don't run into any CLI length limits
-        _.forEach(
-            images['imageIds'],
-            image => {
-                awsCommand([
-                    'ecr', 'batch-delete-image',
-                    '--repository-name', this.provider.naming.getECRRepositoryName(),
-                    '--image-ids', `imageDigest=${image['imageDigest']}`
-                ]);
-            }
-        );
-    }
-    catch (e) {
-        // If we failed to delete the stack from a previous "sls-remove" attempt, but already deleted the repository
-        if (e.message.indexOf("RepositoryNotFoundException") > -1) {
-            this.serverless.cli.log("ECR Repository already deleted");
-        }
-        // Unknown error
-        else {
-            throw e;
-        }
-    }
-}
-
-/**
- * Calls AWS CLI to get the accountID of the calling user
- * @returns {string} The accountID of the calling user
- */
-let awsAccountID = null;
-function getAWSAccountID() {
-    if (awsAccountID == null) {
-        const result = awsCommand(['sts', 'get-caller-identity']);
-        awsAccountID = JSON.parse(result.stdout).Account
-    }
-    return awsAccountID;
-}
-
-module.exports = {
-    getDockerLoginToECRCommand,
-    getAWSAccountID,
-    deleteAllDockerImagesInECR
-};
+const { spawnSync } = require('child_process');
+const fse = require('fs-extra');
+const path = require('path');
+const util = require('util');
+const _ = require('lodash');
+
+/**
+ * Helper function to run an AWS CLI command
+ * @param {string[]} options
+ * @return {Object}
+ */
+function awsCommand(options) {
+    const cmd = 'aws';
+    const ps = spawnSync(cmd, options, { encoding: 'utf-8' });
+    if (ps.error) {
+        if (ps.error.code === 'ENOENT') {
+            throw new Error('aws cli not found! Please install it.');
+        }
+        throw new Error(ps.error);
+    } else if (ps.status !== 0) {
+        throw new Error(ps.stderr);
+    }
+    return ps;
+}
+
+/**
+ * Uses the AWS CLI to generate a pre-authenticated docker command that can be
+ * used to login to the Elastic Container Registry (ECR) from docker.
+ *
+ * @return {string} login -u AWS -p <password> https://<account_id>.dkr.ecr.<region>.amazonaws.com
+ */
+function getDockerLoginToECRCommand() {
+    const awsCliVersion = awsCommand(['--version']);
+
+    // AWS CLI v2+ doesn't support "get-login" command any more - https://github.com/aws/aws-cli/issues/2875
+    if (awsCliVersion.stdout.trim().indexOf('aws-cli/2') >= 0) {
+        const passwordResult = awsCommand(['ecr', 'get-login-password', '--region', this.options.region]);
+        // Getting account ID
+        const accountIdResult = awsCommand([
+            'sts', 'get-caller-identity',
+            '--region', this.options.region,
+            '--query', 'Account',
+            '--output', 'text',
+            ...(this.options.awsProfile ? ['--profile', this.options.awsProfile] : []),
+        ]);
+
+        return 'login -u AWS -p ' + passwordResult.stdout + ' ' +
+            accountIdResult.stdout.trim() + '.dkr.ecr.' + this.options.region + '.amazonaws.com';
+    }
+
+    const result = awsCommand(['ecr', 'get-login', '--region', this.options.region, '--no-include-email']);
+    // AWS CLI returns the full command with "docker " out front. Remove it since we don't need it.
+    return result.stdout.replace('docker ', '').replace(/[\n\r]/g, '');
+}
+
+/**
+ * Deletes all of our docker images in the remote ECR registry
+ */
+function deleteAllDockerImagesInECR() {
+    try {
+        const result = awsCommand(['ecr', 'list-images', '--repository-name', this.provider.naming.getECRRepositoryName()]);
+        const images = JSON.parse(result.stdout);
+
+        this.serverless.cli.log(`Found ${images['imageIds'].length} existing ECR images. Deleting...`)
+
+        // Delete individually instead of batch so we don't run into any CLI length limits
+        _.forEach(
+            images['imageIds'],
+            image => {
+                awsCommand([
+                    'ecr', 'batch-delete-image',
+                    '--repository-name', this.provider.naming.getECRRepositoryName(),
+                    '--image-ids', `imageDigest=${image['imageDigest']}`
+                ]);
+            }
+        );
+    }
+    catch (e) {
+        // If we failed to delete the stack from a previous "sls-remove" attempt, but already deleted the repository
+        if (e.message.indexOf("RepositoryNotFoundException") > -1) {
+            this.serverless.cli.log("ECR Repository already deleted");
+        }
+        // Unknown error
+        else {
+            throw e;
+        }
+    }
+}
+
+/**
+ * Calls AWS CLI to get the accountID of the calling user
+ * @returns {string} The accountID of the calling user
+ */
+let awsAccountID = null;
+function getAWSAccountID() {
+    if (awsAccountID == null) {
+        const result = awsCommand(['sts', 'get-caller-identity']);
+        awsAccountID = JSON.parse(result.stdout).Account
+    }
+    return awsAccountID;
+}
+
+module.exports = {
+    getDockerLoginToECRCommand,
+    getAWSAccountID,
+    deleteAllDockerImagesInECR
+};