Merge branch 'main' of github.com:redhat-developer/rhdh into feat/company-logo

Author: its-mitesh-kumar

.github/actions/check-image-and-changes/action.yaml

@@ -8,6 +8,9 @@ outputs:
   relevant_changes:
     description: "True if changes require a build"
     value: ${{ steps.changes.outputs.relevant }}
+  is_skipped:
+    description: "True if build should be skipped (via [skip-build] tag OR image exists with no relevant changes)"
+    value: ${{ steps.final-decision.outputs.is_skipped }}
   short_sha:
     description: "Short SHA of the latest commit"
     value: ${{ env.SHORT_SHA }}
@@ -35,6 +38,14 @@ runs:
         echo "Changed files:"
         echo "$CHANGED_FILES"
 
+        # Check for [skip-build] tag in commit messages
+        SKIP_BUILD_TAG=false
+        COMMIT_MESSAGES=$(git log --format=%B "$BASE_COMMIT"..HEAD)
+        if echo "$COMMIT_MESSAGES" | grep -q "\[skip-build\]"; then
+          echo "Found [skip-build] tag in commit messages."
+          SKIP_BUILD_TAG=true
+        fi
+
         # Flag to track if we found any relevant changes
         RELEVANT_CHANGES=false
 
@@ -59,6 +70,10 @@ runs:
           echo "relevant=false" >> $GITHUB_OUTPUT
         fi
 
+        # Set is_skipped flag for now (will be updated after image check)
+        echo "skip_build_tag=$SKIP_BUILD_TAG" >> $GITHUB_OUTPUT
+        echo "relevant_changes=$RELEVANT_CHANGES" >> $GITHUB_OUTPUT
+
     - name: Check if Docker image exists
       id: image-check
       shell: bash
@@ -86,3 +101,28 @@ runs:
           echo "Image does not exist (checked both $IMAGE_NAME_PR and $IMAGE_NAME_COMMIT)."
           echo "exists=false" >> $GITHUB_OUTPUT
         fi
+
+    - name: Determine final skip decision
+      id: final-decision
+      shell: bash
+      run: |
+        # Get the values from previous steps
+        SKIP_BUILD_TAG="${{ steps.changes.outputs.skip_build_tag }}"
+        RELEVANT_CHANGES="${{ steps.changes.outputs.relevant_changes }}"
+        IMAGE_EXISTS="${{ steps.image-check.outputs.exists }}"
+        
+        echo "Skip build tag: $SKIP_BUILD_TAG"
+        echo "Relevant changes: $RELEVANT_CHANGES"
+        echo "Image exists: $IMAGE_EXISTS"
+        
+        # Simplified logic: Skip if [skip-build] tag OR (image exists AND no relevant changes)
+        if [[ "$SKIP_BUILD_TAG" == "true" ]]; then
+          echo "Build will be skipped due to [skip-build] tag."
+          echo "is_skipped=true" >> $GITHUB_OUTPUT
+        elif [[ "$IMAGE_EXISTS" == "true" && "$RELEVANT_CHANGES" == "false" ]]; then
+          echo "Build will be skipped - image exists and no relevant changes detected."
+          echo "is_skipped=true" >> $GITHUB_OUTPUT
+        else
+          echo "Build will proceed - either no existing image or relevant changes detected."
+          echo "is_skipped=false" >> $GITHUB_OUTPUT
+        fi

.github/workflows/pr-build-image.yaml

@@ -56,14 +56,8 @@ jobs:
               echo "Base Tag: pr-${{ github.event.number }}"
               echo "Commit Tag: pr-${{ github.event.number }}-${{ env.SHORT_SHA }}"
 
-      - name: Check if build should be skipped
-        run: |
-          if [[ "${{ steps.check-image.outputs.relevant_changes }}" == "false" && "${{ steps.check-image.outputs.image_exists }}" == "true" ]]; then
-            echo "::notice::Skipping build: Image already exists and no relevant changes detected."
-            exit 0
-          fi
-
       - name: Get the latest commits from base branch
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         run: |
           git remote add base-origin https://github.com/${{ github.repository }} || true
           git config user.name "${{ github.event.pull_request.user.login }}"
@@ -73,7 +67,7 @@ jobs:
           git merge --no-edit base-origin/${{ github.event.pull_request.base.ref }}
 
       - name: Build and Push with Buildx
-        if: ${{ steps.check-image.outputs.relevant_changes == 'true' || steps.check-image.outputs.image_exists == 'false' }}
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         uses: ./.github/actions/docker-build
         with:
           registry: ${{ env.REGISTRY }}
