@fishawack/lab-env 5.3.0 → 5.4.0-beta.1

package/commands/create/libs/prompts.js

@@ -76,7 +76,7 @@ module.exports.stack = {
 module.exports.client = {
     type: "list",
     name: "client",
-    message: "Which AWS account should this be deployed too?",
+    message: "Which AWS account should be used?",
     choices: clients.sort(),
     default: 0,
     loop: false,

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

@@ -13,6 +13,9 @@ const {
     PublishFunctionCommand,
     DeleteFunctionCommand,
     DescribeFunctionCommand,
+    ListDistributionsCommand,
+    ListTagsForResourceCommand,
+    ListInvalidationsCommand,
 } = require("@aws-sdk/client-cloudfront");
 const fs = require("fs");
 const { merge } = require("lodash");
@@ -381,3 +384,53 @@ module.exports.removeCloudFrontFunctionAssociation = async (Id) => {
         },
     );
 };
+
+module.exports.listDistributions = async () => {
+    const client = new CloudFrontClient({});
+
+    let distributions = [];
+    let marker;
+
+    do {
+        const res = await client.send(
+            new ListDistributionsCommand({
+                ...(marker ? { Marker: marker } : {}),
+            }),
+        );
+
+        const items = res.DistributionList?.Items || [];
+        distributions = distributions.concat(items);
+        marker = res.DistributionList?.IsTruncated
+            ? res.DistributionList.NextMarker
+            : undefined;
+    } while (marker);
+
+    return distributions;
+};
+
+module.exports.getDistributionTags = async (arn) => {
+    const client = new CloudFrontClient({});
+
+    const res = await client.send(
+        new ListTagsForResourceCommand({ Resource: arn }),
+    );
+
+    return res.Tags?.Items || [];
+};
+
+module.exports.getLatestInvalidationDate = async (distributionId) => {
+    const client = new CloudFrontClient({});
+
+    const res = await client.send(
+        new ListInvalidationsCommand({
+            DistributionId: distributionId,
+            MaxItems: 1,
+        }),
+    );
+
+    const items = res.InvalidationList?.Items || [];
+
+    if (!items.length) return null;
+
+    return items[0].CreateTime;
+};

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

@@ -4,9 +4,13 @@ const {
     ElasticBeanstalkClient,
     CreateApplicationCommand,
     DeleteApplicationCommand,
+    DeleteApplicationVersionCommand,
     CreateEnvironmentCommand,
     TerminateEnvironmentCommand,
     DescribeEnvironmentsCommand,
+    DescribeApplicationsCommand,
+    DescribeApplicationVersionsCommand,
+    CreateApplicationVersionCommand,
     ListAvailableSolutionStacksCommand,
 } = require("@aws-sdk/client-elastic-beanstalk");
 const { Spinner, poll } = require("../../libs/utilities");
@@ -160,3 +164,69 @@ module.exports.copyElasticBeanstalkConfigs = async (configurations) => {
 
     fs.outputFileSync(`.elasticbeanstalk/config.yml`, eb.config());
 };
+
+module.exports.listApplications = async () => {
+    const client = new ElasticBeanstalkClient({});
+
+    const res = await Spinner.prototype.simple(
+        `Retrieving elasticbeanstalk applications`,
+        () => {
+            return client.send(new DescribeApplicationsCommand({}));
+        },
+    );
+
+    return res.Applications || [];
+};
+
+module.exports.listApplicationVersions = async (applicationName) => {
+    const client = new ElasticBeanstalkClient({});
+
+    let versions = [];
+    let nextToken;
+
+    do {
+        const res = await client.send(
+            new DescribeApplicationVersionsCommand({
+                ApplicationName: applicationName,
+                ...(nextToken ? { NextToken: nextToken } : {}),
+            }),
+        );
+
+        versions = versions.concat(res.ApplicationVersions || []);
+        nextToken = res.NextToken;
+    } while (nextToken);
+
+    return versions;
+};
+
+module.exports.createApplicationVersion = async (
+    applicationName,
+    versionLabel,
+) => {
+    const client = new ElasticBeanstalkClient({});
+
+    const res = await client.send(
+        new CreateApplicationVersionCommand({
+            ApplicationName: applicationName,
+            VersionLabel: versionLabel,
+            Process: false,
+        }),
+    );
+
+    return res;
+};
+
+module.exports.deleteApplicationVersion = async (
+    applicationName,
+    versionLabel,
+) => {
+    const client = new ElasticBeanstalkClient({});
+
+    await client.send(
+        new DeleteApplicationVersionCommand({
+            ApplicationName: applicationName,
+            VersionLabel: versionLabel,
+            DeleteSourceBundle: true,
+        }),
+    );
+};

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

@@ -137,6 +137,16 @@ module.exports.syncFWIAMPolicies = async (
             UserName,
             "arn:aws:iam::aws:policy/AmazonOpenSearchServiceFullAccess",
         );
+
+        await module.exports.attachIAMPolicy(
+            UserName,
+            "arn:aws:iam::aws:policy/AmazonOpenSearchServiceFullAccess",
+        );
+
+        await module.exports.attachIAMPolicy(
+            UserName,
+            "arn:aws:iam::aws:policy/AmazonElastiCacheFullAccess",
+        );
     }
 
     if (permissions.includes("manage-users")) {
@@ -472,6 +482,7 @@ module.exports.ensureEBManagedUpdateProfileExists = async () => {
                         "cloudwatch:DeleteAlarms",
                         "cloudwatch:DescribeAlarms",
                         "cloudwatch:PutMetricData",
+                        "elasticache:DescribeReplicationGroups",
                     ],
                     Resource: "*",
                 },

