@red-hat-developer-hub/e2e-test-utils 2.1.15 → 2.1.17

package/dist/utils/plugin-metadata.js

@@ -425,6 +425,25 @@ export function disablePlugins(plugins) {
     }
     return pluginConfig;
 }
+/**
+ * Marks matching plugins disabled and adds fallback disable entries for plugins
+ * that are not already present in the merged configuration.
+ */
+export function applyDisabledPlugins(config, disabledConfig) {
+    const disabledPlugins = disabledConfig.plugins ?? [];
+    const disabledNames = new Set(disabledPlugins.map((plugin) => getNormalizedPluginMergeKey(plugin)));
+    const plugins = (config.plugins ?? []).map((plugin) => disabledNames.has(getNormalizedPluginMergeKey(plugin))
+        ? { ...plugin, disabled: true }
+        : plugin);
+    const presentNames = new Set(plugins.map((plugin) => getNormalizedPluginMergeKey(plugin)));
+    return {
+        ...config,
+        plugins: [
+            ...plugins,
+            ...disabledPlugins.filter((plugin) => !presentNames.has(getNormalizedPluginMergeKey(plugin))),
+        ],
+    };
+}
 /**
  * Auto-generates plugin entries from workspace metadata files.
  * Creates raw entries with local paths and disabled: false.

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

@@ -5,7 +5,7 @@
 import { describe, it } from "node:test";
 import assert from "node:assert";
 import fs from "fs-extra";
-import { extractPluginName, getNormalizedPluginMergeKey, disablePlugins, normalizeDisablePluginName, generatePluginsFromMetadata, } from "../plugin-metadata.js";
+import { extractPluginName, getNormalizedPluginMergeKey, disablePlugins, applyDisabledPlugins, normalizeDisablePluginName, generatePluginsFromMetadata, } from "../plugin-metadata.js";
 import { createMetadataFixture } from "./helpers.js";
 // ── extractPluginName ────────────────────────────────────────────────────────
 describe("extractPluginName", () => {
@@ -70,6 +70,22 @@ describe("normalizeDisablePluginName", () => {
     });
 });
 describe("disablePlugins", () => {
+    it("disables an existing OCI entry by normalized plugin name", () => {
+        const result = applyDisabledPlugins({
+            plugins: [
+                {
+                    package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-auth:bs_1.54.6__1.1.0",
+                    disabled: false,
+                },
+            ],
+        }, disablePlugins(["red-hat-developer-hub-backstage-plugin-app-auth"]));
+        assert.deepStrictEqual(result.plugins, [
+            {
+                package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-auth:bs_1.54.6__1.1.0",
+                disabled: true,
+            },
+        ]);
+    });
     it("returns empty plugins array for empty input", () => {
         const result = disablePlugins([]);
         assert.deepStrictEqual(result, { plugins: [] });

package/dist/utils/workspace-paths.d.ts

@@ -37,8 +37,6 @@ export declare class WorkspacePaths {
     static get dynamicPlugins(): string;
     /** Default Helm value file path: `tests/config/value_file.yaml` */
     static get valueFile(): string;
-    /** Optional Helm values merged after `value_file.yaml` when the new frontend system is active (explicit option, namespace suffix `-app-next`, or `USE_NEW_FRONTEND_SYSTEM=true`) and this file exists. */
-    static get valueFileAppNext(): string;
     /** Default operator subscription path: `tests/config/subscription.yaml` */
     static get subscription(): string;
 }

package/dist/utils/workspace-paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-paths.d.ts","sourceRoot":"","sources":["../../src/utils/workspace-paths.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,cAAc;IACzB,OAAO;IAEP,4FAA4F;IAC5F,MAAM,KAAK,OAAO,IAAI,MAAM,CAE3B;IAED,4DAA4D;IAC5D,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAI5C,0DAA0D;IAC1D,MAAM,KAAK,aAAa,IAAI,MAAM,CAEjC;IAED,8DAA8D;IAC9D,MAAM,KAAK,WAAW,IAAI,MAAM,CAE/B;IAED,gFAAgF;IAChF,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAID,mEAAmE;IACnE,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAED,6DAA6D;IAC7D,MAAM,KAAK,OAAO,IAAI,MAAM,CAE3B;IAED,wEAAwE;IACxE,MAAM,KAAK,cAAc,IAAI,MAAM,CAElC;IAED,mEAAmE;IACnE,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAED,0MAA0M;IAC1M,MAAM,KAAK,gBAAgB,IAAI,MAAM,CAEpC;IAED,2EAA2E;IAC3E,MAAM,KAAK,YAAY,IAAI,MAAM,CAEhC;CACF"}
+{"version":3,"file":"workspace-paths.d.ts","sourceRoot":"","sources":["../../src/utils/workspace-paths.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;GAkBG;AACH,qBAAa,cAAc;IACzB,OAAO;IAEP,4FAA4F;IAC5F,MAAM,KAAK,OAAO,IAAI,MAAM,CAE3B;IAED,4DAA4D;IAC5D,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAI5C,0DAA0D;IAC1D,MAAM,KAAK,aAAa,IAAI,MAAM,CAEjC;IAED,8DAA8D;IAC9D,MAAM,KAAK,WAAW,IAAI,MAAM,CAE/B;IAED,gFAAgF;IAChF,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAID,mEAAmE;IACnE,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAED,6DAA6D;IAC7D,MAAM,KAAK,OAAO,IAAI,MAAM,CAE3B;IAED,wEAAwE;IACxE,MAAM,KAAK,cAAc,IAAI,MAAM,CAElC;IAED,mEAAmE;IACnE,MAAM,KAAK,SAAS,IAAI,MAAM,CAE7B;IAED,2EAA2E;IAC3E,MAAM,KAAK,YAAY,IAAI,MAAM,CAEhC;CACF"}

package/dist/utils/workspace-paths.js

@@ -58,10 +58,6 @@ export class WorkspacePaths {
     static get valueFile() {
         return path.resolve(this.e2eRoot, "tests/config/value_file.yaml");
     }
-    /** Optional Helm values merged after `value_file.yaml` when the new frontend system is active (explicit option, namespace suffix `-app-next`, or `USE_NEW_FRONTEND_SYSTEM=true`) and this file exists. */
-    static get valueFileAppNext() {
-        return path.resolve(this.e2eRoot, "tests/config/value_file-app-next.yaml");
-    }
     /** Default operator subscription path: `tests/config/subscription.yaml` */
     static get subscription() {
         return path.resolve(this.e2eRoot, "tests/config/subscription.yaml");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@red-hat-developer-hub/e2e-test-utils",
-  "version": "2.1.15",
+  "version": "2.1.17",
   "description": "Test utilities for RHDH E2E tests",
   "license": "Apache-2.0",
   "repository": {

package/dist/deployment/rhdh/config/new-frontend-system/dynamic-plugins.yaml

@@ -1,5 +0,0 @@
-plugins:
-  - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-auth:bs_1.49.4__0.0.1
-    disabled: false
-  - package: oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/red-hat-developer-hub-backstage-plugin-app-integrations:bs_1.49.4__0.0.1
-    disabled: false

package/dist/deployment/rhdh/config/new-frontend-system/value_file.yaml

@@ -1,2 +0,0 @@
-# Helm values merge layer for the new frontend system (app-next); merged when NFS layers are active (additive; extend as needed).
-{}