Replace all json.Marshal calls with utils.GoObjectToTerraformString (#244)

Eyal-Shalev · web-flow · commit 37a5b2a00222 · 2025-04-17T14:51:07.000+03:00
diff --git a/port/action-permissions/refreshActionPermissionsToState.go b/port/action-permissions/refreshActionPermissionsToState.go
@@ -1,13 +1,13 @@
 package action_permissions
 
 import (
-	"encoding/json"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
 	"github.com/port-labs/terraform-provider-port-labs/v2/internal/flex"
+	"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
 )
 
-func refreshActionPermissionsState(state *ActionPermissionsModel, a *cli.ActionPermissions, actionId string) error {
+func (r *ActionPermissionsResource) refreshActionPermissionsState(state *ActionPermissionsModel, a *cli.ActionPermissions, actionId string) error {
 	state.ID = types.StringValue(actionId)
 	state.ActionIdentifier = types.StringValue(actionId)
 	state.BlueprintIdentifier = types.StringNull()
@@ -33,12 +33,12 @@ func refreshActionPermissionsState(state *ActionPermissionsModel, a *cli.ActionP
 	state.Permissions.Execute.OwnedByTeam = flex.GoBoolToFramework(a.Execute.OwnedByTeam)
 
 	if a.Execute.Policy != nil {
-		policy, err := json.Marshal(a.Execute.Policy)
+		policy, err := utils.GoObjectToTerraformString(a.Execute.Policy, r.portClient.JSONEscapeHTML)
 		if err != nil {
 			return err
 		}
 
-		state.Permissions.Execute.Policy = types.StringValue(string(policy))
+		state.Permissions.Execute.Policy = policy
 	}
 
 	state.Permissions.Approve = &ApproveModel{}
@@ -59,12 +59,12 @@ func refreshActionPermissionsState(state *ActionPermissionsModel, a *cli.ActionP
 	}
 
 	if a.Approve.Policy != nil {
-		policy, err := json.Marshal(a.Approve.Policy)
+		policy, err := utils.GoObjectToTerraformString(a.Approve.Policy, r.portClient.JSONEscapeHTML)
 		if err != nil {
 			return err
 		}
 
-		state.Permissions.Approve.Policy = types.StringValue(string(policy))
+		state.Permissions.Approve.Policy = policy
 	}
 
 	return nil
diff --git a/port/action-permissions/resource.go b/port/action-permissions/resource.go
@@ -62,7 +62,7 @@ func (r *ActionPermissionsResource) Read(ctx context.Context, req resource.ReadR
 		return
 	}
 
-	err = refreshActionPermissionsState(state, a, actionIdentifier)
+	err = r.refreshActionPermissionsState(state, a, actionIdentifier)
 	if err != nil {
 		resp.Diagnostics.AddError("failed to refresh action permissions state", err.Error())
 		return
diff --git a/port/action/array.go b/port/action/array.go
@@ -2,7 +2,6 @@ package action
 
 import (
 	"context"
-	"encoding/json"
 	"reflect"
 
 	"github.com/hashicorp/terraform-plugin-framework/attr"
@@ -331,12 +330,11 @@ func (r *ActionResource) addArrayPropertiesToResource(v *cli.ActionProperty) (*A
 					objectArray := make([]map[string]interface{}, len(v.Default.([]interface{})))
 					attrs := make([]attr.Value, 0, len(objectArray))
 					for _, value := range v.Default.([]interface{}) {
-						stringfiyValue, err := json.Marshal(value)
+						stringValue, err := utils.GoObjectToTerraformString(value, r.portClient.JSONEscapeHTML)
 						if err != nil {
 							return nil, err
 						}
-						stringValue := string(stringfiyValue)
-						attrs = append(attrs, basetypes.NewStringValue(stringValue))
+						attrs = append(attrs, stringValue)
 					}
 					arrayProp.ObjectItems.Default, _ = types.ListValue(types.StringType, attrs)
 				}
diff --git a/port/action/refreshActionState.go b/port/action/refreshActionState.go
@@ -2,7 +2,6 @@ package action
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"reflect"
 	"strconv"
@@ -362,11 +361,11 @@ func (r *ActionResource) writeTriggerToResource(ctx context.Context, a *cli.Acti
 		}
 
 		if a.Trigger.Condition != nil {
-			triggerCondition, err := json.Marshal(a.Trigger.Condition)
+			triggerCondition, err := utils.GoObjectToTerraformString(a.Trigger.Condition, r.portClient.JSONEscapeHTML)
 			if err != nil {
 				return err
 			}
-			state.SelfServiceTrigger.Condition = types.StringValue(string(triggerCondition))
+			state.SelfServiceTrigger.Condition = triggerCondition
 		}
 	}
 
diff --git a/port/blueprint/array.go b/port/blueprint/array.go
@@ -2,8 +2,6 @@ package blueprint
 
 import (
 	"context"
-	"encoding/json"
-
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
@@ -114,7 +112,7 @@ func arrayPropResourceToBody(ctx context.Context, state *PropertiesModel, props
 	return nil
 }
 
-func AddArrayPropertiesToState(v *cli.BlueprintProperty) *ArrayPropModel {
+func AddArrayPropertiesToState(v *cli.BlueprintProperty, jsonEscapeHTML bool) *ArrayPropModel {
 	arrayProp := &ArrayPropModel{
 		MinItems: flex.GoInt64ToFramework(v.MinItems),
 		MaxItems: flex.GoInt64ToFramework(v.MaxItems),
@@ -179,9 +177,8 @@ func AddArrayPropertiesToState(v *cli.BlueprintProperty) *ArrayPropModel {
 					}
 					attrs := make([]attr.Value, 0, len(objectArray))
 					for _, value := range objectArray {
-						js, _ := json.Marshal(&value)
-						stringValue := string(js)
-						attrs = append(attrs, basetypes.NewStringValue(stringValue))
+						stringValue, _ := utils.GoObjectToTerraformString(&value, jsonEscapeHTML)
+						attrs = append(attrs, stringValue)
 					}
 					arrayProp.ObjectItems.Default, _ = types.ListValue(types.StringType, attrs)
 				} else {
diff --git a/port/blueprint/resource.go b/port/blueprint/resource.go
@@ -57,15 +57,15 @@ func (r *BlueprintResource) Read(ctx context.Context, req resource.ReadRequest,
 		return
 	}
 
-	err = refreshBlueprintState(ctx, state, b)
+	err = r.refreshBlueprintState(ctx, state, b)
 	if err != nil {
 		resp.Diagnostics.AddError("failed writing blueprint fields to resource", err.Error())
 		return
 	}
 	resp.Diagnostics.Append(resp.State.Set(ctx, &state)...)
 }
 
-func refreshBlueprintState(ctx context.Context, bm *BlueprintModel, b *cli.Blueprint) error {
+func (r *BlueprintResource) refreshBlueprintState(ctx context.Context, bm *BlueprintModel, b *cli.Blueprint) error {
 	bm.Identifier = types.StringValue(b.Identifier)
 	bm.ID = types.StringValue(b.Identifier)
 	bm.CreatedAt = types.StringValue(b.CreatedAt.String())
@@ -120,7 +120,7 @@ func refreshBlueprintState(ctx context.Context, bm *BlueprintModel, b *cli.Bluep
 	}
 
 	if len(b.Schema.Properties) > 0 {
-		err := updatePropertiesToState(ctx, b, bm)
+		err := r.updatePropertiesToState(ctx, b, bm)
 		if err != nil {
 			return err
 		}
diff --git a/port/blueprint/updatePropertiesToState.go b/port/blueprint/updatePropertiesToState.go
@@ -2,15 +2,15 @@ package blueprint
 
 import (
 	"context"
-	"encoding/json"
+	"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
 
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
 	"github.com/port-labs/terraform-provider-port-labs/v2/internal/flex"
 	"github.com/samber/lo"
 )
 
-func SetCommonProperties(v cli.BlueprintProperty, prop interface{}) {
+func SetCommonProperties(v cli.BlueprintProperty, prop interface{}, jsonEscapeHTML bool) {
 	properties := []string{"Description", "Icon", "Default", "Title"}
 	for _, property := range properties {
 		switch property {
@@ -63,16 +63,14 @@ func SetCommonProperties(v cli.BlueprintProperty, prop interface{}) {
 				case *BooleanPropModel:
 					p.Default = types.BoolValue(v.Default.(bool))
 				case *ObjectPropModel:
-					js, _ := json.Marshal(v.Default)
-					value := string(js)
-					p.Default = types.StringValue(value)
+					p.Default, _ = utils.GoObjectToTerraformString(v.Default, jsonEscapeHTML)
 				}
 			}
 		}
 	}
 }
 
-func updatePropertiesToState(ctx context.Context, b *cli.Blueprint, bm *BlueprintModel) error {
+func (r *BlueprintResource) updatePropertiesToState(ctx context.Context, b *cli.Blueprint, bm *BlueprintModel) error {
 	properties := &PropertiesModel{}
 
 	for k, v := range b.Schema.Properties {
@@ -89,7 +87,7 @@ func updatePropertiesToState(ctx context.Context, b *cli.Blueprint, bm *Blueprin
 				stringProp.Required = types.BoolValue(false)
 			}
 
-			SetCommonProperties(v, stringProp)
+			SetCommonProperties(v, stringProp, r.portClient.JSONEscapeHTML)
 
 			properties.StringProps[k] = *stringProp
 
@@ -106,7 +104,7 @@ func updatePropertiesToState(ctx context.Context, b *cli.Blueprint, bm *Blueprin
 				numberProp.Required = types.BoolValue(false)
 			}
 
-			SetCommonProperties(v, numberProp)
+			SetCommonProperties(v, numberProp, r.portClient.JSONEscapeHTML)
 
 			properties.NumberProps[k] = *numberProp
 
@@ -115,15 +113,15 @@ func updatePropertiesToState(ctx context.Context, b *cli.Blueprint, bm *Blueprin
 				properties.ArrayProps = make(map[string]ArrayPropModel)
 			}
 
-			arrayProp := AddArrayPropertiesToState(&v)
+			arrayProp := AddArrayPropertiesToState(&v, r.portClient.JSONEscapeHTML)
 
 			if lo.Contains(b.Schema.Required, k) {
 				arrayProp.Required = types.BoolValue(true)
 			} else {
 				arrayProp.Required = types.BoolValue(false)
 			}
 
-			SetCommonProperties(v, arrayProp)
+			SetCommonProperties(v, arrayProp, r.portClient.JSONEscapeHTML)
 
 			properties.ArrayProps[k] = *arrayProp
 
@@ -134,7 +132,7 @@ func updatePropertiesToState(ctx context.Context, b *cli.Blueprint, bm *Blueprin
 
 			booleanProp := &BooleanPropModel{}
 
-			SetCommonProperties(v, booleanProp)
+			SetCommonProperties(v, booleanProp, r.portClient.JSONEscapeHTML)
 
 			if lo.Contains(b.Schema.Required, k) {
 				booleanProp.Required = types.BoolValue(true)
@@ -157,7 +155,7 @@ func updatePropertiesToState(ctx context.Context, b *cli.Blueprint, bm *Blueprin
 				objectProp.Required = types.BoolValue(false)
 			}
 
-			SetCommonProperties(v, objectProp)
+			SetCommonProperties(v, objectProp, r.portClient.JSONEscapeHTML)
 
 			properties.ObjectProps[k] = *objectProp
 		}
diff --git a/port/entity/refreshEntityToState.go b/port/entity/refreshEntityToState.go
@@ -2,13 +2,13 @@ package entity
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
+	"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
 )
 
-func refreshArrayEntityState(ctx context.Context, state *EntityModel, arrayProperties map[string][]interface{}, blueprint *cli.Blueprint) {
+func (r *EntityResource) refreshArrayEntityState(ctx context.Context, state *EntityModel, arrayProperties map[string][]interface{}, blueprint *cli.Blueprint) {
 	mapStringItems := make(map[string][]*string)
 	mapNumberItems := make(map[string][]*float64)
 	mapBooleanItems := make(map[string][]*bool)
@@ -70,9 +70,8 @@ func refreshArrayEntityState(ctx context.Context, state *EntityModel, arrayPrope
 		case "object":
 			if t != nil {
 				for _, item := range t {
-					js, _ := json.Marshal(&item)
-					stringJs := string(js)
-					mapObjectItems[k] = append(mapObjectItems[k], &stringJs)
+					stringJs, _ := utils.GoObjectToTerraformString(&item, r.portClient.JSONEscapeHTML)
+					mapObjectItems[k] = append(mapObjectItems[k], stringJs.ValueStringPointer())
 				}
 				if len(t) == 0 {
 					mapObjectItems[k] = []*string{}
@@ -85,7 +84,7 @@ func refreshArrayEntityState(ctx context.Context, state *EntityModel, arrayPrope
 	}
 }
 
-func refreshPropertiesEntityState(ctx context.Context, state *EntityModel, e *cli.Entity, blueprint *cli.Blueprint) {
+func (r *EntityResource) refreshPropertiesEntityState(ctx context.Context, state *EntityModel, e *cli.Entity, blueprint *cli.Blueprint) {
 	state.Properties = &EntityPropertiesModel{}
 	arrayProperties := make(map[string][]interface{})
 	for k, v := range e.Properties {
@@ -111,8 +110,7 @@ func refreshPropertiesEntityState(ctx context.Context, state *EntityModel, e *cl
 			if state.Properties.ObjectProps == nil {
 				state.Properties.ObjectProps = make(map[string]types.String)
 			}
-			js, _ := json.Marshal(&t)
-			state.Properties.ObjectProps[k] = types.StringValue(string(js))
+			state.Properties.ObjectProps[k], _ = utils.GoObjectToTerraformString(&t, r.portClient.JSONEscapeHTML)
 		case nil:
 			switch blueprint.Schema.Properties[k].Type {
 			case "string":
@@ -141,7 +139,7 @@ func refreshPropertiesEntityState(ctx context.Context, state *EntityModel, e *cl
 		}
 	}
 	if len(arrayProperties) != 0 {
-		refreshArrayEntityState(ctx, state, arrayProperties, blueprint)
+		r.refreshArrayEntityState(ctx, state, arrayProperties, blueprint)
 	}
 }
 
@@ -179,7 +177,7 @@ func refreshRelationsEntityState(ctx context.Context, state *EntityModel, e *cli
 	}
 }
 
-func refreshEntityState(ctx context.Context, state *EntityModel, e *cli.Entity, blueprint *cli.Blueprint) error {
+func (r *EntityResource) refreshEntityState(ctx context.Context, state *EntityModel, e *cli.Entity, blueprint *cli.Blueprint) error {
 	state.ID = types.StringValue(fmt.Sprintf("%s:%s", blueprint.Identifier, e.Identifier))
 	state.Identifier = types.StringValue(e.Identifier)
 	state.Blueprint = types.StringValue(blueprint.Identifier)
@@ -204,7 +202,7 @@ func refreshEntityState(ctx context.Context, state *EntityModel, e *cli.Entity,
 	}
 
 	if len(e.Properties) != 0 {
-		refreshPropertiesEntityState(ctx, state, e, blueprint)
+		r.refreshPropertiesEntityState(ctx, state, e, blueprint)
 	}
 
 	if len(e.Relations) != 0 {
diff --git a/port/entity/resource.go b/port/entity/resource.go
@@ -60,7 +60,7 @@ func (r *EntityResource) Read(ctx context.Context, req resource.ReadRequest, res
 		return
 	}
 
-	err = refreshEntityState(ctx, state, e, b)
+	err = r.refreshEntityState(ctx, state, e, b)
 	if err != nil {
 		resp.Diagnostics.AddError("failed writing entity fields to resource", err.Error())
 		return
diff --git a/port/page/refreshPageToState.go b/port/page/refreshPageToState.go
@@ -1,12 +1,12 @@
 package page
 
 import (
-	"encoding/json"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
+	"github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"
 )
 
-func refreshPageToState(pm *PageModel, b *cli.Page) error {
+func (r *PageResource) refreshPageToState(pm *PageModel, b *cli.Page) error {
 	pm.ID = types.StringValue(b.Identifier)
 	pm.Identifier = types.StringValue(b.Identifier)
 	pm.Type = types.StringValue(b.Type)
@@ -22,11 +22,11 @@ func refreshPageToState(pm *PageModel, b *cli.Page) error {
 	if b.Widgets != nil {
 		// go over each widget and convert it to a string and store it in the widgets array
 		for i, widget := range *b.Widgets {
-			bWidget, err := json.Marshal(widget)
+			bWidget, err := utils.GoObjectToTerraformString(widget, r.portClient.JSONEscapeHTML)
 			if err != nil {
 				return err
 			}
-			pm.Widgets[i] = types.StringValue(string(bWidget))
+			pm.Widgets[i] = bWidget
 		}
 	}
 	return nil
diff --git a/port/page/resource.go b/port/page/resource.go
@@ -62,7 +62,7 @@ func (r *PageResource) Read(ctx context.Context, req resource.ReadRequest, resp
 		return
 	}
 
-	err = refreshPageToState(state, p)
+	err = r.refreshPageToState(state, p)
 
 	if err != nil {
 		resp.Diagnostics.AddError("failed to write page fields to resource", err.Error())
diff --git a/port/search/dataSource.go b/port/search/dataSource.go
@@ -60,7 +60,7 @@ func (d *SearchDataSource) Read(ctx context.Context, req datasource.ReadRequest,
 
 	for _, entity := range searchResult.Entities {
 		matchingEntityBlueprint := blueprints[entity.Blueprint]
-		e := refreshEntityState(ctx, &entity, &matchingEntityBlueprint)
+		e := d.refreshEntityState(ctx, &entity, &matchingEntityBlueprint)
 		data.Entities = append(data.Entities, *e)
 	}
 
diff --git a/port/search/searchResultToState.go b/port/search/searchResultToState.go
diff --git a/port/system_blueprint/resource.go b/port/system_blueprint/resource.go
diff --git a/port/system_blueprint/updatePropertiesToState.go b/port/system_blueprint/updatePropertiesToState.go

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func (r *ActionPermissionsResource) Read(ctx context.Context, req resource.ReadR`
`62`	`62`	`return`
`63`	`63`	`}`
`64`	`64`
`65`		`- err = refreshActionPermissionsState(state, a, actionIdentifier)`
	`65`	`+ err = r.refreshActionPermissionsState(state, a, actionIdentifier)`
`66`	`66`	`if err != nil {`
`67`	`67`	`resp.Diagnostics.AddError("failed to refresh action permissions state", err.Error())`
`68`	`68`	`return`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ package action`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`		`- "encoding/json"`
`6`	`5`	`"fmt"`
`7`	`6`	`"reflect"`
`8`	`7`	`"strconv"`
`@@ -362,11 +361,11 @@ func (r ActionResource) writeTriggerToResource(ctx context.Context, a cli.Acti`
`362`	`361`	`}`
`363`	`362`
`364`	`363`	`if a.Trigger.Condition != nil {`
`365`		`- triggerCondition, err := json.Marshal(a.Trigger.Condition)`
	`364`	`+ triggerCondition, err := utils.GoObjectToTerraformString(a.Trigger.Condition, r.portClient.JSONEscapeHTML)`
`366`	`365`	`if err != nil {`
`367`	`366`	`return err`
`368`	`367`	`}`
`369`		`- state.SelfServiceTrigger.Condition = types.StringValue(string(triggerCondition))`
	`368`	`+ state.SelfServiceTrigger.Condition = triggerCondition`
`370`	`369`	`}`
`371`	`370`	`}`
`372`	`371`
Original file line number	Diff line number	Diff line change
`@@ -57,15 +57,15 @@ func (r *BlueprintResource) Read(ctx context.Context, req resource.ReadRequest,`
`57`	`57`	`return`
`58`	`58`	`}`
`59`	`59`
`60`		`- err = refreshBlueprintState(ctx, state, b)`
	`60`	`+ err = r.refreshBlueprintState(ctx, state, b)`
`61`	`61`	`if err != nil {`
`62`	`62`	`resp.Diagnostics.AddError("failed writing blueprint fields to resource", err.Error())`
`63`	`63`	`return`
`64`	`64`	`}`
`65`	`65`	`resp.Diagnostics.Append(resp.State.Set(ctx, &state)...)`
`66`	`66`	`}`
`67`	`67`
`68`		`-func refreshBlueprintState(ctx context.Context, bm BlueprintModel, b cli.Blueprint) error {`
	`68`	`+func (r BlueprintResource) refreshBlueprintState(ctx context.Context, bm BlueprintModel, b *cli.Blueprint) error {`
`69`	`69`	`bm.Identifier = types.StringValue(b.Identifier)`
`70`	`70`	`bm.ID = types.StringValue(b.Identifier)`
`71`	`71`	`bm.CreatedAt = types.StringValue(b.CreatedAt.String())`
`@@ -120,7 +120,7 @@ func refreshBlueprintState(ctx context.Context, bm BlueprintModel, b cli.Bluep`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`if len(b.Schema.Properties) > 0 {`
`123`		`- err := updatePropertiesToState(ctx, b, bm)`
	`123`	`+ err := r.updatePropertiesToState(ctx, b, bm)`
`124`	`124`	`if err != nil {`
`125`	`125`	`return err`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,15 @@ package blueprint`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`		`- "encoding/json"`
	`5`	`+ "github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"`
`6`	`6`
`7`	`7`	`"github.com/hashicorp/terraform-plugin-framework/types"`
`8`	`8`	`"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"`
`9`	`9`	`"github.com/port-labs/terraform-provider-port-labs/v2/internal/flex"`
`10`	`10`	`"github.com/samber/lo"`
`11`	`11`	`)`
`12`	`12`
`13`		`-func SetCommonProperties(v cli.BlueprintProperty, prop interface{}) {`
	`13`	`+func SetCommonProperties(v cli.BlueprintProperty, prop interface{}, jsonEscapeHTML bool) {`
`14`	`14`	`properties := []string{"Description", "Icon", "Default", "Title"}`
`15`	`15`	`for _, property := range properties {`
`16`	`16`	`switch property {`
`@@ -63,16 +63,14 @@ func SetCommonProperties(v cli.BlueprintProperty, prop interface{}) {`
`63`	`63`	`case *BooleanPropModel:`
`64`	`64`	`p.Default = types.BoolValue(v.Default.(bool))`
`65`	`65`	`case *ObjectPropModel:`
`66`		`- js, _ := json.Marshal(v.Default)`
`67`		`- value := string(js)`
`68`		`- p.Default = types.StringValue(value)`
	`66`	`+ p.Default, _ = utils.GoObjectToTerraformString(v.Default, jsonEscapeHTML)`
`69`	`67`	`}`
`70`	`68`	`}`
`71`	`69`	`}`
`72`	`70`	`}`
`73`	`71`	`}`
`74`	`72`
`75`		`-func updatePropertiesToState(ctx context.Context, b cli.Blueprint, bm BlueprintModel) error {`
	`73`	`+func (r BlueprintResource) updatePropertiesToState(ctx context.Context, b cli.Blueprint, bm *BlueprintModel) error {`
`76`	`74`	`properties := &PropertiesModel{}`
`77`	`75`
`78`	`76`	`for k, v := range b.Schema.Properties {`
`@@ -89,7 +87,7 @@ func updatePropertiesToState(ctx context.Context, b cli.Blueprint, bm Blueprin`
`89`	`87`	`stringProp.Required = types.BoolValue(false)`
`90`	`88`	`}`
`91`	`89`
`92`		`- SetCommonProperties(v, stringProp)`
	`90`	`+ SetCommonProperties(v, stringProp, r.portClient.JSONEscapeHTML)`
`93`	`91`
`94`	`92`	`properties.StringProps[k] = *stringProp`
`95`	`93`
`@@ -106,7 +104,7 @@ func updatePropertiesToState(ctx context.Context, b cli.Blueprint, bm Blueprin`
`106`	`104`	`numberProp.Required = types.BoolValue(false)`
`107`	`105`	`}`
`108`	`106`
`109`		`- SetCommonProperties(v, numberProp)`
	`107`	`+ SetCommonProperties(v, numberProp, r.portClient.JSONEscapeHTML)`
`110`	`108`
`111`	`109`	`properties.NumberProps[k] = *numberProp`
`112`	`110`
`@@ -115,15 +113,15 @@ func updatePropertiesToState(ctx context.Context, b cli.Blueprint, bm Blueprin`
`115`	`113`	`properties.ArrayProps = make(map[string]ArrayPropModel)`
`116`	`114`	`}`
`117`	`115`
`118`		`- arrayProp := AddArrayPropertiesToState(&v)`
	`116`	`+ arrayProp := AddArrayPropertiesToState(&v, r.portClient.JSONEscapeHTML)`
`119`	`117`
`120`	`118`	`if lo.Contains(b.Schema.Required, k) {`
`121`	`119`	`arrayProp.Required = types.BoolValue(true)`
`122`	`120`	`} else {`
`123`	`121`	`arrayProp.Required = types.BoolValue(false)`
`124`	`122`	`}`
`125`	`123`
`126`		`- SetCommonProperties(v, arrayProp)`
	`124`	`+ SetCommonProperties(v, arrayProp, r.portClient.JSONEscapeHTML)`
`127`	`125`
`128`	`126`	`properties.ArrayProps[k] = *arrayProp`
`129`	`127`
`@@ -134,7 +132,7 @@ func updatePropertiesToState(ctx context.Context, b cli.Blueprint, bm Blueprin`
`134`	`132`
`135`	`133`	`booleanProp := &BooleanPropModel{}`
`136`	`134`
`137`		`- SetCommonProperties(v, booleanProp)`
	`135`	`+ SetCommonProperties(v, booleanProp, r.portClient.JSONEscapeHTML)`
`138`	`136`
`139`	`137`	`if lo.Contains(b.Schema.Required, k) {`
`140`	`138`	`booleanProp.Required = types.BoolValue(true)`
`@@ -157,7 +155,7 @@ func updatePropertiesToState(ctx context.Context, b cli.Blueprint, bm Blueprin`
`157`	`155`	`objectProp.Required = types.BoolValue(false)`
`158`	`156`	`}`
`159`	`157`
`160`		`- SetCommonProperties(v, objectProp)`
	`158`	`+ SetCommonProperties(v, objectProp, r.portClient.JSONEscapeHTML)`
`161`	`159`
`162`	`160`	`properties.ObjectProps[k] = *objectProp`
`163`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,13 @@ package entity`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`		`- "encoding/json"`
`6`	`5`	`"fmt"`
`7`	`6`	`"github.com/hashicorp/terraform-plugin-framework/types"`
`8`	`7`	`"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"`
	`8`	`+ "github.com/port-labs/terraform-provider-port-labs/v2/internal/utils"`
`9`	`9`	`)`
`10`	`10`
`11`		`-func refreshArrayEntityState(ctx context.Context, state EntityModel, arrayProperties map[string][]interface{}, blueprint cli.Blueprint) {`
	`11`	`+func (r EntityResource) refreshArrayEntityState(ctx context.Context, state EntityModel, arrayProperties map[string][]interface{}, blueprint *cli.Blueprint) {`
`12`	`12`	`mapStringItems := make(map[string][]*string)`
`13`	`13`	`mapNumberItems := make(map[string][]*float64)`
`14`	`14`	`mapBooleanItems := make(map[string][]*bool)`
`@@ -70,9 +70,8 @@ func refreshArrayEntityState(ctx context.Context, state *EntityModel, arrayPrope`
`70`	`70`	`case "object":`
`71`	`71`	`if t != nil {`
`72`	`72`	`for _, item := range t {`
`73`		`- js, _ := json.Marshal(&item)`
`74`		`- stringJs := string(js)`
`75`		`- mapObjectItems[k] = append(mapObjectItems[k], &stringJs)`
	`73`	`+ stringJs, _ := utils.GoObjectToTerraformString(&item, r.portClient.JSONEscapeHTML)`
	`74`	`+ mapObjectItems[k] = append(mapObjectItems[k], stringJs.ValueStringPointer())`
`76`	`75`	`}`
`77`	`76`	`if len(t) == 0 {`
`78`	`77`	`mapObjectItems[k] = []*string{}`
`@@ -85,7 +84,7 @@ func refreshArrayEntityState(ctx context.Context, state *EntityModel, arrayPrope`
`85`	`84`	`}`
`86`	`85`	`}`
`87`	`86`
`88`		`-func refreshPropertiesEntityState(ctx context.Context, state EntityModel, e cli.Entity, blueprint *cli.Blueprint) {`
	`87`	`+func (r EntityResource) refreshPropertiesEntityState(ctx context.Context, state EntityModel, e cli.Entity, blueprint cli.Blueprint) {`
`89`	`88`	`state.Properties = &EntityPropertiesModel{}`
`90`	`89`	`arrayProperties := make(map[string][]interface{})`
`91`	`90`	`for k, v := range e.Properties {`
`@@ -111,8 +110,7 @@ func refreshPropertiesEntityState(ctx context.Context, state EntityModel, e cl`
`111`	`110`	`if state.Properties.ObjectProps == nil {`
`112`	`111`	`state.Properties.ObjectProps = make(map[string]types.String)`
`113`	`112`	`}`
`114`		`- js, _ := json.Marshal(&t)`
`115`		`- state.Properties.ObjectProps[k] = types.StringValue(string(js))`
	`113`	`+ state.Properties.ObjectProps[k], _ = utils.GoObjectToTerraformString(&t, r.portClient.JSONEscapeHTML)`
`116`	`114`	`case nil:`
`117`	`115`	`switch blueprint.Schema.Properties[k].Type {`
`118`	`116`	`case "string":`
`@@ -141,7 +139,7 @@ func refreshPropertiesEntityState(ctx context.Context, state EntityModel, e cl`
`141`	`139`	`}`
`142`	`140`	`}`
`143`	`141`	`if len(arrayProperties) != 0 {`
`144`		`- refreshArrayEntityState(ctx, state, arrayProperties, blueprint)`
	`142`	`+ r.refreshArrayEntityState(ctx, state, arrayProperties, blueprint)`
`145`	`143`	`}`
`146`	`144`	`}`
`147`	`145`
`@@ -179,7 +177,7 @@ func refreshRelationsEntityState(ctx context.Context, state EntityModel, e cli`
`179`	`177`	`}`
`180`	`178`	`}`
`181`	`179`
`182`		`-func refreshEntityState(ctx context.Context, state EntityModel, e cli.Entity, blueprint *cli.Blueprint) error {`
	`180`	`+func (r EntityResource) refreshEntityState(ctx context.Context, state EntityModel, e cli.Entity, blueprint cli.Blueprint) error {`
`183`	`181`	`state.ID = types.StringValue(fmt.Sprintf("%s:%s", blueprint.Identifier, e.Identifier))`
`184`	`182`	`state.Identifier = types.StringValue(e.Identifier)`
`185`	`183`	`state.Blueprint = types.StringValue(blueprint.Identifier)`
`@@ -204,7 +202,7 @@ func refreshEntityState(ctx context.Context, state EntityModel, e cli.Entity,`
`204`	`202`	`}`
`205`	`203`
`206`	`204`	`if len(e.Properties) != 0 {`
`207`		`- refreshPropertiesEntityState(ctx, state, e, blueprint)`
	`205`	`+ r.refreshPropertiesEntityState(ctx, state, e, blueprint)`
`208`	`206`	`}`
`209`	`207`
`210`	`208`	`if len(e.Relations) != 0 {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func (r *EntityResource) Read(ctx context.Context, req resource.ReadRequest, res`
`60`	`60`	`return`
`61`	`61`	`}`
`62`	`62`
`63`		`- err = refreshEntityState(ctx, state, e, b)`
	`63`	`+ err = r.refreshEntityState(ctx, state, e, b)`
`64`	`64`	`if err != nil {`
`65`	`65`	`resp.Diagnostics.AddError("failed writing entity fields to resource", err.Error())`
`66`	`66`	`return`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ func (r *PageResource) Read(ctx context.Context, req resource.ReadRequest, resp`
`62`	`62`	`return`
`63`	`63`	`}`
`64`	`64`
`65`		`- err = refreshPageToState(state, p)`
	`65`	`+ err = r.refreshPageToState(state, p)`
`66`	`66`
`67`	`67`	`if err != nil {`
`68`	`68`	`resp.Diagnostics.AddError("failed to write page fields to resource", err.Error())`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ func (d *SearchDataSource) Read(ctx context.Context, req datasource.ReadRequest,`
`60`	`60`
`61`	`61`	`for _, entity := range searchResult.Entities {`
`62`	`62`	`matchingEntityBlueprint := blueprints[entity.Blueprint]`
`63`		`- e := refreshEntityState(ctx, &entity, &matchingEntityBlueprint)`
	`63`	`+ e := d.refreshEntityState(ctx, &entity, &matchingEntityBlueprint)`
`64`	`64`	`data.Entities = append(data.Entities, *e)`
`65`	`65`	`}`
`66`	`66`