rhdh-e2e-test-utils 1.1.8 → 1.1.10

package/dist/playwright/base-config.js

@@ -7,8 +7,8 @@ import { resolve } from "path";
 export const baseConfig = {
     testDir: "./tests",
     forbidOnly: !!process.env.CI,
-    retries: process.env.CI ? 1 : 0,
-    workers: "50%",
+    retries: Number(process.env.PLAYWRIGHT_RETRIES ?? 0),
+    workers: process.env.PLAYWRIGHT_WORKERS || "50%",
     outputDir: "node_modules/.cache/e2e-test-results",
     timeout: 90_000,
     reporter: [
@@ -22,8 +22,8 @@ export const baseConfig = {
         screenshot: "only-on-failure",
         viewport: { width: 1920, height: 1080 },
         video: {
-            mode: "on",
-            size: { width: 1920, height: 1080 },
+            mode: "retain-on-failure",
+            size: { width: 1280, height: 720 },
         },
         actionTimeout: 10_000,
         navigationTimeout: 50_000,

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

@@ -52,7 +52,7 @@ export declare function getMetadataDirectory(metadataPath?: string): string | nu
  * @param filePath Path to the metadata YAML file
  * @returns PluginMetadata if valid, null otherwise
  */
-export declare function parseMetadataFile(filePath: string): Promise<PluginMetadata | null>;
+export declare function parseMetadataFile(filePath: string): Promise<PluginMetadata>;
 /**
  * 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.

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":"AAuHA;;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,CA4BhC;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,CA0F/B;AAED;;;;;;;;GAQG;AACH,wBAAsB,2BAA2B,CAC/C,oBAAoB,EAAE,oBAAoB,EAC1C,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CA4B/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;;;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

@@ -32,13 +32,13 @@ async function getOCIUrlsForPR(workspacePath, prNumber) {
         throw new Error(`[PluginMetadata] Failed to parse GitHub repo from source.json: ${repo}`);
     }
     const ownerRepo = match[1];
-    // Read plugins list
-    const pluginsList = await fs.readFile(pluginsListPath, "utf-8");
-    const pluginPaths = pluginsList
-        .trim()
-        .split("\n")
-        .map((l) => l.replace(/:$/, "").trim())
-        .filter(Boolean);
+    // Parse plugins-list.yaml as YAML and extract keys (plugin paths)
+    const pluginsListContent = await fs.readFile(pluginsListPath, "utf-8");
+    const pluginsListData = yaml.load(pluginsListContent);
+    if (!pluginsListData || typeof pluginsListData !== "object") {
+        throw new Error(`[PluginMetadata] plugins-list.yaml is empty or invalid: ${pluginsListPath}`);
+    }
+    const pluginPaths = Object.keys(pluginsListData);
     const workspaceName = path.basename(workspacePath);
     console.log(`[PluginMetadata] Fetching versions for ${pluginPaths.length} plugins from source...`);
     for (const pluginPath of pluginPaths) {
@@ -142,28 +142,23 @@ export function getMetadataDirectory(metadataPath = DEFAULT_METADATA_PATH) {
  * @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;
-        }
-        console.log(`[PluginMetadata] Loaded metadata for: ${packagePath}`);
-        return {
-            packagePath,
-            pluginConfig: pluginConfig || {},
-            packageName: packageName || "",
-            sourceFile: filePath,
-        };
+    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) {
+        throw new Error(`[PluginMetadata] Missing required field spec.dynamicArtifact in ${filePath}`);
     }
-    catch (error) {
-        console.error(`[PluginMetadata] Error parsing ${filePath}:`, error);
-        return null;
+    if (!packageName) {
+        throw new Error(`[PluginMetadata] Missing required field spec.packageName in ${filePath}`);
     }
+    return {
+        packagePath,
+        pluginConfig: pluginConfig || {},
+        packageName,
+        sourceFile: filePath,
+    };
 }
 /**
  * Parses all metadata files in a directory and builds a map of plugin name to config.
@@ -179,16 +174,46 @@ export async function parseAllMetadataFiles(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}`);
-        }
+        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;
 }
+/**
+ * Replaces local package paths with OCI URLs for plugins that have matching metadata.
+ * Only applies to plugins with metadata (workspace plugins). Plugins without metadata
+ * (e.g., keycloak, bulk-import from auth defaults) keep their original paths.
+ *
+ * @param plugins The plugin entries to process
+ * @param metadataMap Map of plugin names to plugin metadata
+ * @param metadataPath Path to the metadata directory (used to resolve workspace root)
+ * @returns Plugin entries with OCI URLs replaced where applicable
+ */
+async function replaceWithOCIUrls(plugins, metadataMap, metadataPath) {
+    const prNumber = process.env.GIT_PR_NUMBER;
+    if (!prNumber) {
+        return plugins;
+    }
+    console.log(`[PluginMetadata] PR build detected (PR #${prNumber}), fetching OCI URLs...`);
+    const workspacePath = path.resolve(metadataPath, "..");
+    const ociUrls = await getOCIUrlsForPR(workspacePath, prNumber);
+    return plugins.map((plugin) => {
+        const pluginName = extractPluginName(plugin.package);
+        const metadata = metadataMap.get(pluginName);
+        if (!metadata?.packageName)
+            return plugin;
+        const displayName = metadata.packageName
+            .replace(/^@/, "")
+            .replace(/\//g, "-");
+        const ociUrl = ociUrls.get(displayName);
+        if (!ociUrl)
+            return plugin;
+        console.log(`[PluginMetadata] Replacing ${plugin.package} with ${ociUrl}`);
+        return { ...plugin, package: ociUrl };
+    });
+}
 /**
  * Injects plugin configurations from metadata into a dynamic plugins config.
  * Metadata config serves as the base, user-provided pluginConfig overrides it.
@@ -255,43 +280,18 @@ export async function generateDynamicPluginsConfigFromMetadata(metadataPath = DE
     if (metadataMap.size === 0) {
         throw new Error(`[PluginMetadata] Cannot generate dynamic-plugins config: no valid metadata files found in ${metadataDir}`);
     }
-    // If PR number is set, fetch OCI URLs
-    const prNumber = process.env.GIT_PR_NUMBER;
-    let ociUrls = null;
-    if (prNumber) {
-        console.log(`[PluginMetadata] PR build detected (PR #${prNumber}), fetching OCI URLs...`);
-        const workspacePath = path.resolve(metadataPath, "..");
-        ociUrls = await getOCIUrlsForPR(workspacePath, prNumber);
-    }
     // Build plugin entries from metadata
-    const plugins = [];
+    let plugins = [];
     for (const [pluginName, metadata] of metadataMap) {
-        let packageRef = metadata.packagePath;
-        // Replace with OCI URL if available (required for PR builds)
-        if (ociUrls) {
-            if (!metadata.packageName) {
-                throw new Error(`[PluginMetadata] PR build requires packageName in metadata but not found for: ${pluginName}\n` +
-                    `  Source file: ${metadata.sourceFile}`);
-            }
-            const displayName = metadata.packageName
-                .replace(/^@/, "")
-                .replace(/\//g, "-");
-            const ociUrl = ociUrls.get(displayName);
-            if (!ociUrl) {
-                throw new Error(`[PluginMetadata] PR build requires OCI URL but not found for: ${displayName}\n` +
-                    `  Package name: ${metadata.packageName}\n` +
-                    `  Source file: ${metadata.sourceFile}`);
-            }
-            console.log(`[PluginMetadata] Replacing ${packageRef} with ${ociUrl}`);
-            packageRef = ociUrl;
-        }
-        console.log(`[PluginMetadata] Adding plugin: ${pluginName} (${packageRef})`);
+        console.log(`[PluginMetadata] Adding plugin: ${pluginName} (${metadata.packagePath})`);
         plugins.push({
-            package: packageRef,
+            package: metadata.packagePath,
             disabled: false,
             pluginConfig: metadata.pluginConfig,
         });
     }
+    // Replace local paths with OCI URLs for PR builds
+    plugins = await replaceWithOCIUrls(plugins, metadataMap, metadataPath);
     console.log(`[PluginMetadata] Generated dynamic-plugins config with ${plugins.length} plugins`);
     return { plugins };
 }
@@ -321,5 +321,10 @@ export async function loadAndInjectPluginMetadata(dynamicPluginsConfig, metadata
         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);
+    const result = injectMetadataConfig(dynamicPluginsConfig, metadataMap);
+    // Replace local paths with OCI URLs for PR builds
+    if (result.plugins) {
+        result.plugins = await replaceWithOCIUrls(result.plugins, metadataMap, metadataPath);
+    }
+    return result;
 }

package/package.json

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