@f5-sales-demo/pi-resource-management 23.0.0 → 23.0.2

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@f5-sales-demo/pi-resource-management",
-	"version": "23.0.0",
+	"version": "23.0.2",
 	"description": "Shared resource management for F5 XC manifest parsing, validation, diff, and CRUD operations",
 	"homepage": "https://github.com/f5-sales-demo/xcsh",
 	"author": "Robin Mordasiewicz",

package/src/resource-client.ts

@@ -124,7 +124,7 @@ export class ResourceClient {
 		const getUrl = this.#buildUrl(resolved.paths.get, namespace, name);
 
 		const startMs = performance.now();
-		const existing = await this.#fetchResource(getUrl);
+		const existing = await this.#fetchComparisonResource(getUrl, resolved);
 
 		if (existing.status === 404) {
 			if (dryRun) return { status: "dry-run", action: "create" };
@@ -166,7 +166,7 @@ export class ResourceClient {
 		const name = manifest.metadata.name;
 		const getUrl = this.#buildUrl(resolved.paths.get, namespace, name);
 		const startMs = performance.now();
-		const existing = await this.#fetchResource(getUrl);
+		const existing = await this.#fetchComparisonResource(getUrl, resolved);
 
 		if (existing.error) return { status: "error", error: existing.error };
 
@@ -275,7 +275,7 @@ export class ResourceClient {
 		const name = manifest.metadata.name;
 		const url = this.#buildUrl(resolved.paths.get, namespace, name);
 
-		const existing = await this.#fetchResource(url);
+		const existing = await this.#fetchComparisonResource(url, resolved);
 		if (existing.status === 404) {
 			return { isNew: true };
 		}
@@ -369,6 +369,22 @@ export class ResourceClient {
 		return body;
 	}
 
+	async #fetchComparisonResource(
+		url: string,
+		resolved: ResolvedKind,
+	): Promise<{ status: number; body?: Record<string, unknown>; error?: ResourceError }> {
+		// The normal certificate projection omits encrypted key material. Compare
+		// against its writable form instead of treating an omitted key as a change.
+		if (resolved.kind !== "certificate") return this.#fetchResource(url);
+		const comparisonUrl = new URL(url);
+		comparisonUrl.searchParams.set("response_format", "2");
+		const result = await this.#fetchResource(comparisonUrl.toString());
+		const replaceForm = result.body?.replace_form;
+		if (replaceForm && typeof replaceForm === "object" && !Array.isArray(replaceForm))
+			return { ...result, body: replaceForm as Record<string, unknown> };
+		return result;
+	}
+
 	async #fetchResource(
 		url: string,
 	): Promise<{ status: number; body?: Record<string, unknown>; error?: ResourceError }> {