rhdh-e2e-test-utils 1.0.0 → 1.1.0

package/dist/utils/kubernetes-client.js

@@ -10,12 +10,35 @@ $.verbose = true;
 class KubernetesClientHelper {
     _kc;
     _k8sApi;
+    _appsApi;
     _customObjectsApi;
     constructor() {
         this._kc = new k8s.KubeConfig();
         this._kc.loadFromDefault();
-        this._k8sApi = this._kc.makeApiClient(k8s.CoreV1Api);
-        this._customObjectsApi = this._kc.makeApiClient(k8s.CustomObjectsApi);
+        try {
+            this._k8sApi = this._kc.makeApiClient(k8s.CoreV1Api);
+            this._appsApi = this._kc.makeApiClient(k8s.AppsV1Api);
+            this._customObjectsApi = this._kc.makeApiClient(k8s.CustomObjectsApi);
+        }
+        catch (error) {
+            if (error instanceof Error &&
+                error.message.includes("No active cluster")) {
+                const currentContext = this._kc.getCurrentContext();
+                const contexts = this._kc.getContexts().map((c) => c.name);
+                throw new Error(`No active Kubernetes cluster found.\n\n` +
+                    `The kubeconfig was loaded but no cluster is configured or the current context is invalid.\n\n` +
+                    `Current context: ${currentContext || "(none)"}\n` +
+                    `Available contexts: ${contexts.length > 0 ? contexts.join(", ") : "(none)"}\n\n` +
+                    `To fix this:\n` +
+                    `  1. Log in to your k8s cluster: oc login or kubectl login\n` +
+                    `  2. Or set a valid context: kubectl config use-context <context-name>\n` +
+                    `  3. Verify your connection: oc whoami && oc cluster-info\n\n` +
+                    `Kubeconfig locations checked:\n` +
+                    `  - KUBECONFIG env: ${process.env.KUBECONFIG || "(not set)"}\n` +
+                    `  - Default: ~/.kube/config`);
+            }
+            throw error;
+        }
     }
     /**
      * Create or update a ConfigMap from a file
@@ -263,6 +286,38 @@ class KubernetesClientHelper {
             }
         }
     }
+    /**
+     * Check if a StatefulSet is ready (all replicas are available)
+     */
+    async isStatefulSetReady(namespace, name) {
+        try {
+            const statefulSet = await this._appsApi.readNamespacedStatefulSet({
+                name,
+                namespace,
+            });
+            const replicas = statefulSet.spec?.replicas ?? 1;
+            const readyReplicas = statefulSet.status?.readyReplicas ?? 0;
+            return readyReplicas >= replicas;
+        }
+        catch {
+            return false;
+        }
+    }
+    /**
+     * Wait for a StatefulSet to be ready (all replicas available)
+     */
+    async waitForStatefulSetReady(namespace, name, timeoutSeconds = 300, pollIntervalMs = 5000) {
+        const startTime = Date.now();
+        const timeoutMs = timeoutSeconds * 1000;
+        while (Date.now() - startTime < timeoutMs) {
+            if (await this.isStatefulSetReady(namespace, name)) {
+                console.log(`✓ StatefulSet ${name} is ready`);
+                return true;
+            }
+            await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
+        }
+        throw new Error(`StatefulSet ${name} in namespace ${namespace} not ready after ${timeoutSeconds}s`);
+    }
     /**
      * Get the cluster's ingress domain from OpenShift config
      * Equivalent to: oc get ingresses.config.openshift.io cluster -o jsonpath='{.spec.domain}'

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

@@ -1,24 +1,45 @@
 import yaml from "js-yaml";
+/**
+ * Array merge strategy options for YAML merging.
+ */
+export type ArrayMergeStrategy = "replace" | "concat" | {
+    byKey: string;
+};
+/**
+ * Options for YAML merging.
+ */
+export interface MergeOptions {
+    /**
+     * Strategy for merging arrays.
+     * - "replace": Replace arrays entirely (default)
+     * - "concat": Concatenate arrays
+     * - { byKey: "keyName" }: Merge arrays of objects by a specific key
+     */
+    arrayMergeStrategy?: ArrayMergeStrategy;
+}
 /**
  * Merge multiple YAML files into one object.
  *
  * @param paths List of YAML file paths (base first, overlays last)
+ * @param options Optional merge options (e.g., arrayMergeStrategy)
  * @returns Merged YAML object
  */
-export declare function mergeYamlFiles(paths: string[]): Promise<Record<string, unknown>>;
+export declare function mergeYamlFiles(paths: string[], options?: MergeOptions): Promise<Record<string, unknown>>;
 /**
  * Merge multiple YAML files if they exist.
  *
  * @param paths List of YAML file paths
+ * @param options Optional merge options (e.g., arrayMergeStrategy)
  * @returns Merged YAML object
  */
-export declare function mergeYamlFilesIfExists(paths: string[]): Promise<Record<string, unknown>>;
+export declare function mergeYamlFilesIfExists(paths: string[], options?: MergeOptions): Promise<Record<string, unknown>>;
 /**
  * Merge multiple YAML files and write the result to an output file.
  *
  * @param inputPaths List of input YAML files
  * @param outputPath Output YAML file path
- * @param options Optional dump formatting
+ * @param dumpOptions Optional dump formatting
+ * @param mergeOptions Optional merge options (e.g., arrayMergeStrategy)
  */
-export declare function mergeYamlFilesToFile(inputPaths: string[], outputPath: string, options?: yaml.DumpOptions): Promise<void>;
+export declare function mergeYamlFilesToFile(inputPaths: string[], outputPath: string, dumpOptions?: yaml.DumpOptions, mergeOptions?: MergeOptions): Promise<void>;
 //# sourceMappingURL=merge-yamls.d.ts.map

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;AAkB3B;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAUlC;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,MAAM,EAAE,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAQlC;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,MAAM,EAAE,EACpB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,IAAI,CAAC,WAA+B,GAC5C,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;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"}

package/dist/utils/merge-yamls.js

@@ -1,14 +1,51 @@
 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.
+ */
+function mergeArraysByKey(target, source, key, mergeOptions) {
+    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);
+            }
+        }
+        else {
+            // Non-object or missing key, append as-is
+            result.push(srcItem);
+        }
+    }
+    return result;
+}
 /**
  * Deeply merges two YAML-compatible objects.
- * Arrays are replaced (not concatenated) — this mimics Kustomize-style merging.
+ * Array handling is controlled by the arrayMergeStrategy option.
  */
