Merge branch 'migrate-azure-resources' of https://github.com/kajahann…

…e/community-plugins into migrate-azure-resources
backstage · Nov 6, 2024 · 7cec930 · 7cec930
2 parents f9c7ba8 + ac17e9b
commit 7cec930
Show file tree

Hide file tree

Showing 19 changed files with 140 additions and 2,787 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -9,7 +9,7 @@ yarn.lock                                           @backstage/community-plugins
 */yarn.lock                                         @backstage/community-plugins-maintainers @backstage-service
 
 /workspaces/3scale                                  @backstage/community-plugins-maintainers  @04kash @AndrienkoAleksandr
-/workspaces/acr                                     @backstage/community-plugins-maintainers  @invincibleJai
+/workspaces/acr                                     @backstage/community-plugins-maintainers  @christoph-jerolimov @invincibleJai
 /workspaces/adr                                     @backstage/community-plugins-maintainers  @kuangp
 /workspaces/analytics                               @backstage/community-plugins-maintainers  @jmezach
 /workspaces/azure-devops                            @backstage/community-plugins-maintainers  @awanlin
@@ -34,11 +34,11 @@ yarn.lock                                           @backstage/community-plugins
 /workspaces/mta                                     @backstage/community-plugins-maintainers  @ibolton336
 /workspaces/nexus-repository-manager                @backstage/community-plugins-maintainers  @schultzp2020
 /workspaces/npm                                     @backstage/community-plugins-maintainers  @christoph-jerolimov @karthikjeeyar
-/workspaces/ocm                                     @backstage/community-plugins-maintainers  @debsmita1
+/workspaces/ocm                                     @backstage/community-plugins-maintainers  @christoph-jerolimov @debsmita1
 /workspaces/octopus-deploy                          @backstage/community-plugins-maintainers  @jmezach
 /workspaces/pingidentity                            @backstage/community-plugins-maintainers  @jessicajhee
 /workspaces/playlist                                @backstage/community-plugins-maintainers  @kuangp
-/workspaces/rbac                                    @backstage/community-plugins-maintainers  @AndrienkoAleksandr @PatAKnight
+/workspaces/rbac                                    @backstage/community-plugins-maintainers  @AndrienkoAleksandr @divyanshiGupta @PatAKnight
 /workspaces/redhat-argocd                           @backstage/community-plugins-maintainers  @karthikjeeyar @rohitkrai03 @Eswaraiahsapram
 /workspaces/redhat-resource-optimization            @backstage/community-plugins-maintainers  @christoph-jerolimov @04kash
 /workspaces/report-portal                           @backstage/community-plugins-maintainers  @yashoswalyo

