fix(conformance): decompress ResourceProperties in discovery responses

Fix compressed ResourceProperties being dropped when converting TrackedProgress to ProgressResult in create/delete paths.

Author: JeroenSoeters

pkg/plugin-conformance-tests/harness.go

@@ -1233,18 +1233,23 @@ func (h *TestHarness) CreateAllUnmanagedResources(evaluatedJSON string) ([]Creat
 		// Strip Formae metadata tags from the resource properties
 		h.stripFormaeTags(res)
 
-		// Strip nested empty collections ({}/[]) that PKL renders for unset
-		// nullable Listing/Mapping fields. Without this, K8S rejects resources
-		// with empty probe objects (e.g. livenessProbe: {}).
-		h.stripNestedEmptyCollections(res)
-
-		// Resolve any resolvable references using previously created resources
+		// Resolve any resolvable references using previously created resources.
+		// This must happen BEFORE stripNestedEmptyCollections to match the
+		// agent's order of operations (resolver.ConvertToPluginFormat then
+		// patch.StripNestedEmptyCollections). The resolvable markers ($res,
+		// $label, etc.) must be intact when the resolver runs; stripping first
+		// can corrupt the resolvable objects through the json round-trip.
 		resolvedProps, err := h.resolveResolvablesInProperties(res.Properties, createdResources)
 		if err != nil {
 			return createdResources, fmt.Errorf("failed to resolve resolvables for %s: %w", res.Label, err)
 		}
 		res.Properties = resolvedProps
 
+		// Strip nested empty collections ({}/[]) that PKL renders for unset
+		// nullable Listing/Mapping fields. Without this, K8S rejects resources
+		// with empty probe objects (e.g. livenessProbe: {}).
+		h.stripNestedEmptyCollections(res)
+
 		// Create the resource with retry on recoverable errors
 		label := fmt.Sprintf("create %s", res.Label)
 		finalProgress, err := h.retryOnRecoverable(label, func() (*pluginOperationResult, error) {

pkg/plugin-conformance-tests/plugin_coordinator.go

@@ -389,6 +389,16 @@ func (c *TestPluginCoordinator) createResource(req CreateResourceRequest) Create
 		"statusMessage", trackedProgress.StatusMessage,
 		"nativeID", trackedProgress.NativeID)
 
+	// Decompress ResourceProperties if compressed for Ergo transport.
+	// TrackedProgress compresses and nils ResourceProperties, but callers
+	// expect it on the embedded ProgressResult.
+	if len(trackedProgress.ResourceProperties) == 0 && len(trackedProgress.CompressedResourceProperties) > 0 {
+		decompressed, err := plugin.DecompressJSON(trackedProgress.CompressedResourceProperties)
+		if err == nil {
+			trackedProgress.ResourceProperties = decompressed
+		}
+	}
+
 	// Return immediately with the operator PID and initial progress
 	// The caller is responsible for polling via GetLatestProgressRequest if needed
 	return CreateResourceResult{
@@ -444,6 +454,14 @@ func (c *TestPluginCoordinator) deleteResource(req DeleteResourceRequest) Delete
 		"nativeID", req.NativeID,
 		"status", trackedProgress.OperationStatus)
 
+	// Decompress ResourceProperties if compressed for Ergo transport
+	if len(trackedProgress.ResourceProperties) == 0 && len(trackedProgress.CompressedResourceProperties) > 0 {
+		decompressed, err := plugin.DecompressJSON(trackedProgress.CompressedResourceProperties)
+		if err == nil {
+			trackedProgress.ResourceProperties = decompressed
+		}
+	}
+
 	// Return immediately with the operator PID and initial progress
 	// The caller is responsible for polling via GetLatestProgressRequest if needed
 	return DeleteResourceResult{