@red-hat-developer-hub/e2e-test-utils 1.1.35 → 1.1.36
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +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;;;;;;;;;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;
|
|
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;;;;;;;;;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;AA0GD;;;;;;;;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"}
|
|
@@ -242,7 +242,12 @@ async function resolvePluginPackages(plugins, metadataMap, metadataPath) {
|
|
|
242
242
|
console.log(`[PluginMetadata] ${pkg} → ${metadata.packagePath}`);
|
|
243
243
|
return { ...plugin, package: metadata.packagePath };
|
|
244
244
|
}
|
|
245
|
-
|
|
245
|
+
// Wrapper (local path): metadata is the source of truth.
|
|
246
|
+
// The user config may have a stale OCI ref from a previous version.
|
|
247
|
+
if (pkg !== metadata.packagePath) {
|
|
248
|
+
console.log(`[PluginMetadata] ${pkg} → ${metadata.packagePath}`);
|
|
249
|
+
}
|
|
250
|
+
return { ...plugin, package: metadata.packagePath };
|
|
246
251
|
}
|
|
247
252
|
// 2. Local paths (./dynamic-plugins/dist/...) and other formats — keep as-is.
|
|
248
253
|
// Local paths reference plugins bundled in the RHDH container image and work
|
|
@@ -151,6 +151,34 @@ describe("processPluginsForDeployment — nightly mode", () => {
|
|
|
151
151
|
await fs.remove(metadataDir);
|
|
152
152
|
}
|
|
153
153
|
});
|
|
154
|
+
it("resolves wrapper plugin to wrapper path when user config has stale OCI ref", async () => {
|
|
155
|
+
// Reproduces: metadata says plugin is a wrapper (local path), but user's
|
|
156
|
+
// dynamic-plugins.yaml has a hardcoded OCI ref from a previous version.
|
|
157
|
+
// In nightly mode, the plugin should resolve to the wrapper path from
|
|
158
|
+
// metadata, not pass through the stale OCI ref unchanged.
|
|
159
|
+
const metadataDir = await createMetadataFixture([
|
|
160
|
+
{
|
|
161
|
+
name: "backstage-plugin-catalog-backend-module-github-org",
|
|
162
|
+
packageName: "@backstage/plugin-catalog-backend-module-github-org",
|
|
163
|
+
dynamicArtifact: "./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic",
|
|
164
|
+
},
|
|
165
|
+
]);
|
|
166
|
+
try {
|
|
167
|
+
const config = {
|
|
168
|
+
plugins: [
|
|
169
|
+
{
|
|
170
|
+
package: "oci://ghcr.io/redhat-developer/rhdh-plugin-export-overlays/backstage-plugin-catalog-backend-module-github-org:bs_1.45.3__0.3.16",
|
|
171
|
+
disabled: false,
|
|
172
|
+
},
|
|
173
|
+
],
|
|
174
|
+
};
|
|
175
|
+
const result = await processPluginsForDeployment(config, metadataDir);
|
|
176
|
+
assert.strictEqual(result.plugins[0].package, "./dynamic-plugins/dist/backstage-plugin-catalog-backend-module-github-org-dynamic", "when metadata has a wrapper path, nightly must resolve to wrapper — not pass through stale OCI ref from user config");
|
|
177
|
+
}
|
|
178
|
+
finally {
|
|
179
|
+
await fs.remove(metadataDir);
|
|
180
|
+
}
|
|
181
|
+
});
|
|
154
182
|
it("keeps local path plugins unchanged in nightly", async () => {
|
|
155
183
|
const metadataDir = await createMetadataFixture([
|
|
156
184
|
{
|