Srv 948

.github/workflows/build.yml

@@ -0,0 +1,66 @@
+name: "Docker Images"
+
+on:
+  push:
+    branches:
+      - master
+  workflow_call:
+    outputs:
+      tag_hash:
+        description: "The commit hash used to tag the Docker image"
+        value: ${{ jobs.build-image.outputs.tag_hash }}
+
+env:
+  AWS_REGION: eu-west-1
+
+jobs:
+  build-image:
+    name: Build, Tag and Upload
+    runs-on: ubuntu-latest
+    env:
+      SUPERSET_REPOSITORY_URI: "289222877357.dkr.ecr.eu-west-1.amazonaws.com/webgains/superset"
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Create dist directory
+        run: mkdir dist
+
+      - name: Compute labels
+        id: compute_labels
+        run: |
+          TAG_HASH="$(echo $GITHUB_SHA | head -c 8)"
+          TAG_NAME="$(echo $GITHUB_REF | sed -E -e 's:refs/pull/([0-9]+)/merge:pr.\1:' -e 's:refs/heads/::' -e 's:tag/v?([.0-9]+):v\1:' -e 's:/:.:')"
+          echo "TAG_HASH=$TAG_HASH" >> $GITHUB_ENV
+          echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV
+          if [ $TAG_NAME = "main" ]; then echo "LATEST_TAG=$SUPERSET_REPOSITORY_URI:latest" >> $GITHUB_ENV; fi
+          echo "tag_hash=$TAG_HASH" >> $GITHUB_OUTPUT
+
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4.0.2
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v2.0.1
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          tags: |
+            ${{ env.SUPERSET_REPOSITORY_URI }}:${{ env.TAG_HASH }}
+            ${{ env.SUPERSET_REPOSITORY_URI }}:${{ env.TAG_NAME }}
+            ${{ env.LATEST_TAG }}
+    outputs:
+      tag_hash: ${{ steps.compute_labels.outputs.tag_hash }}

.github/workflows/license-check.yml

@@ -1,8 +1,9 @@
 name: License Template Check
 
 on:
-  pull_request:
-    types: [synchronize, opened, reopened, ready_for_review]
+  workflow_dispatch:
+#  pull_request:
+#    types: [synchronize, opened, reopened, ready_for_review]
 
 # cancel previous workflow jobs for PRs
 concurrency:

.github/workflows/pr-closed.yml

@@ -0,0 +1,18 @@
+name: PR Cleanup
+
+on:
+  pull_request:
+    types: [closed]
+
+jobs:
+  destroy:
+    name: Destroy Stack
+    uses: webgains/github-workflows/.github/workflows/destroy-stack.yml@main
+    secrets: inherit
+    with:
+      environment: feature
+      stack: superset-pr-${{ github.event.pull_request.number }}SupersetService
+    permissions:
+      contents: read
+      deployments: write
+      id-token: write

.github/workflows/pr-deployment.yml

@@ -0,0 +1,50 @@
+name: PR Deployment
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  build:
+    uses: ./.github/workflows/build.yml
+    name: Build
+    secrets: inherit
+    permissions:
+      checks: write
+      actions: write
+      contents: write
+      packages: read
+      issues: read
+      pull-requests: write
+
+  labels:
+    runs-on: ubuntu-latest
+    name: Add Labels
+    steps:
+      - name: Add labels
+        id: add_labels
+        run: |
+          echo "feature_name=superset-pr-${{ github.event.pull_request.number }}" | sed 's:\.:-:g' >> $GITHUB_OUTPUT
+    outputs:
+      feature_name: ${{ steps.add_labels.outputs.feature_name }}
+
+  deploy:
+    name: Deploy to Feature Environment
+    needs: [labels, build]
+    uses: webgains/github-workflows/.github/workflows/deploy-service-to-environment.yml@WI-5868-allow-service-deploy-workflow-to-use-any-repositor
+    secrets: inherit
+    with:
+      environment: feature
+      name: ${{ needs.labels.outputs.feature_name }}
+      stack: ${{ needs.labels.outputs.feature_name }}
+      service: superset
+      component: service
+      override: |
+        {
+          "namespace": "${{ needs.labels.outputs.feature_name }}",
+          "supersetImageTag": "${{ needs.build.outputs.tag_hash }}"
+        }
+    permissions:
+      contents: read
+      deployments: write
+      id-token: write

.github/workflows/pr-lint.yml

@@ -1,12 +1,13 @@
 name: PR Lint
 
 on:
