@red-hat-developer-hub/e2e-test-utils 1.1.15 → 1.1.17

package/README.md

@@ -4,3 +4,10 @@ Documentation is available online:
 
 - Package documentation: https://redhat-developer.github.io/rhdh-e2e-test-utils/
 - Overlay testing documentation: https://redhat-developer.github.io/rhdh-e2e-test-utils/overlay/
+
+## Testing
+
+Unit tests use Node’s built-in test runner (`node:test`) and are discovered by pattern.
+
+- **Run tests:** `yarn test` (builds then runs all tests under `dist/` matching `**/*.test.js`).
+- **Add or change tests:** Add a `*.test.ts` file next to the code under `src/` (e.g. `src/utils/foo.test.ts`). It is compiled to `dist/` and picked up automatically; no need to update the test script.

package/dist/deployment/keycloak/deployment.d.ts

@@ -54,6 +54,10 @@ export declare class KeycloakHelper {
      * Get all groups in a realm
      */
     getGroups(realm: string): Promise<KeycloakGroupConfig[]>;
+    /**
+     * Get groups for a user in a realm (user resolved by username).
+     */
+    getGroupsOfUser(realm: string, username: string): Promise<KeycloakGroupConfig[]>;
     /**
      * Delete a user from a realm
      */

package/dist/deployment/keycloak/deployment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/deployment/keycloak/deployment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAY1E,OAAO,KAAK,EACV,yBAAyB,EACzB,wBAAwB,EACxB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,YAAY,CAAC;AAEpB,qBAAa,cAAc;IAClB,SAAS,yBAAgC;IACzC,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,WAAW,EAAE,MAAM,CAAM;IACzB,KAAK,EAAE,MAAM,CAAM;IACnB,QAAQ,EAAE,MAAM,CAAM;IACtB,YAAY,EAAE,MAAM,CAAM;IACjC,OAAO,CAAC,YAAY,CAAoC;gBAE5C,OAAO,GAAE,yBAA8B;IAInD;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAa7B;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAUnC;;OAEG;IACG,gBAAgB,CAAC,OAAO,CAAC,EAAE;QAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;QACvC,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAC;QAC/B,KAAK,CAAC,EAAE,kBAAkB,EAAE,CAAC;KAC9B,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCjB;;OAEG;IACG,OAAO,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB9D;;OAEG;IACG,WAAW,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB7D;;OAEG;IACG,YAAY,CAChB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,IAAI,CAAC;IAqChB;;OAEG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB5E;;OAEG;IACG,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA8C1E;;OAEG;IACG,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAe5D;;OAEG;IACG,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAQ9D;;OAEG;IACG,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhE;;OAEG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlE;;OAEG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW/C;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAK/B;;OAEG;IACG,cAAc,CAAC,OAAO,GAAE,MAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAY1D,OAAO,CAAC,sBAAsB;YAahB,eAAe;YAWf,YAAY;IAwBpB,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;YAO3B,gBAAgB;YAoBhB,sBAAsB;YActB,kBAAkB;YAQlB,0BAA0B;YAmD1B,eAAe;IAqB7B,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,IAAI;CAGb"}
+{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/deployment/keycloak/deployment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAY1E,OAAO,KAAK,EACV,yBAAyB,EACzB,wBAAwB,EACxB,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EACzB,MAAM,YAAY,CAAC;AAEpB,qBAAa,cAAc;IAClB,SAAS,yBAAgC;IACzC,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,WAAW,EAAE,MAAM,CAAM;IACzB,KAAK,EAAE,MAAM,CAAM;IACnB,QAAQ,EAAE,MAAM,CAAM;IACtB,YAAY,EAAE,MAAM,CAAM;IACjC,OAAO,CAAC,YAAY,CAAoC;gBAE5C,OAAO,GAAE,yBAA8B;IAInD;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAa7B;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAUnC;;OAEG;IACG,gBAAgB,CAAC,OAAO,CAAC,EAAE;QAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;QACvC,MAAM,CAAC,EAAE,mBAAmB,EAAE,CAAC;QAC/B,KAAK,CAAC,EAAE,kBAAkB,EAAE,CAAC;KAC9B,GAAG,OAAO,CAAC,IAAI,CAAC;IAsCjB;;OAEG;IACG,OAAO,CAAC,MAAM,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB9D;;OAEG;IACG,WAAW,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAmB7D;;OAEG;IACG,YAAY,CAChB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,oBAAoB,GAC3B,OAAO,CAAC,IAAI,CAAC;IAqChB;;OAEG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkB5E;;OAEG;IACG,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IA8C1E;;OAEG;IACG,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAe5D;;OAEG;IACG,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAQ9D;;OAEG;IACG,eAAe,CACnB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAejC;;OAEG;IACG,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhE;;OAEG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlE;;OAEG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAW/C;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAK/B;;OAEG;IACG,cAAc,CAAC,OAAO,GAAE,MAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAY1D,OAAO,CAAC,sBAAsB;YAahB,eAAe;YAWf,YAAY;IAwBpB,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;YAO3B,gBAAgB;YAoBhB,sBAAsB;YActB,kBAAkB;YAQlB,0BAA0B;YAmD1B,eAAe;IAqB7B,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,IAAI;CAGb"}

package/dist/deployment/keycloak/deployment.js

@@ -245,6 +245,22 @@ export class KeycloakHelper {
         const groups = await this._adminClient.groups.find();
         return groups.map((g) => ({ name: g.name }));
     }
+    /**
+     * Get groups for a user in a realm (user resolved by username).
+     */
+    async getGroupsOfUser(realm, username) {
+        await this._ensureAdminClient();
+        this._adminClient.setConfig({ realmName: realm });
+        const users = await this._adminClient.users.find({ username });
+        if (users.length === 0) {
+            return [];
+        }
+        const user = users[0];
+        const groups = await this._adminClient.users.listGroups({
+            id: user.id,
+        });
+        return groups.map((g) => ({ name: g.name }));
+    }
     /**
      * Delete a user from a realm
      */

package/dist/deployment/keycloak/index.d.ts

@@ -1,2 +1,3 @@
 export { KeycloakHelper } from "./deployment.js";
+export type { KeycloakUserConfig, KeycloakGroupConfig } from "./types.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/deployment/keycloak/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/deployment/keycloak/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/deployment/keycloak/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,YAAY,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC"}

package/dist/deployment/rhdh/deployment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAkB1E,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAGjB,MAAM,YAAY,CAAC;AAEpB,qBAAa,cAAc;IAClB,SAAS,yBAAgC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,gBAAgB,CAAC;gBAE9B,SAAS,EAAE,MAAM;IAKvB,MAAM,CAAC,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YAuCpD,eAAe;YAmBf,aAAa;IAqB3B;;;OAGG;YACW,0BAA0B;YAuC1B,oBAAoB;YAWpB,eAAe;YAmCf,mBAAmB;IAiD3B,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrC;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC,cAAc,CAAC,OAAO,GAAE,MAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBpD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAIjB,oBAAoB;IAsClC;;;OAGG;YACW,0BAA0B;IAwCxC,OAAO,CAAC,sBAAsB;IAoCxB,SAAS,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrE,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,SAAS;CAMlB"}
+{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAmB1E,OAAO,KAAK,EACV,iBAAiB,EACjB,gBAAgB,EAGjB,MAAM,YAAY,CAAC;AAEpB,qBAAa,cAAc;IAClB,SAAS,yBAAgC;IACzC,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,gBAAgB,CAAC;gBAE9B,SAAS,EAAE,MAAM;IAKvB,MAAM,CAAC,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YAuCpD,eAAe;YAmBf,aAAa;IAqB3B;;;OAGG;YACW,0BAA0B;YA6C1B,oBAAoB;YAWpB,eAAe;YAmCf,mBAAmB;IAiD3B,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAWrC;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC,cAAc,CAAC,OAAO,GAAE,MAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAwBpD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAIjB,oBAAoB;IAsClC;;;OAGG;YACW,0BAA0B;IAwCxC,OAAO,CAAC,sBAAsB;IAoCxB,SAAS,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAUrE,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,SAAS;CAMlB"}

package/dist/deployment/rhdh/deployment.js

@@ -3,7 +3,7 @@ import { $ } from "../../utils/bash.js";
 import yaml from "js-yaml";
 import { test } from "@playwright/test";
 import { mergeYamlFilesIfExists, deepMerge } from "../../utils/merge-yamls.js";
-import { loadAndInjectPluginMetadata, generateDynamicPluginsConfigFromMetadata, } from "../../utils/plugin-metadata.js";
+import { loadAndInjectPluginMetadata, generateDynamicPluginsConfigFromMetadata, getNormalizedPluginMergeKey, } from "../../utils/plugin-metadata.js";
 import { envsubst } from "../../utils/common.js";
 import { runOnce } from "../../playwright/run-once.js";
 import cloneDeepWith from "lodash.clonedeepwith";
@@ -81,10 +81,15 @@ export class RHDHDeployment {
         if (!userConfigExists) {
             this._log(`Dynamic plugins config not found at '${userConfigPath}', auto-generating from metadata...`);
             const metadataConfig = await generateDynamicPluginsConfigFromMetadata();
-            // Merge with package defaults and auth config
+            // Merge with package defaults and auth config. Use normalized plugin key so
+            // the same logical plugin (e.g. keycloak from metadata OCI + auth local path)
+            // is deduplicated; metadata (source) wins so OCI URL is kept on PR builds.
             const authPlugins = await mergeYamlFilesIfExists([DEFAULT_CONFIG_PATHS.dynamicPlugins, authConfig.dynamicPlugins], { arrayMergeStrategy: { byKey: "package" } });
-            return deepMerge(metadataConfig, authPlugins, {
-                arrayMergeStrategy: { byKey: "package" },
+            return deepMerge(authPlugins, metadataConfig, {
+                arrayMergeStrategy: {
+                    byKey: "package",
+                    normalizeKey: (item) => getNormalizedPluginMergeKey(item),
+                },
             });
         }
         // User config exists - merge provided configs and inject metadata for listed plugins only

package/dist/deployment/rhdh/deployment.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=deployment.test.d.ts.map

package/dist/deployment/rhdh/deployment.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deployment.test.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/deployment.test.ts"],"names":[],"mappings":""}

package/dist/deployment/rhdh/deployment.test.js

@@ -0,0 +1,41 @@
+import { describe, it } from "node:test";
+import assert from "node:assert";
+import { deepMerge } from "../../utils/merge-yamls.js";
+import { getNormalizedPluginMergeKey } from "../../utils/plugin-metadata.js";
+/**
+ * Tests the merge behavior used when user dynamic-plugins config does not exist:
+ * auth config (e.g. keycloak) is merged with metadata config using normalized plugin key.
+ * Result must have exactly one entry per logical plugin; metadata (source) wins so OCI URL is kept.
+ */
+describe("dynamic-plugins merge (no user config path)", () => {
+    it("yields one keycloak plugin with OCI package when auth has local path and metadata has OCI", () => {
+        const authPlugins = {
+            plugins: [
+                {
+                    package: "./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic",
+                    disabled: false,
+                    pluginConfig: {},
+                },
+            ],
+            includes: ["dynamic-plugins.default.yaml"],
+        };
+        const metadataConfig = {
+            plugins: [
+                {
+                    package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-catalog-backend-module-keycloak:pr_1980__3.16.0!backstage-community-plugin-catalog-backend-module-keycloak",
+                    disabled: false,
+                    pluginConfig: { catalog: { providers: { keycloakOrg: {} } } },
+                },
+            ],
+        };
+        const merged = deepMerge(authPlugins, metadataConfig, {
+            arrayMergeStrategy: {
+                byKey: "package",
+                normalizeKey: (item) => getNormalizedPluginMergeKey(item),
+            },
+        });
+        const plugins = merged.plugins;
+        assert.strictEqual(plugins.length, 1, "merged config must have exactly one keycloak plugin");
+        assert.ok(plugins[0].package?.startsWith("oci://"), "metadata (OCI) must win over auth local path");
+    });
+});

package/dist/eslint/base.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.config.d.ts","sourceRoot":"","sources":["../../src/eslint/base.config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,CA4M3E"}
+{"version":3,"file":"base.config.d.ts","sourceRoot":"","sources":["../../src/eslint/base.config.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAErC;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,CAmN3E"}

package/dist/eslint/base.config.js

@@ -209,5 +209,12 @@ export function createEslintConfig(tsconfigRootDir) {
                 "check-file/filename-naming-convention": "off",
             },
         },
+        // Node test runner (*.test.ts) - describe/it return promises the runner handles
+        {
+            files: ["**/*.test.ts"],
+            rules: {
+                "@typescript-eslint/no-floating-promises": "off",
+            },
+        },
     ];
 }

package/dist/utils/merge-yamls.d.ts

@@ -4,6 +4,8 @@ import yaml from "js-yaml";
  */
 export type ArrayMergeStrategy = "replace" | "concat" | {
     byKey: string;
+    /** Optional: normalize key for matching so different values (e.g. OCI vs local path) map to the same entry. Source wins when merging. */
+    normalizeKey?: (item: unknown) => string;
 };
 /**
  * Options for YAML merging.
@@ -14,6 +16,7 @@ export interface MergeOptions {
      * - "replace": Replace arrays entirely (default)
      * - "concat": Concatenate arrays
      * - { byKey: "keyName" }: Merge arrays of objects by a specific key
+     * - { byKey: "keyName", normalizeKey }: Same, but match by normalized key (e.g. for plugin deduplication)
      */
     arrayMergeStrategy?: ArrayMergeStrategy;
 }

package/dist/utils/merge-yamls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge-yamls.d.ts","sourceRoot":"","sources":["../../src/utils/merge-yamls.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,SAAS,CAAC;AAG3B;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAC1B,SAAS,GACT,QAAQ,GACR;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtB;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;CACzC;AA4CD;;;GAGG;AACH,wBAAgB,SAAS,CACvB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,GAAE,YAAiB,GACzB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAkBzB;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAUlC;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CASlC;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,MAAM,EAAE,EACpB,UAAU,EAAE,MAAM,EAClB,WAAW,GAAE,IAAI,CAAC,WAA+B,EACjD,YAAY,GAAE,YAAiB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAKf"}
+{"version":3,"file":"merge-yamls.d.ts","sourceRoot":"","sources":["../../src/utils/merge-yamls.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,SAAS,CAAC;AAG3B;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAC1B,SAAS,GACT,QAAQ,GACR;IACE,KAAK,EAAE,MAAM,CAAC;IACd,yIAAyI;IACzI,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,MAAM,CAAC;CAC1C,CAAC;AAEN;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;CACzC;AA2DD;;;GAGG;AACH,wBAAgB,SAAS,CACvB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC/B,OAAO,GAAE,YAAiB,GACzB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAkBzB;AAED;;;;;;GAMG;AACH,wBAAsB,cAAc,CAClC,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAUlC;AAED;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,GAAE,YAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CASlC;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,MAAM,EAAE,EACpB,UAAU,EAAE,MAAM,EAClB,WAAW,GAAE,IAAI,CAAC,WAA+B,EACjD,YAAY,GAAE,YAAiB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAKf"}

package/dist/utils/merge-yamls.js

@@ -2,28 +2,39 @@ import fs from "fs-extra";
 import yaml from "js-yaml";
 import mergeWith from "lodash.mergewith";
 /**
- * Merges two arrays of objects by a specific key.
- * Objects with matching keys are deeply merged, new objects are appended.
+ * Returns the merge key for an item: normalized if normalizeKey is provided, else raw key value.
+ * Returns null if the item is not an object or has no key (and no normalizer is provided).
  */
-function mergeArraysByKey(target, source, key, mergeOptions) {
+function getMergeKey(item, key, normalizeKey) {
+    if (typeof item !== "object" || item === null) {
+        return null;
+    }
+    if (normalizeKey) {
+        return normalizeKey(item);
+    }
+    if (key in item) {
+        return String(item[key]);
+    }
+    return null;
+}
+/**
+ * Merges two arrays of objects by a specific key (optionally normalized).
+ * Objects with matching keys are deeply merged, new objects are appended. Source wins.
+ */
+function mergeArraysByKey(target, source, keyStrategy, mergeOptions) {
+    const { byKey: key, normalizeKey } = keyStrategy;
     const result = [...target];
     for (const srcItem of source) {
-        if (typeof srcItem === "object" && srcItem !== null && key in srcItem) {
-            const srcKeyValue = srcItem[key];
-            const existingIndex = result.findIndex((item) => typeof item === "object" &&
-                item !== null &&
-                item[key] === srcKeyValue);
-            if (existingIndex !== -1) {
-                // Merge existing object with source object
-                result[existingIndex] = deepMerge(result[existingIndex], srcItem, mergeOptions);
-            }
-            else {
-                // Append new object
-                result.push(srcItem);
-            }
+        const srcKeyValue = getMergeKey(srcItem, key, normalizeKey);
+        if (srcKeyValue === null) {
+            result.push(srcItem);
+            continue;
+        }
+        const existingIndex = result.findIndex((item) => getMergeKey(item, key, normalizeKey) === srcKeyValue);
+        if (existingIndex !== -1) {
+            result[existingIndex] = deepMerge(result[existingIndex], srcItem, mergeOptions);
         }
         else {
-            // Non-object or missing key, append as-is
             result.push(srcItem);
         }
     }
@@ -44,7 +55,7 @@ export function deepMerge(target, source, options = {}) {
                 return [...objValue, ...srcValue];
             }
             else if (typeof strategy === "object" && "byKey" in strategy) {
-                return mergeArraysByKey(objValue, srcValue, strategy.byKey, options);
+                return mergeArraysByKey(objValue, srcValue, strategy, options);
             }
         }
     });

package/dist/utils/merge-yamls.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=merge-yamls.test.d.ts.map

package/dist/utils/merge-yamls.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-yamls.test.d.ts","sourceRoot":"","sources":["../../src/utils/merge-yamls.test.ts"],"names":[],"mappings":""}

package/dist/utils/merge-yamls.test.js

@@ -0,0 +1,54 @@
+import { describe, it } from "node:test";
+import assert from "node:assert";
+import { deepMerge } from "./merge-yamls.js";
+import { getNormalizedPluginMergeKey } from "./plugin-metadata.js";
+describe("deepMerge with arrayMergeStrategy byKey", () => {
+    it("keeps two plugin entries when package values differ and no normalizeKey", () => {
+        const target = {
+            plugins: [
+                {
+                    package: "oci://ghcr.io/org/repo/backstage-community-plugin-catalog-backend-module-keycloak:tag!alias",
+                    disabled: false,
+                },
+            ],
+        };
+        const source = {
+            plugins: [
+                {
+                    package: "./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic",
+                    disabled: false,
+                },
+            ],
+        };
+        const result = deepMerge(target, source, {
+            arrayMergeStrategy: { byKey: "package" },
+        });
+        const plugins = result.plugins;
+        assert.strictEqual(plugins.length, 2, "without normalizeKey both entries are kept");
+    });
+    it("merges into one plugin when normalizeKey maps both to same key and source wins", () => {
+        const target = {
+            plugins: [
+                {
+                    package: "./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic",
+                    disabled: false,
+                },
+            ],
+        };
+        const source = {
+            plugins: [
+                {
+                    package: "oci://ghcr.io/org/repo/backstage-community-plugin-catalog-backend-module-keycloak:pr_1__1.0!keycloak",
+                    disabled: false,
+                },
+            ],
+        };
+        const normalizeKey = (item) => getNormalizedPluginMergeKey(item);
+        const result = deepMerge(target, source, {
+            arrayMergeStrategy: { byKey: "package", normalizeKey },
+        });
+        const plugins = result.plugins;
+        assert.strictEqual(plugins.length, 1, "same normalized key yields one entry");
+        assert.ok(plugins[0].package?.startsWith("oci://"), "source (OCI) wins over target (local path)");
+    });
+});

package/dist/utils/plugin-metadata.d.ts

@@ -33,6 +33,18 @@ export declare function shouldInjectPluginMetadata(): boolean;
  * @returns The extracted plugin name
  */
 export declare function extractPluginName(packageRef: string): string;
+/**
+ * Returns a stable merge key for a plugin entry so OCI and local path for the same
+ * logical plugin match when merging dynamic-plugins configs. Strips a trailing
+ * "-dynamic" so e.g. backstage-community-plugin-catalog-backend-module-keycloak-dynamic
+ * and ...-keycloak (from OCI) map to the same key.
+ *
+ * @param entry Plugin entry with optional package reference
+ * @returns Normalized key for merge deduplication, or empty string if package is missing
+ */
+export declare function getNormalizedPluginMergeKey(entry: {
+    package?: string;
+}): string;
 /**
  * Default metadata directory path relative to the e2e-tests directory.
  * Follows the same pattern as user config paths (e.g., tests/config/dynamic-plugins.yaml).

package/dist/utils/plugin-metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-metadata.d.ts","sourceRoot":"","sources":["../../src/utils/plugin-metadata.ts"],"names":[],"mappings":"AA8HA;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,2EAA2E;IAC3E,WAAW,EAAE,MAAM,CAAC;IACpB,iEAAiE;IACjE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,sEAAsE;IACtE,WAAW,EAAE,MAAM,CAAC;IACpB,gCAAgC;IAChC,UAAU,EAAE,MAAM,CAAC;CACpB;AAgBD;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,IAAI,OAAO,CAmBpD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAQ5D;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AAEnD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,GAAE,MAA8B,GAC3C,MAAM,GAAG,IAAI,CAUf;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC,CA0BzB;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAwBtC;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AA4CD;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAClC,oBAAoB,EAAE,oBAAoB,EAC1C,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,GACvC,oBAAoB,CAsCtB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,wCAAwC,CAC5D,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CAsD/B;AAED;;;;;;;;GAQG;AACH,wBAAsB,2BAA2B,CAC/C,oBAAoB,EAAE,oBAAoB,EAC1C,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CAuC/B"}
+{"version":3,"file":"plugin-metadata.d.ts","sourceRoot":"","sources":["../../src/utils/plugin-metadata.ts"],"names":[],"mappings":"AA8HA;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,2EAA2E;IAC3E,WAAW,EAAE,MAAM,CAAC;IACpB,iEAAiE;IACjE,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,sEAAsE;IACtE,WAAW,EAAE,MAAM,CAAC;IACpB,gCAAgC;IAChC,UAAU,EAAE,MAAM,CAAC;CACpB;AAgBD;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,IAAI,OAAO,CAmBpD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAQ5D;AAED;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE;IACjD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CAMT;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AAEnD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,GAAE,MAA8B,GAC3C,MAAM,GAAG,IAAI,CAUf;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC,CA0BzB;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAwBtC;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,OAAO,CAAC,EAAE,WAAW,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AA4CD;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAClC,oBAAoB,EAAE,oBAAoB,EAC1C,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,GACvC,oBAAoB,CAsCtB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,wCAAwC,CAC5D,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CAsD/B;AAED;;;;;;;;GAQG;AACH,wBAAsB,2BAA2B,CAC/C,oBAAoB,EAAE,oBAAoB,EAC1C,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CAuC/B"}

package/dist/utils/plugin-metadata.js

@@ -114,6 +114,22 @@ export function extractPluginName(packageRef) {
     const match = ref.match(/\/([^/:@]+)(?:[:@].*)?$/);
     return match?.[1] || packageRef;
 }
+/**
+ * Returns a stable merge key for a plugin entry so OCI and local path for the same
+ * logical plugin match when merging dynamic-plugins configs. Strips a trailing
+ * "-dynamic" so e.g. backstage-community-plugin-catalog-backend-module-keycloak-dynamic
+ * and ...-keycloak (from OCI) map to the same key.
+ *
+ * @param entry Plugin entry with optional package reference
+ * @returns Normalized key for merge deduplication, or empty string if package is missing
+ */
+export function getNormalizedPluginMergeKey(entry) {
+    const pkg = entry?.package;
+    if (pkg === undefined || pkg === "") {
+        return "";
+    }
+    return extractPluginName(pkg).replace(/-dynamic$/, "");
+}
 /**
  * Default metadata directory path relative to the e2e-tests directory.
  * Follows the same pattern as user config paths (e.g., tests/config/dynamic-plugins.yaml).

package/dist/utils/plugin-metadata.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=plugin-metadata.test.d.ts.map

package/dist/utils/plugin-metadata.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin-metadata.test.d.ts","sourceRoot":"","sources":["../../src/utils/plugin-metadata.test.ts"],"names":[],"mappings":""}

package/dist/utils/plugin-metadata.test.js

@@ -0,0 +1,39 @@
+import { describe, it } from "node:test";
+import assert from "node:assert";
+import { extractPluginName, getNormalizedPluginMergeKey, } from "./plugin-metadata.js";
+describe("getNormalizedPluginMergeKey", () => {
+    it("returns same key for OCI keycloak and local keycloak-dynamic (same logical plugin)", () => {
+        const oci = getNormalizedPluginMergeKey({
+            package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-catalog-backend-module-keycloak:pr_1980__3.16.0!backstage-community-plugin-catalog-backend-module-keycloak",
+        });
+        const local = getNormalizedPluginMergeKey({
+            package: "./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic",
+        });
+        assert.strictEqual(oci, local, "same logical plugin has same merge key");
+        assert.strictEqual(oci, "backstage-community-plugin-catalog-backend-module-keycloak");
+    });
+    it("returns different keys for different plugins", () => {
+        const keycloak = getNormalizedPluginMergeKey({
+            package: "./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic",
+        });
+        const techRadar = getNormalizedPluginMergeKey({
+            package: "./dynamic-plugins/dist/backstage-community-plugin-tech-radar-dynamic",
+        });
+        assert.notStrictEqual(keycloak, techRadar);
+    });
+    it("returns empty string for missing or empty package", () => {
+        assert.strictEqual(getNormalizedPluginMergeKey({}), "");
+        assert.strictEqual(getNormalizedPluginMergeKey({ package: "" }), "");
+        assert.strictEqual(getNormalizedPluginMergeKey({ package: undefined }), "");
+    });
+});
+describe("extractPluginName", () => {
+    it("extracts name from OCI URL with tag and alias", () => {
+        const name = extractPluginName("oci://ghcr.io/org/repo/backstage-community-plugin-catalog-backend-module-keycloak:pr_1__1.0!alias");
+        assert.strictEqual(name, "backstage-community-plugin-catalog-backend-module-keycloak");
+    });
+    it("extracts name from local path with -dynamic suffix", () => {
+        const name = extractPluginName("./dynamic-plugins/dist/backstage-community-plugin-catalog-backend-module-keycloak-dynamic");
+        assert.strictEqual(name, "backstage-community-plugin-catalog-backend-module-keycloak-dynamic");
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@red-hat-developer-hub/e2e-test-utils",
-  "version": "1.1.15",
+  "version": "1.1.17",
   "description": "Test utilities for RHDH E2E tests",
   "license": "Apache-2.0",
   "repository": {
@@ -66,6 +66,7 @@
     "prepublishOnly": "yarn build",
     "prettier:check": "prettier --check . '!dist' '!README.md' '!docs' '!.github/workflows/deploy-docs.yml'",
     "prettier:fix": "prettier --write . '!dist' '!README.md' '!docs' '!.github/workflows/deploy-docs.yml'",
+    "test": "node --test \"dist/**/*.test.js\"",
     "typecheck": "tsc --noEmit"
   },
   "keywords": [
@@ -75,7 +76,7 @@
     "test-utils"
   ],
   "engines": {
-    "node": ">=22",
+    "node": ">=22.18.0",
     "yarn": ">=3"
   },
   "peerDependencies": {