Merge branch 'main' of https://github.com/janus-idp/backstage-showcase …

…into changesets

Signed-off-by: Paul Schultz <pschultz@pobox.com>

.changeset/eighty-icons-grin.md

@@ -0,0 +1,26 @@
+---
+'backstage-plugin-scaffolder-backend-module-gitlab': patch
+'backstage-plugin-scaffolder-backend-module-github': patch
+'backstage-plugin-scaffolder-backend-module-azure': patch
+'backstage-plugin-scaffolder-backend-module-gerrit': patch
+'backstage-plugin-scaffolder-backend-module-bitbucket-cloud': patch
+'backstage-plugin-scaffolder-backend-module-bitbucket-server': patch
+'backstage-plugin-catalog-backend-module-github-org': patch
+'immobiliarelabs-backstage-plugin-gitlab-backend': patch
+'backstage-plugin-catalog-backend-module-github': patch
+'backstage-plugin-catalog-backend-module-gitlab': patch
+'roadiehq-backstage-plugin-argo-cd-backend': patch
+'roadiehq-scaffolder-backend-module-utils': patch
+'backstage-plugin-azure-devops-backend': patch
+'backstage-plugin-kubernetes-backend': patch
+'backstage-plugin-sonarqube-backend': patch
+'roadiehq-scaffolder-backend-argocd': patch
+'backstage-plugin-techdocs-backend': patch
+'backstage-plugin-jenkins-backend': patch
+'@internal/plugin-dynamic-plugins-info-backend': patch
+'@internal/plugin-scalprum-backend': patch
+'backend': patch
+'dynamic-plugins-imports': patch
+---
+
+Switching to the new backend

.changeset/neat-sloths-add.md

@@ -0,0 +1,5 @@
+---
+'dynamic-plugins-imports': minor
+---
+
+added the RBAC plugin UI

.changeset/short-fans-stare.md

