Release/2.1.1 hotfix (#203)

* Hotfix bugs that solve critical deployment or runtime errors

* Fix documentation spelling

* Prettier fix

* Npm audit fix

* Fix GitHub build environment versions

* GitHub and dependency upgrade fix for CI/CD

Author: scheurik

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
             - name: Setup Python Version
               uses: actions/setup-python@v2
               with:
-                  python-version: 3.10.11
+                  python-version: 3.12.0
 
             - name: Setup node for the whole package
               uses: actions/setup-node@v3
@@ -67,6 +67,7 @@ jobs:
                   dir: "vams/web"
                   cmd: install
 
+            #####
             # - name: Run yarn audit web directory
             #   uses: Borales/[email protected]
             #   with:
@@ -78,6 +79,7 @@ jobs:
             #   env:
             #       CI: "true"
             #   run: npm run test
+            #####
 
             - name: Web build
               working-directory: vams/web
@@ -98,7 +100,9 @@ jobs:
               run: |
                   CDK_NAG_ENABLED=true
                   export REGION=us-east-1
-                  npx cdk synth
+                  npm -g uninstall aws-cdk
+                  npm -g install aws-cdk
+                  cdk synth
 
             - name: eslint
               working-directory: vams
@@ -114,6 +118,8 @@ jobs:
               with:
                   input_path: vams/infra/cdk.out/vams-core-prod-us-east-1.template.json
 
+            #####
             #- name: run checks
             #  working-directory: vams/backend
             #  run: make all
+            #####

.prettierrc

@@ -3,5 +3,6 @@
     "tabWidth": 4,
     "arrowParens": "always",
     "singleQuote": false,
-    "bracketSpacing": true
+    "bracketSpacing": true,
+    "endOfLine": "auto"
 }

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.1.1] (2025-01-17)
+
+This hotfix version includes bug fixes related to dependency tools and library updates.
+
+### Bug Fixes
+
+-   Fixed and added Poetry export plugin library used during Lambda layer building due to Poetry no longer including "export" as part of the core library.
+-   Fixed Dockerfile container environment variable formats to no longer use the deprecated Docker format. `ENV KEY VALUE` -> `ENV KEY=VALUE`
+-   Fixed 3D Metadata Labeling pipeline use-case to use the latest Blender version due to Alpine APK support deprecation for earlier specified versions.
+-   Fixed 3D Metadata Labeling pipeline use-case state machine Lambda to not hard-code the `us-east-1` region for IAM role resource permission and use the stack-deployed region instead.
+
 ## [2.1.0] (2024-11-15)
 
 This minor version includes changes to VAMS pipelines, use-case pipeline implementations, and v2.0 bug fixes.

backendPipelines/genAi/metadata3dLabeling/container/Dockerfile_BlenderRenderer

@@ -4,11 +4,11 @@
 FROM --platform=linux/amd64 public.ecr.aws/docker/library/python:3.12-alpine
 
 #Install blender + openCV (has all the libraries needed for blender rendering)
-RUN apk add --no-cache blender=4.1.1-r2 py3-numpy py3-opencv
+RUN apk add --no-cache blender py3-numpy py3-opencv
 
 # python environment varibles
-ENV PYTHONDONTWRITEBYTECODE 1
-ENV PYTHONUNBUFFERED 1
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
 
 # copy python scripts app to container
 COPY ./ ./

backendPipelines/preview/pcPotreeViewer/container/Dockerfile_PDAL

@@ -54,15 +54,15 @@ RUN conda-pack -n pdal --dest-prefix=/opt/conda/envs/pdal -o  /tmp/env.tar && \
 
 FROM condaforge/miniforge3
 
-ENV CONDAENV "/opt/conda/envs/pdal"
+ENV CONDAENV="/opt/conda/envs/pdal"
 COPY --from=build /venv "/opt/conda/envs/pdal"
 
 ENV PROJ_NETWORK=TRUE
 ENV PROJ_DATA="${CONDAENV}/share/proj"
 ENV GDAL_DATA="${CONDAENV}/share/gdal"
 ENV GEOTIFF_CSV="${CONDAENV}/share/epsg_csv"
 ENV GDAL_DRIVER_PATH="${CONDAENV}/lib/gdalplugins"
-ENV PATH $PATH:${CONDAENV}/bin
+ENV PATH=$PATH:${CONDAENV}/bin
 ENV GTIFF_REPORT_COMPD_CS=TRUE
 ENV REPORT_COMPD_CS=TRUE
 ENV OAMS_TRADITIONAL_GIS_ORDER=TRUE

backendPipelines/preview/pcPotreeViewer/container/Dockerfile_Potree

@@ -34,8 +34,8 @@ RUN make && \
     rm -rf /PotreeConverter
 
 # python environment varibles
-ENV PYTHONDONTWRITEBYTECODE 1
-ENV PYTHONUNBUFFERED 1
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
 
 # copy python scripts app to container
 COPY ./ ./pc_pipeline

infra/lib/core-stack.ts

@@ -403,7 +403,8 @@ export class CoreVAMSStack extends cdk.Stack {
                     fn.runtime.name === "python3.10" ||
                     fn.runtime.name === "python3.11" ||
                     fn.runtime.name === "python3.12" ||
-                    fn.runtime.name === "nodejs18.x"
+                    fn.runtime.name === "nodejs18.x" ||
+                    fn.runtime.name === "nodejs20.x"
                 ) {
                     //console.log(item.node.path,fn.runtime.name)
                     NagSuppressions.addResourceSuppressions(fn, [

infra/lib/helper/lambda.ts

@@ -14,6 +14,7 @@ export function layerBundlingCommand(): string {
     return [
         "pip install --upgrade pip",
         "pip install poetry",
+        "pip install poetry-plugin-export",
         "poetry export --without-hashes --format=requirements.txt > requirements.txt",
         "pip install -r requirements.txt -t /asset-output/python",
         "rsync -rLv ./ /asset-output/python",

infra/lib/nestedStacks/pipelines/genAi/metadata3dLabeling/lambdaBuilder/metadata3dLabelingFunctions.ts

@@ -214,7 +214,9 @@ export function buildMetadataGenerationPipelineFunction(
         effect: iam.Effect.ALLOW,
         actions: ["bedrock:InvokeModel", "bedrock:InvokeModelWithResponseStream"],
         resources: [
-            "arn:aws:bedrock:us-east-1::foundation-model/anthropic.claude-3-sonnet-20240229-v1:0",
+            "arn:aws:bedrock:" +
+                config.env.region +
+                "::foundation-model/anthropic.claude-3-sonnet-20240229-v1:0",
         ],
     });
     fun.addToRolePolicy(bedrockPolicy);