add dynamic unknown fields to the blueprint property types (#260)

Author: itamar-smirra-port

internal/cli/models.go

@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"encoding/json"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -45,26 +46,28 @@ type (
 	}
 
 	BlueprintProperty struct {
-		Type               string              `json:"type,omitempty"`
-		Title              *string             `json:"title,omitempty"`
-		Identifier         string              `json:"identifier,omitempty"`
-		Items              map[string]any      `json:"items,omitempty"`
-		Default            any                 `json:"default,omitempty"`
-		Icon               *string             `json:"icon,omitempty"`
-		Format             *string             `json:"format,omitempty"`
-		MaxLength          *int                `json:"maxLength,omitempty"`
-		MinLength          *int                `json:"minLength,omitempty"`
-		MaxItems           *int                `json:"maxItems,omitempty"`
-		MinItems           *int                `json:"minItems,omitempty"`
-		Maximum            *float64            `json:"maximum,omitempty"`
-		Minimum            *float64            `json:"minimum,omitempty"`
-		Description        *string             `json:"description,omitempty"`
-		Blueprint          *string             `json:"blueprint,omitempty"`
-		Pattern            *string             `json:"pattern,omitempty"`
-		Enum               []any               `json:"enum,omitempty"`
-		Spec               *string             `json:"spec,omitempty"`
-		SpecAuthentication *SpecAuthentication `json:"specAuthentication,omitempty"`
-		EnumColors         map[string]string   `json:"enumColors,omitempty"`
+		Type               string                 `json:"type,omitempty"`
+		Title              *string                `json:"title,omitempty"`
+		Identifier         string                 `json:"identifier,omitempty"`
+		Items              map[string]any 		  `json:"items,omitempty"`
+		Default            any            		  `json:"default,omitempty"`
+		Icon               *string                `json:"icon,omitempty"`
+		Format             *string                `json:"format,omitempty"`
+		MaxLength          *int                   `json:"maxLength,omitempty"`
+		MinLength          *int                   `json:"minLength,omitempty"`
+		MaxItems           *int                   `json:"maxItems,omitempty"`
+		MinItems           *int                   `json:"minItems,omitempty"`
+		Maximum            *float64               `json:"maximum,omitempty"`
+		Minimum            *float64               `json:"minimum,omitempty"`
+		Description        *string                `json:"description,omitempty"`
+		Blueprint          *string                `json:"blueprint,omitempty"`
+		Pattern            *string                `json:"pattern,omitempty"`
+		Enum               []any          		  `json:"enum,omitempty"`
+		Spec               *string                `json:"spec,omitempty"`
+		SpecAuthentication *SpecAuthentication    `json:"specAuthentication,omitempty"`
+		EnumColors         map[string]string      `json:"enumColors,omitempty"`
+		// UnknownFields captures any dynamic fields not explicitly defined above
+		UnknownFields      map[string]any 		  `json:"-"`
 	}
 
 	EntitiesSortModel struct {
@@ -486,6 +489,75 @@ type (
 	}
 )
 
+// Custom UnmarshalJSON for BlueprintProperty to capture dynamic fields
+func (bp *BlueprintProperty) UnmarshalJSON(data []byte) error {
+	// Define an alias to avoid infinite recursion
+	type Alias BlueprintProperty
+	
+	// First, unmarshal into the alias to populate known fields
+	aux := &struct {
+		*Alias
+	}{
+		Alias: (*Alias)(bp),
+	}
+	
+	if err := json.Unmarshal(data, aux); err != nil {
+		return err
+	}
+	
+	// Now unmarshal into a map to capture all fields
+	var all map[string]interface{}
+	if err := json.Unmarshal(data, &all); err != nil {
+		return err
+	}
+	
+	bp.UnknownFields = make(map[string]interface{})
+	
+	// List of known fields that shouldn't go into UnknownFields
+	knownFields := map[string]bool{
+		"type": true, "title": true, "identifier": true, "items": true,
+		"default": true, "icon": true, "format": true, "maxLength": true,
+		"minLength": true, "maxItems": true, "minItems": true, "maximum": true,
+		"minimum": true, "description": true, "blueprint": true, "pattern": true,
+		"enum": true, "spec": true, "specAuthentication": true, "enumColors": true,
+	}
+	
+	// Add any unknown fields to UnknownFields
+	for key, value := range all {
+		if !knownFields[key] {
+			bp.UnknownFields[key] = value
+		}
+	}
+	
+	return nil
+}
+
+// Custom MarshalJSON for BlueprintProperty to include dynamic fields
+func (bp BlueprintProperty) MarshalJSON() ([]byte, error) {
+	// Define an alias to avoid infinite recursion
+	type Alias BlueprintProperty
+	
+	// Marshal the known fields first
+	aux := Alias(bp)
+	aux.UnknownFields = nil // Don't marshal this field directly
+	
+	data, err := json.Marshal(aux)
+	if err != nil {
+		return nil, err
+	}
+	
+	var result map[string]interface{}
+	if err := json.Unmarshal(data, &result); err != nil {
+		return nil, err
+	}
+	
+	for key, value := range bp.UnknownFields {
+		result[key] = value
+	}
+	
+	return json.Marshal(result)
+}
+
 type PortBody struct {
 	OK                   bool              `json:"ok"`
 	Entity               Entity            `json:"entity"`