Merge pull request #2456 from artilleryio/bernardobridge/art-1607-use-the-right-docker-image-version-in-published-versions-of

ci: use the right docker image version in published artillery versions

Author: bernardobridge

.github/workflows/docker-ecs-worker-image.yml

@@ -2,9 +2,6 @@ name: Build & publish ECS/Fargate worker image to ECR
 
 on:
   workflow_dispatch: 
-  push:
-    branches:
-      - main
   workflow_call:
     inputs:
       ref:

.github/workflows/npm-publish-all-packages-canary.yml

@@ -18,8 +18,18 @@ on:
       - 'packages/artillery-plugin-memory-inspector/**'
 
 jobs:
+  publish-fargate-worker-image:
+    if: "!contains( github.event.head_commit.message, 'ci: release v')"
+    uses: ./.github/workflows/docker-ecs-worker-image.yml
+    permissions:
+      contents: read
+      id-token: write
+    secrets:
+      ECR_WORKER_IMAGE_PUSH_ROLE_ARN: ${{ secrets.ECR_WORKER_IMAGE_PUSH_ROLE_ARN }}
+
   build:
     runs-on: ubuntu-latest
+    if: "!contains( github.event.head_commit.message, 'ci: release v')"
     permissions:
       contents: read
       packages: write
@@ -32,6 +42,9 @@ jobs:
           node-version: '18.x'
           registry-url: 'https://registry.npmjs.org'
           scope: '@artilleryio'
+      - run: node ./github/workflows/scripts/replace-worker-version-in-js-file.js
+        env:
+          COMMIT_SHA: ${{ github.sha }}
       - run: | 
           export COMMIT_SHA=$(git rev-parse --short HEAD)
           node .github/workflows/scripts/replace-package-versions-with-commit-sha.js

.github/workflows/npm-publish-artillery.yml

@@ -6,8 +6,18 @@ on:
     paths:
       - packages/artillery/package.json
 jobs:
+  publish-fargate-worker-image:
+    if: "contains( github.event.head_commit.message, 'ci: release v')"
+    uses: ./.github/workflows/docker-ecs-worker-image.yml
+    permissions:
+      contents: read
+      id-token: write
+    secrets:
+      ECR_WORKER_IMAGE_PUSH_ROLE_ARN: ${{ secrets.ECR_WORKER_IMAGE_PUSH_ROLE_ARN }}
+  
   build:
     if: "contains(github.event.head_commit.message, 'ci: release v')"
+    needs: publish-fargate-worker-image
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -19,7 +29,12 @@ jobs:
           node-version: '18.x'
           registry-url: 'https://registry.npmjs.org'
           scope: '@artilleryio'
-      - run: PACKAGE_FOLDER_NAME=artillery node .github/workflows/scripts/rename-packages-to-correct-version.js
+      - run: node ./github/workflows/scripts/replace-worker-version-in-js-file.js
+        env:
+          COMMIT_SHA: ${{ github.sha }}
+      - run: node .github/workflows/scripts/rename-packages-to-correct-version.js
+        env:
+          PACKAGE_FOLDER_NAME: artillery
       - run: npm -w artillery publish --tag latest
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/scripts/replace-worker-version-in-js-file.js

@@ -0,0 +1,32 @@
+const fs = require('fs');
+const path = require('path');
+
+const commitSha = process.env.COMMIT_SHA;
+
+const filePath = path.join(
+  __dirname,
+  '../../../packages/artillery/lib/platform/aws-ecs/legacy/constants.js'
+);
+
+try {
+  let content = fs.readFileSync(filePath, 'utf8');
+
+  // This regex matches "const DEFAULT_IMAGE_TAG" followed by any characters, and then an equal sign and more characters
+  // until it reaches a semicolon or end of the line
+  const regex = /const DEFAULT_IMAGE_TAG\s*=\s*(['"])[^'"]*?\1/;
+  const replacement = `const DEFAULT_IMAGE_TAG = '${commitSha}'`; // Replace with commitSha in single quotes
+  content = content.replace(regex, replacement);
+
+  // Write the modified content back to the file
+  fs.writeFileSync(filePath, content);
+
+  // Verify by reading the content again and console logging it
+  const verifyContent = fs.readFileSync(filePath, 'utf8');
+  console.log(verifyContent);
+
+  if (!verifyContent.includes(commitSha)) {
+    throw new Error('Failed to replace commit SHA in JS file');
+  }
+} catch (error) {
+  console.error('Error occurred:', error);
+}

packages/artillery/lib/platform/aws-ecs/legacy/constants.js

@@ -1,3 +1,4 @@
+// NOTE: if changing this, change replace-worker-version-in-js-file.js script in github workflows that looks for a specific pattern here.
 const DEFAULT_IMAGE_TAG = 'f7534a2844b58ee2a851081a3c498e671ad94f17';
 
 module.exports = {