feat(cli): refactor

Signed-off-by: Pavel Tishkov <[email protected]>

Author: fl64

src/cli/internal/cmd/collectdebuginfo/collectors.go

@@ -45,9 +45,6 @@ var coreKinds = map[string]bool{
 	"PersistentVolumeClaim": true,
 	"PersistentVolume":      true,
 	"Event":                 true,
-	"Service":               true,
-	"ConfigMap":             true,
-	"Secret":                true,
 }
 
 func (b *DebugBundle) collectVMResources(ctx context.Context, client kubeclient.Client, namespace, vmName string) error {
@@ -364,83 +361,45 @@ func (b *DebugBundle) getInternalResourceList(ctx context.Context, resource, nam
 }
 
 func (b *DebugBundle) outputResource(kind, name, namespace string, obj runtime.Object) error {
-	unstructuredObj, isUnstructured := obj.(*unstructured.Unstructured)
-
 	// Output separator if not first resource
 	if b.resourceCount > 0 {
 		fmt.Fprintf(b.stdout, "\n---\n")
 	}
 	b.resourceCount++
 
-	// Convert to JSON first to preserve all fields including TypeMeta (kind, apiVersion, spec, status, etc.)
-	jsonBytes, err := json.Marshal(obj)
-	if err != nil {
-		return fmt.Errorf("failed to marshal %s/%s to JSON: %w", kind, name, err)
+	// Ensure Kind is set from input if missing
+	gvk := obj.GetObjectKind().GroupVersionKind()
+	if gvk.Kind == "" {
+		gvk.Kind = kind
+		obj.GetObjectKind().SetGroupVersionKind(gvk)
 	}
 
-	// Always parse JSON and ensure apiVersion and kind are present
-	// This handles cases where TypeMeta might not be serialized properly
-	var jsonObj map[string]interface{}
-	if err := json.Unmarshal(jsonBytes, &jsonObj); err == nil {
-		needsUpdate := false
-		// If apiVersion is missing, try to get it from the object itself
-		if _, ok := jsonObj["apiVersion"]; !ok {
-			var apiVersion string
-
-			// For unstructured objects, get apiVersion directly
-			if isUnstructured {
-				apiVersion = unstructuredObj.GetAPIVersion()
-			} else {
-				// For typed objects, get apiVersion from GVK
-				// Objects from cluster should have GVK set correctly
-				gvk := obj.GetObjectKind().GroupVersionKind()
-
-				// If GVK is empty, try to get it from scheme
-				if gvk.Kind == "" || (gvk.Group == "" && gvk.Version == "") {
-					// Try to get GVK from scheme
-					if gvks, _, err := kubeclient.Scheme.ObjectKinds(obj); err == nil && len(gvks) > 0 {
-						gvk = gvks[0]
-						// Set GVK on the object for future use
-						obj.GetObjectKind().SetGroupVersionKind(gvk)
-					}
-				}
-
-				// Use GroupVersion().String() which automatically formats as "group/version" or "version"
-				// This works for both custom resources (group/version) and core resources (version only)
-				apiVersion = gvk.GroupVersion().String()
-			}
-
-			// If we got a valid apiVersion, use it
-			if apiVersion != "" && apiVersion != "/" {
-				jsonObj["apiVersion"] = apiVersion
-				needsUpdate = true
-			} else if coreKinds[kind] {
-				// Fallback: for core Kubernetes resources, use "v1"
-				jsonObj["apiVersion"] = coreAPIVersion
-				needsUpdate = true
-			}
-		}
-		// Ensure kind is also present
-		if _, ok := jsonObj["kind"]; !ok {
-			jsonObj["kind"] = kind
-			needsUpdate = true
-		}
-		// Re-marshal with apiVersion and kind if needed
-		if needsUpdate {
-			jsonBytes, err = json.Marshal(jsonObj)
-			if err != nil {
-				return fmt.Errorf("failed to re-marshal %s/%s to JSON: %w", kind, name, err)
-			}
+	// If GroupVersion is missing/empty, try to get from scheme
+	if gvk.GroupVersion().Empty() {
+		gvks, _, err := kubeclient.Scheme.ObjectKinds(obj)
+		if err == nil && len(gvks) > 0 {
+			gvk = gvks[0]
+			obj.GetObjectKind().SetGroupVersionKind(gvk)
+		} else if coreKinds[kind] {
+			// Fallback for core Kubernetes resources if scheme doesn't know about them
+			gvk = schema.GroupVersionKind{Group: "", Version: coreAPIVersion, Kind: kind}
+			obj.GetObjectKind().SetGroupVersionKind(gvk)
 		}
 	}
 
-	// Convert JSON to YAML - this preserves all fields
+	// Marshal to JSON (now with TypeMeta if set)
+	jsonBytes, err := json.Marshal(obj)
+	if err != nil {
+		return fmt.Errorf("failed to marshal %s/%s to JSON: %w", kind, name, err)
+	}
+
+	// Convert to YAML
 	yamlBytes, err := yaml.JSONToYAML(jsonBytes)
 	if err != nil {
 		return fmt.Errorf("failed to convert %s/%s to YAML: %w", kind, name, err)
 	}
 
-	// Output comment and full YAML resource
+	// Output
 	fmt.Fprintf(b.stdout, "# %d. %s: %s\n%s", b.resourceCount, kind, name, string(yamlBytes))
 
 	return nil