merged the orchestrator specs down to two

Signed-off-by: rostalan <rlan@redhat.com>

Author: rostalan

workspaces/orchestrator/e2e-tests/playwright.config.ts

@@ -10,13 +10,12 @@ export default defineConfig({
   projects: [
     {
       name: "orchestrator",
-      testMatch: "specs/**/*.spec.ts",
-      testIgnore: "specs/**/*-rbac.spec.ts",
+      testMatch: "specs/orchestrator.spec.ts",
     },
     {
       name: "orchestrator-rbac",
       dependencies: ["orchestrator"],
-      testMatch: "specs/**/*-rbac.spec.ts",
+      testMatch: "specs/orchestrator-rbac.spec.ts",
     },
   ],
 });

workspaces/orchestrator/e2e-tests/tests/specs/deploy-sonataflow.ts

@@ -1,24 +1,87 @@
+import { readdir, readFile, writeFile } from "fs/promises";
+import { join } from "path";
 import { installOrchestrator } from "rhdh-e2e-test-utils/orchestrator";
 import { $ } from "rhdh-e2e-test-utils/utils";
 
 const WORKFLOW_REPO =
   "https://github.com/rhdhorchestrator/serverless-workflows.git";
 
+const MANIFEST_DIRS = [
+  "workflows/greeting/manifests",
+  "workflows/fail-switch/src/main/resources/manifests",
+];
+
 export async function deploySonataflow(namespace: string): Promise<void> {
   await installOrchestrator(namespace);
 
   const workflowDir = `/tmp/serverless-workflows-${process.pid}`;
   try {
     await $`git clone --depth=1 ${WORKFLOW_REPO} ${workflowDir}`;
-    await $`oc apply -n ${namespace} -f ${workflowDir}/workflows/greeting/manifests/`;
-    await $`oc apply -n ${namespace} -f ${workflowDir}/workflows/fail-switch/src/main/resources/manifests/`;
+    await patchWorkflowPersistence(workflowDir);
+    for (const rel of MANIFEST_DIRS) {
+      await $`oc apply -n ${namespace} -f ${join(workflowDir, rel)}`;
+    }
   } finally {
     await $`rm -rf ${workflowDir}`.catch(() => {});
   }
 
   await waitForWorkflows(namespace);
 }
 
+/**
+ * The upstream serverless-workflows manifests expect a Helm-chart-style
+ * PostgreSQL (secret & service both named sonataflow-psql-postgresql,
+ * keys: postgres-username / postgres-password).  The e2e infrastructure
+ * creates a different layout (secret: backstage-psql-secret, service:
+ * backstage-psql, keys: POSTGRES_USER / POSTGRES_PASSWORD).
+ * Patch the cloned manifests so the SonataFlow CRs reference the
+ * resources that actually exist.
+ */
+async function patchWorkflowPersistence(workflowDir: string): Promise<void> {
+  for (const rel of MANIFEST_DIRS) {
+    const dir = join(workflowDir, rel);
+    const files = (await readdir(dir)).filter(
+      (f) => f.endsWith(".yaml") || f.endsWith(".yml"),
+    );
+    for (const file of files) {
+      const filePath = join(dir, file);
+      let content = await readFile(filePath, "utf-8");
+      content = patchPersistence(content);
+      await writeFile(filePath, content);
+    }
+  }
+}
+
+function patchPersistence(content: string): string {
+  // secretRef precedes serviceRef in these manifests; patch it first so
+  // the blanket replacement below only touches serviceRef occurrences.
+  content = content.replace(
+    /(secretRef:)([\s\S]*?)(serviceRef:)/g,
+    (_m, pre, block, post) =>
+      pre +
+      block
+        .replace(
+          /name: sonataflow-psql-postgresql/,
+          "name: backstage-psql-secret",
+        )
+        .replace(/userKey: postgres-username/, "userKey: POSTGRES_USER")
+        .replace(
+          /passwordKey: postgres-password/,
+          "passwordKey: POSTGRES_PASSWORD",
+        ) +
+      post,
+  );
+
+  // Remaining sonataflow-psql-postgresql refs are in serviceRef blocks.
+  content = content.replace(/sonataflow-psql-postgresql/g, "backstage-psql");
+  content = content.replace(
+    /databaseName: sonataflow\b/g,
+    "databaseName: backstage_plugin_orchestrator",
+  );
+
+  return content;
+}
+
 async function waitForWorkflows(namespace: string): Promise<void> {
   const resourceDeadline = Date.now() + 60_000;
   while (Date.now() < resourceDeadline) {