@@ -88,6 +82,7 @@ jobs:
           platform: linux/amd64
 
       - name: Comment the image pull link
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         uses: actions/github-script@v7
         with:
           script: |

.github/workflows/pr.yaml

@@ -37,36 +37,35 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Check Image and Relevant Changes
         id: check-image
         uses: ./.github/actions/check-image-and-changes
 
-      - name: Check if build should be skipped
-        run: |
-          if [[ "${{ steps.check-image.outputs.relevant_changes }}" == "false" && "${{ steps.check-image.outputs.image_exists }}" == "true" ]]; then
-            echo "Skipping build: Image already exists and no relevant changes detected."
-            exit 0
-          fi
-
       - name: Setup Node.js
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: "https://registry.npmjs.org"
 
       - name: Setup local Turbo cache
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         uses: dtinth/setup-github-actions-caching-for-turbo@cc723b4600e40a6b8815b65701d8614b91e2669e # v1
 
       - name: Use app-config.example.yaml
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         run: rm app-config.yaml && mv app-config.example.yaml app-config.yaml
 
       - name: Install dependencies
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         uses: backstage/actions/yarn-install@b3c1841fd69e1658ac631afafd0fb140a2309024 # v0.6.17
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
       - name: Build packages
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         run: yarn run build --continue --affected
 
   test:
@@ -80,55 +79,60 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         with:
           fetch-depth: 0
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Check Image and Relevant Changes
         id: check-image
         uses: ./.github/actions/check-image-and-changes
 
-      - name: Check if tests should be skipped
-        run: |
-          if [[ "${{ steps.check-image.outputs.relevant_changes }}" == "false" && "${{ steps.check-image.outputs.image_exists }}" == "true" ]]; then
-            echo "Skipping tests: No relevant changes detected."
-            exit 0
-          fi
-
       - name: Setup Node.js
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
         with:
           node-version: ${{ matrix.node-version }}
           registry-url: "https://registry.npmjs.org"
 
       - name: Setup local Turbo cache
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         uses: dtinth/setup-github-actions-caching-for-turbo@cc723b4600e40a6b8815b65701d8614b91e2669e # v1
 
       - name: Use app-config.example.yaml
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         run: rm app-config.yaml && mv app-config.example.yaml app-config.yaml
 
       - name: Install dependencies
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         uses: backstage/actions/yarn-install@b3c1841fd69e1658ac631afafd0fb140a2309024 # v0.6.17
         with:
           cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
 
       - name: Run prettier
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         run: yarn prettier:check --continue --affected
 
       - name: Run lint
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         run: yarn run lint:check --continue --affected
 
       - name: Run monorepo tools
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         run: yarn run monorepo:check
 
       - name: Regenerate dockerfiles
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         run: |
           yarn run build:dockerfile; if [[ $(git diff --name-only | grep Dockerfile || true) != "" ]]; then \
             echo "ERROR: Workspace is dirty! Must run 'yarn build:dockerfile' and commit changes!"; exit 1; \
           fi
 
       - name: Run tests
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         run: yarn run test --continue --affected
 
       - name: Install dynamic plugin dependencies
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         run: cd ./dynamic-plugins && yarn install && cd ..
 
       - name: Verify dynamic plugin wrappers
+        if: ${{ steps.check-image.outputs.is_skipped != 'true' }}
         run: cd ./dynamic-plugins && yarn test && cd ..

.github/workflows/update-versions.yaml

@@ -0,0 +1,45 @@
+name: Update versions.md in Dynamic Plugins Documentation
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - "backstage.json"
+      - "packages/app/package.json"
+      - "packages/backend/package.json"
+
+jobs:
+  update-versions-md:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate token
+        id: generate-token
+        uses: actions/create-github-app-token@d72941d797fd3113feb6b93fd0dec494b13a2547 # v1.12.0
+        with:
+          app-id: ${{ secrets.RHDH_GITHUB_APP_ID }}
+          private-key: ${{ secrets.RHDH_GITHUB_APP_PRIVATE_KEY }}
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: ".nvmrc"
+
+      - name: Run update-versions-doc script
+        run: node scripts/update-versions-doc.mjs docs/dynamic-plugins/versions.md
+        env:
+          GITHUB_REPOSITORY: ${{ github.repository }}
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v7
+        with:
+          token: ${{ steps.generate-token.outputs.token }}
+          commit-message: "chore(docs): Update versions.md in dynamic plugin documentation"
+          branch: update-versions-doc-${{ github.ref_name }}
+          title: "chore(docs): [${{ github.ref_name }}] Update versions.md in dynamic plugin documentation"
+          body: "Updates Version Compatibility Matrix in dynamic plugin documentation"
+          labels: "documentation"
+          signoff: true
+          delete-branch: true

