Merge branch 'main' into snyk-upgrade-a01219c3a07316c6b8fd00ba2f50d331

.changeset/renovate-0404963.md

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

.changeset/renovate-5e39527.md

@@ -0,0 +1,9 @@
+---
+'app': patch
+'@internal/plugin-dynamic-plugins-info-backend': patch
+'@internal/plugin-scalprum-backend': patch
+---
+
+Updated dependency `@testing-library/user-event` to `14.5.2`.
+Updated dependency `@types/supertest` to `2.0.16`.
+Updated dependency `@types/mock-fs` to `4.13.4`.

.changeset/renovate-8603a98.md

@@ -0,0 +1,6 @@
+---
+'backend': patch
+---
+
+Updated dependency `fs-extra` to `11.2.0`.
+Updated dependency `@types/fs-extra` to `11.0.4`.

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

@@ -67,7 +67,7 @@ jobs:
           push: true
 
       - name: Comment the image pull link
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             github.rest.issues.createComment({

.github/workflows/sync-renovate-changeset.yaml

@@ -25,7 +25,7 @@ jobs:
           git config --global user.name github-actions[bot]
           git config --global user.email github-actions[bot]@users.noreply.github.com
       - name: Generate changeset
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const { promises: fs } = require("fs");

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

@@ -21,4 +21,5 @@ data:
   KEYCLOAK_REALM: bXlyZWFsbQ==
   KEYCLOAK_CLIENT_ID: bXljbGllbnQ=
   KEYCLOAK_CLIENT_SECRET: dGVtcA==
+  DH_TARGET_URL: aHR0cDovL3Rlc3QtYmFja3N0YWdlLWN1c3RvbWl6YXRpb24tcHJvdmlkZXItc2hvd2Nhc2UuYmFja3N0YWdlLW9zLTItZXUtZGUtMi1ieC1jNzRiM2VkNDRjZTg2OTQ5ZjUwMWFlZmIyZGI4MDY1Mi0wMDAwLmV1LWRlLmNvbnRhaW5lcnMuYXBwZG9tYWluLmNsb3Vk
 type: Opaque

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

@@ -51,12 +51,7 @@ data:
           target: ${DH_TARGET_URL}
           changeOrigin: true
           # Change to "false" in case of using self hosted cluster with a self-signed certificate
-          secure: true
-        '/developer-hub/tech-radar':
-          target: ${DH_TECHRADAR_TARGET_URL}
-          changeOrigin: true
-          # Change to "false" in case of using self hosted cluster with a self-signed certificate
-          secure: true
+          secure: false
 
     catalog:
       import:

.ibm/pipelines/value_files/values_showcase.yaml

@@ -90,6 +90,9 @@ global:
                     owner: janus-authors
         - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-ocm
           disabled: false
+        # Enable tech-radar plugin.
+        - package: ./dynamic-plugins/dist/backstage-plugin-tech-radar
+          disabled: false
 
 
   # this value will be overriden by 'helm install .... --set global.clusterRouterBase=value'

e2e-tests/cypress/e2e/plugins/quick-access-and-tech-radar.spec.ts

@@ -0,0 +1,29 @@
+import { HomePage } from '../../support/pages/HomePage';
+import { TechRadar } from '../../support/pages/TechRadar';
+import { Common } from '../../utils/Common';
+import { UIhelper } from '../../utils/UIhelper';
+
+//Pre-req: Enable backstage-plugin-tech-radar Plugin
+
+describe('Test Customized Quick Access and tech-radar plugin', () => {
+  before(() => {
+    Common.loginAsGuest();
+  });
+
+  it('Verify Customized Quick Access', () => {
+    HomePage.verifyQuickAccess('TEST COMMUNITY', 'Website', true);
+    HomePage.verifyQuickAccess('MONITORING TOOLS', 'Grafana', true);
+    HomePage.verifyQuickAccess('SECURITY TOOLS', 'Vault', true);
+  });
+
+  it('Verify tech-radar', () => {
+    UIhelper.openSidebar('Tech Radar');
+    UIhelper.verifyHeading('Tech Radar');
+    UIhelper.verifyHeading('Company Radar');
+
+    TechRadar.verifyRadarDetails('Languages', 'TEST JavaScript');
+    TechRadar.verifyRadarDetails('Storage', 'AWS S3');
+    TechRadar.verifyRadarDetails('Frameworks', 'React');
+    TechRadar.verifyRadarDetails('Infrastructure', 'ArgoCD');
+  });
+});

e2e-tests/cypress/support/pages/HomePage.ts

@@ -10,9 +10,16 @@ export class HomePage {
     UIhelper.verifyLink(text);
   }
 
-  static verifyQuickAccess(section: string, quickAccessItem: string) {
-    cy.contains(HomePagePO.MuiAccordion, section)
-      .contains('a div[class*="MuiListItemText-root"]', quickAccessItem)
-      .should('be.visible');
+  static verifyQuickAccess(
+    section: string,
+    quickAccessItem: string,
+    expand = false,
+  ) {
+    cy.contains(HomePagePO.MuiAccordion, section).within($section => {
+      if (expand) cy.wrap($section).click();
+      cy.contains('a div[class*="MuiListItemText-root"]', quickAccessItem)
+        .scrollIntoView({ duration: 1000 })
+        .should('be.visible');
+    });
   }
 }

e2e-tests/cypress/support/pages/TechRadar.ts

@@ -0,0 +1,9 @@
+export class TechRadar {
+  static verifyRadarDetails(section: string, text: string) {
+    cy.contains('h2', section)
+      .parent()
+      .contains(text)
+      .scrollIntoView()
+      .should('be.visible');
+  }
+}

packages/app/package.json

@@ -60,7 +60,7 @@
     "@testing-library/jest-dom": "5.17.0",
     "@testing-library/react": "12.1.5",
     "@testing-library/react-hooks": "8.0.1",
-    "@testing-library/user-event": "14.5.1",
+    "@testing-library/user-event": "14.5.2",
     "@types/node": "18.18.7",
     "@types/react": "17.0.69",
     "@types/react-dom": "17.0.22"

packages/backend/package.json

@@ -54,14 +54,14 @@
     "lodash": "4.17.21",
     "prom-client": "15.0.0",
     "winston": "3.11.0",
-    "fs-extra": "10.1.0",
+    "fs-extra": "11.2.0",
     "express-rate-limit": "7.1.3",
     "@manypkg/get-packages": "1.1.3"
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
     "@types/express": "4.17.20",
-    "@types/fs-extra": "9.0.11",
+    "@types/fs-extra": "11.0.4",
     "cross-env": "7.0.3"
   },
   "files": [

plugins/dynamic-plugins-info-backend/package.json

@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@types/supertest": "2.0.15",
+    "@types/supertest": "2.0.16",
     "supertest": "6.3.3",
     "msw": "1.3.2"
   },

plugins/scalprum-backend/package.json

@@ -34,8 +34,8 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.23.1",
-    "@types/supertest": "2.0.15",
-    "@types/mock-fs": "4.13.3",
+    "@types/supertest": "2.0.16",
+    "@types/mock-fs": "4.13.4",
     "mock-fs": "5.2.0",
     "msw": "1.3.2",
     "supertest": "6.3.3"

yarn.lock

@@ -8446,10 +8446,10 @@
     "@testing-library/dom" "^8.0.0"
     "@types/react-dom" "<18.0.0"
 
-"@testing-library/[email protected].1":
-  version "14.5.1"
-  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.5.1.tgz#27337d72046d5236b32fd977edee3f74c71d332f"
-  integrity sha512-UCcUKrUYGj7ClomOo2SpNVvx4/fkd/2BbIHDCle8A0ax+P3bU7yJwDBDrS6ZwdTMARWTGODX1hEsCcO+7beJjg==
+"@testing-library/[email protected].2":
+  version "14.5.2"
+  resolved "https://registry.yarnpkg.com/@testing-library/user-event/-/user-event-14.5.2.tgz#db7257d727c891905947bd1c1a99da20e03c2ebd"
+  integrity sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ==
 
 "@tokenizer/token@^0.3.0":
   version "0.3.0"
@@ -8704,11 +8704,12 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
-"@types/fs-extra@9.0.11":
-  version "9.0.11"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.11.tgz#8cc99e103499eab9f347dbc6ca4e99fb8d2c2b87"
-  integrity sha512-mZsifGG4QeQ7hlkhO56u7zt/ycBgGxSVsFI/6lGTU34VtwkiqrrSDgw0+ygs8kFGWcXnFQWMrzF2h7TtDFNixA==
+"@types/fs-extra@11.0.4":
+  version "11.0.4"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-11.0.4.tgz#e16a863bb8843fba8c5004362b5a73e17becca45"
+  integrity sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==
   dependencies:
+    "@types/jsonfile" "*"
     "@types/node" "*"
 
 "@types/glob@*":
@@ -8849,6 +8850,13 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
+"@types/jsonfile@*":
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/@types/jsonfile/-/jsonfile-6.1.4.tgz#614afec1a1164e7d670b4a7ad64df3e7beb7b702"
+  integrity sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==
+  dependencies:
+    "@types/node" "*"
+
 "@types/jsonwebtoken@^9.0.0":
   version "9.0.4"
   resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-9.0.4.tgz#8b74bbe87bde81a3469d4b32a80609bec62c23ec"
@@ -8928,10 +8936,10 @@
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.4.tgz#81f886786411c45bba3f33e781ab48bd56bfca2e"
   integrity sha512-Kfe/D3hxHTusnPNRbycJE1N77WHDsdS4AjUYIzlDzhDrS47NrwuL3YW4VITxwR7KCVpzwgy4Rbj829KSSQmwXQ==
 
-"@types/[email protected].3":
-  version "4.13.3"
-  resolved "https://registry.yarnpkg.com/@types/mock-fs/-/mock-fs-4.13.3.tgz#57a53413bd27bca41509053b105430eaf6bf1cce"
-  integrity sha512-PeXnRqMVBkVjHNCxu1wzPBi9cv5uWVl6535XD11NXt8pasJXh2MHxWvJs6d7eyt/V6BGgHZ4O3LF71CVMdMasA==
+"@types/[email protected].4":
+  version "4.13.4"
+  resolved "https://registry.yarnpkg.com/@types/mock-fs/-/mock-fs-4.13.4.tgz#e73edb4b4889d44d23f1ea02d6eebe50aa30b09a"
+  integrity sha512-mXmM0o6lULPI8z3XNnQCpL0BGxPwx1Ul1wXYEPBGl4efShyxW2Rln0JOPEWGyZaYZMM6OVXM/15zUuFMY52ljg==
   dependencies:
     "@types/node" "*"
 
@@ -9225,10 +9233,10 @@
     "@types/cookiejar" "*"
     "@types/node" "*"
 
-"@types/[email protected].15":
-  version "2.0.15"
-  resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.15.tgz#3d032865048c84c6a3bbbf1f949145b917d2ff65"
-  integrity sha512-jUCZZ/TMcpGzoSaed9Gjr8HCf3HehExdibyw3OHHEL1als1KmyzcOZZH4MjbObI8TkWsEr7bc7gsW0WTDni+qQ==
+"@types/[email protected].16":
+  version "2.0.16"
+  resolved "https://registry.yarnpkg.com/@types/supertest/-/supertest-2.0.16.tgz#7a1294edebecb960d957bbe9b26002a2b7f21cd7"
+  integrity sha512-6c2ogktZ06tr2ENoZivgm7YnprnhYE4ZoXGMY+oA7IuAf17M8FWvujXZGmxLv8y0PTyts4x5A+erSwVUFA8XSg==
   dependencies:
     "@types/superagent" "*"
 
@@ -14901,6 +14909,15 @@ [email protected], fs-extra@^10.0.0, fs-extra@^10.1.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
+[email protected]:
+  version "11.2.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
+  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
 fs-extra@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"