rhdh-e2e-test-utils 1.1.3 → 1.1.4

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

@@ -8,6 +8,11 @@ export declare class RHDHDeployment {
     deploy(): Promise<void>;
     private _applyAppConfig;
     private _applySecrets;
+    /**
+     * Builds the merged dynamic plugins configuration.
+     * Merges: package defaults + auth config + user config + metadata (for PR builds).
+     */
+    private _buildDynamicPluginsConfig;
     private _applyDynamicPlugins;
     private _deployWithHelm;
     private _deployWithOperator;

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;AAa1E,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;IAUvB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;YAqBf,eAAe;YAgBf,aAAa;YAeb,oBAAoB;YAkBpB,eAAe;YA2Cf,mBAAmB;IA4B3B,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;IA6BlC,OAAO,CAAC,sBAAsB;IAoCxB,SAAS,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAcrE,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,SAAS;CAGlB"}
+{"version":3,"file":"deployment.d.ts","sourceRoot":"","sources":["../../../src/deployment/rhdh/deployment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,kCAAkC,CAAC;AAiB1E,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;IAUvB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;YAqBf,eAAe;YAgBf,aAAa;IAe3B;;;OAGG;YACW,0BAA0B;YAuC1B,oBAAoB;YAWpB,eAAe;YAmCf,mBAAmB;IA4B3B,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;IA6BlC,OAAO,CAAC,sBAAsB;IAoCxB,SAAS,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;IAcrE,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,SAAS;CAmBlB"}

package/dist/deployment/rhdh/deployment.js

@@ -2,7 +2,8 @@ import { KubernetesClientHelper } from "../../utils/kubernetes-client.js";
 import { $ } from "../../utils/bash.js";
 import yaml from "js-yaml";
 import { test } from "@playwright/test";
-import { mergeYamlFilesIfExists } from "../../utils/merge-yamls.js";
+import { mergeYamlFilesIfExists, deepMerge } from "../../utils/merge-yamls.js";
+import { loadAndInjectPluginMetadata, generateDynamicPluginsConfigFromMetadata, } from "../../utils/plugin-metadata.js";
 import { envsubst } from "../../utils/common.js";
 import fs from "fs-extra";
 import boxen from "boxen";
@@ -53,13 +54,37 @@ export class RHDHDeployment {
         ]);
         await this.k8sClient.applySecretFromObject("rhdh-secrets", JSON.parse(envsubst(JSON.stringify(secretsYaml))), this.deploymentConfig.namespace);
     }
-    async _applyDynamicPlugins() {
+    /**
+     * Builds the merged dynamic plugins configuration.
+     * Merges: package defaults + auth config + user config + metadata (for PR builds).
+     */
+    async _buildDynamicPluginsConfig() {
+        const userConfigPath = this.deploymentConfig.dynamicPlugins;
+        const userConfigExists = userConfigPath && fs.existsSync(userConfigPath);
         const authConfig = AUTH_CONFIG_PATHS[this.deploymentConfig.auth];
-        const dynamicPluginsYaml = await mergeYamlFilesIfExists([
+        // If user's dynamic-plugins config doesn't exist, auto-generate from metadata
+        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
+            const authPlugins = await mergeYamlFilesIfExists([DEFAULT_CONFIG_PATHS.dynamicPlugins, authConfig.dynamicPlugins], { arrayMergeStrategy: { byKey: "package" } });
+            return deepMerge(metadataConfig, authPlugins, {
+                arrayMergeStrategy: { byKey: "package" },
+            });
+        }
+        // User config exists - merge provided configs and inject metadata for listed plugins only
+        let dynamicPluginsConfig = await mergeYamlFilesIfExists([
             DEFAULT_CONFIG_PATHS.dynamicPlugins,
             authConfig.dynamicPlugins,
-            this.deploymentConfig.dynamicPlugins,
+            userConfigPath,
         ], { arrayMergeStrategy: { byKey: "package" } });
+        // Inject plugin metadata configuration for plugins in the config
+        dynamicPluginsConfig =
+            await loadAndInjectPluginMetadata(dynamicPluginsConfig);
+        return dynamicPluginsConfig;
+    }
+    async _applyDynamicPlugins() {
+        const dynamicPluginsYaml = await this._buildDynamicPluginsConfig();
         this._logBoxen("Dynamic Plugins", dynamicPluginsYaml);
         await this.k8sClient.applyConfigMapFromObject("dynamic-plugins", dynamicPluginsYaml, this.deploymentConfig.namespace);
     }
@@ -72,15 +97,10 @@ export class RHDHDeployment {
         ]));
         this._logBoxen("Value File", valueFileObject);
         // Merge dynamic plugins into the values file (including auth-specific plugins)
