Merge branch 'main' into dlvhdr/devbox-and-widget-blueprint

Author: dlvhdr

docs/resources/port_action.md

@@ -506,6 +506,7 @@ Optional:
 - `order_properties` (List of String) Order properties
 - `required_jq_query` (String) The required jq query of the property
 - `steps` (Attributes List) The steps of the action (see [below for nested schema](#nestedatt--self_service_trigger--steps))
+- `titles` (Attributes Map) action titles (see [below for nested schema](#nestedatt--self_service_trigger--titles))
 - `user_properties` (Attributes) User properties (see [below for nested schema](#nestedatt--self_service_trigger--user_properties))
 
 <a id="nestedatt--self_service_trigger--steps"></a>
@@ -517,6 +518,20 @@ Required:
 - `title` (String) The step's title (max 25 characters)
 
 
+<a id="nestedatt--self_service_trigger--titles"></a>
+### Nested Schema for `self_service_trigger.titles`
+
+Required:
+
+- `title` (String) The title of the action title
+
+Optional:
+
+- `description` (String) The description of the action title
+- `visible` (Boolean) The visibility of the string property
+- `visible_jq_query` (String) The visibility condition jq query of the string property
+
+
 <a id="nestedatt--self_service_trigger--user_properties"></a>
 ### Nested Schema for `self_service_trigger.user_properties`
 

examples/resources/port_action/main.tf

@@ -79,6 +79,14 @@ resource "port_action" "restart_microservice" {
   self_service_trigger = {
     operation            = "DAY-2"
     blueprint_identifier = port_blueprint.microservice.identifier
+    titles = {
+      "titleIdentifier" = {
+        title = "My String Title"
+        description = "My String Description",
+        visible_jq_query = "true"
+      }
+    }
+    order_properties = ["titleIdentifier","webhook_url","service","testString","testNumber"]
     user_properties = {
       string_props = {
         "webhook_url" = {

internal/cli/models.go

@@ -1,6 +1,9 @@
 package cli
 
 import (
+	"encoding/json"
+	"reflect"
+	"strings"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -45,26 +48,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 {
@@ -100,6 +105,12 @@ type (
 		Sort               *EntitiesSortModel  `json:"sort,omitempty"`
 	}
 
+	ActionTitle struct {
+		Title       string  `json:"title"`
+		Description *string `json:"description,omitempty"`
+		Visible     any     `json:"visible,omitempty"`
+	}
+
 	SpecAuthentication struct {
 		ClientId         string `json:"clientId,omitempty"`
 		AuthorizationUrl string `json:"authorizationUrl,omitempty"`
@@ -218,6 +229,7 @@ type (
 		Required   any                       `json:"required,omitempty"`
 		Order      []string                  `json:"order,omitempty"`
 		Steps      []Step                    `json:"steps,omitempty"`
+		Titles     map[string]ActionTitle    `json:"titles,omitempty"`
 	}
 
 	TriggerEvent struct {
@@ -486,6 +498,94 @@ type (
 	}
 )
 
+// getKnownFields uses reflection to extract JSON field names from BlueprintProperty struct
+func getKnownFields(bp *BlueprintProperty) map[string]bool {
+	knownFields := make(map[string]bool)
+	t := reflect.TypeOf(*bp)
+	
+	for i := 0; i < t.NumField(); i++ {
+		field := t.Field(i)
+		
+		// Get the JSON tag
+		jsonTag := field.Tag.Get("json")
+		if jsonTag == "" || jsonTag == "-" {
+			continue // Skip fields without JSON tags or with "-"
+		}
+		
+		// Handle "fieldname,omitempty" format
+		fieldName, _, _ := strings.Cut(jsonTag, ",")
+		if fieldName != "" {
+			knownFields[fieldName] = true
+		}
+	}
+	
+	return knownFields
+}
+
+// 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]any
+	if err := json.Unmarshal(data, &all); err != nil {
+		return err
+	}
+	
+	// Initialize UnknownFields map
+	bp.UnknownFields = make(map[string]any)
+	
+	// Use reflection to get known fields instead of hardcoding
+	knownFields := getKnownFields(bp)
+	
+	// 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]any
+	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"`

port/action/actionStateToPortBody.go

@@ -19,7 +19,7 @@ func actionDataSetToPortBody(dataSet *DatasetModel) *cli.Dataset {
 		dataSetRule := cli.DatasetRule{
 			Operator: rule.Operator.ValueString(),
 		}
-		
+
 		if rule.Value != nil && !rule.Value.JqQuery.IsNull() {
 			dataSetRule.Value = &cli.DatasetValue{
 				JqQuery: rule.Value.JqQuery.ValueString(),
@@ -100,6 +100,13 @@ func triggerToBody(ctx context.Context, data *ActionModel) (*cli.Trigger, error)
 			}
 		}
 
+		if data.SelfServiceTrigger.Titles != nil {
+			err := actionTitlesToBody(ctx, selfServiceTrigger, data.SelfServiceTrigger)
+			if err != nil {
+				return nil, err
+			}
+		}
+
 		if !data.SelfServiceTrigger.OrderProperties.IsNull() {
 			order, err := utils.TerraformListToGoArray(ctx, data.SelfServiceTrigger.OrderProperties, "string")
 			if err != nil {
@@ -253,6 +260,41 @@ func actionPropertiesToBody(ctx context.Context, actionTrigger *cli.Trigger, dat
 	return nil
 }
 
+func actionTitlesToBody(ctx context.Context, actionTrigger *cli.Trigger, data *SelfServiceTriggerModel) error {
+	actionTitles := map[string]cli.ActionTitle{}
+	var err error
+	if data.Titles != nil {
+		for key, actionTitle := range data.Titles {
+
+			cliTitle := cli.ActionTitle{
+				Title:       actionTitle.Title.ValueString(),
+				Description: actionTitle.Description.ValueStringPointer(),
+			}
+
+			if !actionTitle.Visible.IsNull() {
+				cliTitle.Visible = actionTitle.Visible.ValueBool()
+			}
+
+			if !actionTitle.VisibleJqQuery.IsNull() {
+				VisibleJqQueryMap := map[string]string{
+					"jqQuery": actionTitle.VisibleJqQuery.ValueString(),
+				}
+				cliTitle.Visible = VisibleJqQueryMap
+			}
+
+			actionTitles[key] = cliTitle
+		}
+	}
+
+	if err != nil {
+		return err
+	}
+
+	actionTrigger.UserInputs.Titles = actionTitles
+
+	return nil
+}
+
 func invocationMethodToBody(ctx context.Context, data *ActionModel) (*cli.InvocationMethod, error) {
 	if data.KafkaMethod != nil {
 		payload, err := utils.TerraformStringToGoType[interface{}](data.KafkaMethod.Payload)

port/action/model.go

@@ -284,14 +284,22 @@ type Step struct {
 	Order []types.String `tfsdk:"order"`
 }
 
+type ActionTitle struct {
+	Title          types.String `tfsdk:"title"`
+	Description    types.String `tfsdk:"description"`
+	Visible        types.Bool   `tfsdk:"visible"`
+	VisibleJqQuery types.String `tfsdk:"visible_jq_query"`
+}
+
 type SelfServiceTriggerModel struct {
-	BlueprintIdentifier types.String         `tfsdk:"blueprint_identifier"`
-	Operation           types.String         `tfsdk:"operation"`
-	UserProperties      *UserPropertiesModel `tfsdk:"user_properties"`
-	RequiredJqQuery     types.String         `tfsdk:"required_jq_query"`
-	OrderProperties     types.List           `tfsdk:"order_properties"`
-	Steps               []Step               `tfsdk:"steps"`
-	Condition           types.String         `tfsdk:"condition"`
+	BlueprintIdentifier types.String           `tfsdk:"blueprint_identifier"`
+	Operation           types.String           `tfsdk:"operation"`
+	UserProperties      *UserPropertiesModel   `tfsdk:"user_properties"`
+	Titles              map[string]ActionTitle `tfsdk:"titles"`
+	RequiredJqQuery     types.String           `tfsdk:"required_jq_query"`
+	OrderProperties     types.List             `tfsdk:"order_properties"`
+	Steps               []Step                 `tfsdk:"steps"`
+	Condition           types.String           `tfsdk:"condition"`
 }
 
 type EntityCreatedEventModel struct {

port/action/refreshActionState.go

@@ -153,13 +153,13 @@ func writeDatasetToResource(ds *cli.Dataset) *DatasetModel {
 			Property:  flex.GoStringToFramework(v.Property),
 			Operator:  flex.GoStringToFramework(&v.Operator),
 		}
-		
+
 		if v.Value != nil {
 			rule.Value = &Value{
 				JqQuery: flex.GoStringToFramework(&v.Value.JqQuery),
 			}
 		}
-		
+
 		datasetModel.Rules = append(datasetModel.Rules, *rule)
 	}
 
@@ -325,18 +325,54 @@ func (r *ActionResource) buildUserProperties(ctx context.Context, a *cli.Action,
 	return properties, nil
 }
 
+func (r *ActionResource) buildActionTitles(a *cli.Action) (map[string]ActionTitle, error) {
+	if a.Trigger.UserInputs.Titles == nil {
+		return nil, nil
+	}
+
+	actionTitles := make(map[string]ActionTitle)
+
+	for key, actionTitle := range a.Trigger.UserInputs.Titles {
+		stateTitle := ActionTitle{
+			Title:       types.StringValue(actionTitle.Title),
+			Description: flex.GoStringToFramework(actionTitle.Description),
+		}
+
+		if actionTitle.Visible != nil {
+			visible := reflect.ValueOf(actionTitle.Visible)
+			switch visible.Kind() {
+			case reflect.Bool:
+				boolValue := visible.Interface().(bool)
+				stateTitle.Visible = types.BoolValue(boolValue)
+			case reflect.Map:
+				jq := visible.Interface().(map[string]any)
+				jqQueryValue := jq["jqQuery"].(string)
+				stateTitle.VisibleJqQuery = types.StringValue(jqQueryValue)
+			}
+		}
+
+		actionTitles[key] = stateTitle
+	}
+	return actionTitles, nil
+}
+
 func (r *ActionResource) writeTriggerToResource(ctx context.Context, a *cli.Action, state *ActionModel) error {
 	if a.Trigger.Type == consts.SelfService {
 		userProperties, err := r.buildUserProperties(ctx, a, state)
 		if err != nil {
 			return err
 		}
+		actionTitles, err := r.buildActionTitles(a)
+		if err != nil {
+			return err
+		}
 		requiredJqQuery, _ := buildRequired(a.Trigger.UserInputs)
 		state.SelfServiceTrigger = &SelfServiceTriggerModel{
 			BlueprintIdentifier: flex.GoStringToFramework(a.Trigger.BlueprintIdentifier),
 			Operation:           types.StringValue(*a.Trigger.Operation),
 			UserProperties:      userProperties,
 			RequiredJqQuery:     requiredJqQuery,
+			Titles:              actionTitles,
 		}
 
 		if len(a.Trigger.UserInputs.Order) > 0 {