-function deepMerge(target, source) {
-    return mergeWith(target, source, (objValue, srcValue) => {
+function deepMerge(target, source, options = {}) {
+    const strategy = options.arrayMergeStrategy ?? "replace";
+    return mergeWith({ ...target }, source, (objValue, srcValue) => {
         if (Array.isArray(objValue) && Array.isArray(srcValue)) {
-            return srcValue; // Replace arrays instead of merging
+            if (strategy === "replace") {
+                return srcValue;
+            }
+            else if (strategy === "concat") {
+                return [...objValue, ...srcValue];
+            }
+            else if (typeof strategy === "object" && "byKey" in strategy) {
+                return mergeArraysByKey(objValue, srcValue, strategy.byKey, options);
+            }
         }
     });
 }
@@ -16,14 +53,15 @@ function deepMerge(target, source) {
  * Merge multiple YAML files into one object.
  *
  * @param paths List of YAML file paths (base first, overlays last)
+ * @param options Optional merge options (e.g., arrayMergeStrategy)
  * @returns Merged YAML object
  */
-export async function mergeYamlFiles(paths) {
+export async function mergeYamlFiles(paths, options = {}) {
     let merged = {};
     for (const path of paths) {
         const content = await fs.readFile(path, "utf8");
         const parsed = (yaml.load(content) || {});
-        merged = deepMerge(merged, parsed);
+        merged = deepMerge(merged, parsed, options);
     }
     return merged;
 }
@@ -31,26 +69,28 @@ export async function mergeYamlFiles(paths) {
  * Merge multiple YAML files if they exist.
  *
  * @param paths List of YAML file paths
+ * @param options Optional merge options (e.g., arrayMergeStrategy)
  * @returns Merged YAML object
  */
-export async function mergeYamlFilesIfExists(paths) {
+export async function mergeYamlFilesIfExists(paths, options = {}) {
     return await mergeYamlFiles(paths.filter((path) => {
         const exists = fs.existsSync(path);
         if (!exists)
             console.log(`YAML file ${path} does not exist`);
         return exists;
-    }));
+    }), options);
 }
 /**
  * Merge multiple YAML files and write the result to an output file.
  *
  * @param inputPaths List of input YAML files
  * @param outputPath Output YAML file path
- * @param options Optional dump formatting
+ * @param dumpOptions Optional dump formatting
+ * @param mergeOptions Optional merge options (e.g., arrayMergeStrategy)
  */
-export async function mergeYamlFilesToFile(inputPaths, outputPath, options = { lineWidth: -1 }) {
-    const merged = await mergeYamlFiles(inputPaths);
-    const yamlString = yaml.dump(merged, options);
+export async function mergeYamlFilesToFile(inputPaths, outputPath, dumpOptions = { lineWidth: -1 }, mergeOptions = {}) {
+    const merged = await mergeYamlFiles(inputPaths, mergeOptions);
+    const yamlString = yaml.dump(merged, dumpOptions);
     await fs.outputFile(outputPath, yamlString);
     console.log(`Merged ${inputPaths.length} YAML files into ${outputPath}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhdh-e2e-test-utils",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Test utilities for RHDH E2E tests",
   "license": "Apache-2.0",
   "type": "module",
@@ -27,17 +27,26 @@
     "./utils": {
       "types": "./dist/utils/index.d.ts",
       "default": "./dist/utils/index.js"
+    },
+    "./helpers": {
+      "types": "./dist/playwright/helpers/index.d.ts",
+      "default": "./dist/playwright/helpers/index.js"
+    },
+    "./pages": {
+      "types": "./dist/playwright/pages/index.d.ts",
+      "default": "./dist/playwright/pages/index.js"
+    },
+    "./keycloak": {
+      "types": "./dist/deployment/keycloak/index.d.ts",
+      "default": "./dist/deployment/keycloak/index.js"
     }
   },
   "files": [
     "dist",
-    "tsconfig.base.json",
-    "src/deployment/rhdh/config",
-    "src/deployment/rhdh/helm",
-    "src/deployment/rhdh/operator"
+    "tsconfig.base.json"
   ],
   "scripts": {
-    "build": "yarn clean && tsc -p tsconfig.build.json",
+    "build": "yarn clean && tsc -p tsconfig.build.json && cp -r src/deployment/rhdh/config dist/deployment/rhdh/ && cp -r src/deployment/keycloak/config dist/deployment/keycloak/",
     "check": "yarn typecheck && yarn lint:check && yarn prettier:check",
     "clean": "rm -rf dist",
     "lint:check": "eslint . --ignore-pattern dist --ignore-pattern README.md",
@@ -61,6 +70,7 @@
     "@playwright/test": "^1.57.0"
   },
   "devDependencies": {
+    "@backstage/catalog-model": "1.7.5",
     "@playwright/test": "^1.57.0",
     "@types/fs-extra": "^11.0.4",
     "@types/js-yaml": "^4.0.9",
@@ -68,7 +78,9 @@
     "@types/node": "^24.10.1"
   },
   "dependencies": {
+    "@axe-core/playwright": "^4.11.0",
     "@eslint/js": "^9.39.1",
+    "@keycloak/keycloak-admin-client": "^26.0.0",
     "@kubernetes/client-node": "^1.4.0",
     "boxen": "^8.0.1",
     "eslint": "^9.39.1",
@@ -77,6 +89,7 @@
     "fs-extra": "^11.3.2",
     "js-yaml": "^4.1.1",
     "lodash.mergewith": "^4.6.2",
+    "otplib": "12.0.1",
     "prettier": "^3.7.4",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.48.1",