@fishawack/lab-env 5.7.0-beta.2 → 5.7.0-beta.3

package/CHANGELOG.md

@@ -1,5 +1,47 @@
 ## Changelog
 
+### 5.7.0-beta.3 (2026-07-01)
+
+#### Features
+
+* added a rekey that keeps an operator from accidentally removing their own keys ([a5887c8](https://bitbucket.org/fishawackdigital/lab-env/commits/a5887c809c76df27d7a3cd42ab309b4a3ffd852a))
+* added cron and queue setup as default laravel files ([21a74c5](https://bitbucket.org/fishawackdigital/lab-env/commits/21a74c54e492e498985934ce2f5b507b42f79dd7))
+* app now prompts for smtp creds and creates them for operators ([6fb1916](https://bitbucket.org/fishawackdigital/lab-env/commits/6fb1916b2685bfc0248ef5b27da86d7ad0ab9b69))
+* environment prompt and setting in outputted json ([77eac4d](https://bitbucket.org/fishawackdigital/lab-env/commits/77eac4d392441c18c90bb22f9054d69f8e9393b9))
+* export base64 encoded creds for runner users ([9b2d05e](https://bitbucket.org/fishawackdigital/lab-env/commits/9b2d05e7ebc1120c39ae8d1752e99fc23a2bd99f))
+* ignore 400s and health checks on load balancer now baked in rather than configs ([8e56878](https://bitbucket.org/fishawackdigital/lab-env/commits/8e568788804508220093a3a6803d1185fda72a4f))
+* populate session domain when app domain defined ([6df2fef](https://bitbucket.org/fishawackdigital/lab-env/commits/6df2fefe9ab94487864e16b00ce7d4a2ac98230e))
+* prompt for instance size ([be6d133](https://bitbucket.org/fishawackdigital/lab-env/commits/be6d133e792fa1cd5b8c7f16225f3aa7ec0d1ca1))
+* prompt users for eb files that have changed ([0572244](https://bitbucket.org/fishawackdigital/lab-env/commits/057224429aeeb267fd8207cb19f25f152294ba4d))
+* run key commands in parallel with parallel logging ([17cba11](https://bitbucket.org/fishawackdigital/lab-env/commits/17cba11118ddabd9ee49a187923ce28044ce5654))
+* support adding email creds with dedicated iam user ([451672a](https://bitbucket.org/fishawackdigital/lab-env/commits/451672a852b40b9d7ddb5b1ee8daaee5951f71e2))
+* support cache option and parallelize prov and deprov ([7081109](https://bitbucket.org/fishawackdigital/lab-env/commits/7081109f4413d4b78a83d4531c96f28181151746))
+* support creating elasticcache option ([71ea8c3](https://bitbucket.org/fishawackdigital/lab-env/commits/71ea8c3bead34f27d960b29115684bdf0ad4e717))
+* support green blue flag to mirror env ([fdfb4ea](https://bitbucket.org/fishawackdigital/lab-env/commits/fdfb4ea0a68829950f2b7aee7429d0c7b026bfe8))
+
+#### Bug Fixes
+
+* added missing opensearch secret store into setvars ([d764a2a](https://bitbucket.org/fishawackdigital/lab-env/commits/d764a2abb8e02c31acec5230a0d6a74b5a5ed47f))
+* added tags to resources that were missing them ([8347271](https://bitbucket.org/fishawackdigital/lab-env/commits/8347271cefa467ae70da62d71782509cf44c7f54))
+* app name now defaults to sentence case from app title ([a799af1](https://bitbucket.org/fishawackdigital/lab-env/commits/a799af1bae31fc28ab18747415c7a74f96871507))
+* aws region now part of app secrets ([6446778](https://bitbucket.org/fishawackdigital/lab-env/commits/6446778a9335a52d13b059590c1921f018d6d516))
+* coerce tags to strings and keep checksums of files to detect local changes ([c44ed04](https://bitbucket.org/fishawackdigital/lab-env/commits/c44ed04905d1f3ef9077409d8da71be897dd980b))
+* delete now runs in parallel ([52a9997](https://bitbucket.org/fishawackdigital/lab-env/commits/52a99974b5bd09427e7430d83321be0a1c28ebde))
+* dont copy nginx healthcheck anymore now laravel provides ([eed3730](https://bitbucket.org/fishawackdigital/lab-env/commits/eed37305a93ce3cc5c2b91fbb8b94ce52e99a597))
+* duplicate hooks to avoid permission issues and move setvars to prebuild: ([861e6e5](https://bitbucket.org/fishawackdigital/lab-env/commits/861e6e5579524ec757288781f99a30fe86b9127d))
+* go back to config for healtcheck as needs to be done via resources ([f8c50fa](https://bitbucket.org/fishawackdigital/lab-env/commits/f8c50fa4c5ac110c846aa39af7f5fa785d631b30))
+* iac code now placed in dedicated IaC dir and htpasswd on fullstack deprecated ([d41c17c](https://bitbucket.org/fishawackdigital/lab-env/commits/d41c17c026e525ef9f97a033d783ea1ccf8c1018))
+* instance size now abstracted ([57c5996](https://bitbucket.org/fishawackdigital/lab-env/commits/57c59962b101ebb6d43debc639ae3deb04e5e660))
+* instance size qusetions now comes after healhchecks ([fd22642](https://bitbucket.org/fishawackdigital/lab-env/commits/fd22642b8e23a6e0bb6f7d5f661d9647be98ce2f))
+* moved setvars to hooks so it processes on config updates aswell as deploys ([1b88516](https://bitbucket.org/fishawackdigital/lab-env/commits/1b88516852ba56000bffce833a094437fa5ef865))
+* remove laravel-vue as separate option ([cbfa13c](https://bitbucket.org/fishawackdigital/lab-env/commits/cbfa13c19019627b0aedc18781209f3dcf01c63f))
+* renamed setvars to setvars-secure to be backwards compatible ([c0edccc](https://bitbucket.org/fishawackdigital/lab-env/commits/c0edcccea465f61b0273c5315c3b19d429555af8))
+* wait for cloudfront dns before testing ([6f0c182](https://bitbucket.org/fishawackdigital/lab-env/commits/6f0c1825ebc6725fc1d92711e35b5e92939abb68))
+
+#### Build Updates
+
+* bumped to latest pipelines ([cff06a5](https://bitbucket.org/fishawackdigital/lab-env/commits/cff06a53321382533a9f30cecedb6afbb2e2832e))
+
 ### 5.7.0-beta.2 (2026-06-11)
 
 #### Features

package/_Test/provision.js

@@ -49,14 +49,7 @@ describe("provision", () => {
 
             process.env.REPO = repo;
 
-            config = await aws.fullstack(
-                repo,
-                [],
-                [],
-                repo,
-                branch,
-                "wordpress",
-            );
+            config = await aws.fullstack(repo, [], repo, branch, "wordpress");
         });
 
         it("Should provision elastic beanstalk environment", async () => {

package/_Test/prune.js

@@ -264,11 +264,14 @@ describe("prune", () => {
                 cfDistributionId,
             );
 
-            // Allow propagation time
-            await new Promise((r) => setTimeout(r, 5000));
-
-            const distributions = await aws.cloudfront.listDistributions();
-            const ids = distributions.map((d) => d.Id);
+            // Poll until the distribution is no longer in the list (eventual consistency)
+            let ids;
+            const deadline = Date.now() + 120000;
+            do {
+                await new Promise((r) => setTimeout(r, 5000));
+                const distributions = await aws.cloudfront.listDistributions();
+                ids = distributions.map((d) => d.Id);
+            } while (ids.includes(cfDistributionId) && Date.now() < deadline);
 
             expect(ids).to.not.include(cfDistributionId);
         });

package/bitbucket-pipelines.yml

@@ -46,6 +46,6 @@ pipelines:
           - docker
   branches:
     master:
-      import: bitbucket-ci:v2.2.0:master
+      import: bitbucket-ci:v2.3.7:master
     beta:
-      import: bitbucket-ci:v2.2.0:beta
+      import: bitbucket-ci:v2.3.7:beta

package/cli.js

@@ -170,6 +170,7 @@ const args = hideBin(process.argv);
                 "delete",
                 "key",
                 "dekey",
+                "rekey",
                 "prune",
                 "sync-secrets",
             ].forEach((d) =>

package/commands/create/cmds/dekey.js

@@ -4,6 +4,7 @@ const aws = require("../services/aws/index.js");
 const {
     setAWSClientDefaults,
 } = require("../../../commands/create/services/aws/misc.js");
+const parallelRunner = require("../libs/parallel-runner.js");
 
 module.exports = [
     "dekey",
@@ -63,16 +64,19 @@ module.exports = [
             clients = answer.clients;
         }
 
-        for (let i = 0; i < clients.length; i++) {
-            let client = clients[i];
+        const batches = clients.map((client) => ({
+            users,
+            client,
+            fn: async (user) => {
+                setAWSClientDefaults(client);
 
-            setAWSClientDefaults(client);
-
-            for (let j = 0; j < users.length; j++) {
-                let user = users[j];
+                await aws.iam.removeIAMUser(`fw-automation-${user}`);
+            },
+        }));
 
-                await aws.iam.removeIAMUser(`fw-automation-${user}`, client);
-            }
-        }
+        await parallelRunner(batches, {
+            concurrency: 10,
+            verb: "Remove credentials",
+        });
     },
 ];

package/commands/create/cmds/deprovision.js

@@ -16,6 +16,11 @@ module.exports = [
             describe: "Branch to configure",
             type: "string",
         });
+        yargs.option("green-blue", {
+            alias: "g",
+            describe: "Teardown a cloned environment (pass source branch name)",
+            type: "string",
+        });
     },
     async (argv) => {
         let branch = argv.branch || _.branch;
@@ -78,6 +83,16 @@ module.exports = [
         // Set AWS client defaults before any AWS operations
         setAWSClientDefaults(answers.client, answers.region);
 
+        if (argv.greenBlue) {
+            await aws.fullstackCloneTerminate(
+                slug,
+                _.repoSafe,
+                branch,
+                argv.greenBlue,
+            );
+            return;
+        }
+
         if (answers.stack === "fullstack") {
             const resourceAnswers = await inquirer.prompt([
                 {
@@ -98,6 +113,18 @@ module.exports = [
                     message: "Delete the OpenSearch domain?",
                     default: false,
                 },
+                {
+                    type: "confirm",
+                    name: "deleteCache",
+                    message: "Delete the ElastiCache cluster?",
+                    default: false,
+                },
+                {
+                    type: "confirm",
+                    name: "deleteMail",
+                    message: "Delete the SES mail credentials?",
+                    default: false,
+                },
                 {
                     type: "confirm",
                     name: "deleteAppSecret",
@@ -110,6 +137,8 @@ module.exports = [
                 deleteStorage: resourceAnswers.deleteStorage,
                 deleteDatabase: resourceAnswers.deleteDatabase,
                 deleteOpenSearch: resourceAnswers.deleteOpenSearch,
+                deleteCache: resourceAnswers.deleteCache,
+                deleteMail: resourceAnswers.deleteMail,
                 deleteAppSecret: resourceAnswers.deleteAppSecret,
             });
         } else {

package/commands/create/cmds/key.js

@@ -1,15 +1,13 @@
 const _ = require("../../../globals.js");
-const utilities = require("../libs/utilities");
 const inquirer = require("inquirer");
 const aws = require("../services/aws/index.js");
-const email = require("../services/email.js");
-const htmlEmail = require("fs").readFileSync(
-    `${__dirname}/../templates/credentials.html`,
-    { encoding: "utf8" },
-);
+const outputCredentials = require("../libs/output-credentials.js");
+const { misc } = require("../libs/vars.js");
 const {
     setAWSClientDefaults,
 } = require("../../../commands/create/services/aws/misc.js");
+const parallelRunner = require("../libs/parallel-runner.js");
+const resolveOperator = require("../libs/resolve-operator.js");
 
 module.exports = [
     "key",
@@ -18,6 +16,8 @@ module.exports = [
         : false,
     () => {},
     async () => {
+        let operator = await resolveOperator();
+
         let users = [];
         let clients = [];
         let sendEmail = false;
@@ -74,32 +74,73 @@ module.exports = [
             {
                 type: "confirm",
                 name: "check",
-                message: `Would you like to email out the credentials after creation (requires office365 credentials in ~/targets/misc.json)?`,
+                message: `Would you like to email out the credentials after creation (requires mail credentials in ~/targets/misc.json)?`,
                 default: "Y",
             },
         ]);
 
         sendEmail = answer.check;
 
-        let credentials = {};
-
-        for (let i = 0; i < clients.length; i++) {
-            let client = clients[i];
+        // Check for SES email credentials if user wants to send emails
+        if (sendEmail && !misc.nodemailer?.AWSSES?.username) {
+            answer = await inquirer.prompt([
+                {
+                    type: "confirm",
+                    name: "check",
+                    message:
+                        "No email credentials found, create them via AWS SES?",
+                    default: "Y",
+                },
+            ]);
 
-            setAWSClientDefaults(client);
+            if (answer.check) {
+                try {
+                    const creds = await aws.ses.ensureOperatorSESCredentials(
+                        operator.username,
+                    );
+
+                    if (creds) {
+                        aws.ses.updateMiscNodemailer(creds);
+                        console.log(
+                            "\n  ✓ SES email credentials created and saved to misc.json\n",
+                        );
+                    } else {
+                        console.log(
+                            "\n  ⚠ SES IAM user exists but keys were already created. Rotate with `fw rekey` to generate new credentials.\n",
+                        );
+                    }
+                } catch (err) {
+                    console.log(
+                        `\n  ⚠ Failed to create SES credentials: ${err.message}\n`,
+                    );
+                }
+            }
+        }
 
-            for (let j = 0; j < users.length; j++) {
-                let user = users[j];
+        let credentials = {};
 
-                if (!credentials[user]) {
-                    credentials[user] = {};
-                }
+        const batches = clients.map((client) => ({
+            users,
+            client,
+            fn: async (user) => {
+                setAWSClientDefaults(client);
 
-                let res = await aws.iam.createFWIAMUser(
+                return aws.iam.createFWIAMUser(
                     `fw-automation-${user}`,
                     _.config.users.find((d) => d.username === user).permissions,
                 );
+            },
+        }));
+
+        const resultsMap = await parallelRunner(batches, {
+            concurrency: 10,
+            verb: "Create credentials",
+        });
+
+        for (const [user, entries] of resultsMap) {
+            credentials[user] = {};
 
+            for (const { client, res } of entries) {
                 credentials[user][client] = {
                     key:
                         (res.AccessKey && res.AccessKey.AccessKeyId) ||
@@ -111,28 +152,6 @@ module.exports = [
             }
         }
 
-        let output = "";
-
-        for (var user in credentials) {
-            output += utilities.colorize(`\n${user}\n`, "title");
-
-            let outputUser = "";
-            for (var client in credentials[user]) {
-                outputUser += `\n[${client}]\n`;
-                outputUser += `aws_access_key_id = ${credentials[user][client].key}\n`;
-                outputUser += `aws_secret_access_key = ${credentials[user][client].secret}\n`;
-            }
-            output += outputUser;
-
-            if (sendEmail) {
-                await email.send(
-                    _.config.users.find((d) => d.username === user).email,
-                    "New AWS Keys",
-                    `${htmlEmail}<pre><code>${outputUser.replace(/\n/g, "<br>")}</code></pre>`,
-                );
-            }
-        }
-
-        console.log(output);
+        await outputCredentials(credentials, sendEmail);
     },
 ];