wip: testing out production urls

.circleci/config.yml

@@ -79,10 +79,6 @@ commands:
       - run:
           command: |
             pnpm jest --clearCache
-  increment-docker-version:
-    description: Increment Docker Version
-    steps:
-      - run: ~/project/.circleci/config/commands/increment-docker-version.sh
   install-cypher-shell:
     steps:
       - run:
@@ -112,10 +108,15 @@ commands:
             - ~/.nvm
       - run:
           command: |
+            source $BASH_ENV
             nvm install 22.14.0
             nvm alias default 22.14.0
             node -v
             which node
+            npm -v
+            which npm
+            npx -v
+            which npx
           name: Set Node Version
   install-packages:
     steps:
@@ -225,7 +226,6 @@ commands:
           keys:
             - nvm-cache-{{ checksum ".nvmrc" }}
           name: Restore NVM Cache
-      - load-nvm
       - install-pnpm
       - setup-env
   restore-workspace-database:
@@ -247,7 +247,6 @@ commands:
           keys:
             - nvm-cache-{{ checksum ".nvmrc" }}
           name: Restore NVM Cache
-      - load-nvm
       - install-pnpm
       - install-cypher-shell
       - setup-env
@@ -601,10 +600,10 @@ jobs:
     resource_class: large
     steps:
       - checkout
+      - install-nvm
       - install-terraform
-      - increment-docker-version
+      - setup-env
       - login-docker
-      - increment-docker-version
       - persist_to_workspace:
           paths:
             - .docker/config.json
@@ -621,8 +620,8 @@ jobs:
     resource_class: << parameters.resource_class >>
     steps:
       - checkout
-      - setup-env
       - install-nvm
+      - setup-env
       - install-pnpm
       - install-packages
   tf-apply:
@@ -951,7 +950,7 @@ workflows:
               only:
                 - staging
           requires:
-            - tf-apply-ci
+            - setup-infra-workspace
       - docker-api:
           context:
             - prod
@@ -960,7 +959,7 @@ workflows:
               only:
                 - staging
           requires:
-            - tf-apply-ci
+            - setup-infra-workspace
       - docker-sites:
           context:
             - prod
@@ -969,7 +968,7 @@ workflows:
               only:
                 - staging
           requires:
-            - tf-apply-ci
+            - setup-infra-workspace
       - docker-landing:
           context:
             - prod
@@ -1006,4 +1005,102 @@ workflows:
           requires:
             - hold-apply
           stage: prod
+  infra-pr-tag:
+    jobs:
+      - setup-infra-workspace:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+      - tf-plan:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          name: tf-plan-ci
+          requires:
+            - setup-infra-workspace
+          stage: ci
+      - tf-apply:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          name: tf-apply-ci
+          requires:
+            - tf-plan-ci
+          stage: ci
+      - docker-web:
+          context:
+            - prod
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          requires:
+            - setup-infra-workspace
+      - docker-api:
+          context:
+            - prod
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          requires:
+            - setup-infra-workspace
+      - docker-sites:
+          context:
+            - prod
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          requires:
+            - setup-infra-workspace
+      - docker-landing:
+          context:
+            - prod
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          requires:
+            - setup-infra-workspace
+      - tf-plan:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          requires:
+            - docker-web
+            - docker-api
+            - docker-sites
+            - docker-landing
+          stage: prod
+      - hold-apply:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          requires:
+            - tf-plan
+          type: approval
+      - tf-apply:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^[0-9]+\.[0-9]+\.[0-9]+$/
+          requires:
+            - hold-apply
+          stage: prod
 working_directory: ~/project

.circleci/config/commands/install-nvm.yml

@@ -15,7 +15,12 @@ steps:
   - run:
       name: 'Set Node Version'
       command: |
+        source $BASH_ENV
         nvm install 22.14.0
         nvm alias default 22.14.0
         node -v
         which node
+        npm -v
+        which npm
+        npx -v
+        which npx

.circleci/config/commands/restore-workspace-database.yml

@@ -17,7 +17,6 @@ steps:
       name: 'Restore NVM Cache'
       keys:
         - nvm-cache-{{ checksum ".nvmrc" }}
-  - load-nvm
   - install-pnpm
   - install-cypher-shell
   - setup-env

.circleci/config/commands/restore-workspace.yml

@@ -17,6 +17,5 @@ steps:
       name: 'Restore NVM Cache'
       keys:
         - nvm-cache-{{ checksum ".nvmrc" }}
-  - load-nvm
   - install-pnpm
   - setup-env

.circleci/config/env.sh

@@ -1,9 +1,26 @@
 #!/bin/bash
 
+# Disable exit on error to handle commands that might return non-zero
+set +e
+
 #
 # Git settings
 #