diff --git a/workspaces/keycloak/.changeset/smart-cows-breathe.md b/workspaces/keycloak/.changeset/smart-cows-breathe.md
@@ -0,0 +1,5 @@
+---
+'@backstage-community/plugin-catalog-backend-module-keycloak': patch
+---
+
+Fix pluginId and pluginPackage metadata in the package.json file
diff --git a/workspaces/keycloak/plugins/catalog-backend-module-keycloak/package.json b/workspaces/keycloak/plugins/catalog-backend-module-keycloak/package.json
@@ -11,8 +11,8 @@
   "backstage": {
     "role": "backend-plugin-module",
     "supported-versions": "1.32.5",
-    "pluginId": "keycloak",
-    "pluginPackage": "@backstage-community/plugin-catalog-backend-module-keycloak"
+    "pluginId": "catalog",
+    "pluginPackage": "@backstage/plugin-catalog-backend"
   },
   "exports": {
     ".": "./src/index.ts",

diff --git a/workspaces/redhat-argocd/.changeset/four-emus-sparkle.md b/workspaces/redhat-argocd/.changeset/four-emus-sparkle.md
diff --git a/workspaces/redhat-argocd/plugins/argocd/CHANGELOG.md b/workspaces/redhat-argocd/plugins/argocd/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## @backstage-community/plugin-redhat-argocd
 
+## 1.10.2
+
+### Patch Changes
+
+- a83d499: Bumping the @janus-cli/shared-react dependency to ^2.13.0
+
 ## 1.10.1
 
 ### Patch Changes

diff --git a/workspaces/redhat-argocd/plugins/argocd/package.json b/workspaces/redhat-argocd/plugins/argocd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@backstage-community/plugin-redhat-argocd",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",

diff --git a/workspaces/redhat-resource-optimization/.changeset/nervous-flies-ring.md b/workspaces/redhat-resource-optimization/.changeset/nervous-flies-ring.md
@@ -0,0 +1,6 @@
+---
+'@backstage-community/plugin-redhat-resource-optimization-backend': patch
+'@backstage-community/plugin-redhat-resource-optimization': patch
+---
+
+Removed `export-dynamic` script and Janus IDP cli from the build process and npm release.
diff --git a/workspaces/redhat-resource-optimization/package.json b/workspaces/redhat-resource-optimization/package.json
@@ -27,7 +27,6 @@
     "postinstall": "cd ../../ && yarn install",
     "prettier:check": "prettier --check .",
     "new": "backstage-cli new --scope @backstage-community",
-    "export-dynamic": "yarn workspaces foreach -A run export-dynamic",
     "versions:bump": "yarn backstage-cli versions:bump"
   },
   "workspaces": {
@@ -46,7 +45,6 @@
     "@backstage/e2e-test-utils": "^0.1.1",
     "@backstage/repo-tools": "^0.10.0",
     "@changesets/cli": "^2.27.1",
-    "@janus-idp/cli": "^1.11.1",
     "@microsoft/api-extractor-model": "^7.29.2",
     "@microsoft/tsdoc": "^0.15.0",
     "@microsoft/tsdoc-config": "^0.17.0",

diff --git a/...es/redhat-resource-optimization/plugins/redhat-resource-optimization-backend/package.json b/...es/redhat-resource-optimization/plugins/redhat-resource-optimization-backend/package.json
@@ -37,7 +37,7 @@
     "./package.json": "./package.json"
   },
   "files": [
-    "app-config.rhdh.yaml",
+    "app-config.dynamic.yaml",
     "dist",
     "config.d.ts"
   ],
@@ -55,7 +55,6 @@
   "scripts": {
     "build": "backstage-cli package build",
     "clean": "backstage-cli package clean",
-    "export-dynamic": "yarn run -T janus-cli package export-dynamic-plugin --embed-as-dependencies",
     "lint": "backstage-cli package lint",
     "postpack": "backstage-cli package postpack",
     "prepack": "backstage-cli package prepack",

diff --git a/...esource-optimization/app-config.rhdh.yaml → ...urce-optimization/app-config.dynamic.yaml b/...esource-optimization/app-config.rhdh.yaml → ...urce-optimization/app-config.dynamic.yaml
diff --git a/workspaces/redhat-resource-optimization/plugins/redhat-resource-optimization/package.json b/workspaces/redhat-resource-optimization/plugins/redhat-resource-optimization/package.json
@@ -46,9 +46,8 @@
     "./package.json": "./package.json"
   },
   "files": [
-    "app-config.rhdh.yaml",
-    "dist",
-    "dist-scalprum"
+    "app-config.dynamic.yaml",
+    "dist"
   ],
   "license": "Apache-2.0",
   "main": "src/index.ts",
@@ -75,7 +74,6 @@
   "scripts": {
     "build": "backstage-cli package build",
     "clean": "backstage-cli package clean",
-    "export-dynamic": "yarn run -T janus-cli package export-dynamic-plugin",
     "lint": "backstage-cli package lint",
     "postpack": "backstage-cli package postpack",
     "prepack": "backstage-cli package prepack",

diff --git a/workspaces/redhat-resource-optimization/scripts/01-stage-dynamic-plugins.sh b/workspaces/redhat-resource-optimization/scripts/01-stage-dynamic-plugins.sh
@@ -5,7 +5,12 @@ PLUGIN_REGISTRY_URL="${PLUGIN_REGISTRY_URL:-"http://plugin-registry:8080"}"
 
 yarn install
 yarn build:all
-yarn export-dynamic
+
+for plugin in plugins/redhat-resource-optimization*; do
+    cd $plugin
+    npx -y @janus-idp/cli@^1.13.0 package export-dynamic-plugin
+    cd ..
+done
 
 # Uses "npm pack" to to create .tgz files containing the plugin static assets
 DYNAMIC_PLUGIN_ROOT_DIR="./dynamic-plugins-root"