@red-hat-developer-hub/e2e-test-utils 1.1.10 → 1.1.12

package/dist/deployment/keycloak/deployment.js

@@ -1,6 +1,6 @@
 import KeycloakAdminClient from "@keycloak/keycloak-admin-client";
 import { KubernetesClientHelper } from "../../utils/kubernetes-client.js";
-import { $ } from "../../utils/bash.js";
+import { $, runQuietUnlessFailure } from "../../utils/bash.js";
 import { DEFAULT_KEYCLOAK_CONFIG, BITNAMI_CHART_REPO, BITNAMI_CHART_NAME, DEFAULT_CONFIG_PATHS, DEFAULT_RHDH_CLIENT, SERVICE_ACCOUNT_ROLES, DEFAULT_USERS, DEFAULT_GROUPS, } from "./constants.js";
 export class KeycloakHelper {
     k8sClient = new KubernetesClientHelper();
@@ -310,10 +310,10 @@ export class KeycloakHelper {
     }
     async _deployWithHelm() {
         await $ `helm repo add bitnami ${BITNAMI_CHART_REPO} || true`;
-        await $ `helm repo update > /dev/null 2>&1`;
-        await $ `helm upgrade --install ${this.deploymentConfig.releaseName} ${BITNAMI_CHART_NAME} \
+        await runQuietUnlessFailure `helm repo update`;
+        await runQuietUnlessFailure `helm upgrade --install ${this.deploymentConfig.releaseName} ${BITNAMI_CHART_NAME} \
       --namespace ${this.deploymentConfig.namespace} \
-      --values ${this.deploymentConfig.valuesFile} > /dev/null 2>&1`;
+      --values ${this.deploymentConfig.valuesFile}`;
         await this.waitUntilReady();
     }
     async _createRoute() {

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

@@ -5,7 +5,9 @@ export declare class RHDHDeployment {
     rhdhUrl: string;
     deploymentConfig: DeploymentConfig;
     constructor(namespace: string);
-    deploy(): Promise<void>;
+    deploy(options?: {
+        timeout?: number | null;
+    }): Promise<void>;
     private _applyAppConfig;
     private _applySecrets;
     /**

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;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;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;IAcrE,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;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,CAAC,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;YAyBpD,eAAe;YAgBf,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;IAcrE,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,SAAS;CAMlB"}

package/dist/deployment/rhdh/deployment.js

@@ -19,9 +19,13 @@ export class RHDHDeployment {
         this._log("RHDH Base URL: " + this.rhdhUrl);
         console.table(this.deploymentConfig);
     }
-    async deploy() {
+    async deploy(options) {
         this._log("Starting RHDH deployment...");
-        test.setTimeout(600_000);
+        // Default 600s, custom number to override, null to skip and let consumer control the timeout
+        const timeout = options?.timeout === undefined ? 600_000 : options.timeout;
+        if (timeout !== null) {
+            test.setTimeout(timeout);
+        }
         await this.k8sClient.createNamespaceIfNotExists(this.deploymentConfig.namespace);
         await this._applyAppConfig();
         await this._applySecrets();

package/dist/utils/bash.d.ts

@@ -1,3 +1,9 @@
 import { $ } from "zx";
+/**
+ * Runs a shell command with stdout/stderr captured. On success, output is not printed.
+ * On non-zero exit, stdout and stderr are written to console.error and an error is thrown.
+ * Use for noisy commands that should stay quiet on success but show output when they fail.
+ */
+export declare function runQuietUnlessFailure(strings: TemplateStringsArray, ...values: unknown[]): Promise<void>;
 export { $ };
 //# sourceMappingURL=bash.d.ts.map

package/dist/utils/bash.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../../src/utils/bash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,IAAI,CAAC;AAKvB,OAAO,EAAE,CAAC,EAAE,CAAC"}
+{"version":3,"file":"bash.d.ts","sourceRoot":"","sources":["../../src/utils/bash.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,IAAI,CAAC;AAYvB;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,oBAAoB,EAC7B,GAAG,MAAM,EAAE,OAAO,EAAE,GACnB,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED,OAAO,EAAE,CAAC,EAAE,CAAC"}

package/dist/utils/bash.js

@@ -1,4 +1,25 @@
 import { $ } from "zx";
 $.quiet = true;
 $.stdio = ["inherit", "inherit", "inherit"];
+/**
+ * Runs a shell command with stdout/stderr captured. On success, output is not printed.
+ * On non-zero exit, stdout and stderr are written to console.error and an error is thrown.
+ * Use for noisy commands that should stay quiet on success but show output when they fail.
+ */
+export async function runQuietUnlessFailure(strings, ...values) {
+    const runWithPipe = $({
+        stdio: ["pipe", "pipe", "pipe"],
+        nothrow: true,
+    });
+    const result = (await runWithPipe(strings, ...values));
+    if (result.exitCode !== 0) {
+        if (result.stdout?.trim()) {
+            console.error("[command stdout]:", result.stdout.trim());
+        }
+        if (result.stderr?.trim()) {
+            console.error("[command stderr]:", result.stderr.trim());
+        }
+        throw new Error(`Command failed with exit code ${result.exitCode}. Output above.`);
+    }
+}
 export { $ };

package/dist/utils/index.d.ts

@@ -1,5 +1,5 @@
 export { envsubst } from "./common.js";
-export { $ } from "./bash.js";
+export { $, runQuietUnlessFailure } from "./bash.js";
 export { mergeYamlFiles, mergeYamlFilesIfExists, mergeYamlFilesToFile, } from "./merge-yamls.js";
 export { KubernetesClientHelper } from "./kubernetes-client.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,MAAM,WAAW,CAAC;AAC9B,OAAO,EACL,cAAc,EACd,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,EACL,cAAc,EACd,sBAAsB,EACtB,oBAAoB,GACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC"}

package/dist/utils/index.js

@@ -1,4 +1,4 @@
 export { envsubst } from "./common.js";
-export { $ } from "./bash.js";
+export { $, runQuietUnlessFailure } from "./bash.js";
 export { mergeYamlFiles, mergeYamlFilesIfExists, mergeYamlFilesToFile, } from "./merge-yamls.js";
 export { KubernetesClientHelper } from "./kubernetes-client.js";

package/package.json

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