chore: resolve conflicts

rudderlabs · Sep 14, 2023 · 8e658e9 · 8e658e9
2 parents dd207d0 + 1a99dd9
commit 8e658e9
Show file tree

Hide file tree

Showing 7 changed files with 161 additions and 61 deletions.
diff --git a/.github/workflows/build-pr-artifacts.yml b/.github/workflows/build-pr-artifacts.yml
@@ -43,7 +43,7 @@ jobs:
     uses: ./.github/workflows/build-push-docker-image.yml
     with:
       build_tag: rudderstack/develop-rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name }}
-      push_tags: rudderstack/develop-rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name }},rudderlabs/develop-rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name }}
+      push_tags: rudderstack/develop-rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name }}
       img_tag: ${{ needs.generate-tag-names.outputs.tag_name }}
       dockerfile: Dockerfile
       load_target: development
@@ -59,7 +59,7 @@ jobs:
     uses: ./.github/workflows/build-push-docker-image.yml
     with:
       build_tag: rudderstack/develop-rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }}
-      push_tags: rudderstack/develop-rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }},rudderlabs/develop-rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }}
+      push_tags: rudderstack/develop-rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }}
       img_tag: ${{ needs.generate-tag-names.outputs.tag_name_ut }}
       dockerfile: Dockerfile-ut-func
       load_target: development

diff --git a/.github/workflows/build-push-docker-image.yml b/.github/workflows/build-push-docker-image.yml
@@ -29,9 +29,9 @@ env:
   DOCKERHUB_USERNAME: rudderlabs
 
 jobs:
-  build-transformer-image:
-    name: Build Transformer Docker Image
-    runs-on: ubuntu-latest
+  build-transformer-image-arm64:
+    name: Build Transformer Docker Image ARM64
+    runs-on: [self-hosted, Linux, ARM64]
     steps:
       - name: Checkout
         uses: actions/[email protected]
@@ -55,12 +55,12 @@ jobs:
           target: ${{ inputs.load_target }}
           load: true
           tags: ${{ inputs.build_tag }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          # cache-from: type=gha
+          # cache-to: type=gha,mode=max
 
       - name: Run Tests
         run: |
-          docker run ${{ inputs.build_tag }} npm run test:js:ci        
+          docker run ${{ inputs.build_tag }} npm run test:js:ci
           docker run ${{ inputs.build_tag }} npm run test:ts:ci
 
       - name: Build and Push Multi-platform Images
@@ -70,12 +70,80 @@ jobs:
           file: ${{ inputs.dockerfile }}
           target: ${{ inputs.push_target }}
           push: true
-          tags: ${{ inputs.push_tags }}
+          tags: ${{ inputs.push_tags }}-arm64
           platforms: |
-            linux/amd64
             linux/arm64
           build-args: |
-            version=${{ inputs.img_tag }}
+            version=${{ inputs.img_tag }}-arm64
             GIT_COMMIT_SHA=${{ github.sha }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          # cache-from: type=gha
+          # cache-to: type=gha,mode=max
+
+  build-transformer-image-amd64:
+    name: Build Transformer Docker Image AMD64
+    runs-on: [self-hosted, Linux, X64]
+    steps:
+      - name: Checkout
+        uses: actions/[email protected]
+        with:
+          fetch-depth: 1
+
+      - name: Setup Docker Buildx
+        uses: docker/[email protected]
+
+      - name: Login to DockerHub
+        uses: docker/[email protected]
+        with:
+          username: ${{ env.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PROD_TOKEN }}
+
+      - name: Build Docker Image
+        uses: docker/[email protected]
+        with:
+          context: .
+          file: ${{ inputs.dockerfile }}
+          target: ${{ inputs.load_target }}
+          load: true
+          tags: ${{ inputs.build_tag }}
+          # cache-from: type=gha
+          # cache-to: type=gha,mode=max
+
+      - name: Run Tests
+        run: |
+          docker run ${{ inputs.build_tag }} npm run test:js:ci
+          docker run ${{ inputs.build_tag }} npm run test:ts:ci
+
+      - name: Build and Push Multi-platform Images
+        uses: docker/[email protected]
+        with:
+          context: .
+          file: ${{ inputs.dockerfile }}
+          target: ${{ inputs.push_target }}
+          push: true
+          tags: ${{ inputs.push_tags }}-amd64
+          platforms: |
+            linux/amd64
+          build-args: |
+            version=${{ inputs.img_tag }}-amd64
+            GIT_COMMIT_SHA=${{ github.sha }}
+          # cache-from: type=gha
+          # cache-to: type=gha,mode=max
+
+  create-manifest:
+    name: Create multi-arch manifest
+    runs-on: ubuntu-latest
+    needs: [build-transformer-image-amd64, build-transformer-image-arm64]
+
+    steps:
+      - name: Set up Docker Buildx
+        uses: docker/[email protected]
+
+      - name: Login to DockerHub
+        uses: docker/[email protected]
+        with:
+          username: ${{ env.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PROD_TOKEN }}
+
+      - name: Create multi-arch manifest
+        run: |
+          docker buildx imagetools create -t ${{ inputs.push_tags }} ${{ inputs.push_tags }}-amd64 ${{ inputs.push_tags }}-arm64
diff --git a/.github/workflows/prepare-for-dev-deploy.yml b/.github/workflows/prepare-for-dev-deploy.yml
@@ -51,7 +51,7 @@ jobs:
     uses: ./.github/workflows/build-push-docker-image.yml
     with:
       build_tag: rudderstack/develop-rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name }}