@@ -0,0 +1,18 @@
+---
+'dynamic-plugins-imports': patch
+---
+
+updated toplogy and tekton plugin dependencies
+
+Toplogy Features:
+
+- fix to layout nodes correctly on first load ([#1194](https://github.com/janus-idp/backstage-plugins/issues/1194))
+- stop polling after log streaming completes ([#1122](https://github.com/janus-idp/backstage-plugins/issues/1122))
+- added default runtime icon to topology nodes ([#1157](https://github.com/janus-idp/backstage-plugins/issues/1157))
+
+Tekton Features:
+
+- fix [#922](https://github.com/janus-idp/backstage-plugins/issues/922) and [#962](https://github.com/janus-idp/backstage-plugins/issues/962) by using full width for pipeline visualization
+- external sbom view action should not open logs modal ([#1152](https://github.com/janus-idp/backstage-plugins/issues/1152))
+- fix [#947](https://github.com/janus-idp/backstage-plugins/issues/947): Reset pagination when changing any filter ([#1140](https://github.com/janus-idp/backstage-plugins/issues/1140))
+- stop polling after log streaming completes ([#1122](https://github.com/janus-idp/backstage-plugins/issues/1122))

.changeset/small-rabbits-tan.md

@@ -0,0 +1,6 @@
+---
+'backstage-plugin-catalog-backend-module-bitbucket-server': patch
+'backstage-plugin-catalog-backend-module-bitbucket-cloud': patch
+---
+
+Add the dynamic wrapper for bitbucket (cloud and server) discovery

.changeset/smart-dolphins-chew.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/smooth-pumas-argue.md

@@ -0,0 +1,5 @@
+---
+'roadiehq-backstage-plugin-argo-cd': patch
+---
+
+Downgrade ArgoCD frontend plugin to a working state due to https://github.com/RoadieHQ/roadie-backstage-plugins/issues/1238

.changeset/strange-sheep-obey.md

@@ -0,0 +1,5 @@
+---
+'app': patch
+---
+
+Add support for full page components to AdminPage, and update the RBAC frontend and backend plugins

.changeset/sweet-colts-exercise.md

@@ -0,0 +1,5 @@
+---
+'app': minor
+---
+
+updated Nav and tab styles to match PatternFly5.

.changeset/twenty-falcons-work.md

@@ -0,0 +1,5 @@
+---
+'app': patch
+---
+
+Update from using a deprecated Scalprum API to remove a console warning message

.changeset/two-needles-sniff.md

@@ -0,0 +1,9 @@
+---
+'dynamic-plugins-imports': patch
+---
+
+bumped up RBAC plugin and dynamic-plugins-info plugin version
+
+- fix to show 0 if no members in a group ([#1187](https://github.com/janus-idp/backstage-plugins/issues/1187))
+- updates to use relative links and to add a property to help better integrate RBAC plugin and dynamic-plugins-info plugin into the backstage-showcase Administration page ([#1185](https://github.com/janus-idp/backstage-plugins/issues/1185))
+- ensures the plugin configuration for dynamic-plugins-info is also exported when the package is released ([#1158](https://github.com/janus-idp/backstage-plugins/pull/1158))

.changeset/young-numbers-whisper.md

@@ -0,0 +1,5 @@
+---
+'app': patch
+---
+
+Add an Administration tab and related AdminPage component to act as a holder for dynamic plugins that focus on administrative tasks. Add the dynamic-plugins-info dynamic plugin.

.github/actions/docker-build/action.yaml

@@ -57,14 +57,6 @@ runs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
-    - name: Cache Docker layers
-      uses: actions/cache@v3
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-buildx-
-
     - name: Log in to the Container registry
       if: ${{ inputs.push }}
       uses: docker/login-action@v3
@@ -92,14 +84,3 @@ runs:
         provenance: false
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}
-        cache-from: type=local,src=/tmp/.buildx-cache
-        cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-
-    - # Temp fix
-      # https://github.com/docker/build-push-action/issues/252
-      # https://github.com/moby/buildkit/issues/1896
-      name: Move cache
-      shell: bash
-      run: |
-        rm -rf /tmp/.buildx-cache
-        mv /tmp/.buildx-cache-new /tmp/.buildx-cache

.github/renovate.json

@@ -20,7 +20,8 @@
         "^@backstage/",
         "^@janus-idp/",
         "^@immobiliarelabs/",
-        "^@roadiehq/"
+        "^@roadiehq/",
+        "^@pagerduty/"
       ],
       "groupName": ["Backstage packages"],
       "dependencyDashboardApproval": true

.github/workflows/cache-cleanup.yaml

@@ -0,0 +1,31 @@
+# based on https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#managing-caches
+
+name: cleanup caches by a branch
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cleanup
+        run: |
+          gh extension install actions/gh-actions-cache
+
+          echo "Fetching list of cache key"
+          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 )
+
+          ## Setting this to not fail the workflow while deleting cache keys.
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO: ${{ github.repository }}
+          BRANCH: refs/pull/${{ github.event.pull_request.number }}/merge

.ibm/pipelines/auth/secrets-rhdh-secrets.yaml

@@ -10,7 +10,8 @@ data:
   GITHUB_APP_CLIENT_SECRET: dGVtcA==
   GITHUB_APP_WEBHOOK_URL: aHR0cHM6Ly9zbWVlLmlvL0NrRUNLYVgwNzhyZVhobEpEVzA=
   GITHUB_APP_WEBHOOK_SECRET: dGVtcA==
-  GITHUB_ORG_URL: aHR0cHM6Ly9naXRodWIuY29tL2phbnVzLXFl
+  GITHUB_URL: aHR0cHM6Ly9naXRodWIuY29t
+  GITHUB_ORG: amFudXMtcWU=
   K8S_CLUSTER_NAME: Y2k1aGp2ZmYwMG8yZzY2OXZxOGc=
   K8S_CLUSTER_API_SERVER_URL: aHR0cHM6Ly9jMTE0LWUuZXUtZGUuY29udGFpbmVycy5jbG91ZC5pYm0uY29tOjMxNTA2
   K8S_SERVICE_ACCOUNT_TOKEN: dGVtcA==
@@ -21,5 +22,6 @@ data:
   KEYCLOAK_REALM: bXlyZWFsbQ==
   KEYCLOAK_CLIENT_ID: bXljbGllbnQ=
   KEYCLOAK_CLIENT_SECRET: dGVtcA==
+  ACR_SECRET: dGVtcA==
   DH_TARGET_URL: aHR0cDovL3Rlc3QtYmFja3N0YWdlLWN1c3RvbWl6YXRpb24tcHJvdmlkZXItc2hvd2Nhc2UuYmFja3N0YWdlLW9zLTItZXUtZGUtMi1ieC1jNzRiM2VkNDRjZTg2OTQ5ZjUwMWFlZmIyZGI4MDY1Mi0wMDAwLmV1LWRlLmNvbnRhaW5lcnMuYXBwZG9tYWluLmNsb3Vk
 type: Opaque

.ibm/pipelines/openshift-tests.sh

@@ -19,7 +19,7 @@ trap cleanup EXIT
 add_helm_repos() {
   helm version
 
-  declare -a repos=("bitnami=https://charts.bitnami.com/bitnami" "backstage=https://backstage.github.io/charts" "janus-idp=https://janus-idp.github.io/helm-backstage" "${HELM_REPO_NAME}=${HELM_REPO_URL}")
+  declare -a repos=("bitnami=https://charts.bitnami.com/bitnami" "backstage=https://backstage.github.io/charts" "rhdh-chart=https://redhat-developer.github.io/rhdh-chart")
 
   for repo in "${repos[@]}"; do
     key="${repo%%=*}"
@@ -96,7 +96,7 @@ apply_yaml_files() {
   # Add additional configurations
   sed -i "s/backstage.io\/kubernetes-id:.*/backstage.io\/kubernetes-id: $K8S_PLUGIN_ANNOTATION/g" "$dir/resources/deployment/deployment-test-app-component.yaml"
 
-  for key in GITHUB_APP_APP_ID GITHUB_APP_CLIENT_ID GITHUB_APP_PRIVATE_KEY GITHUB_APP_CLIENT_SECRET GITHUB_APP_WEBHOOK_URL GITHUB_APP_WEBHOOK_SECRET KEYCLOAK_CLIENT_SECRET OCM_CLUSTER_TOKEN; do
+  for key in GITHUB_APP_APP_ID GITHUB_APP_CLIENT_ID GITHUB_APP_PRIVATE_KEY GITHUB_APP_CLIENT_SECRET GITHUB_APP_WEBHOOK_URL GITHUB_APP_WEBHOOK_SECRET KEYCLOAK_CLIENT_SECRET OCM_CLUSTER_TOKEN ACR_SECRET; do
     sed -i "s/$key:.*/$key: ${!key}/g" "$dir/auth/secrets-rhdh-secrets.yaml"
   done
 
@@ -139,7 +139,7 @@ run_tests() {
 
   (
     set -e
-    echo Using PR container image: pr-${GIT_PR_NUMBER}-${SHORT_SHA}
+    echo Using PR container image: ${TAG_NAME}
     yarn test
   ) |& tee "/tmp/${LOGFILE}"
 
@@ -153,13 +153,34 @@ run_tests() {
 }
 
 check_backstage_running() {
-  # Check if Backstage is up and running
-  BACKSTAGE_URL_RESPONSE=$(curl -Is "https://${RELEASE_NAME}-${NAME_SPACE}.${K8S_CLUSTER_ROUTER_BASE}" | head -n 1)
+  local url="https://${RELEASE_NAME}-backstage-${NAME_SPACE}.${K8S_CLUSTER_ROUTER_BASE}"
+
+  # Maximum number of attempts to check URL
+  local max_attempts=30
+  # Time in seconds to wait
+  local wait_seconds=30
+
+  echo "Checking if Backstage is up and running at $url"
+
+  for ((i=1; i<=max_attempts; i++)); do
+    # Get the status code
+    local http_status=$(curl -I -s "$url" | grep HTTP | awk '{print $2}')
+
+    # Check if the status code is 200
+    if [[ $http_status -eq 200 ]]; then
+      echo "Backstage is up and running!"
+      export BASE_URL=$url
+      echo "######## BASE URL ########"
+      echo "$BASE_URL"
+      return 0
+    else
+      echo "Attempt $i of $max_attempts: Backstage not yet available (HTTP Status: $http_status)"
+      sleep $wait_seconds
+    fi
+  done
 
-  echo "$BACKSTAGE_URL_RESPONSE"
-  export BASE_URL="https://${RELEASE_NAME}-${NAME_SPACE}.${K8S_CLUSTER_ROUTER_BASE}"
-  echo "######## BASE URL ########"
-  echo "$BASE_URL"
+  echo "Failed to reach Backstage at $BASE_URL after $max_attempts attempts."
+  return 1
 }
 
 main() {
@@ -194,18 +215,20 @@ main() {
   LONG_SHA=$(echo "$GIT_PR_RESPONSE" | jq -r '.head.sha')
   SHORT_SHA=$(git rev-parse --short ${LONG_SHA})
 
-  echo "Tag name with short SHA: pr-${GIT_PR_NUMBER}-${SHORT_SHA}"
+  echo "Tag name with short SHA: ${TAG_NAME}"
 
-  helm upgrade -i ${RELEASE_NAME} -n ${NAME_SPACE} ${HELM_REPO_NAME}/${HELM_IMAGE_NAME} --version ${CHART_VERSION} -f $DIR/value_files/${HELM_CHART_VALUE_FILE_NAME} --set global.clusterRouterBase=${K8S_CLUSTER_ROUTER_BASE} --set upstream.backstage.image.tag=pr-${GIT_PR_NUMBER}-${SHORT_SHA}
+  helm upgrade -i ${RELEASE_NAME} -n ${NAME_SPACE} rhdh-chart/backstage --version ${CHART_VERSION} -f $DIR/value_files/${HELM_CHART_VALUE_FILE_NAME} --set global.clusterRouterBase=${K8S_CLUSTER_ROUTER_BASE} --set upstream.backstage.image.tag=${TAG_NAME}
 
-  echo "Waiting for backstage deployment..."
-  sleep 500
+  check_backstage_running
+  backstage_status=$?
 
   echo "Display pods for verification..."
   oc get pods -n ${NAME_SPACE}
 
-  check_backstage_running
-
+  if [ $backstage_status -ne 0 ]; then
+    echo "Backstage is not running. Exiting..."
+    exit 1
+  fi
 
   run_tests
 }

.ibm/pipelines/resources/config_map/configmap-app-config-rhdh.yaml

@@ -52,6 +52,14 @@ data:
           changeOrigin: true
           # Change to "false" in case of using self hosted cluster with a self-signed certificate
           secure: false
+        '/acr/api':
+          target: 'https://rhdhqetest.azurecr.io/acr/v1/'
+          changeOrigin: true
+          headers:
+            # If you use Bearer Token for authorization, please replace the 'Basic' with 'Bearer' in the following line.
+            Authorization: '${ACR_SECRET}'
+          # Change to "false" in case of using self hosted artifactory instance with a self-signed certificate
+          secure: false
 
     catalog:
       import:
@@ -64,7 +72,9 @@ data:
         - type: url
           target: https://github.com/janus-idp/backstage-showcase/blob/main/catalog-entities/all.yaml
         - type: url
-          target: https://github.com/janus-idp/software-templates/blob/main/showcase-templates.yaml
+          target: https://github.com/redhat-developer/red-hat-developer-hub-software-templates/blob/main/templates.yaml
+        - type: url
+          target: https://github.com/janus-qe/acr-catalog/blob/main/catalog-info.yaml
 
     techdocs:
       builder: external

.ibm/pipelines/value_files/values_showcase.yaml

@@ -33,6 +33,8 @@ global:
                         seconds: 15
         - package: ./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic
           disabled: false
+        - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-dynamic-plugins-info
+          disabled: false
         - package:  ./dynamic-plugins/dist/backstage-plugin-github-issues
           disabled: false
         - package: ./dynamic-plugins/dist/roadiehq-backstage-plugin-github-pull-requests
@@ -93,6 +95,8 @@ global:
         # Enable tech-radar plugin.
         - package: ./dynamic-plugins/dist/backstage-plugin-tech-radar
           disabled: false
+        - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-acr
+          disabled: false
 
 
   # this value will be overriden by 'helm install .... --set global.clusterRouterBase=value'
@@ -120,7 +124,6 @@ upstream:
     backstage.io/kubernetes-id: developer-hub
   backstage:
     image:
-      debug: true
       pullPolicy: Always
       pullSecrets:
         - rhdh-pull-secret

CONTRIBUTING.md

@@ -43,7 +43,7 @@ If you found a bug in our showcase app, please submit an [issue](https://github.
 1. Run the following command
 
    ```console
-   yarn version:all
+   yarn versions:all
    ```
 
 ### Enhancement Requests

app-config.yaml

@@ -151,7 +151,7 @@ catalog:
       target: https://github.com/janus-idp/backstage-showcase/blob/main/catalog-entities/all.yaml
 
     - type: url
-      target: https://github.com/janus-idp/software-templates/blob/main/showcase-templates.yaml
+      target: https://github.com/redhat-developer/red-hat-developer-hub-software-templates/blob/main/templates.yaml
 
 # Plugin: PagerDuty
 pagerduty:

backstage.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.22.1"
+  "version": "1.23.0"
 }