@brunwig/mup-aws-beanstalk 0.8.7 → 2.0.5

package/.babelrc

@@ -1,6 +1,17 @@
 {
-  "plugins": [
-    "@babel/plugin-proposal-object-rest-spread",
-    "@babel/plugin-transform-modules-commonjs"
-  ]
+	"presets": [
+		["@babel/preset-env",
+			{
+				"targets": [
+					"defaults",
+					"last 2 versions",
+					"not IE 11",
+					"node 14"
+				]
+			}
+		]
+	],
+	"assumptions": {
+		"setPublicClassFields": true
+	}
 }

package/.eslintrc.yml

@@ -1,5 +1,5 @@
-parser: babel-eslint
-extends: airbnb
+parser: '@babel/eslint-parser'
+extends: standard
 rules:
   comma-dangle: [2, 'never']
   no-plusplus: 0

package/docs/getting-started.md

@@ -8,7 +8,7 @@ You can install `mup` and `mup-aws-beanstalk` by running
 npm i -g mup mup-aws-beanstalk
 ```
 
-The AWS Beanstalk plugin requires Node 4 or newer and Meteor Up 1.3.5 or newer.
+The AWS Beanstalk plugin requires Node 14 or newer and Meteor Up 1.3.5 or newer.
 
 ## Step 1: Initialize your project
 

package/docs/index.md

@@ -76,9 +76,22 @@ module.exports = {
         // (optional, default is us-east-1) AWS region to deploy to
         region: 'us-west-1',
 
+        // name of the aws platform to us - matches the start portion of the name
+        // https://docs.aws.amazon.com/elasticbeanstalk/latest/platforms/platform-history-nodejs.html
+        awsPlatformBranchName: 'Node.js 20',
+
         // (optional, default is "mup-env-<app name>")
         // Name of AWS Elastic Beanstalk environment
-        envName: 'production', 
+        envName: 'production',
+
+        // (optional, default is "webserver")
+        // Type (or "tier") of the environment. Set it to "worker"
+        // to make a worker environment that has no web-facing load-
+        // balancer and only responds to SQS queue messages.
+        // This will also make the SSL options do nothing.
+        // Read more at:
+        // https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/using-features-managing-env-tiers.html
+        envType: "webserver"
 
         // (optional) Packages to install with the yum package manager
         yumPackages: {
@@ -94,9 +107,12 @@ module.exports = {
         // (optional) Send a SIGTERM signal to the app instances 30 seconds before they will be shut down.
         gracefulShutdown: true,
 
-        // (optional) Supports large environment variables and settings.json by storing them in s3. 
+        // (optional) Supports large environment variables and settings.json by storing them in s3.
         longEnvVars: true,
 
+        // (optional) Enable log streamin to CloudWatch, and to the terminal output while deploying when `verbose` is also active.
+        streamLogs: false,
+
         // (optional, default is 3) Number of old application versions to keep
         oldVersions: 3,
 
@@ -136,7 +152,7 @@ module.exports = {
 }
 ```
 