.ibm/images/Dockerfile

@@ -1,6 +1,6 @@
 # Base image from Microsoft Playwright
 # Must stay pinned to a version which includes Nodejs 22
-FROM mcr.microsoft.com/playwright:v1.52.0-jammy
+FROM mcr.microsoft.com/playwright:v1.53.0-jammy
 
 # Set environment variables for the container
 ENV CI=1 \
@@ -77,6 +77,11 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
 RUN apt-get update -y && \
     apt-get install -y skopeo
 
+# Install PostgreSQL CLI (psql only)
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends postgresql-client && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
 # Install umoci
 RUN curl -LO "https://github.com/opencontainers/umoci/releases/download/v0.4.7/umoci.amd64" && \
     chmod +x umoci.amd64 && \

.ibm/pipelines/clear-database.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+clear_database() {
+  export POSTGRES_USER="$(echo -n "$RDS_USER" | base64 --decode)"
+  export PGPASSWORD=$RDS_PASSWORD
+  export POSTGRES_HOST=$RDS_1_HOST
+
+  echo "Starting database cleanup process..."
+  
+  # Get list of databases, handle potential connection errors
+  DATABASES=$(psql -h "$POSTGRES_HOST" -U "$POSTGRES_USER" -p "5432" -d postgres -Atc \
+    "SELECT datname FROM pg_database WHERE datistemplate = false AND datname NOT IN ('postgres', 'rdsadmin');" 2>/dev/null)
+  
+  if [ $? -ne 0 ]; then
+    echo "Warning: Failed to connect to database or retrieve database list"
+    return 1
+  fi
+
+  if [ -z "$DATABASES" ]; then
+    echo "No databases found to drop"
+    return 0
+  fi
+
+  echo "Found databases to drop: $(echo "$DATABASES" | tr '\n' ' ')"
+
+  for db in $DATABASES; do
+    echo "Attempting to drop database: $db"
+    
+    # Use IF EXISTS to avoid errors if database doesn't exist
+    # Capture both stdout and stderr, but don't let errors stop the script
+    if psql -h "$POSTGRES_HOST" -U "$POSTGRES_USER" -p "5432" -d postgres -c "DROP DATABASE IF EXISTS \"$db\";" 2>&1; then
+      echo "Successfully dropped database: $db"
+    else
+      echo "Warning: Failed to drop database $db, but continuing with cleanup"
+    fi
+  done
+  
+  echo "Database cleanup process completed"
+}

.ibm/pipelines/cluster/aks/aks-helm-deployment.sh

@@ -17,7 +17,7 @@ initiate_aks_helm_deployment() {
   cp -a "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "${ARTIFACT_DIR}/${NAME_SPACE}/" # Save the final value-file into the artifacts directory.
   echo "Deploying image from repository: ${QUAY_REPO}, TAG_NAME: ${TAG_NAME}, in NAME_SPACE: ${NAME_SPACE}"
   helm upgrade -i "${RELEASE_NAME}" -n "${NAME_SPACE}" \
-    "${HELM_REPO_NAME}/${HELM_IMAGE_NAME}" --version "${CHART_VERSION}" \
+    "${HELM_CHART_URL}" --version "${CHART_VERSION}" \
     -f "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" \
     --set global.host="${K8S_CLUSTER_ROUTER_BASE}" \
     --set upstream.backstage.image.repository="${QUAY_REPO}" \

.ibm/pipelines/cluster/gke/gke-helm-deployment.sh

@@ -21,7 +21,7 @@ initiate_gke_helm_deployment() {
   cp -a "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" "${ARTIFACT_DIR}/${NAME_SPACE}/" # Save the final value-file into the artifacts directory.
   echo "Deploying image from repository: ${QUAY_REPO}, TAG_NAME: ${TAG_NAME}, in NAME_SPACE: ${NAME_SPACE}"
   helm upgrade -i "${RELEASE_NAME}" -n "${NAME_SPACE}" \
-    "${HELM_REPO_NAME}/${HELM_IMAGE_NAME}" --version "${CHART_VERSION}" \
+    "${HELM_CHART_URL}" --version "${CHART_VERSION}" \
     -f "/tmp/${HELM_CHART_K8S_MERGED_VALUE_FILE_NAME}" \
     --set global.host="${K8S_CLUSTER_ROUTER_BASE}" \
     --set upstream.backstage.image.repository="${QUAY_REPO}" \