-echo "export GIT_COMMIT_MSG=$(git log --format=format:\"%s\" -n 1 ${CIRCLE_SHA1})" >> $BASH_ENV
+echo "[env.sh] Setting up git commit message..."
+echo "[env.sh] CIRCLE_SHA1: ${CIRCLE_SHA1:-not set}"
+if [ -n "$CIRCLE_SHA1" ]; then
+  GIT_MSG=$(git log --format=format:"%s" -n 1 "$CIRCLE_SHA1" 2>&1) || {
+    echo "[env.sh] ERROR: Failed to get commit message for $CIRCLE_SHA1"
+    echo "[env.sh] Error: $GIT_MSG"
+    # Use HEAD as fallback
+    GIT_MSG=$(git log --format=format:"%s" -n 1 HEAD 2>&1) || GIT_MSG="Unknown commit"
+  }
+else
+  echo "[env.sh] CIRCLE_SHA1 not set, using HEAD"
+  GIT_MSG=$(git log --format=format:"%s" -n 1 HEAD 2>&1) || GIT_MSG="Unknown commit"
+fi
+echo "export GIT_COMMIT_MSG=\"$GIT_MSG\"" >> $BASH_ENV
+echo "[env.sh] Git commit message: $GIT_MSG"
 
 #
 # Global environments
@@ -47,6 +64,66 @@ else
   echo "export SLACK_PARAM_MENTIONS=\<@${SLACK_WEBBER}\>" >> $BASH_ENV
 fi
 
+#
+# Docker tag version from git tags
+#
+echo "[env.sh] Checking for git tags..."
+# Check if we're in a git repository
+if ! git rev-parse --git-dir > /dev/null 2>&1; then
+  echo "[env.sh] ERROR: Not in a git repository"
+  echo "[env.sh] Current directory: $(pwd)"
+  exit 1
+fi
+
+# Get current HEAD SHA
+echo "[env.sh] Current HEAD: $(git rev-parse HEAD 2>&1 || echo 'Failed to get HEAD')"
+
+# List all tags for debugging
+echo "[env.sh] All tags pointing to HEAD:"
+git tag --points-at HEAD 2>&1 || echo "[env.sh] Failed to get tags"
+
+# Get semantic version tags
+VERSION_TAG=$(git tag --points-at HEAD 2>/dev/null | grep -E "^[0-9]+\.[0-9]+\.[0-9]+$" | head -1 || true)
+echo "[env.sh] Version tag found: '${VERSION_TAG:-none}'"
+
+# Check if validate-semver.js exists
+if [ ! -f "./scripts/validate-semver.js" ]; then
+  echo "[env.sh] ERROR: validate-semver.js not found at ./scripts/validate-semver.js"
+  echo "[env.sh] Current directory: $(pwd)"
+  echo "[env.sh] Contents of scripts directory:"
+  ls -la ./scripts/ 2>&1 || echo "scripts directory not found"
+  exit 1
+fi
+
+echo "[env.sh] Running validate-semver.js..."
+
+# Run validate-semver.js directly with node
+SEMVER_CMD="node ./scripts/validate-semver.js \"$VERSION_TAG\""
+echo "[env.sh] Command: $SEMVER_CMD"
+
+# Run the command and capture both stdout and stderr
+SEMVER_OUTPUT=$(eval "$SEMVER_CMD" 2>&1)
+SEMVER_EXIT_CODE=$?
+
+if [ $SEMVER_EXIT_CODE -ne 0 ]; then
+  echo "[env.sh] ERROR: validate-semver.js failed with exit code: $SEMVER_EXIT_CODE"
+  echo "[env.sh] Output: $SEMVER_OUTPUT"
+  # Don't exit, continue with || true behavior
+else
+  echo "[env.sh] validate-semver.js succeeded"
+  # Execute the output commands
+  eval "$SEMVER_OUTPUT"
+fi
+
 # Done
-source $BASH_ENV
+echo "[env.sh] Sourcing BASH_ENV..."
+if [ -f "$BASH_ENV" ]; then
+  source $BASH_ENV
+  echo "[env.sh] BASH_ENV sourced successfully"
+else
+  echo "[env.sh] ERROR: BASH_ENV file not found at: $BASH_ENV"
+  exit 1
+fi
+
+echo "[env.sh] env.sh completed successfully"
 

.circleci/config/install-nvm.sh

@@ -7,3 +7,6 @@ echo 'source $NVM_DIR/nvm.sh' >> $BASH_ENV
 if [ ! -d "$NVM_DIR" ]; then
   wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
 fi
+
+# Source BASH_ENV to make nvm available in current shell
+source $BASH_ENV

.circleci/config/jobs/setup-infra-workspace.yml

@@ -2,11 +2,11 @@ executor: docker-node
 resource_class: large
 steps:
   - checkout
+  - install-nvm
   - install-terraform
-  - increment-docker-version
-  # - install-packer
+  - setup-env
   - login-docker
-  - increment-docker-version
+
   - persist_to_workspace:
       root: ~/
       # Persists the docker login