-        const authConfig = AUTH_CONFIG_PATHS[this.deploymentConfig.auth];
         if (!valueFileObject.global) {
             valueFileObject.global = {};
         }
-        valueFileObject.global.dynamic = await mergeYamlFilesIfExists([
-            DEFAULT_CONFIG_PATHS.dynamicPlugins,
-            authConfig.dynamicPlugins,
-            this.deploymentConfig.dynamicPlugins,
-        ], { arrayMergeStrategy: { byKey: "package" } });
+        valueFileObject.global.dynamic = await this._buildDynamicPluginsConfig();
         this._logBoxen("Dynamic Plugins", valueFileObject.global.dynamic);
         fs.writeFileSync(`/tmp/${this.deploymentConfig.namespace}-value-file.yaml`, yaml.dump(valueFileObject));
         await $ `
@@ -223,6 +243,20 @@ export class RHDHDeployment {
         console.log("[RHDHDeployment]", ...args);
     }
     _logBoxen(title, data) {
-        console.log(boxen(yaml.dump(data), { title, padding: 1 }));
+        console.log(boxen(yaml.dump(data, { lineWidth: -1 }), {
+            title,
+            padding: 0,
+            width: 120,
+            borderStyle: {
+                topLeft: "┌",
+                topRight: "┐",
+                bottomLeft: "└",
+                bottomRight: "┘",
+                top: "─",
+                bottom: "─",
+                left: "",
+                right: "",
+            },
+        }));
     }
 }

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

@@ -17,6 +17,11 @@ export interface MergeOptions {
      */
     arrayMergeStrategy?: ArrayMergeStrategy;
 }
+/**
+ * Deeply merges two YAML-compatible objects.
+ * Array handling is controlled by the arrayMergeStrategy option.
+ */
+export declare function deepMerge(target: Record<string, unknown>, source: Record<string, unknown>, options?: MergeOptions): Record<string, unknown>;
 /**
  * Merge multiple YAML files into one object.
  *

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;AAwED;;;;;;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;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"}

package/dist/utils/merge-yamls.js

@@ -33,7 +33,7 @@ function mergeArraysByKey(target, source, key, mergeOptions) {
  * Deeply merges two YAML-compatible objects.
  * Array handling is controlled by the arrayMergeStrategy option.
  */
-function deepMerge(target, source, options = {}) {
+export function deepMerge(target, source, options = {}) {
     const strategy = options.arrayMergeStrategy ?? "replace";
     return mergeWith({ ...target }, source, (objValue, srcValue) => {
         if (Array.isArray(objValue) && Array.isArray(srcValue)) {

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

@@ -0,0 +1,116 @@
+/**
+ * Represents parsed plugin metadata from a Package CRD file.
+ */
+export interface PluginMetadata {
+    /** The dynamic artifact path (e.g., ./dynamic-plugins/dist/plugin-name) */
+    packagePath: string;
+    /** The plugin configuration from appConfigExamples[0].content */
+    pluginConfig: Record<string, unknown>;
+    /** The package name (e.g., @backstage-community/plugin-tech-radar) */
+    packageName: string;
+    /** Source metadata file path */
+    sourceFile: string;
+}
+/**
+ * Checks if plugin metadata handling should be enabled.
+ * This controls both auto-generation and injection of plugin metadata.
+ *
+ * Default: ENABLED (for local dev and PR builds)
+ * Disabled when:
+ * - RHDH_SKIP_PLUGIN_METADATA_INJECTION is set, OR
+ * - JOB_NAME contains "periodic-" (nightly/periodic builds)
+ */
+export declare function shouldInjectPluginMetadata(): boolean;
+/**
+ * Extracts the plugin name from a package path or OCI reference.
+ *
+ * Handles various formats:
+ * - Local path: ./dynamic-plugins/dist/backstage-community-plugin-tech-radar
+ * - OCI with integrity: oci://quay.io/rhdh/plugin@sha256:...!backstage-community-plugin-tech-radar
+ * - OCI without integrity: oci://quay.io/rhdh/backstage-community-plugin-tech-radar:tag
+ *
+ * @param packageRef The package reference string
+ * @returns The extracted plugin name
+ */
+export declare function extractPluginName(packageRef: 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).
+ */
+export declare const DEFAULT_METADATA_PATH = "../metadata";
+/**
+ * Gets the metadata directory path.
+ * Uses the provided path or falls back to DEFAULT_METADATA_PATH.
+ *
+ * @param metadataPath Optional custom path to metadata directory
+ * @returns The metadata directory path, or null if it doesn't exist
+ */
+export declare function getMetadataDirectory(metadataPath?: string): string | null;
+/**
+ * Parses a single metadata YAML file and extracts plugin configuration.
+ *
+ * @param filePath Path to the metadata YAML file
+ * @returns PluginMetadata if valid, null otherwise
+ */
+export declare function parseMetadataFile(filePath: string): Promise<PluginMetadata | null>;
+/**
+ * Parses all metadata files in a directory and builds a map of plugin name to config.
+ * The plugin name is extracted from the dynamicArtifact path for flexible matching.
+ *
+ * @param metadataDir Path to the metadata directory
+ * @returns Map of plugin name to plugin configuration
+ */
+export declare function parseAllMetadataFiles(metadataDir: string): Promise<Map<string, PluginMetadata>>;
+/**
+ * Plugin entry in dynamic-plugins.yaml
+ */
+export interface PluginEntry {
+    package: string;
+    disabled?: boolean;
+    pluginConfig?: Record<string, unknown>;
+    [key: string]: unknown;
+}
+/**
+ * Dynamic plugins configuration structure
+ */
+export interface DynamicPluginsConfig {
+    plugins?: PluginEntry[];
+    includes?: string[];
+    [key: string]: unknown;
+}
+/**
+ * Injects plugin configurations from metadata into a dynamic plugins config.
+ * Metadata config serves as the base, user-provided pluginConfig overrides it.
+ *
+ * Matching is done by extracting the plugin name from both the package reference
+ * and the metadata's dynamicArtifact, allowing flexible matching across different
+ * package formats (local paths, OCI references, etc.).
+ *
+ * @param dynamicPluginsConfig The dynamic plugins configuration to augment
+ * @param metadataMap Map of plugin names to plugin metadata
+ * @returns The augmented configuration with injected pluginConfigs
+ */
+export declare function injectMetadataConfig(dynamicPluginsConfig: DynamicPluginsConfig, metadataMap: Map<string, PluginMetadata>): DynamicPluginsConfig;
+/**
+ * Generates a complete dynamic-plugins configuration from metadata files.
+ * Iterates through all metadata files and creates plugin entries with:
+ * - package: the dynamicArtifact path
+ * - disabled: false (enabled by default)
+ * - pluginConfig: from appConfigExamples[0].content
+ *
+ * @param metadataPath Optional custom path to metadata directory (default: ../metadata)
+ * @returns Complete dynamic plugins configuration
+ * @throws Error if metadata directory not found or no valid metadata files
+ */
+export declare function generateDynamicPluginsConfigFromMetadata(metadataPath?: string): Promise<DynamicPluginsConfig>;
+/**
+ * Main function to load and inject plugin metadata for PR builds.
+ * For non-PR builds (nightly), returns the config unchanged.
+ *
+ * @param dynamicPluginsConfig The dynamic plugins configuration
+ * @param metadataPath Optional custom path to metadata directory (default: ../metadata)
+ * @returns Augmented configuration with metadata (for PR) or unchanged (for nightly)
+ * @throws Error if PR build but no metadata directory found
+ */
+export declare function loadAndInjectPluginMetadata(dynamicPluginsConfig: DynamicPluginsConfig, metadataPath?: string): Promise<DynamicPluginsConfig>;
+//# sourceMappingURL=plugin-metadata.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"plugin-metadata.d.ts","sourceRoot":"","sources":["../../src/utils/plugin-metadata.ts"],"names":[],"mappings":"AAMA;;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,GAAG,IAAI,CAAC,CAmChC;AAED;;;;;;GAMG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CA2BtC;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;AAED;;;;;;;;;;;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,CAmD/B;AAED;;;;;;;;GAQG;AACH,wBAAsB,2BAA2B,CAC/C,oBAAoB,EAAE,oBAAoB,EAC1C,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CA4B/B"}

package/dist/utils/plugin-metadata.js

@@ -0,0 +1,233 @@
+import fs from "fs-extra";
+import path from "path";
+import yaml from "js-yaml";
+import { glob } from "zx";
+import { deepMerge } from "./merge-yamls.js";
+/**
+ * Checks if plugin metadata handling should be enabled.
+ * This controls both auto-generation and injection of plugin metadata.
+ *
+ * Default: ENABLED (for local dev and PR builds)
+ * Disabled when:
+ * - RHDH_SKIP_PLUGIN_METADATA_INJECTION is set, OR
+ * - JOB_NAME contains "periodic-" (nightly/periodic builds)
+ */
+export function shouldInjectPluginMetadata() {
+    // Explicit opt-out
+    if (process.env.RHDH_SKIP_PLUGIN_METADATA_INJECTION) {
+        console.log("[PluginMetadata] Metadata handling disabled (RHDH_SKIP_PLUGIN_METADATA_INJECTION is set)");
+        return false;
+    }
+    // Periodic/nightly job
+    const jobName = process.env.JOB_NAME || "";
+    if (jobName.includes("periodic-")) {
+        console.log("[PluginMetadata] Metadata handling disabled (periodic job detected)");
+        return false;
+    }
+    return true;
+}
+/**
+ * Extracts the plugin name from a package path or OCI reference.
+ *
+ * Handles various formats:
+ * - Local path: ./dynamic-plugins/dist/backstage-community-plugin-tech-radar
+ * - OCI with integrity: oci://quay.io/rhdh/plugin@sha256:...!backstage-community-plugin-tech-radar
+ * - OCI without integrity: oci://quay.io/rhdh/backstage-community-plugin-tech-radar:tag
+ *
+ * @param packageRef The package reference string
+ * @returns The extracted plugin name
+ */
+export function extractPluginName(packageRef) {
+    // Strip ! suffix if present (e.g., oci://...@sha256:...!alias)
+    const ref = packageRef.includes("!") ? packageRef.split("!")[0] : packageRef;
+    // Regex to extract plugin name from various formats:
+    // Captures the last path segment (chars except / : @) before any :tag or @digest
+    const match = ref.match(/\/([^/:@]+)(?:[:@].*)?$/);
+    return match?.[1] || packageRef;
+}
+/**
+ * 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).
+ */
+export const DEFAULT_METADATA_PATH = "../metadata";
+/**
+ * Gets the metadata directory path.
+ * Uses the provided path or falls back to DEFAULT_METADATA_PATH.
+ *
+ * @param metadataPath Optional custom path to metadata directory
+ * @returns The metadata directory path, or null if it doesn't exist
+ */
+export function getMetadataDirectory(metadataPath = DEFAULT_METADATA_PATH) {
+    const resolvedPath = path.resolve(metadataPath);
+    if (fs.existsSync(resolvedPath) && fs.statSync(resolvedPath).isDirectory()) {
+        console.log(`[PluginMetadata] Using metadata directory: ${resolvedPath}`);
+        return resolvedPath;
+    }
+    console.log(`[PluginMetadata] Metadata directory not found: ${resolvedPath}`);
+    return null;
+}
+/**
+ * Parses a single metadata YAML file and extracts plugin configuration.
+ *
+ * @param filePath Path to the metadata YAML file
+ * @returns PluginMetadata if valid, null otherwise
+ */
+export async function parseMetadataFile(filePath) {
+    try {
+        const content = await fs.readFile(filePath, "utf8");
+        const parsed = yaml.load(content);
+        const packagePath = parsed?.spec?.dynamicArtifact;
+        const packageName = parsed?.spec?.packageName;
+        const pluginConfig = parsed?.spec?.appConfigExamples?.[0]?.content;
+        if (!packagePath) {
+            console.log(`[PluginMetadata] Skipping ${filePath}: no spec.dynamicArtifact`);
+            return null;
+        }
+        if (!pluginConfig) {
+            console.log(`[PluginMetadata] Skipping ${filePath}: no spec.appConfigExamples[0].content`);
+            return null;
+        }
+        console.log(`[PluginMetadata] Loaded metadata for: ${packagePath}`);
+        return {
+            packagePath,
+            pluginConfig,
+            packageName: packageName || "",
+            sourceFile: filePath,
+        };
+    }
+    catch (error) {
+        console.error(`[PluginMetadata] Error parsing ${filePath}:`, error);
+        return null;
+    }
+}
+/**
+ * Parses all metadata files in a directory and builds a map of plugin name to config.
+ * The plugin name is extracted from the dynamicArtifact path for flexible matching.
+ *
+ * @param metadataDir Path to the metadata directory
+ * @returns Map of plugin name to plugin configuration
+ */
+export async function parseAllMetadataFiles(metadataDir) {
+    const pattern = path.join(metadataDir, "*.yaml");
+    const files = await glob(pattern);
+    console.log(`[PluginMetadata] Found ${files.length} metadata files in ${metadataDir}`);
+    const metadataMap = new Map();
+    for (const file of files) {
+        const metadata = await parseMetadataFile(file);
+        if (metadata) {
+            // Use extracted plugin name as key for flexible matching
+            const pluginName = extractPluginName(metadata.packagePath);
+            metadataMap.set(pluginName, metadata);
+            console.log(`[PluginMetadata] Mapped plugin: ${pluginName} <- ${metadata.packagePath}`);
+        }
+    }
+    console.log(`[PluginMetadata] Successfully parsed ${metadataMap.size} plugin metadata entries`);
+    return metadataMap;
+}
+/**
+ * Injects plugin configurations from metadata into a dynamic plugins config.
+ * Metadata config serves as the base, user-provided pluginConfig overrides it.
+ *
+ * Matching is done by extracting the plugin name from both the package reference
+ * and the metadata's dynamicArtifact, allowing flexible matching across different
+ * package formats (local paths, OCI references, etc.).
+ *
+ * @param dynamicPluginsConfig The dynamic plugins configuration to augment
+ * @param metadataMap Map of plugin names to plugin metadata
+ * @returns The augmented configuration with injected pluginConfigs
+ */
+export function injectMetadataConfig(dynamicPluginsConfig, metadataMap) {
+    if (!dynamicPluginsConfig.plugins) {
+        return dynamicPluginsConfig;
+    }
+    const augmentedPlugins = dynamicPluginsConfig.plugins.map((plugin) => {
+        // Extract plugin name from package reference for flexible matching
+        const pluginName = extractPluginName(plugin.package);
+        const metadata = metadataMap.get(pluginName);
+        if (!metadata) {
+            // No metadata found for this plugin, keep as-is
+            console.log(`[PluginMetadata] No metadata found for: ${pluginName} (from ${plugin.package})`);
+            return plugin;
+        }
+        console.log(`[PluginMetadata] Injecting config for: ${pluginName} (from ${plugin.package})`);
+        // Merge: metadata config (base) + user config (override)
+        const mergedPluginConfig = deepMerge(metadata.pluginConfig, plugin.pluginConfig || {});
+        return {
+            ...plugin,
+            pluginConfig: mergedPluginConfig,
+        };
+    });
+    return {
+        ...dynamicPluginsConfig,
+        plugins: augmentedPlugins,
+    };
+}
+/**
+ * Generates a complete dynamic-plugins configuration from metadata files.
+ * Iterates through all metadata files and creates plugin entries with:
+ * - package: the dynamicArtifact path
+ * - disabled: false (enabled by default)
+ * - pluginConfig: from appConfigExamples[0].content
+ *
+ * @param metadataPath Optional custom path to metadata directory (default: ../metadata)
+ * @returns Complete dynamic plugins configuration
+ * @throws Error if metadata directory not found or no valid metadata files
+ */
+export async function generateDynamicPluginsConfigFromMetadata(metadataPath = DEFAULT_METADATA_PATH) {
+    // Skip if metadata handling is disabled
+    if (!shouldInjectPluginMetadata()) {
+        console.log("[PluginMetadata] Returning empty config (metadata handling disabled)");
+        return { plugins: [] };
+    }
+    console.log("[PluginMetadata] No dynamic-plugins config provided, generating from metadata...");
+    // Get metadata directory
+    const metadataDir = getMetadataDirectory(metadataPath);
+    if (!metadataDir) {
+        throw new Error(`[PluginMetadata] Cannot generate dynamic-plugins config: metadata directory not found at: ${path.resolve(metadataPath)}`);
+    }
+    // Parse all metadata files
+    const metadataMap = await parseAllMetadataFiles(metadataDir);
+    if (metadataMap.size === 0) {
+        throw new Error(`[PluginMetadata] Cannot generate dynamic-plugins config: no valid metadata files found in ${metadataDir}`);
+    }
+    // Build plugin entries from metadata
+    const plugins = [];
+    for (const [pluginName, metadata] of metadataMap) {
+        console.log(`[PluginMetadata] Adding plugin from metadata: ${pluginName} (${metadata.packagePath})`);
+        plugins.push({
+            package: metadata.packagePath,
+            disabled: false,
+            pluginConfig: metadata.pluginConfig,
+        });
+    }
+    console.log(`[PluginMetadata] Generated dynamic-plugins config with ${plugins.length} plugins`);
+    return { plugins };
+}
+/**
+ * Main function to load and inject plugin metadata for PR builds.
+ * For non-PR builds (nightly), returns the config unchanged.
+ *
+ * @param dynamicPluginsConfig The dynamic plugins configuration
+ * @param metadataPath Optional custom path to metadata directory (default: ../metadata)
+ * @returns Augmented configuration with metadata (for PR) or unchanged (for nightly)
+ * @throws Error if PR build but no metadata directory found
+ */
+export async function loadAndInjectPluginMetadata(dynamicPluginsConfig, metadataPath = DEFAULT_METADATA_PATH) {
+    // Skip metadata injection if disabled
+    if (!shouldInjectPluginMetadata()) {
+        return dynamicPluginsConfig;
+    }
+    console.log("[PluginMetadata] Loading plugin metadata...");
+    // Get metadata directory
+    const metadataDir = getMetadataDirectory(metadataPath);
+    if (!metadataDir) {
+        throw new Error(`[PluginMetadata] PR build requires metadata directory but not found at: ${path.resolve(metadataPath)}`);
+    }
+    // Parse all metadata files
+    const metadataMap = await parseAllMetadataFiles(metadataDir);
+    if (metadataMap.size === 0) {
+        throw new Error(`[PluginMetadata] PR build requires plugin metadata but no valid metadata files found in ${metadataDir}`);
+    }
+    // Inject metadata configs into the dynamic plugins config
+    return injectMetadataConfig(dynamicPluginsConfig, metadataMap);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhdh-e2e-test-utils",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Test utilities for RHDH E2E tests",
   "license": "Apache-2.0",
   "type": "module",