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

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 ## Changelog
 
+### 5.7.0-beta.5 (2026-07-03)
+
+#### Bug Fixes
+
+* allow rekey outside of projects ([94b511b](https://bitbucket.org/fishawackdigital/lab-env/commits/94b511b629fbf80b842a9ab5db9f3671f1f603f0))
+* retry on rate limits and aws errors on key commands ([0244221](https://bitbucket.org/fishawackdigital/lab-env/commits/0244221b8a263256f015380280024c862213b885))
+* safe check for misc bitbucket vars ([cee035c](https://bitbucket.org/fishawackdigital/lab-env/commits/cee035c25f927d1b5f55c00f10fa35f08733e4bf))
+
+### 5.7.0-beta.4 (2026-07-03)
+
+#### Bug Fixes
+
+* added missing ses permission for fullstack roles ([9da2562](https://bitbucket.org/fishawackdigital/lab-env/commits/9da256264ef3ac923bcf4acf0b531e28c3aa154f))
+* correctly tag iam ec2 role for eb with tags ([204aced](https://bitbucket.org/fishawackdigital/lab-env/commits/204acedd6f63af0b6c72875b12b6e97660dfa6a3))
+* safe check the fail property on scans as sometimes the file doesnt exist ([e5b5e39](https://bitbucket.org/fishawackdigital/lab-env/commits/e5b5e39251e6c1c22ec7f9cf155ad5c86492e9cb))
+* session domain now the domain given exactly ([8071c91](https://bitbucket.org/fishawackdigital/lab-env/commits/8071c911a54c869661469fe2fdcdcc3ffc10cb2b))
+
 ### 5.7.0-beta.3 (2026-07-01)
 
 #### Features

package/commands/create/libs/parallel-runner.js

@@ -3,6 +3,33 @@ const chalk = require("chalk");
 const { Spinner } = require("./utilities");
 
 const SPINNER_FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+const MAX_RETRIES = 15;
+const INITIAL_DELAY = 2000;
+const MAX_DELAY = 60000;
+
+const RETRYABLE_ERRORS = [
+    "Throttling",
+    "ThrottlingException",
+    "TooManyRequestsException",
+    "RequestLimitExceeded",
+    "ServiceUnavailable",
+    "InternalFailure",
+    "RequestTimeout",
+    "RequestTimeoutException",
+];
+
+function isRetryable(err) {
+    if (
+        RETRYABLE_ERRORS.includes(err.name) ||
+        RETRYABLE_ERRORS.includes(err.Code)
+    ) {
+        return true;
+    }
+
+    const statusCode = err.$metadata?.httpStatusCode;
+
+    return statusCode === 429 || statusCode === 503 || statusCode === 500;
+}
 
 function formatElapsed(ms) {
     const secs = Math.floor(ms / 1000);
@@ -78,7 +105,20 @@ module.exports = async function parallelRunner(
                 continue;
             }
 
-            if (state.status === "active") {
+            if (state.status === "retrying") {
+                const remaining = Math.max(
+                    0,
+                    Math.ceil(
+                        (state.retryDelay - (Date.now() - state.retryStart)) /
+                            1000,
+                    ),
+                );
+                lines.push(
+                    chalk.yellow(
+                        `  ↻ ${verb}: ${user} - ${state.client} (${state.batchesDone + 1}/${totalBatches}) retry ${state.retryAttempt}/${MAX_RETRIES} ${remaining}s`,
+                    ),
+                );
+            } else if (state.status === "active") {
                 const taskElapsed = Date.now() - state.taskStart;
                 let suffix = "";
                 if (taskElapsed > 5000) {
@@ -130,24 +170,58 @@ module.exports = async function parallelRunner(
             const groupUsers = group.filter((u) => batch.users.includes(u));
 
             await Promise.all(
-                groupUsers.map(async (user) => {
+                groupUsers.map(async (user, userIndex) => {
                     const state = groupStates.get(user);
                     state.client = batch.client;
-                    state.status = "active";
                     state.taskStart = Date.now();
 
-                    try {
-                        const res = await batch.fn(user);
-                        results.get(user).push({ client: batch.client, res });
-                        state.status = "done";
-                    } catch (err) {
-                        state.status = "error";
-                        state.hasError = true;
-                        state.errorMsg = err.message || String(err);
-                        errors.push({ user, client: batch.client, error: err });
-                    } finally {
-                        state.batchesDone++;
+                    for (let attempt = 0; attempt <= MAX_RETRIES; attempt++) {
+                        state.status = "active";
+                        state.taskStart = Date.now();
+
+                        try {
+                            const res = await batch.fn(user);
+                            results
+                                .get(user)
+                                .push({ client: batch.client, res });
+                            state.status = "done";
+                            state.retryAttempt = 0;
+                            break;
+                        } catch (err) {
+                            if (!isRetryable(err) || attempt === MAX_RETRIES) {
+                                state.status = "error";
+                                state.hasError = true;
+                                state.errorMsg = err.message || String(err);
+                                errors.push({
+                                    user,
+                                    client: batch.client,
+                                    error: err,
+                                });
+                                break;
+                            }
+
+                            let delay = Math.min(
+                                INITIAL_DELAY * Math.pow(2, attempt),
+                                MAX_DELAY,
+                            );
+                            // Stagger retries per user to avoid thundering herd
+                            delay +=
+                                Math.floor(Math.random() * delay * 0.3) +
+                                userIndex * 1000;
+
+                            state.status = "retrying";
+                            state.retryAttempt = attempt + 1;
+                            state.retryDelay = delay;
+                            state.retryStart = Date.now();
+                            throttleCount++;
+
+                            await new Promise((resolve) =>
+                                setTimeout(resolve, delay),
+                            );
+                        }
                     }
+
+                    state.batchesDone++;
                 }),
             );
         }

package/commands/create/libs/vars.js

@@ -68,17 +68,17 @@ const bitbucketApi = (module.exports.bitbucketApi =
     "https://api.bitbucket.org/2.0/repositories");
 
 module.exports.apis = {
-    bbWorkspaceAPI: `${bitbucketApi}/${misc.bitbucket.workspace}`,
+    bbWorkspaceAPI: `${bitbucketApi}/${misc?.bitbucket?.workspace}`,
 };
 
 // URLs
 module.exports.urls = {
-    bitbucketSSH: `git@bitbucket.org:${misc.bitbucket.workspace}`,
+    bitbucketSSH: `git@bitbucket.org:${misc?.bitbucket?.workspace}`,
 };
 
 // Request Headers
 module.exports.headers = {
-    bbHeaders: encode(misc.bitbucket.username, misc.bitbucket.token),
+    bbHeaders: encode(misc?.bitbucket?.username, misc?.bitbucket?.token),
 };
 
 // Required global node modules

package/commands/create/services/aws/iam.js

@@ -170,6 +170,7 @@ module.exports.syncFWIAMPolicies = async (
             "arn:aws:iam::aws:policy/AmazonRDSFullAccess",
             "arn:aws:iam::aws:policy/AmazonElastiCacheFullAccess",
             "arn:aws:iam::aws:policy/SecretsManagerReadWrite",
+            "arn:aws:iam::aws:policy/AmazonSESFullAccess",
         );
     }
 
@@ -356,12 +357,20 @@ module.exports.getRole = async (RoleName) => {
     return res;
 };
 
-module.exports.createRole = async (RoleName, AssumeRolePolicyDocument) => {
+module.exports.createRole = async (
+    RoleName,
+    AssumeRolePolicyDocument,
+    Tags,
+) => {
     let res = await Spinner.prototype.simple(
         `Creating the role ${RoleName}`,
         () => {
             return getClient().send(
-                new CreateRoleCommand({ RoleName, AssumeRolePolicyDocument }),
+                new CreateRoleCommand({
+                    RoleName,
+                    AssumeRolePolicyDocument,
+                    ...(Tags && Tags.length ? { Tags } : {}),
+                }),
             );
         },
     );
@@ -369,12 +378,15 @@ module.exports.createRole = async (RoleName, AssumeRolePolicyDocument) => {
     return res;
 };
 
-module.exports.createInstanceProfile = async (InstanceProfileName) => {
+module.exports.createInstanceProfile = async (InstanceProfileName, Tags) => {
     let res = await Spinner.prototype.simple(
         `Creating the instance profile ${InstanceProfileName}`,
         () => {
             return getClient().send(
-                new CreateInstanceProfileCommand({ InstanceProfileName }),
+                new CreateInstanceProfileCommand({
+                    InstanceProfileName,
+                    ...(Tags && Tags.length ? { Tags } : {}),
+                }),
             );
         },
     );
@@ -588,6 +600,7 @@ module.exports.ensureEnvironmentInstanceProfile = async (
     ebSlug,
     s3BucketName,
     opensearchDomainArn,
+    tags,
 ) => {
     const role = `${ebSlug}-role`;
 
@@ -608,9 +621,10 @@ module.exports.ensureEnvironmentInstanceProfile = async (
                     },
                 ],
             }),
+            tags,
         );
 
-        await module.exports.createInstanceProfile(role);
+        await module.exports.createInstanceProfile(role, tags);
         await module.exports.attachRoleToInstanceProfile(role, role);
     }
 

package/commands/create/services/aws/index.js

@@ -814,6 +814,7 @@ module.exports.fullstack = async (
             name,
             s3Slug,
             opensearchDomainArn,
+            tags,
         );
     } else {
         await aws.iam.ensureEBInstanceProfileExists();
@@ -960,11 +961,7 @@ module.exports.fullstack = async (
             ...mailCreds,
             APP_NAME: appName,
             APP_DOMAIN: appDomain,
-            SESSION_DOMAIN: appDomain
-                ? appDomain.split(".").length > 2
-                    ? appDomain.split(".").slice(1).join(".")
-                    : appDomain
-                : undefined,
+            SESSION_DOMAIN: appDomain || undefined,
         },
     );
 
@@ -1099,11 +1096,7 @@ module.exports.fullstack = async (
                 ...cacheData,
                 APP_NAME: appName,
                 APP_DOMAIN: appDomain,
-                SESSION_DOMAIN: appDomain
-                    ? appDomain.split(".").length > 2
-                        ? appDomain.split(".").slice(1).join(".")
-                        : appDomain
-                    : undefined,
+                SESSION_DOMAIN: appDomain || undefined,
             },
         );
 

package/commands/scan.js

@@ -32,7 +32,7 @@ const run = () => {
         });
 
         if (failed) {
-            if (_.coreConfig.attributes.failOnScanErrors) {
+            if (_.coreConfig?.attributes?.failOnScanErrors) {
                 throw new Error(
                     "Scan found issues. Failing the build as failOnScanErrors flag is set to true.",
                 );

package/globals.js

@@ -279,6 +279,7 @@ if (composer && composer.require && composer.require["laravel/framework"]) {
             args[0] !== "new" &&
             args[0] !== "key" &&
             args[0] !== "dekey" &&
+            args[0] !== "rekey" &&
             args[0] !== "lint" &&
             args[0] !== "workspace" &&
             args[0] !== "prune"

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fishawack/lab-env",
-    "version": "5.7.0-beta.3",
+    "version": "5.7.0-beta.5",
     "description": "Docker manager for FW",
     "main": "cli.js",
     "scripts": {