INS-1519: Fix kyverno policy download (#285)

* Fix YAML convertion

* Fixes

Author: jdesouza

pkg/appgroups/types.go

@@ -1,5 +1,7 @@
 package appgroups
 
+import "github.com/fairwindsops/insights-cli/pkg/utils"
+
 // copied from FW Insights openAPI codegen
 
 type AppGroup struct {
@@ -8,6 +10,10 @@ type AppGroup struct {
 	Type string       `json:"type,omitempty" yaml:"type,omitempty"`
 }
 
+func (a AppGroup) GetYamlBytes() ([]byte, error) {
+	return utils.GetYamlBytes(a)
+}
+
 // AppGroupSpec defines model for AppGroupSpec.
 type AppGroupSpec struct {
 	Exclude []AppGroupSpecCriteria `json:"exclude,omitempty" yaml:"exclude,omitempty"`

pkg/cli/download.go

@@ -22,7 +22,6 @@ import (
 
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v3"
 )
 
 var downloadDir string
@@ -50,6 +49,7 @@ var downloadCmd = &cobra.Command{
 
 type nameable interface {
 	GetName() string
+	GetYamlBytes() ([]byte, error)
 }
 
 var filenameRegex = regexp.MustCompile("[^A-Za-z0-9]+")
@@ -78,9 +78,9 @@ func saveEntitiesLocally[T nameable](saveDir string, entities []T, overrideLocal
 		filename := formatFilename(e.GetName())
 		filePath := saveDir + "/" + filename
 
-		b, err := yaml.Marshal(e)
+		b, err := e.GetYamlBytes()
 		if err != nil {
-			return saved, fmt.Errorf("error marshalling policy-mapping %s: %w", e.GetName(), err)
+			return saved, fmt.Errorf("error getting yaml bytes for entity %s: %w", e.GetName(), err)
 		}
 		err = os.WriteFile(filePath, b, 0644)
 		if err != nil {

pkg/kyverno/types.go

@@ -15,7 +15,12 @@
 package kyverno
 
 import (
+	"bytes"
+	"fmt"
+	"strings"
 	"time"
+
+	"go.yaml.in/yaml/v3"
 )
 
 // KyvernoPolicy represents a Kyverno policy
@@ -34,6 +39,102 @@ type KyvernoPolicy struct {
 	UpdatedAt         *time.Time             `json:"updated_at,omitempty"`
 }
 
+func (k KyvernoPolicy) GetYamlBytes() ([]byte, error) {
+	yamlBytes, err := convertPolicySpecToYAML(k)
+	if err != nil {
+		return nil, fmt.Errorf("failed to convert policy spec to YAML: %w", err)
+	}
+	return []byte(yamlBytes), nil
+}
+
+// Helper function to convert a KyvernoPolicy spec to YAML string
+func convertPolicySpecToYAML(policy KyvernoPolicy) (string, error) {
+	// Parse the spec JSON
+
+	apiVersion := "kyverno.io/v1"
+	kind := "ClusterPolicy"
+	if policy.Kind != "" {
+		kind = policy.Kind
+	}
+	if policy.APIVersion != "" {
+		apiVersion = policy.APIVersion
+	}
+	// Create the full policy structure
+	policyMap := map[string]any{
+		"apiVersion": apiVersion,
+		"kind":       kind,
+		"metadata": map[string]any{
+			"name": policy.Name,
+		},
+		"spec": policy.Spec,
+	}
+
+	// Add labels and annotations if they exist and are not empty
+	if len(policy.Labels) > 0 {
+		policyMap["metadata"].(map[string]any)["labels"] = policy.Labels
+	}
+
+	// Add existing annotations if they exist
+	if len(policy.Annotations) > 0 {
+		policyMap["metadata"].(map[string]any)["annotations"] = policy.Annotations
+	}
+
+	// Add status only if it exists and is not null
+	if len(policy.Status) > 0 {
+		policyMap["status"] = policy.Status
+	}
+	// Clean up any null values before marshaling
+	cleanPolicyMap := cleanNullValues(policyMap)
+
+	// Convert to YAML
+	// yaml converter should use only 2 spaces for indentation
+	var buf bytes.Buffer
+	encoder := yaml.NewEncoder(&buf)
+	encoder.SetIndent(2)
+	err := encoder.Encode(cleanPolicyMap)
+	if err != nil {
+		return "", fmt.Errorf("failed to marshal policy to YAML: %w", err)
+	}
+	yamlContent := buf.String()
+	yamlContent = strings.TrimSpace(yamlContent)
+	return yamlContent, nil
+}
+
+// cleanNullValues recursively removes null values from a map
+func cleanNullValues(data any) any {
+	switch v := data.(type) {
+	case map[string]any:
+		cleaned := make(map[string]any)
+		for key, value := range v {
+			if value != nil {
+				cleanedValue := cleanNullValues(value)
+				if cleanedValue != nil {
+					cleaned[key] = cleanedValue
+				}
+			}
+		}
+		return cleaned
+	case []any:
+		var cleaned []any
+		for _, item := range v {
+			if item != nil {
+				cleanedItem := cleanNullValues(item)
+				if cleanedItem != nil {
+					cleaned = append(cleaned, cleanedItem)
+				}
+			}
+		}
+		return cleaned
+	case nil:
+		return nil
+	case string:
+		// Don't process strings, return as-is
+		return v
+	default:
+		return v
+	}
+}
+
 // GetName implements the nameable interface for download functionality
 func (k KyvernoPolicy) GetName() string {
 	return k.Name

pkg/policymappings/types.go

@@ -1,5 +1,9 @@
 package policymappings
 
+import (
+	"github.com/fairwindsops/insights-cli/pkg/utils"
+)
+
 // copied from FW Insights openAPI codegen
 
 type PolicyMapping struct {
@@ -19,3 +23,7 @@ type PolicyMappingSpec struct {
 func (pm PolicyMapping) GetName() string {
 	return pm.Name
 }
+
+func (pm PolicyMapping) GetYamlBytes() ([]byte, error) {
+	return utils.GetYamlBytes(pm)
+}

pkg/utils/utils.go

@@ -1,5 +1,9 @@
 package utils
 
+import (
+	"go.yaml.in/yaml/v2"
+)
+
 func GetHeaders(inputContentType string) map[string]string {
 	contentType := "application/json"
 	if inputContentType != "" {
@@ -20,3 +24,7 @@ func InvertBoolPointer(b *bool) *bool {
 	r := !*b
 	return &r
 }
+
+func GetYamlBytes[T any](e T) ([]byte, error) {
+	return yaml.Marshal(e)
+}