package/eslint.config.js

@@ -79,6 +79,7 @@ module.exports = defineConfig([
                 fixture: "readonly",
                 expect: "readonly",
                 $: "readonly",
+                $$: "readonly",
                 _: "readonly",
             },
         },

package/globals.js

@@ -134,6 +134,7 @@ var opts = { encoding: "utf8", stdio: "inherit", shell: "/bin/bash" };
 const users = {
     core: "node",
     php: "php",
+    python: "py",
 };
 
 try {
@@ -233,7 +234,8 @@ if (composer && composer.require && composer.require["laravel/framework"]) {
             args[0] !== "key" &&
             args[0] !== "dekey" &&
             args[0] !== "lint" &&
-            args[0] !== "workspace"
+            args[0] !== "workspace" &&
+            args[0] !== "prune"
         ) {
             unknownLabEnvConfig(platform, version);
         }
@@ -278,7 +280,8 @@ if (composer && composer.require && composer.require["laravel/framework"]) {
             args[0] !== "key" &&
             args[0] !== "dekey" &&
             args[0] !== "lint" &&
-            args[0] !== "workspace"
+            args[0] !== "workspace" &&
+            args[0] !== "prune"
         ) {
             unknownLabEnvConfig(platform, version);
         }
@@ -352,7 +355,8 @@ if (process.env.FW_NEXT || forced) {
         args[0] !== "key" &&
         args[0] !== "dekey" &&
         args[0] !== "lint" &&
-        args[0] !== "workspace"
+        args[0] !== "workspace" &&
+        args[0] !== "prune"
     ) {
         if (version) {
             unknownLabEnvConfig("core", version);
@@ -712,7 +716,8 @@ if (
     args[0] !== "key" &&
     args[0] !== "dekey" &&
     args[0] !== "lint" &&
-    args[0] !== "workspace"
+    args[0] !== "workspace" &&
+    args[0] !== "prune"
 ) {
     if (!forced) {
         // Stop here if diagnosis either unset or outdated

package/package.json

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

package/python/0/CHANGELOG.md

@@ -0,0 +1,10 @@
+## Changelog
+
+### 1.1.1 (2026-03-11)
+* [Bug] own venv dir so ci can remove correcty
+
+### 1.1.0 (2026-03-11)
+* [Feat] python now uses named user and sets up like other projects
+
+### 1.0.0 (2025-07-21)
+* [Misc] initial commit

package/python/0/Dockerfile

@@ -2,6 +2,15 @@ FROM ghcr.io/astral-sh/uv:python3.13-bookworm AS development
 
 LABEL org.opencontainers.image.authors="Mike Mellor <mike.mellor@avalerehealth.com>"
 
+# Add py user
+RUN useradd -m -G www-data -s /bin/bash py
+
+COPY entrypoint.sh /bin/entrypoint.sh
+RUN chmod +x /bin/entrypoint.sh
+ENTRYPOINT ["/bin/entrypoint.sh"]
+
+CMD ["sleep infinity"]
+
 FROM fishawack/lab-env-python-0:latest AS production
 
 # Copy source code into container

package/python/0/docker-compose.yml

@@ -5,10 +5,11 @@ services:
       target: development
     image: $FW_PYTHON_0_IMAGE:${FW_PYTHON_0_VERSION:-latest}
     working_dir: /workspace
-    command: sleep infinity
     tty: true
     stdin_open: true
-    user: "${USER_UID}:${USER_GID}"
+    init: true
+    networks:
+      - default
     environment:
       - PATH=/workspace/.venv/bin:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
       - UV_NO_CACHE=1
@@ -17,12 +18,18 @@ services:
       - PYTHONUNBUFFERED="1"
       - REPO=${REPO:-}
       - PORT_PY=${PORT_PY:-8000}
+      - FW_ROOT=${FW_ROOT:-}
       - USER_UID=${USER_UID:-0}
       - USER_GID=${USER_GID:-0}
     ports:
       - ${PORT_PY:-8000}:${PORT_PY:-8000}
     volumes:
       - $CWD/:/workspace
+      - venv:/workspace/.venv
+      - $FW_DIR/.ssh:/home/py/.ssh
 networks:
   default:
     driver: "bridge"
+volumes:
+  venv:
+    driver: "local"

package/python/0/entrypoint.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Setting $FW_ROOT will bypass the user switch to py
+if [ -z "$FW_ROOT" ]; then
+    # Set py user id to match host users id so no permission issues outside of docker
+    usermod -u $USER_UID py &>/dev/null
+
+    # Fix access rights to stdout and stderr
+    chown py /proc/self/fd/{1,2}
+
+    # Own the .venv folder otherwise it'll be owned by root/previous py id which will prevent writing
+    chown py /workspace/.venv
+
+    # If bash command then start an non login interactive shell
+    if [[ "$@" == "bash" ]]; then
+        exec su py
+    # Otherwise pipe the command into the non login non interactive shell as a command to exec
+    else
+        exec su py -c "$@"
+    fi
+else
+    echo "Accessing as root"
+    exec "$@"
+fi

package/python/0/package.json

@@ -1,6 +1,6 @@
 {
     "name": "python",
-    "version": "1.0.0",
+    "version": "1.1.1",
     "description": "lab-env docker config for the python module",
     "scripts": {
         "preversion": "docker login",