-  pull_request:
+  workflow_dispatch:
+#  pull_request:
     # By default, a workflow only runs when a pull_request's activity type is opened, synchronize, or reopened. We
     # explicity override here so that PR titles are re-linted when the PR text content is edited.
     #
     # Possible values: https://help.github.com/en/actions/reference/events-that-trigger-workflows#pull-request-event-pull_request
-    types: [opened, edited, reopened, synchronize]
+#    types: [opened, edited, reopened, synchronize]
 
 jobs:
   lint-check:

.github/workflows/superset-e2e.yml

@@ -1,12 +1,12 @@
 name: E2E
 
 on:
-  push:
-    branches:
-      - "master"
-      - "[0-9].[0-9]*"
-  pull_request:
-    types: [synchronize, opened, reopened, ready_for_review]
+#  push:
+#    branches:
+#      - "master"
+#      - "[0-9].[0-9]*"
+#  pull_request:
+#    types: [synchronize, opened, reopened, ready_for_review]
   workflow_dispatch:
     inputs:
       use_dashboard:

.github/workflows/superset-frontend.yml

@@ -1,12 +1,13 @@
 name: Frontend
 
 on:
-  push:
-    branches:
-      - "master"
-      - "[0-9].[0-9]*"
-  pull_request:
-    types: [synchronize, opened, reopened, ready_for_review]
+  workflow_dispatch:
+#  push:
+#    branches:
+#      - "master"
+#      - "[0-9].[0-9]*"
+#  pull_request:
+#    types: [synchronize, opened, reopened, ready_for_review]
 
 # cancel previous workflow jobs for PRs
 concurrency:

Dockerfile

@@ -27,7 +27,7 @@ ARG BUILDPLATFORM=${BUILDPLATFORM:-amd64}
 # superset-node used for building frontend assets
 ######################################################################
 FROM --platform=${BUILDPLATFORM} node:20-bullseye-slim AS superset-node
-ARG BUILD_TRANSLATIONS="false" # Include translations in the final build
+ARG BUILD_TRANSLATIONS="true"
 ENV BUILD_TRANSLATIONS=${BUILD_TRANSLATIONS}
 ARG DEV_MODE="false"           # Skip frontend build in dev mode
 ENV DEV_MODE=${DEV_MODE}
@@ -37,7 +37,7 @@ COPY docker/ /app/docker/
 ARG NPM_BUILD_CMD="build"
 
 # Install system dependencies required for node-gyp
-RUN /app/docker/apt-install.sh build-essential python3 zstd
+RUN /app/docker/apt-install.sh build-essential python3 zstd jq
 
 # Define environment variables for frontend build
 ENV BUILD_CMD=${NPM_BUILD_CMD} \
@@ -66,26 +66,19 @@ RUN --mount=type=bind,source=./superset-frontend/package.json,target=./package.j
 # Runs the webpack build process
 COPY superset-frontend /app/superset-frontend
 
-# Build the frontend if not in dev mode
-RUN --mount=type=cache,target=/app/superset-frontend/.temp_cache \
-    --mount=type=cache,target=/root/.npm \
-    if [ "$DEV_MODE" = "false" ]; then \
-        echo "Running 'npm run ${BUILD_CMD}'"; \
-        npm run ${BUILD_CMD}; \
-    else \
-        echo "Skipping 'npm run ${BUILD_CMD}' in dev mode"; \
-    fi;
-
-# Copy translation files
+# This copies the .po files needed for translation
+RUN mkdir -p /app/superset/translations
 COPY superset/translations /app/superset/translations
 
-# Build the frontend if not in dev mode
-RUN if [ "$BUILD_TRANSLATIONS" = "true" ]; then \
-        npm run build-translation; \
-    fi; \
-    rm -rf /app/superset/translations/*/*/*.po; \
-    rm -rf /app/superset/translations/*/*/*.mo;
+RUN mkdir -p /app/locales
+COPY locales /app/locales
+
+# Compiles .json files from the .po files, then deletes the .po files
+RUN npm run build-translation
+RUN rm /app/superset/translations/*/LC_MESSAGES/*.po
+RUN rm /app/superset/translations/messages.pot
 
+RUN npm run ${BUILD_CMD}
 
 ######################################################################
 # Base python layer
@@ -96,6 +89,11 @@ ENV BUILD_TRANSLATIONS=${BUILD_TRANSLATIONS}
 ARG DEV_MODE="false"           # Skip frontend build in dev mode
 ENV DEV_MODE=${DEV_MODE}
 
+# Include translations in the final build. The default supports en only to
+# reduce complexity and weight for those only using en
+ARG BUILD_TRANSLATIONS="true"
+
+WORKDIR /app
 ENV LANG=C.UTF-8 \
     LC_ALL=C.UTF-8 \
     SUPERSET_ENV=production \