From 042ff082b6c3d584184dd53a6a37d00b3a0ecbf2 Mon Sep 17 00:00:00 2001 From: gazarenkov Date: Thu, 19 Jun 2025 14:50:38 +0300 Subject: [PATCH 1/7] add orchestrator plugin to dynamic-plugins.default.yaml --- dynamic-plugins.default.yaml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dynamic-plugins.default.yaml b/dynamic-plugins.default.yaml index fbc01c770b..a7b303df5c 100644 --- a/dynamic-plugins.default.yaml +++ b/dynamic-plugins.default.yaml @@ -1085,3 +1085,37 @@ plugins: config: path: marketplace title: Catalog + + # Group: Orchestrator + - package: "@redhat/backstage-plugin-orchestrator@1.5.1" + disabled: false + integrity: sha512-7VOe+XGTUzrdO/av0DNHbydOjB3Lo+XdCs6fj3JVODLP7Ypd3GXHf/nssYxG5ZYC9F1t9MNeguE2bZOB6ckqTA== + pluginConfig: + dynamicPlugins: + frontend: + red-hat-developer-hub.backstage-plugin-orchestrator: + appIcons: + - importName: OrchestratorIcon + module: OrchestratorPlugin + name: orchestratorIcon + dynamicRoutes: + - importName: OrchestratorPage + menuItem: + icon: orchestratorIcon + text: Orchestrator + module: OrchestratorPlugin + path: /orchestrator + - package: "@redhat/backstage-plugin-orchestrator-backend-dynamic@1.5.1" + disabled: true + integrity: sha512-VIenFStdq9QvvmgmEMG8O7b2wqIebvEcqNeJ9SWZ8jen9t+efTK6D3Rde74LQ1no1QaHLx8RoxNCOuTUEF8O/g== + pluginConfig: + orchestrator: + dataIndexService: + url: http://sonataflow-platform-data-index-service + - package: "@redhat/backstage-plugin-scaffolder-backend-module-orchestrator-dynamic@1.5.1" + disabled: true + integrity: sha512-bnVQjVsUZ470Vgm2kd5Lo/bVa2fF0q4GufBDc/8oTQsnP3zZJQqKFvFElBTCjY76RqkECydlvZ1UFybSzvockQ== + pluginConfig: + orchestrator: + dataIndexService: + url: http://sonataflow-platform-data-index-service From c67dcad280c0b4555471d34711797b2380955853 Mon Sep 17 00:00:00 2001 From: gazarenkov Date: Thu, 19 Jun 2025 17:31:19 +0300 Subject: [PATCH 2/7] fix --- dynamic-plugins.default.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dynamic-plugins.default.yaml b/dynamic-plugins.default.yaml index a7b303df5c..f6a75d6573 100644 --- a/dynamic-plugins.default.yaml +++ b/dynamic-plugins.default.yaml @@ -1085,7 +1085,7 @@ plugins: config: path: marketplace title: Catalog - + # Group: Orchestrator - package: "@redhat/backstage-plugin-orchestrator@1.5.1" disabled: false @@ -1105,6 +1105,7 @@ plugins: text: Orchestrator module: OrchestratorPlugin path: /orchestrator + - package: "@redhat/backstage-plugin-orchestrator-backend-dynamic@1.5.1" disabled: true integrity: sha512-VIenFStdq9QvvmgmEMG8O7b2wqIebvEcqNeJ9SWZ8jen9t+efTK6D3Rde74LQ1no1QaHLx8RoxNCOuTUEF8O/g== @@ -1112,6 +1113,7 @@ plugins: orchestrator: dataIndexService: url: http://sonataflow-platform-data-index-service + - package: "@redhat/backstage-plugin-scaffolder-backend-module-orchestrator-dynamic@1.5.1" disabled: true integrity: sha512-bnVQjVsUZ470Vgm2kd5Lo/bVa2fF0q4GufBDc/8oTQsnP3zZJQqKFvFElBTCjY76RqkECydlvZ1UFybSzvockQ== From ef7dd0932280d34734304ea135ac07c87f721643 Mon Sep 17 00:00:00 2001 From: gazarenkov Date: Thu, 19 Jun 2025 19:26:47 +0300 Subject: [PATCH 3/7] add dependencies --- dynamic-plugins.default.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dynamic-plugins.default.yaml b/dynamic-plugins.default.yaml index f6a75d6573..cd5e14e052 100644 --- a/dynamic-plugins.default.yaml +++ b/dynamic-plugins.default.yaml @@ -1113,6 +1113,9 @@ plugins: orchestrator: dataIndexService: url: http://sonataflow-platform-data-index-service + dependencies: + - ref: sonataflow + - ref: npmrc-secret - package: "@redhat/backstage-plugin-scaffolder-backend-module-orchestrator-dynamic@1.5.1" disabled: true From 87c6daea872d86ca487403c4fdade685f34622ad Mon Sep 17 00:00:00 2001 From: gazarenkov Date: Thu, 19 Jun 2025 21:08:01 +0300 Subject: [PATCH 4/7] remove dependencies --- dynamic-plugins.default.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/dynamic-plugins.default.yaml b/dynamic-plugins.default.yaml index cd5e14e052..f6a75d6573 100644 --- a/dynamic-plugins.default.yaml +++ b/dynamic-plugins.default.yaml @@ -1113,9 +1113,6 @@ plugins: orchestrator: dataIndexService: url: http://sonataflow-platform-data-index-service - dependencies: - - ref: sonataflow - - ref: npmrc-secret - package: "@redhat/backstage-plugin-scaffolder-backend-module-orchestrator-dynamic@1.5.1" disabled: true From bdd10a1f69ad9f5aa223be9037e4053bd71422d4 Mon Sep 17 00:00:00 2001 From: gazarenkov Date: Thu, 19 Jun 2025 21:11:35 +0300 Subject: [PATCH 5/7] fix disabled --- dynamic-plugins.default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dynamic-plugins.default.yaml b/dynamic-plugins.default.yaml index f6a75d6573..b88b6f1f35 100644 --- a/dynamic-plugins.default.yaml +++ b/dynamic-plugins.default.yaml @@ -1088,7 +1088,7 @@ plugins: # Group: Orchestrator - package: "@redhat/backstage-plugin-orchestrator@1.5.1" - disabled: false + disabled: true integrity: sha512-7VOe+XGTUzrdO/av0DNHbydOjB3Lo+XdCs6fj3JVODLP7Ypd3GXHf/nssYxG5ZYC9F1t9MNeguE2bZOB6ckqTA== pluginConfig: dynamicPlugins: From f1b8756a2ad72073230c644f831d4cc892108694 Mon Sep 17 00:00:00 2001 From: gazarenkov Date: Tue, 24 Jun 2025 15:37:48 +0300 Subject: [PATCH 6/7] add redhat registry to .npmrc --- .github/workflows/pr.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index da344046f0..bee7cc1ad5 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -100,6 +100,11 @@ jobs: if: ${{ steps.check-image.outputs.is_skipped != 'true' }} run: rm app-config.yaml && mv app-config.example.yaml app-config.yaml + - name: Configure .npmrc for Red Hat scope + if: ${{ steps.check-image.outputs.is_skipped != 'true' }} + run: | + echo "@redhat:registry=https://npm.registry.redhat.com" >> ~/.npmrc # for orchestrator plugin + - name: Install dependencies if: ${{ steps.check-image.outputs.is_skipped != 'true' }} uses: backstage/actions/yarn-install@b3c1841fd69e1658ac631afafd0fb140a2309024 # v0.6.17 From f86e609a942ba9906c5b6d9533aa08a7ece6d880 Mon Sep 17 00:00:00 2001 From: gazarenkov Date: Tue, 24 Jun 2025 16:56:23 +0300 Subject: [PATCH 7/7] external plugins --- .github/workflows/pr.yaml | 5 ----- dynamic-plugins/_utils/src/wrappers.test.ts | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index bee7cc1ad5..da344046f0 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -100,11 +100,6 @@ jobs: if: ${{ steps.check-image.outputs.is_skipped != 'true' }} run: rm app-config.yaml && mv app-config.example.yaml app-config.yaml - - name: Configure .npmrc for Red Hat scope - if: ${{ steps.check-image.outputs.is_skipped != 'true' }} - run: | - echo "@redhat:registry=https://npm.registry.redhat.com" >> ~/.npmrc # for orchestrator plugin - - name: Install dependencies if: ${{ steps.check-image.outputs.is_skipped != 'true' }} uses: backstage/actions/yarn-install@b3c1841fd69e1658ac631afafd0fb140a2309024 # v0.6.17 diff --git a/dynamic-plugins/_utils/src/wrappers.test.ts b/dynamic-plugins/_utils/src/wrappers.test.ts index 2411a81103..fd2ae2e218 100644 --- a/dynamic-plugins/_utils/src/wrappers.test.ts +++ b/dynamic-plugins/_utils/src/wrappers.test.ts @@ -119,7 +119,7 @@ function validateDynamicPluginsConfig( const isExternalPlugin = externalDynamicPlugins?.some( (externalDynamicPlugin) => externalDynamicPlugin.package === plugin.package, - ); + ) || !plugin.package.startsWith("./"); if (!isExternalPlugin) { // We want the third index ['.', 'dynamic-plugins', 'dist', 'backstage-plugin-scaffolder-backend-module-github-dynamic'] packageNames.push(plugin.package.split("/")[3]);