-Changes to `yumPackages`, `forceSSL`, `buildOptions`, and `longEnvVars` requires deploying a new version to take affect.
+Changes to `yumPackages`, `forceSSL`, `buildOptions`, ``requireInstanceRole` and `longEnvVars` requires deploying a new version to take affect.
 
 ## Commands
 
@@ -150,7 +166,7 @@ Changes to `yumPackages`, `forceSSL`, `buildOptions`, and `longEnvVars` requires
 - `mup start` Scales the app back up after being stopped
 - `mup restart` Restarts the app
 - `mup beanstalk events` View events from the app's Beanstalk enviroment. Useful when troubleshooting problems.
-- `mup beanstalk clean` Removes old application versions from s3 and Beanstalk. Is automatically run by `mup deploy` 
+- `mup beanstalk clean` Removes old application versions from s3 and Beanstalk. Is automatically run by `mup deploy`
 - `mup beanstalk ssl` Sets up SSL and shows you it's current status. Automatically run by `mup reconfig` and `mup deploy`
 - `mup beanstalk status` View the app's and server's health and http request stats
 
@@ -159,7 +175,7 @@ Changes to `yumPackages`, `forceSSL`, `buildOptions`, and `longEnvVars` requires
 AWS Elastic Beanstalk is free, but you do pay for the services it uses, including:
 
 - EC2 Instances. By default, it uses `t2.micro`, which costs $8.50/month($0.012 / hour). While the Beanstalk environment is updating, or a new version is being deployed, 25% additional servers will be used.
-- Application Load Balancer. Pricing details are at https://aws.amazon.com/elasticloadbalancing/pricing/
+- Application Load Balancer (when not using worker environment type). Pricing details are at https://aws.amazon.com/elasticloadbalancing/pricing/
 - S3. 3 - 4 app bundles are stored on s3. Each deploy will make 2 list requests and upload 1 file. Beanstalk might store additional files on s3.
 
 Graceful Shutdown uses the following services:
@@ -176,7 +192,7 @@ This does not apply when changing the instance type. Instead, Beanstalk terminat
 
 ## Load balancing
 
-Load balancing is automatically configured and supports web sockets and sticky sessions.
+Load balancing for web-facing apps is automatically configured and supports web sockets and sticky sessions.
 
 ## Scale
 

package/index.js

@@ -1 +1 @@
-module.exports = require('./lib');
+module.exports = require('./lib')

package/lib/assets/Procfile

@@ -0,0 +1 @@
+web: npm start

package/lib/assets/health-check.js

@@ -14,16 +14,22 @@
  */
 
 var http = require('http');
+
 var debugEnabled = process.env.HEALTH_CHECK_VERBOSE === 'true';
+
 var log = function log(message, debug) {
   if (!debug || debugEnabled) {
     console.log('[HealthCheck] ' + new Date() + ': ' + message);
   }
 };
+
+
 var server = http.createServer(function (request, response) {
   var timeout;
   var appRequest;
+
   log('Received health check request', true);
+
   appRequest = http.get('http://127.0.0.1:8081', function (res) {
     log('Health check succeeded', true);
     response.statusCode = 200;
@@ -36,11 +42,14 @@ var server = http.createServer(function (request, response) {
     response.end('Failed');
     clearTimeout(timeout);
   });
+
   timeout = setTimeout(function () {
     log('Request to app timed out after 3 seconds');
     appRequest.abort();
   }, 3000);
 });
+
+
 try {
   server.listen(8039);
   log('Started health check server', true);
@@ -48,4 +57,3 @@ try {
   // Port is being used, likely from another health-check server running
   log('Port being used');
 }
-//# sourceMappingURL=health-check.js.map

package/lib/assets/health-check.js.map

@@ -1 +1 @@
-{"version":3,"file":"health-check.js","names":["http","require","debugEnabled","process","env","HEALTH_CHECK_VERBOSE","log","message","debug","console","Date","server","createServer","request","response","timeout","appRequest","get","res","statusCode","end","clearTimeout","resume","on","e","setTimeout","abort","listen"],"sources":["../../src/assets/health-check.js"],"sourcesContent":["/* eslint-disable no-var, prefer-template, func-names, prefer-arrow-callback */\n\n/*\n * The health check expects the response's status code to be 200\n * Some apps set their status code to something else, which would\n * cause the health check to always fail.\n *\n * The health check gets sent to this server, which checks if\n * the app is responding to requests, and then sets the correct\n * status code for the health check.\n *\n * This uses the same version of node that the app is using,\n * so it needs to support Node 0.10.\n */\n\nvar http = require('http');\n\nvar debugEnabled = process.env.HEALTH_CHECK_VERBOSE === 'true';\n\nvar log = function log(message, debug) {\n  if (!debug || debugEnabled) {\n    console.log('[HealthCheck] ' + new Date() + ': ' + message);\n  }\n};\n\n\nvar server = http.createServer(function (request, response) {\n  var timeout;\n  var appRequest;\n\n  log('Received health check request', true);\n\n  appRequest = http.get('http://127.0.0.1:8081', function (res) {\n    log('Health check succeeded', true);\n    response.statusCode = 200;\n    response.end('Success');\n    clearTimeout(timeout);\n    res.resume();\n  }).on('error', function (e) {\n    log('Request to app failed ' + e);\n    response.statusCode = 500;\n    response.end('Failed');\n    clearTimeout(timeout);\n  });\n\n  timeout = setTimeout(function () {\n    log('Request to app timed out after 3 seconds');\n    appRequest.abort();\n  }, 3000);\n});\n\n\ntry {\n  server.listen(8039);\n  log('Started health check server', true);\n} catch (e) {\n  // Port is being used, likely from another health-check server running\n  log('Port being used');\n}\n"],"mappings":"AAAA;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;;AAEA,IAAIA,IAAI,GAAGC,OAAO,CAAC,MAAM,CAAC;AAE1B,IAAIC,YAAY,GAAGC,OAAO,CAACC,GAAG,CAACC,oBAAoB,KAAK,MAAM;AAE9D,IAAIC,GAAG,GAAG,SAASA,GAAGA,CAACC,OAAO,EAAEC,KAAK,EAAE;EACrC,IAAI,CAACA,KAAK,IAAIN,YAAY,EAAE;IAC1BO,OAAO,CAACH,GAAG,CAAC,gBAAgB,GAAG,IAAII,IAAI,CAAC,CAAC,GAAG,IAAI,GAAGH,OAAO,CAAC;EAC7D;AACF,CAAC;AAGD,IAAII,MAAM,GAAGX,IAAI,CAACY,YAAY,CAAC,UAAUC,OAAO,EAAEC,QAAQ,EAAE;EAC1D,IAAIC,OAAO;EACX,IAAIC,UAAU;EAEdV,GAAG,CAAC,+BAA+B,EAAE,IAAI,CAAC;EAE1CU,UAAU,GAAGhB,IAAI,CAACiB,GAAG,CAAC,uBAAuB,EAAE,UAAUC,GAAG,EAAE;IAC5DZ,GAAG,CAAC,wBAAwB,EAAE,IAAI,CAAC;IACnCQ,QAAQ,CAACK,UAAU,GAAG,GAAG;IACzBL,QAAQ,CAACM,GAAG,CAAC,SAAS,CAAC;IACvBC,YAAY,CAACN,OAAO,CAAC;IACrBG,GAAG,CAACI,MAAM,CAAC,CAAC;EACd,CAAC,CAAC,CAACC,EAAE,CAAC,OAAO,EAAE,UAAUC,CAAC,EAAE;IAC1BlB,GAAG,CAAC,wBAAwB,GAAGkB,CAAC,CAAC;IACjCV,QAAQ,CAACK,UAAU,GAAG,GAAG;IACzBL,QAAQ,CAACM,GAAG,CAAC,QAAQ,CAAC;IACtBC,YAAY,CAACN,OAAO,CAAC;EACvB,CAAC,CAAC;EAEFA,OAAO,GAAGU,UAAU,CAAC,YAAY;IAC/BnB,GAAG,CAAC,0CAA0C,CAAC;IAC/CU,UAAU,CAACU,KAAK,CAAC,CAAC;EACpB,CAAC,EAAE,IAAI,CAAC;AACV,CAAC,CAAC;AAGF,IAAI;EACFf,MAAM,CAACgB,MAAM,CAAC,IAAI,CAAC;EACnBrB,GAAG,CAAC,6BAA6B,EAAE,IAAI,CAAC;AAC1C,CAAC,CAAC,OAAOkB,CAAC,EAAE;EACV;EACAlB,GAAG,CAAC,iBAAiB,CAAC;AACxB","ignoreList":[]}
+{"version":3,"file":"health-check.js","sourceRoot":"","sources":["../../src/assets/health-check.js"],"names":[],"mappings":";AAAA,+EAA+E;AAE/E;;;;;;;;;;;GAWG;AAEH,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE3B,IAAI,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,oBAAoB,KAAK,MAAM,CAAC;AAE/D,IAAI,GAAG,GAAG,SAAS,GAAG,CAAC,OAAO,EAAE,KAAK;IACnC,IAAI,CAAC,KAAK,IAAI,YAAY,EAAE,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,IAAI,IAAI,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC,CAAC;AAGF,IAAI,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,OAAO,EAAE,QAAQ;IACxD,IAAI,OAAO,CAAC;IACZ,IAAI,UAAU,CAAC;IAEf,GAAG,CAAC,+BAA+B,EAAE,IAAI,CAAC,CAAC;IAE3C,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,uBAAuB,EAAE,UAAU,GAAG;QAC1D,GAAG,CAAC,wBAAwB,EAAE,IAAI,CAAC,CAAC;QACpC,QAAQ,CAAC,UAAU,GAAG,GAAG,CAAC;QAC1B,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACxB,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,GAAG,CAAC,MAAM,EAAE,CAAC;IACf,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC;QACxB,GAAG,CAAC,wBAAwB,GAAG,CAAC,CAAC,CAAC;QAClC,QAAQ,CAAC,UAAU,GAAG,GAAG,CAAC;QAC1B,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACvB,YAAY,CAAC,OAAO,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,UAAU,CAAC;QACnB,GAAG,CAAC,0CAA0C,CAAC,CAAC;QAChD,UAAU,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC,EAAE,IAAI,CAAC,CAAC;AACX,CAAC,CAAC,CAAC;AAGH,IAAI,CAAC;IACH,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACpB,GAAG,CAAC,6BAA6B,EAAE,IAAI,CAAC,CAAC;AAC3C,CAAC;AAAC,OAAO,CAAC,EAAE,CAAC;IACX,sEAAsE;IACtE,GAAG,CAAC,iBAAiB,CAAC,CAAC;AACzB,CAAC"}

package/lib/assets/nginx-server.conf

@@ -6,6 +6,11 @@ if ($http_x_forwarded_proto = "http") {
 }
 <% } %>
 
+# App adaptations 
+proxy_hide_header X-Powered-By;
+proxy_hide_header Server;
+server_tokens off;
+
 location / {
   proxy_pass          http://127.0.0.1:8081;
   proxy_http_version  1.1;

package/lib/assets/node.sh

@@ -1,25 +1,55 @@
 #!/bin/bash
 NODE_VERSION=<%= nodeVersion %>
 NPM_VERSION=<%= npmVersion %>
+MAJOR_NODE_VERSION=`echo $NODE_VERSION | awk -F. '{print $1}'`
+MINOR_NODE_VERSION=`echo $NODE_VERSION | awk -F. '{print $2}'`
+PATCH_NODE_VERSION=`echo $NODE_VERSION | awk -F. '{print $3}'`
+METEOR_VERSION=<%= meteorVersion %>
 
+echo "Node: $NODE_VERSION"
+echo "Major: $MAJOR_NODE_VERSION"
+echo "Minor: $MINOR_NODE_VERSION"
+echo "Patch: $PATCH_NODE_VERSION"
 
 export NVM_DIR="/.nvm"
 # Install nvm
 curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.6/install.sh | bash
 [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
 
-nvm install $NODE_VERSION
+if [[ $MAJOR_NODE_VERSION == "14" && $MINOR_NODE_VERSION -ge 21 && $PATCH_NODE_VERSION -ge 4 ]]; then
+  #Install latests 14 version so the folder structure is there when trying to download custom node version
+  nvm install 14
+
+  # Install Meteor's custom NodeJS v14 LTS version
+  NODE_INSTALL_PATH="/.nvm/versions/node/v$NODE_VERSION"
+
+  if [ -d $NODE_INSTALL_PATH ]; then
+    echo "Meteor's custom v14 LTS Node version is already installed ($NODE_VERSION)"
+  else
+    echo "Using Meteor's custom NodeJS v14 LTS version"
+
+    # https://hub.docker.com/layers/meteor/node/14.21.4/images/sha256-f4e19b4169ff617118f78866c2ffe392a7ef44d4e30f2f9fc31eef2c35ceebf3?context=explore
+    curl "https://static.meteor.com/dev-bundle-node-os/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz" | tar xzf - -C /tmp/
+    mv /tmp/node-v$NODE_VERSION-linux-x64 "$NODE_INSTALL_PATH"
+    ls -l $NODE_INSTALL_PATH
+  fi
+else
+  echo "Using NVM"
+  nvm install $NODE_VERSION
+fi
+
+# Verify installed Node.js and npm versions
+echo "Node.js version: $(node -v)"
+echo "NPM version before update: $(npm -v)"
+
 nvm use $NODE_VERSION
 nvm alias default $NODE_VERSION
 npm i -g npm@$NPM_VERSION
 
-APP_PATH="$(/opt/elasticbeanstalk/bin/get-config container -k app_staging_dir)"
-echo "APP_PATH: $APP_PATH"
-
-# AWS Linux 2
+# AWS Linux 2 / 2023
 [[ -z "$APP_PATH" ]] && APP_PATH="$(/opt/elasticbeanstalk/bin/get-config platformconfig -k AppStagingDir)"
 echo "APP_PATH: $APP_PATH"
 
 cd "$APP_PATH"
-ls
-cd programs/server && npm install --unsafe-perm
+echo "Installing npm dependencies"
+cd programs/server && npm install --unsafe-perm

package/lib/assets/npm.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+export NVM_DIR="/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
+
+APP_PATH="$(/opt/elasticbeanstalk/bin/get-config container -k app_staging_dir)"
+echo "APP_PATH: $APP_PATH"
+
+# AWS Linux 2 /2023
+[[ -z "$APP_PATH" ]] && APP_PATH="$(/opt/elasticbeanstalk/bin/get-config platformconfig -k AppStagingDir)"
+echo "APP_PATH: $APP_PATH"
+
+cd "$APP_PATH"
+ls
+cd programs/server && npm install --unsafe-perm

package/lib/assets/prevent-npm.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+ls -la
+mkdir -p node_modules
+sudo chown -R webapp:webapp node_modules

package/lib/assets/role-start.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+export NVM_DIR="/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
+
+nvm use default --delete-prefix --silent
+
+[[ ! -z "$MUP_ENV_FILE_VERSION" ]] && { echo "Long Env is enabled."; source /etc/app/env.txt; }
+
+echo "Node version"
+echo $(node --version)
+echo "Npm version"
+echo $(npm --version)
+# Check if meteor-settings.js exists and prepend METEOR_SETTINGS to main.js
+SETTINGS_FILE="./programs/server/assets/app/meteor-settings.js"
+MAIN_JS="./main.js"
+TEMP_MAIN_JS="./main_temp.js"
+
+if [ -f "$SETTINGS_FILE" ]; then
+    echo "Found settings file"
+     
+    # Prepend the require statement to main.js
+    echo "Requiring settings.js in main.js"
+    echo "require('$SETTINGS_FILE');" > "$TEMP_MAIN_JS"
+    cat "$MAIN_JS" >> "$TEMP_MAIN_JS"
+    mv "$TEMP_MAIN_JS" "$MAIN_JS"
+else
+    export METEOR_SETTINGS=$(node -e 'console.log(decodeURIComponent(process.env.METEOR_SETTINGS_ENCODED))')
+fi
+
+
+MAX_WAIT=60  # Timeout in seconds
+WAITED=0
+while [ -z "$INSTANCE_ROLE" ]; do
+    INSTANCE_ROLE=$(grep '^INSTANCE_ROLE=' /etc/environment | cut -d '=' -f2)
+    sleep 1
+    WAITED=$((WAITED + 1))
+    if [ $WAITED -ge $MAX_WAIT ]; then
+        echo "Timeout: INSTANCE_ROLE not set after $MAX_WAIT seconds. Exiting."
+        exit 1
+    else
+        echo "Waited $WAITED seconds for INSTANCE_ROLE to be set..."
+    fi
+done
+
+# Update all environment variables
+if [ -f /etc/environment ]; then
+    echo "Updating environment variables from /etc/environment"
+    set -a  # Automatically export all variables
+    source /etc/environment
+    set +a
+else
+    echo "/etc/environment file not found."
+fi
+
+echo "INSTANCE_ROLE is set to '$INSTANCE_ROLE'"
+echo "FIRST_INSTANCE is set to '$FIRST_INSTANCE'"
+echo "=> Starting health check server"
+node health-check.js &
+echo "=> Starting App"
+node main.js

package/lib/assets/start.sh

@@ -18,4 +18,4 @@ echo "=> Starting health check server"
 node health-check.js &
 
 echo "=> Starting App"
-node main.js
+node main.js

package/lib/assets/yarn.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+npm i -g corepack # <- Add this line to install corepack first
+
+corepack enable
+APP_PATH="$(/opt/elasticbeanstalk/bin/get-config container -k app_staging_dir)"
+echo "APP_PATH: $APP_PATH"
+
+# AWS Linux 2 /2023
+[[ -z "$APP_PATH" ]] && APP_PATH="$(/opt/elasticbeanstalk/bin/get-config platformconfig -k AppStagingDir)"
+echo "APP_PATH: $APP_PATH"
+
+cd "$APP_PATH"
+ls
+cd programs/server
+yarn set version 1.x
+yarn config set unsafe-perm true
+yarn install

package/lib/aws.js

@@ -1,83 +1,49 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.cloudWatchEvents = exports.cloudTrail = exports.beanstalk = exports.autoScaling = exports.acm = void 0;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ec2InstanceConnect = exports.logs = exports.ec2 = exports.ssm = exports.sts = exports.cloudWatchEvents = exports.cloudTrail = exports.acm = exports.autoScaling = exports.iam = exports.beanstalk = exports.s3 = void 0;
 exports.default = configure;
-exports.sts = exports.ssm = exports.s3 = exports.iam = exports.ec2InstanceConnect = exports.ec2 = void 0;
-var _awsSdk = _interopRequireDefault(require("aws-sdk"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-/* eslint-disable import/no-mutable-exports */
-let s3 = exports.s3 = {};
-let beanstalk = exports.beanstalk = {};
-let iam = exports.iam = {};
-let autoScaling = exports.autoScaling = {};
-let acm = exports.acm = {};
-let cloudTrail = exports.cloudTrail = {};
-let cloudWatchEvents = exports.cloudWatchEvents = {};
-let sts = exports.sts = {};
-let ssm = exports.ssm = {};
-let ec2 = exports.ec2 = {};
-let ec2InstanceConnect = exports.ec2InstanceConnect = {};
-
+const client_iam_1 = require("@aws-sdk/client-iam");
+const client_s3_1 = require("@aws-sdk/client-s3");
+const client_elastic_beanstalk_1 = require("@aws-sdk/client-elastic-beanstalk");
+const client_acm_1 = require("@aws-sdk/client-acm");
+const client_auto_scaling_1 = require("@aws-sdk/client-auto-scaling");
+const client_cloudwatch_events_1 = require("@aws-sdk/client-cloudwatch-events");
+const client_cloudwatch_logs_1 = require("@aws-sdk/client-cloudwatch-logs");
+const client_cloudtrail_1 = require("@aws-sdk/client-cloudtrail");
+const client_ec2_instance_connect_1 = require("@aws-sdk/client-ec2-instance-connect");
+const client_sts_1 = require("@aws-sdk/client-sts");
+const client_ssm_1 = require("@aws-sdk/client-ssm");
+const client_ec2_1 = require("@aws-sdk/client-ec2");
 /* eslint-enable import/no-mutable-exports */
-
 const MAX_RETRY_DELAY = 1000 * 60 * 2;
-const AWS_UPLOAD_TIMEOUT = 1000 * 60 * 60;
-function configure({
-  auth,
-  name,
-  region
-}) {
-  const options = {
-    accessKeyId: auth.id,
-    secretAccessKey: auth.secret,
-    region: region || 'us-east-1',
-    maxRetries: 25,
-    retryDelayOptions: {
-      customBackoff: retryCount => Math.min(2 ** retryCount * 1000, MAX_RETRY_DELAY)
-    }
-  };
-  _awsSdk.default.config.update(options);
-  exports.s3 = s3 = new _awsSdk.default.S3({
-    params: {
-      Bucket: `mup-${name}`
-    },
-    httpOptions: {
-      timeout: AWS_UPLOAD_TIMEOUT
-    },
-    apiVersion: '2006-03-01'
-  });
-  exports.beanstalk = beanstalk = new _awsSdk.default.ElasticBeanstalk({
-    apiVersion: '2010-12-01'
-  });
-  exports.iam = iam = new _awsSdk.default.IAM({
-    apiVersion: '2010-05-08'
-  });
-  exports.autoScaling = autoScaling = new _awsSdk.default.AutoScaling({
-    apiVersion: '2011-01-01'
-  });
-  exports.acm = acm = new _awsSdk.default.ACM({
-    apiVersion: '2015-12-08'
-  });
-  exports.cloudTrail = cloudTrail = new _awsSdk.default.CloudTrail({
-    apiVersion: '2013-11-01'
-  });
-  exports.sts = sts = new _awsSdk.default.STS({
-    apiVersion: '2011-06-15'
-  });
-  exports.cloudWatchEvents = cloudWatchEvents = new _awsSdk.default.CloudWatchEvents({
-    apiVersion: '2015-10-07'
-  });
-  exports.ssm = ssm = new _awsSdk.default.SSM({
-    apiVersion: '2014-11-06'
-  });
-  exports.ec2 = ec2 = new _awsSdk.default.EC2({
-    apiVersion: '2016-11-15'
-  });
-  exports.ec2InstanceConnect = ec2InstanceConnect = new _awsSdk.default.EC2InstanceConnect({
-    apiVersion: '2018-04-02'
-  });
+// const AWS_UPLOAD_TIMEOUT = 1000 * 60 * 60;
+function configure({ auth, name: _name, region }) {
+    const commonOptions = {
+        credentials: {
+            accessKeyId: auth.id,
+            secretAccessKey: auth.secret,
+        },
+        region: region || 'us-east-1',
+        maxRetries: 25,
+        retryDelayOptions: {
+            customBackoff: (retryCount) => Math.min((2 ** retryCount * 1000), MAX_RETRY_DELAY)
+        }
+    };
+    exports.s3 = new client_s3_1.S3({
+        ...commonOptions,
+        // params: { Bucket: `mup-${name}` },
+        // httpOptions: { timeout: AWS_UPLOAD_TIMEOUT },
+    });
+    exports.beanstalk = new client_elastic_beanstalk_1.ElasticBeanstalk({ ...commonOptions });
+    exports.iam = new client_iam_1.IAM({ ...commonOptions });
+    exports.autoScaling = new client_auto_scaling_1.AutoScaling({ ...commonOptions });
+    exports.acm = new client_acm_1.ACM({ ...commonOptions });
+    exports.cloudTrail = new client_cloudtrail_1.CloudTrail({ ...commonOptions });
+    exports.sts = new client_sts_1.STS({ ...commonOptions });
+    exports.cloudWatchEvents = new client_cloudwatch_events_1.CloudWatchEvents({ ...commonOptions });
+    exports.ssm = new client_ssm_1.SSM({ ...commonOptions });
+    exports.ec2 = new client_ec2_1.EC2({ ...commonOptions });
+    exports.logs = new client_cloudwatch_logs_1.CloudWatchLogs({ ...commonOptions });
+    exports.ec2InstanceConnect = new client_ec2_instance_connect_1.EC2InstanceConnect({ ...commonOptions });
 }
 //# sourceMappingURL=aws.js.map

package/lib/aws.js.map

@@ -1 +1 @@
-{"version":3,"file":"aws.js","names":["_awsSdk","_interopRequireDefault","require","e","__esModule","default","s3","exports","beanstalk","iam","autoScaling","acm","cloudTrail","cloudWatchEvents","sts","ssm","ec2","ec2InstanceConnect","MAX_RETRY_DELAY","AWS_UPLOAD_TIMEOUT","configure","auth","name","region","options","accessKeyId","id","secretAccessKey","secret","maxRetries","retryDelayOptions","customBackoff","retryCount","Math","min","AWS","config","update","S3","params","Bucket","httpOptions","timeout","apiVersion","ElasticBeanstalk","IAM","AutoScaling","ACM","CloudTrail","STS","CloudWatchEvents","SSM","EC2","EC2InstanceConnect"],"sources":["../src/aws.js"],"sourcesContent":["import AWS from 'aws-sdk';\n\n/* eslint-disable import/no-mutable-exports */\nexport let s3 = {};\nexport let beanstalk = {};\nexport let iam = {};\nexport let autoScaling = {};\nexport let acm = {};\nexport let cloudTrail = {};\nexport let cloudWatchEvents = {};\nexport let sts = {};\nexport let ssm = {};\nexport let ec2 = {};\nexport let ec2InstanceConnect = {};\n\n/* eslint-enable import/no-mutable-exports */\n\nconst MAX_RETRY_DELAY = 1000 * 60 * 2;\nconst AWS_UPLOAD_TIMEOUT = 1000 * 60 * 60;\n\nexport default function configure({ auth, name, region }) {\n  const options = {\n    accessKeyId: auth.id,\n    secretAccessKey: auth.secret,\n    region: region || 'us-east-1',\n    maxRetries: 25,\n    retryDelayOptions: {\n      customBackoff: retryCount => Math.min((2 ** retryCount * 1000), MAX_RETRY_DELAY)\n    }\n  };\n\n  AWS.config.update(options);\n\n  s3 = new AWS.S3({\n    params: { Bucket: `mup-${name}` },\n    httpOptions: { timeout: AWS_UPLOAD_TIMEOUT },\n    apiVersion: '2006-03-01'\n  });\n  beanstalk = new AWS.ElasticBeanstalk({ apiVersion: '2010-12-01' });\n  iam = new AWS.IAM({ apiVersion: '2010-05-08' });\n  autoScaling = new AWS.AutoScaling({ apiVersion: '2011-01-01' });\n  acm = new AWS.ACM({ apiVersion: '2015-12-08' });\n  cloudTrail = new AWS.CloudTrail({ apiVersion: '2013-11-01' });\n  sts = new AWS.STS({ apiVersion: '2011-06-15' });\n  cloudWatchEvents = new AWS.CloudWatchEvents({ apiVersion: '2015-10-07' });\n  ssm = new AWS.SSM({ apiVersion: '2014-11-06' });\n  ec2 = new AWS.EC2({ apiVersion: '2016-11-15' });\n  ec2InstanceConnect = new AWS.EC2InstanceConnect({ apiVersion: '2018-04-02' });\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"aws.js","sourceRoot":"","sources":["../src/aws.ts"],"names":[],"mappings":";;;AAiCA,4BA6BC;AA9DD,oDAA0C;AAC1C,kDAAwC;AACxC,gFAAqE;AACrE,oDAA0C;AAC1C,sEAA2D;AAC3D,gFAAqE;AACrE,4EAAiE;AACjE,kEAAwD;AACxD,sFAA0E;AAC1E,oDAA0C;AAC1C,oDAA0C;AAC1C,oDAA0C;AAiB1C,6CAA6C;AAE7C,MAAM,eAAe,GAAG,IAAI,GAAG,EAAE,GAAG,CAAC,CAAC;AACtC,6CAA6C;AAE7C,SAAwB,SAAS,CAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAgB;IAC5E,MAAM,aAAa,GAAG;QACpB,WAAW,EAAE;YACX,WAAW,EAAE,IAAI,CAAC,EAAE;YACpB,eAAe,EAAE,IAAI,CAAC,MAAM;SAC7B;QACD,MAAM,EAAE,MAAM,IAAI,WAAW;QAC7B,UAAU,EAAE,EAAE;QACd,iBAAiB,EAAE;YACjB,aAAa,EAAE,CAAC,UAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,UAAU,GAAG,IAAI,CAAC,EAAE,eAAe,CAAC;SAC3F;KACF,CAAC;IAEF,UAAE,GAAG,IAAI,cAAE,CAAC;QACV,GAAG,aAAa;QAChB,qCAAqC;QACrC,gDAAgD;KACjD,CAAC,CAAC;IACH,iBAAS,GAAG,IAAI,2CAAgB,CAAC,EAAE,GAAG,aAAa,EAAE,CAAC,CAAC;IACvD,WAAG,GAAG,IAAI,gBAAG,CAAC,EAAE,GAAG,aAAa,EAAE,CAAC,CAAC;IACpC,mBAAW,GAAG,IAAI,iCAAW,CAAC,EAAE,GAAG,aAAa,EAAE,CAAC,CAAC;IACpD,WAAG,GAAG,IAAI,gBAAG,CAAC,EAAE,GAAG,aAAa,EAAE,CAAC,CAAC;IACpC,kBAAU,GAAG,IAAI,8BAAU,CAAC,EAAE,GAAG,aAAa,EAAE,CAAC,CAAC;IAClD,WAAG,GAAG,IAAI,gBAAG,CAAC,EAAE,GAAG,aAAa,EAAE,CAAC,CAAC;IACpC,wBAAgB,GAAG,IAAI,2CAAgB,CAAC,EAAE,GAAG,aAAa,EAAE,CAAC,CAAC;IAC9D,WAAG,GAAG,IAAI,gBAAG,CAAC,EAAE,GAAG,aAAa,EAAE,CAAC,CAAC;IACpC,WAAG,GAAG,IAAI,gBAAG,CAAC,EAAE,GAAG,aAAa,EAAE,CAAC,CAAC;IACpC,YAAI,GAAG,IAAI,uCAAc,CAAC,EAAE,GAAG,aAAa,EAAE,CAAC,CAAC;IAChD,0BAAkB,GAAG,IAAI,gDAAkB,CAAC,EAAE,GAAG,aAAa,EAAE,CAAC,CAAC;AACpE,CAAC"}