-      push_tags: rudderstack/develop-rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name }},rudderlabs/develop-rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name }}
+      push_tags: rudderstack/develop-rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name }}
       img_tag: ${{ needs.generate-tag-names.outputs.tag_name }}
       dockerfile: Dockerfile
       load_target: development
@@ -67,7 +67,7 @@ jobs:
     uses: ./.github/workflows/build-push-docker-image.yml
     with:
       build_tag: rudderstack/develop-rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }}
-      push_tags: rudderstack/develop-rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }},rudderlabs/develop-rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }}
+      push_tags: rudderstack/develop-rudder-transformer:${{ needs.generate-tag-names.outputs.tag_name_ut }}
       img_tag: ${{ needs.generate-tag-names.outputs.tag_name_ut }}
       dockerfile: Dockerfile-ut-func
       load_target: development

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -60,6 +60,7 @@
     "@koa/router": "^12.0.0",
     "@ndhoule/extend": "^2.0.0",
     "@pyroscope/nodejs": "^0.2.6",
+    "@rudderstack/workflow-engine": "^0.5.7",
     "ajv": "^8.12.0",
     "ajv-draft-04": "^1.0.0",
     "ajv-formats": "^2.1.1",
@@ -99,7 +100,6 @@
     "prom-client": "^14.2.0",
     "qs": "^6.11.1",
     "rudder-transformer-cdk": "^1.4.11",
-    "rudder-workflow-engine": "^0.4.7",
     "set-value": "^4.1.0",
     "sha256": "^0.2.0",
     "stacktrace-parser": "^0.1.10",

diff --git a/src/cdk/v2/handler.ts b/src/cdk/v2/handler.ts
@@ -4,7 +4,7 @@ import {
   TemplateType,
   ExecutionBindings,
   StepOutput,
-} from 'rudder-workflow-engine';
+} from '@rudderstack/workflow-engine';
 import { FixMe } from '../../util/types';
 
 import tags from '../../v0/util/tags';

diff --git a/src/cdk/v2/utils.ts b/src/cdk/v2/utils.ts
@@ -1,6 +1,6 @@
 import path from 'path';
 import fs from 'fs/promises';
-import { WorkflowExecutionError, WorkflowCreationError } from 'rudder-workflow-engine';
+import { WorkflowExecutionError, WorkflowCreationError } from '@rudderstack/workflow-engine';
 import logger from '../../logger';
 import { generateErrorObject } from '../../v0/util';
 import { PlatformError } from '../../v0/util/errorTypes';