@red-hat-developer-hub/e2e-test-utils 1.1.30 → 1.1.32

package/dist/deployment/orchestrator/install-orchestrator.sh

@@ -105,9 +105,9 @@ log::success() {
 # Operator subscription and status
 # ---------------------------------------------------------------------------
 install_subscription() {
-  local name=$1 namespace=$2 channel=$3 package=$4 source_name=$5 source_namespace=$6
-  oc apply -f - << EOD
-apiVersion: operators.coreos.com/v1alpha1
+  local name=$1 namespace=$2 channel=$3 package=$4 source_name=$5 source_namespace=$6 starting_csv=${7:-}
+  local yaml
+  yaml="apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
   name: $name
@@ -117,30 +117,38 @@ spec:
   installPlanApproval: Automatic
   name: $package
   source: $source_name
-  sourceNamespace: $source_namespace
-EOD
+  sourceNamespace: $source_namespace"
+  if [[ -n "$starting_csv" ]]; then
+    yaml+="
+  startingCSV: $starting_csv"
+  fi
+  echo "$yaml" | oc apply -f -
   return 0
 }
 
-check_operator_status() {
-  local timeout=${1:-300} namespace=$2 operator_name=$3 expected_status=${4:-Succeeded}
-  log::info "Checking operator '${operator_name}' in '${namespace}' (timeout ${timeout}s, expected: ${expected_status})"
+# Wait for an operator CSV to reach a status phase.
+# Uses OLM label selector (operators.coreos.com/<package>.<namespace>) which is
+# deterministic, unlike spec.displayName which varies across channels/versions.
+wait_for_operator() {
+  local timeout=${1:-300} namespace=$2 package=$3 expected_status=${4:-Succeeded}
+  local label="operators.coreos.com/${package}.${namespace}"
+  log::info "Waiting for operator '${package}' in '${namespace}' (label=${label}, timeout ${timeout}s, expected: ${expected_status})"
   timeout "${timeout}" bash -c "
     while true; do
-      CURRENT_PHASE=\$(oc get csv -n '${namespace}' -o jsonpath='{.items[?(@.spec.displayName==\"${operator_name}\")].status.phase}')
-      echo \"[check_operator_status] Phase: \${CURRENT_PHASE}\" >&2
-      [[ \"\${CURRENT_PHASE}\" == \"${expected_status}\" ]] && echo \"[check_operator_status] Operator reached ${expected_status}\" >&2 && break
+      CURRENT_PHASE=\$(oc get csv -n '${namespace}' -l '${label}' -o jsonpath='{.items[0].status.phase}' 2>/dev/null)
+      echo \"[wait_for_operator] Phase: \${CURRENT_PHASE}\" >&2
+      [[ \"\${CURRENT_PHASE}\" == \"${expected_status}\" ]] && echo \"[wait_for_operator] Operator reached ${expected_status}\" >&2 && break
       sleep 10
     done
-  " || { log::error "Operator did not reach ${expected_status} in time."; return 1; }
+  " || { log::error "Operator '${package}' did not reach ${expected_status} in time."; return 1; }
 }
 
 install_serverless_logic_ocp_operator() {
-  install_subscription logic-operator openshift-operators stable logic-operator redhat-operators openshift-marketplace
+  install_subscription logic-operator openshift-operators stable logic-operator redhat-operators openshift-marketplace logic-operator.v1.37.2
   return 0
 }
 waitfor_serverless_logic_ocp_operator() {
-  check_operator_status 500 openshift-operators "Red Hat OpenShift Serverless Logic" Succeeded
+  wait_for_operator 500 openshift-operators logic-operator Succeeded
   return 0
 }
 
@@ -149,7 +157,7 @@ install_serverless_ocp_operator() {
   return 0
 }
 waitfor_serverless_ocp_operator() {
-  check_operator_status 300 openshift-operators "Red Hat OpenShift Serverless" Succeeded
+  wait_for_operator 300 openshift-operators serverless-operator Succeeded
   return 0
 }
 

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

@@ -28,9 +28,11 @@ export interface DynamicPluginsConfig {
 export declare function isNightlyJob(): boolean;
 /**
  * Extracts the plugin name from a package path or OCI reference.
+ * Strips the `-dynamic` suffix so local paths and OCI refs for the same
+ * logical plugin produce the same key.
  *
  * Handles various formats:
- * - Local path: ./dynamic-plugins/dist/backstage-community-plugin-tech-radar
+ * - Local path: ./dynamic-plugins/dist/backstage-community-plugin-tech-radar-dynamic
  * - OCI with alias: oci://quay.io/rhdh/plugin@sha256:...!backstage-community-plugin-tech-radar
  * - OCI without alias: oci://quay.io/rhdh/backstage-community-plugin-tech-radar:tag
  */

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":"AAWA,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB;AAaD,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,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;AAID;;;;;;;;;GASG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAqBtC;AAID;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAI5D;AAYD,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AAEnD,wBAAgB,oBAAoB,CAClC,YAAY,GAAE,MAA8B,GAC3C,MAAM,GAAG,IAAI,CAQf;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC,CAyBzB;AAED,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAwBtC;AA2JD;;;;;;;GAOG;AACH;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE;IACjD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CAMT;AAqGD;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAW7E;AAED;;;;;;;GAOG;AACH,wBAAsB,2BAA2B,CAC/C,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CAwB/B;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,oBAAoB,EAC5B,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CA6B/B"}
+{"version":3,"file":"plugin-metadata.d.ts","sourceRoot":"","sources":["../../src/utils/plugin-metadata.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACtC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB;AAaD,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,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;AAID;;;;;;;;;GASG;AACH,wBAAgB,YAAY,IAAI,OAAO,CAqBtC;AAID;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAI5D;AAYD,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AAEnD,wBAAgB,oBAAoB,CAClC,YAAY,GAAE,MAA8B,GAC3C,MAAM,GAAG,IAAI,CAQf;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,cAAc,CAAC,CAyBzB;AAED,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAwBtC;AA2JD;;;;;;;GAOG;AACH;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,KAAK,EAAE;IACjD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,MAAM,CAMT;AAqGD;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAW7E;AAED;;;;;;;GAOG;AACH,wBAAsB,2BAA2B,CAC/C,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CAwB/B;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,oBAAoB,EAC5B,YAAY,GAAE,MAA8B,GAC3C,OAAO,CAAC,oBAAoB,CAAC,CA6B/B"}

package/dist/utils/plugin-metadata.js

@@ -35,16 +35,18 @@ export function isNightlyJob() {
 // ── Utilities ─────────────────────────────────────────────────────────────────
 /**
  * Extracts the plugin name from a package path or OCI reference.
+ * Strips the `-dynamic` suffix so local paths and OCI refs for the same
+ * logical plugin produce the same key.
  *
  * Handles various formats:
- * - Local path: ./dynamic-plugins/dist/backstage-community-plugin-tech-radar
+ * - Local path: ./dynamic-plugins/dist/backstage-community-plugin-tech-radar-dynamic
  * - OCI with alias: oci://quay.io/rhdh/plugin@sha256:...!backstage-community-plugin-tech-radar
  * - OCI without alias: oci://quay.io/rhdh/backstage-community-plugin-tech-radar:tag
  */
 export function extractPluginName(packageRef) {
     const ref = packageRef.includes("!") ? packageRef.split("!")[0] : packageRef;
     const match = ref.match(/\/([^/:@]+)(?:[:@].*)?$/);
-    return match?.[1] || packageRef;
+    return (match?.[1] || packageRef).replace(/-dynamic$/, "");
 }
 /**
  * Derives the displayName from a packageName.
@@ -207,7 +209,7 @@ export function getNormalizedPluginMergeKey(entry) {
     if (pkg === undefined || pkg === "") {
         return "";
     }
-    return extractPluginName(pkg).replace(/-dynamic$/, "");
+    return extractPluginName(pkg);
 }
 async function resolvePluginPackages(plugins, metadataMap, metadataPath) {
     // Build PR OCI URLs if applicable

package/dist/utils/tests/plugin-metadata.pr.test.js

@@ -256,6 +256,61 @@ describe("processPluginsForDeployment — PR mode", () => {
             await fs.remove(metadataDir);
         }
     });
+    // ── -dynamic suffix normalization ────────────────────────────────────────
+    describe("-dynamic suffix normalization", () => {
+        it("resolves OCI plugin to metadata when dynamicArtifact has -dynamic suffix", async () => {
+            const metadataDir = await createMetadataFixture([
+                {
+                    name: "backstage-plugin-catalog-backend-module-github",
+                    packageName: "@backstage/plugin-catalog-backend-module-github",
+                    dynamicArtifact: "./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic",
+                    appConfigExamples: {
+                        catalog: { providers: { github: { org: "test" } } },
+                    },
+                },
+            ]);
+            try {
+                const config = {
+                    plugins: [
+                        {
+                            package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-catalog-backend-module-github:bs_1.45.3__0.11.2",
+                            disabled: false,
+                        },
+                    ],
+                };
+                const result = await processPluginsForDeployment(config, metadataDir);
+                assert.ok(result.plugins[0].pluginConfig, "metadata config must be injected even when dynamicArtifact has -dynamic suffix but OCI URL does not");
+                assert.deepStrictEqual(result.plugins[0].pluginConfig, { catalog: { providers: { github: { org: "test" } } } }, "injected config must match metadata appConfigExamples");
+            }
+            finally {
+                await fs.remove(metadataDir);
+            }
+        });
+        it("keeps local -dynamic path unchanged when metadata also has -dynamic", async () => {
+            const metadataDir = await createMetadataFixture([
+                {
+                    name: "backstage-plugin-catalog-backend-module-github",
+                    packageName: "@backstage/plugin-catalog-backend-module-github",
+                    dynamicArtifact: "./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic",
+                },
+            ]);
+            try {
+                const config = {
+                    plugins: [
+                        {
+                            package: "./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic",
+                            disabled: false,
+                        },
+                    ],
+                };
+                const result = await processPluginsForDeployment(config, metadataDir);
+                assert.strictEqual(result.plugins[0].package, "./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-dynamic", "local path with -dynamic must stay unchanged");
+            }
+            finally {
+                await fs.remove(metadataDir);
+            }
+        });
+    });
     // ── PR vs nightly precedence ────────────────────────────────────────────
     describe("PR vs nightly precedence", () => {
         it("isNightlyJob returns false when both GIT_PR_NUMBER and E2E_NIGHTLY_MODE are set", () => {

package/dist/utils/tests/plugin-metadata.test.js

@@ -18,8 +18,8 @@ describe("extractPluginName", () => {
     it("extracts name from OCI URL with tag only (no alias)", () => {
         assert.strictEqual(extractPluginName("oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-community-plugin-tekton:bs_1.45.3__3.33.3"), "backstage-community-plugin-tekton");
     });
-    it("extracts name from local path", () => {
-        assert.strictEqual(extractPluginName("./dynamic-plugins/dist/backstage-community-plugin-keycloak-dynamic"), "backstage-community-plugin-keycloak-dynamic");
+    it("extracts name from local path and strips -dynamic suffix", () => {
+        assert.strictEqual(extractPluginName("./dynamic-plugins/dist/backstage-community-plugin-keycloak-dynamic"), "backstage-community-plugin-keycloak");
     });
     it("extracts name from OCI URL with digest but no alias", () => {
         assert.strictEqual(extractPluginName("oci://quay.io/rhdh/backstage-plugin-events-backend-module-github@sha256:c1d17d47aaa"), "backstage-plugin-events-backend-module-github");

package/package.json

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