@fishawack/lab-env 5.1.0 → 5.2.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,48 @@
 ## Changelog
 
+### 5.2.0-beta.2 (2026-01-17)
+
+#### Bug Fixes
+
+* make nginx depend on web server to stop race condition errors ([16f6b11](https://bitbucket.org/fishawackdigital/lab-env/commits/16f6b11592107bcbdd1d2dc5e32cc4312b1e2909))
+* nginx now resolves on request rather than start time to avoid race conditions ([7cb6356](https://bitbucket.org/fishawackdigital/lab-env/commits/7cb6356b5628534aa6487178e1cc988e645b0771))
+* python now has access to webDev commands like install and runs npm test ([44c2cf3](https://bitbucket.org/fishawackdigital/lab-env/commits/44c2cf3d7287ad1c34e87917334a95d565793ab4))
+
+#### Build Updates
+
+* bumped fishawack/lab-env-adonis-0-nginx to 1.0.1 ([337f993](https://bitbucket.org/fishawackdigital/lab-env/commits/337f993c4eac2d1a253c38c87f20d50577d66959))
+* bumped fishawack/lab-env-laravel-8-nginx to 0.1.3 ([5aa1a0e](https://bitbucket.org/fishawackdigital/lab-env/commits/5aa1a0e032319ba1f68117734bbb3ea6a6920148))
+* login to docker before tests ([ee005ff](https://bitbucket.org/fishawackdigital/lab-env/commits/ee005ff06a146ef1060dc8a24ace80e2b94691f5))
+
+### 5.2.0-beta.1 (2026-01-14)
+
+#### Features
+
+* added ignore 4xx and self healing configs to default high avail provision ([d8d2748](https://bitbucket.org/fishawackdigital/lab-env/commits/d8d27484973779e7954a23618f1af98fcb698a7b))
+* can now set region for prov and deprov commands ([2a2d06e](https://bitbucket.org/fishawackdigital/lab-env/commits/2a2d06e8a3bb1fff4b25cea41f1027aa0d6949f7))
+* database now only added if asked for via prompt ([dc890bb](https://bitbucket.org/fishawackdigital/lab-env/commits/dc890bb52bf44cc529a0ec47e621fa0b0eea2d51))
+* flatten environment settings so nested objects can be set together that share conditions ([5bbcc30](https://bitbucket.org/fishawackdigital/lab-env/commits/5bbcc301e93789c6e0bad05e321ff66f80f973cb))
+* objects in environemnt settings now takes a method to allow customization ([d1a2456](https://bitbucket.org/fishawackdigital/lab-env/commits/d1a24567c45ef98840766555debde9932b90ad6c))
+* python now has a self authored based image allowing overriding ([3a3827c](https://bitbucket.org/fishawackdigital/lab-env/commits/3a3827c6b26a14fb204888f86c74494141bf6880))
+* region is now a list rather than free text ([d1eceea](https://bitbucket.org/fishawackdigital/lab-env/commits/d1eceeaad271686b18cb8d8ef786c2b9c9aac070))
+* setup custom managed elasticbeanstalk profile on new prov commands ([75559af](https://bitbucket.org/fishawackdigital/lab-env/commits/75559afbace897eebf380fe66df6d6ab22758fbb))
+* switch subnets and vpc when switching between eu and us python services ([817d60a](https://bitbucket.org/fishawackdigital/lab-env/commits/817d60ade606716184074342c6e1d19a54115140))
+* utilize python self authored image and allow overriding ([a63ae30](https://bitbucket.org/fishawackdigital/lab-env/commits/a63ae30213a7101d9030efe7b2240e8dc1b73053))
+
+#### Bug Fixes
+
+* added missing list tags permission ([bcff194](https://bitbucket.org/fishawackdigital/lab-env/commits/bcff19487d1b26ec2529309925cfb625733e4ed2))
+* deprov no longer prompts for region ([2b3a627](https://bitbucket.org/fishawackdigital/lab-env/commits/2b3a62749463f6280ab52e1e6ed8d24e8d5a8f4a))
+* handle errors on content command ([25e32bb](https://bitbucket.org/fishawackdigital/lab-env/commits/25e32bb78ded523ef25eee2b467dc4be7c05ca5f))
+* only prompt for region on fullstack as cloudfront only supports us-east-1 ([53d8ef7](https://bitbucket.org/fishawackdigital/lab-env/commits/53d8ef7eb85d175ee5e684f34509f83f74a24f48))
+* remove client from method params ([29b8423](https://bitbucket.org/fishawackdigital/lab-env/commits/29b84238c32742044dba867a90616506918a4d3e))
+* use same role for service and managed updates ([4a69f4d](https://bitbucket.org/fishawackdigital/lab-env/commits/4a69f4d20c2231f8cffb95c4790f0e557ba59d57))
+
+#### Build Updates
+
+* bumped fishawack/lab-env-python-0 to 1.0.0 ([21d7da1](https://bitbucket.org/fishawackdigital/lab-env/commits/21d7da1bbdcf932fe74351882282577710bfb81d))
+* updated auto bumped commands to pass linting ([437d2e8](https://bitbucket.org/fishawackdigital/lab-env/commits/437d2e8c9e9d183f955c17a8edb7186dc61f2e0f))
+
 ### 5.1.0 (2025-12-23)
 
 #### Features

package/_Test/key.js

@@ -2,12 +2,17 @@
 
 const expect = require("chai").expect;
 const aws = require("../commands/create/services/aws/index.js");
+const {
+    setAWSClientDefaults,
+} = require("../commands/create/services/aws/misc.js");
 
 describe("key", async () => {
     let account = "fishawack";
 
     before(async () => {
-        let res = await aws.iam.createFWIAMUser("fw-test-user", account);
+        setAWSClientDefaults(account);
+
+        let res = await aws.iam.createFWIAMUser("fw-test-user");
 
         // Wait for key as AWS doesn't provide a way to wait for it to becom eactive
         await new Promise((resolve) => setTimeout(() => resolve(), 10000));
@@ -32,6 +37,6 @@ describe("key", async () => {
         delete process.env.AWS_ACCESS_KEY_ID;
         delete process.env.AWS_SECRET_ACCESS_KEY;
 
-        await aws.iam.removeIAMUser("fw-test-user", account);
+        await aws.iam.removeIAMUser("fw-test-user");
     });
 });

package/_Test/provision.js

@@ -3,6 +3,9 @@
 const expect = require("chai").expect;
 const execSync = require("child_process").execSync;
 const aws = require("../commands/create/services/aws/index.js");
+const {
+    setAWSClientDefaults,
+} = require("../commands/create/services/aws/misc.js");
 var fetch;
 
 describe("provision", () => {
@@ -14,20 +17,14 @@ describe("provision", () => {
 
     describe("static", () => {
         before(async () => {
+            setAWSClientDefaults(account);
+
             fetch = (await import("node-fetch")).default;
 
-            config = await aws.static(
-                name,
-                account,
-                undefined,
-                undefined,
-                repo,
-                branch,
-            );
+            config = await aws.static(name, undefined, undefined, repo, branch);
 
             await aws.s3.addFileToS3Bucket(
                 name,
-                account,
                 "index.html",
                 new TextEncoder().encode("test"),
             );
@@ -38,15 +35,9 @@ describe("provision", () => {
         });
 
         after(async () => {
-            await aws.s3.removeFileToS3Bucket(name, account, "index.html");
+            await aws.s3.removeFileToS3Bucket(name, "index.html");
 
-            await aws.staticTerminate(
-                name,
-                account,
-                repo,
-                branch,
-                config.cloudfront,
-            );
+            await aws.staticTerminate(name, repo, branch, config.cloudfront);
         });
     });
 
@@ -58,7 +49,6 @@ describe("provision", () => {
 
             config = await aws.fullstack(
                 repo,
-                account,
                 [],
                 [],
                 repo,
@@ -74,7 +64,7 @@ describe("provision", () => {
         });
 
         after(async () => {
-            await aws.fullstackTerminate(repo, account, repo, branch);
+            await aws.fullstackTerminate(repo, repo, branch);
 
             execSync(`rm -rf .elasticbeanstalk`, {
                 encoding: "utf8",

package/_Test/s3.js

@@ -2,6 +2,9 @@
 
 const expect = require("chai").expect;
 const s3 = require("../commands/create/services/aws/s3.js");
+const {
+    setAWSClientDefaults,
+} = require("../commands/create/services/aws/misc.js");
 
 describe("s3", () => {
     let repo = "lab-env-test-suite";
@@ -9,11 +12,12 @@ describe("s3", () => {
 
     describe("terminate", () => {
         before(async () => {
-            await s3.createS3Bucket(repo, account);
+            setAWSClientDefaults(account);
+
+            await s3.createS3Bucket(repo);
 
             await s3.addFileToS3Bucket(
                 repo,
-                account,
                 "index.html",
                 new TextEncoder().encode("test"),
             );
@@ -22,10 +26,10 @@ describe("s3", () => {
         it("Should remove all files from bucket during terminate process", async () => {
             let err;
 
-            await s3.emptyS3Bucket(repo, account);
+            await s3.emptyS3Bucket(repo);
 
             try {
-                await s3.removeS3Bucket(repo, account);
+                await s3.removeS3Bucket(repo);
             } catch (e) {
                 err = e;
             }
@@ -35,9 +39,9 @@ describe("s3", () => {
 
         after(async () => {
             try {
-                await s3.removeFileToS3Bucket(repo, account, "index.html");
+                await s3.removeFileToS3Bucket(repo, "index.html");
 
-                await s3.removeS3Bucket(repo, account);
+                await s3.removeS3Bucket(repo);
             } catch {
                 /* empty */
             }

package/adonis/0/docker-compose.yml

@@ -23,6 +23,8 @@ services:
       - $CWD/:/app
     ports:
       - "${PORT_WEB:-8000}:80"
+    depends_on:
+      - node
   node:
     build:
       context: $FW_ADONIS_0_NODE_CONTEXT

package/adonis/0/nginx/CHANGELOG.md

@@ -1,4 +1,7 @@
 ## Changelog
 
+### 0.1.3 (2025-01-17)
+* [fix] nginx now resolves on request rather than start time to avoid race conditions
+
 ### 1.0.0 (2024-06-04)
 * [misc] initial release

package/adonis/0/nginx/nginx.conf

@@ -2,8 +2,12 @@ server {
     listen 80;
     listen [::]:80;
 
+    # Docker embedded DNS
+    resolver 127.0.0.11 ipv6=off valid=10s;
+
     location / {
-        proxy_pass http://node:3333;
+        set $upstream node:3333;
+        proxy_pass http://$upstream;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection 'upgrade';

package/adonis/0/nginx/package.json

@@ -1,10 +1,10 @@
 {
     "name": "nginx",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "lab-env docker config for the nginx module",
     "scripts": {
         "preversion": "docker login",
-        "postversion": "docker buildx build --target development --platform linux/amd64,linux/arm64 -t fishawack/lab-env-adonis-0-nginx:$npm_package_version -t fishawack/lab-env-adonis-0-nginx:latest --push . && git add . && git commit -m \"build: Bumped fishawack/lab-env-adonis-0-nginx to $npm_package_version\""
+        "postversion": "docker buildx build --target development --platform linux/amd64,linux/arm64 -t fishawack/lab-env-adonis-0-nginx:$npm_package_version -t fishawack/lab-env-adonis-0-nginx:latest --push . && git add . && git commit -m \"build: bumped fishawack/lab-env-adonis-0-nginx to $npm_package_version\""
     },
     "author": "Mike Mellor",
     "license": "ISC"

package/bitbucket-pipelines.yml

@@ -41,7 +41,7 @@ pipelines:
           # Install
           - su aws-runner -c 'npm run setup'
           # Test
-          - su aws-runner -c 'npm test'
+          - su aws-runner -c 'docker login $DOCKER_CREDENTIALS && npm test'
         services:
           - docker
   branches:

package/cli.js

@@ -95,7 +95,7 @@ const args = hideBin(process.argv);
             adonis: ["base", "webDev"],
             php: ["base", "webDev"],
             core: ["base", "webDev"],
-            python: ["base"], // Python only gets base commands, no webDev
+            python: ["base", "webDev"], // Python only gets base commands, no webDev
         };
 
         // Config-based command additions

package/commands/content.js

@@ -37,36 +37,47 @@ module.exports = [
         } else {
             _.command("core", `npm run content`);
 
-            if (process.env.HUB_URL) {
-                console.log(`Syncing branch configurations from Hub...`);
-                // TODO: Fetch specific values and map to core config vlaues
-                // TODO: Add migration step of test ui to docs
-                const repository = await findRepository(_.remote);
-                const configurations = await getConfigurations(repository?.id);
+            try {
+                if (process.env.HUB_URL) {
+                    console.log(`Syncing branch configurations from Hub...`);
+                    // TODO: Fetch specific values and map to core config vlaues
+                    // TODO: Add migration step of test ui to docs
+                    const repository = await findRepository(_.remote);
+                    const configurations = await getConfigurations(
+                        repository?.id,
+                    );
 
-                // Remove existing hub configuration files
-                glob.sync("hub.*.*.json").forEach((file) =>
-                    fs.removeSync(file),
-                );
+                    // Remove existing hub configuration files
+                    glob.sync("hub.*.*.json").forEach((file) =>
+                        fs.removeSync(file),
+                    );
 
-                configurations?.forEach(({ config, id, branch }) => {
-                    const filePath = `hub.${branch}.${id}.json`;
+                    configurations?.forEach(({ config, id, branch }) => {
+                        const filePath = `hub.${branch}.${id}.json`;
 
-                    fs.writeFileSync(
-                        filePath,
-                        JSON.stringify(
-                            {
-                                attributes: {
-                                    targets: {
-                                        [branch]: config,
+                        fs.writeFileSync(
+                            filePath,
+                            JSON.stringify(
+                                {
+                                    attributes: {
+                                        targets: {
+                                            [branch]: config,
+                                        },
                                     },
                                 },
-                            },
-                            null,
-                            4,
-                        ),
-                    );
-                });
+                                null,
+                                4,
+                            ),
+                        );
+                    });
+                }
+            } catch (error) {
+                console.log(
+                    utilities.colorize(
+                        `\nUnable to sync configurations from Hub: ${error.message}\n`,
+                        "error",
+                    ),
+                );
             }
         }
     },

package/commands/create/cmds/deprovision.js

@@ -1,8 +1,9 @@
 const _ = require("../../../globals.js");
 const inquirer = require("inquirer");
 const aws = require("../services/aws/index.js");
+const { setAWSClientDefaults } = require("../services/aws/misc.js");
 const utilities = require("../libs/utilities");
-const { stack, client } = require("../libs/prompts.js");
+const { stack, client, region } = require("../libs/prompts.js");
 
 module.exports = [
     ["deprovision", "deprov"],
@@ -47,6 +48,11 @@ module.exports = [
                     },
                 ])),
             };
+        } else {
+            answers = {
+                ...answers,
+                ...(await inquirer.prompt([region])),
+            };
         }
 
         const slug = aws.slug(
@@ -69,9 +75,11 @@ module.exports = [
             process.exit(1);
         }
 
+        // Set AWS client defaults before any AWS operations
+        setAWSClientDefaults(answers.client, answers.region);
+
         await aws[`${answers.stack}Terminate`](
             slug,
-            answers.client,
             _.repoSafe,
             branch,
             answers.id,

package/commands/create/cmds/provision.js

@@ -3,8 +3,9 @@ const utilities = require("../libs/utilities");
 const execSync = require("child_process").execSync;
 const inquirer = require("inquirer");
 const aws = require("../services/aws/index.js");
+const { setAWSClientDefaults } = require("../services/aws/misc.js");
 const generator = require("generate-password");
-const { stack, client } = require("../libs/prompts.js");
+const { stack, client, region } = require("../libs/prompts.js");
 const { frameworks } = require("../libs/vars");
 
 module.exports = [
@@ -56,6 +57,13 @@ module.exports = [
                         message: "What availability is required?",
                         choices: ["low", "high"],
                     },
+                    {
+                        type: "confirm",
+                        name: "database",
+                        message: "Does this site need a database?",
+                        default: true,
+                    },
+                    region,
                 ])),
             };
         }
@@ -123,10 +131,12 @@ module.exports = [
             answers.stack === "static" ? "s3" : "eb",
         );
 
+        // Set AWS client defaults before any AWS operations
+        setAWSClientDefaults(answers.client, answers.region);
+
         try {
             infastructure = await aws[answers.stack](
                 slug,
-                answers.client,
                 [
                     { Key: "repository", Value: _.repo },
                     { Key: "environment", Value: branch },
@@ -137,6 +147,7 @@ module.exports = [
                 branch,
                 answers.framework,
                 answers.availability,
+                answers.database,
             );
         } catch (e) {
             console.log(e.message);

package/commands/create/libs/prompts.js

@@ -81,3 +81,12 @@ module.exports.client = {
     default: 0,
     loop: false,
 };
+
+module.exports.region = {
+    type: "list",
+    name: "region",
+    message: "Which AWS region should be used?",
+    choices: ["us-east-1", "eu-west-1"],
+    default: 0,
+    validate: (input) => !!input.length,
+};

package/commands/create/libs/vars.js

@@ -209,20 +209,37 @@ module.exports.eb = {
                     Value: "internal",
                     Namespace: "aws:ec2:vpc",
                 },
-                {
-                    OptionName: "VPCId",
-                    Value: "vpc-d30bcca8",
-                    Namespace: "aws:ec2:vpc",
-                },
-                {
-                    OptionName: "Subnets",
-                    Value: "subnet-00bf5eda896fdd5c5,subnet-0aa7e40d4701683ae",
-                    Namespace: "aws:ec2:vpc",
-                },
-                {
-                    OptionName: "ELBSubnets",
-                    Value: "subnet-00bf5eda896fdd5c5,subnet-0aa7e40d4701683ae",
-                    Namespace: "aws:ec2:vpc",
+                () => {
+                    const regions = {
+                        "us-east-1": {
+                            VPCId: "vpc-d30bcca8",
+                            Subnets:
+                                "subnet-00bf5eda896fdd5c5,subnet-0aa7e40d4701683ae",
+                        },
+                        "eu-west-1": {
+                            VPCId: "vpc-cc0d9aa9",
+                            Subnets:
+                                "subnet-0e357f06e047e1c10,subnet-0956ffb043535455d",
+                        },
+                    };
+
+                    return [
+                        {
+                            OptionName: "VPCId",
+                            Value: regions[process.env.AWS_REGION].VPCId,
+                            Namespace: "aws:ec2:vpc",
+                        },
+                        {
+                            OptionName: "Subnets",
+                            Value: regions[process.env.AWS_REGION].Subnets,
+                            Namespace: "aws:ec2:vpc",
+                        },
+                        {
+                            OptionName: "ELBSubnets",
+                            Value: regions[process.env.AWS_REGION].Subnets,
+                            Namespace: "aws:ec2:vpc",
+                        },
+                    ];
                 },
                 {
                     OptionName: "AssociatePublicIpAddress",
@@ -499,26 +516,37 @@ module.exports.eb = {
             high: [],
         },
         shared: [
+            {
+                OptionName: "ServiceRole",
+                Value: "lab-env-aws-elasticbeanstalk-service-role",
+                Namespace: "aws:elasticbeanstalk:environment",
+            },
             {
                 OptionName: "IamInstanceProfile",
                 Value: "aws-elasticbeanstalk-ec2-role",
                 Namespace: "aws:autoscaling:launchconfiguration",
             },
-            {
-                OptionName: "HasCoupledDatabase",
-                Value: "true",
-                Namespace: "aws:rds:dbinstance",
-            },
-            {
-                OptionName: "DBEngineVersion",
-                Value: "8.0.43",
-                Namespace: "aws:rds:dbinstance",
-            },
-            {
-                OptionName: "DBPassword",
-                Value: generator.generate({ length: 10, numbers: true }),
-                Namespace: "aws:rds:dbinstance",
-            },
+            ({ database }) =>
+                database && [
+                    {
+                        OptionName: "HasCoupledDatabase",
+                        Value: "true",
+                        Namespace: "aws:rds:dbinstance",
+                    },
+                    {
+                        OptionName: "DBEngineVersion",
+                        Value: "8.0.43",
+                        Namespace: "aws:rds:dbinstance",
+                    },
+                    {
+                        OptionName: "DBPassword",
+                        Value: generator.generate({
+                            length: 10,
+                            numbers: true,
+                        }),
+                        Namespace: "aws:rds:dbinstance",
+                    },
+                ],
         ],
         low: [
             {
@@ -545,7 +573,7 @@ module.exports.eb = {
             },
             {
                 OptionName: "ServiceRoleForManagedUpdates",
-                Value: "AWSServiceRoleForElasticBeanstalkManagedUpdates",
+                Value: "lab-env-aws-elasticbeanstalk-service-role",
                 Namespace: "aws:elasticbeanstalk:managedactions",
             },
             {
@@ -681,13 +709,13 @@ module.exports.eb = {
         high: [
             ".ebextensions/misc/alb-http-to-https-redirection.config",
             ".ebextensions/misc/enable-https-lb.config",
+            ".ebextensions/misc/asg-self-healing.config",
+            ".ebextensions/misc/health-ignore-4xx.config",
         ],
     },
-    merge(
-        type,
-        { framework, availability = "low", platform, language },
-        data = {},
-    ) {
+    merge(type, config, data = {}) {
+        const { framework, availability = "low", platform, language } = config;
+
         return JSON.parse(
             template(
                 JSON.stringify(
@@ -702,6 +730,10 @@ module.exports.eb = {
                             this[type][framework]?.shared,
                             this[type][framework]?.[availability],
                         )
+                        .map((d) =>
+                            typeof d === "function" ? d(config, data) : d,
+                        )
+                        .flat()
                         .filter(Boolean),
                 ),
             )({ ...process.env, ...data }),