@fishawack/lab-env 5.7.0-beta.7 → 5.7.0-beta.8

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## Changelog
 
+### 5.7.0-beta.8 (2026-07-08)
+
+#### Bug Fixes
+
+* added restart queue to config post deploy ([397a138](https://bitbucket.org/fishawackdigital/lab-env/commits/397a138c46d45e4e437820f0e14e574bda19ea74))
+* fail deprov if env goes back to ready ([e3dc73f](https://bitbucket.org/fishawackdigital/lab-env/commits/e3dc73fb21cc0a9d5f356d0f9c1d88d08cfdf13b))
+* handle double hypen name safe values to always enforce only a single ([4a18dde](https://bitbucket.org/fishawackdigital/lab-env/commits/4a18dde460d49e5034f5952977c5fa5727d02126))
+* increase timeout on test suits before call ([a0a31c8](https://bitbucket.org/fishawackdigital/lab-env/commits/a0a31c89e7d548a13e0f0ecdf1c591a1e2463506))
+* moved setvars config update to prebuild for consistency ([64483d0](https://bitbucket.org/fishawackdigital/lab-env/commits/64483d0473f2c3f449a55f0f6fe6ee1e565c12a9))
+* simpler queue worker ([4ecc62d](https://bitbucket.org/fishawackdigital/lab-env/commits/4ecc62df734c9aabdbaec1db6ea87c80169128b3))
+
 ### 5.7.0-beta.7 (2026-07-03)
 
 #### Bug Fixes

package/_Test/boilerplate-adonis.js

@@ -12,7 +12,7 @@ const execSync = require("child_process").execSync;
 
 describe("deploy", () => {
     before(function () {
-        this.timeout(60000 * 10);
+        this.timeout(60000 * 20);
 
         execSync(
             `git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`,

package/_Test/boilerplate-craftcms.js

@@ -12,7 +12,7 @@ const execSync = require("child_process").execSync;
 
 describe("deploy", () => {
     before(function () {
-        this.timeout(60000 * 10);
+        this.timeout(60000 * 20);
 
         execSync(
             `git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`,

package/_Test/boilerplate-drupal.js

@@ -12,7 +12,7 @@ const execSync = require("child_process").execSync;
 
 describe("deploy", () => {
     before(function () {
-        this.timeout(60000 * 10);
+        this.timeout(60000 * 20);
 
         execSync(
             `git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`,

package/_Test/boilerplate-laravel.js

@@ -12,7 +12,7 @@ const execSync = require("child_process").execSync;
 
 describe("deploy", () => {
     before(function () {
-        this.timeout(60000 * 10);
+        this.timeout(60000 * 20);
 
         execSync(
             `git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`,

package/_Test/boilerplate-python.js

@@ -12,7 +12,7 @@ const execSync = require("child_process").execSync;
 
 describe("deploy", () => {
     before(function () {
-        this.timeout(60000 * 10);
+        this.timeout(60000 * 20);
 
         execSync(
             `git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`,

package/_Test/boilerplate-wordpress.js

@@ -12,7 +12,7 @@ const execSync = require("child_process").execSync;
 
 describe("deploy", () => {
     before(function () {
-        this.timeout(60000 * 10);
+        this.timeout(60000 * 20);
 
         execSync(
             `git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`,

package/_Test/boilerplate.js

@@ -12,7 +12,7 @@ const execSync = require("child_process").execSync;
 
 describe("deploy", () => {
     before(function () {
-        this.timeout(60000 * 10);
+        this.timeout(60000 * 20);
 
         execSync(
             `git -C _Test/_fixtures clone git@bitbucket.org:fishawackdigital/${repo}`,

package/commands/create/libs/utilities.js

@@ -142,12 +142,14 @@ module.exports.nameSafe = (name, service = "s3") => {
 
     safe = safe.substring(0, maxLength - suffix.length - prefix.length);
     safe = safe.replace(/[^a-zA-Z0-9-_. ]/g, ""); // Remove special chars except . _ - as these are all transformed into -
+    safe = safe.replace(/-+$/, ""); // Strip trailing hyphens before suffix is appended
     safe = safe.toLowerCase();
     safe = `${prefix}${safe}`;
     safe = `${safe}${suffix}`;
     safe = safe.replace(/\./g, "-");
     // eslint-disable-next-line no-useless-escape
     safe = safe.replace(/\_/g, "-");
+    safe = safe.replace(/--+/g, "-"); // Collapse any consecutive hyphens
 
     return safe;
 };

package/commands/create/libs/vars.js

@@ -584,6 +584,7 @@ module.exports.eb = {
                 ".ebextensions/laravel/rds-ssl.config",
                 ".ebextensions/laravel/software.config",
                 ".platform/hooks/postdeploy/restart_queue.sh",
+                ".platform/confighooks/postdeploy/restart_queue.sh",
             ],
         },
         adonis: {
@@ -606,7 +607,7 @@ module.exports.eb = {
         },
         shared: [
             ".platform/hooks/prebuild/setvars.sh",
-            ".platform/confighooks/postdeploy/setvars.sh",
+            ".platform/confighooks/prebuild/setvars.sh",
             ".ebextensions/misc/asg-self-healing.config",
             ".ebextensions/misc/alb-http-to-https-redirection.config",
             ".ebextensions/misc/enable-https-lb.config",

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

@@ -186,6 +186,7 @@ module.exports.removeElasticBeanstalkEnvironment = async (name) => {
             return module.exports.waitForElasticBeanstalkEnvironment(
                 name,
                 "Terminated",
+                "Ready",
             );
         },
     );
@@ -265,7 +266,7 @@ module.exports.copyElasticBeanstalkConfigs = async (configurations, branch) => {
         }
     }
 
-    fs.outputFileSync(checksumPath, JSON.stringify(checksums, null, 2));
+    fs.outputFileSync(checksumPath, JSON.stringify(checksums, null, 4) + "\n");
 
     fs.outputFileSync(
         `_IaC/${branch}/.elasticbeanstalk/config.yml`,

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

@@ -1617,7 +1617,10 @@ module.exports.fullstackTerminate = async (
                     );
                     return res.DBInstances[0];
                 } catch (e) {
-                    if (e.name === "DBInstanceNotFoundFault") {
+                    if (
+                        e.name === "DBInstanceNotFoundFault" ||
+                        e.name === "InvalidParameterValue"
+                    ) {
                         return { DBInstanceStatus: "deleted" };
                     }
                     throw e;
@@ -1640,7 +1643,10 @@ module.exports.fullstackTerminate = async (
                     );
                     return DomainStatus;
                 } catch (e) {
-                    if (e.name === "ResourceNotFoundException") {
+                    if (
+                        e.name === "ResourceNotFoundException" ||
+                        e.name === "ValidationException"
+                    ) {
                         return { deleted: true };
                     }
                     throw e;
@@ -1664,7 +1670,10 @@ module.exports.fullstackTerminate = async (
                     );
                     return ReplicationGroups[0];
                 } catch (e) {
-                    if (e.name === "ReplicationGroupNotFoundFault") {
+                    if (
+                        e.name === "ReplicationGroupNotFoundFault" ||
+                        e.name === "InvalidParameterValue"
+                    ) {
                         return { deleted: true };
                     }
                     throw e;

package/commands/create/templates/elasticbeanstalk/.ebextensions/laravel/queue-worker.config

@@ -13,7 +13,7 @@ files:
       Group=webapp
       WorkingDirectory=/var/app/current
       EnvironmentFile=/etc/sysconfig/env
-      ExecStart=/usr/bin/php /var/app/current/artisan queue:work database --queue=streaming,default --timeout=620 --tries=1
+      ExecStart=/usr/bin/php /var/app/current/artisan queue:work --timeout=620 --tries=1
       Restart=always
       RestartSec=5
       StandardOutput=append:/var/log/queue-worker.log

package/commands/create/templates/elasticbeanstalk/.platform/confighooks/postdeploy/restart_queue.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -e
+
+systemctl restart queue-worker

package/package.json

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