Skip to content

Commit

Permalink
Fix refresh array entity (#65)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dvirsegev
dvirsegev authored Jul 31, 2023
1 parent 373fc50 commit 2730797
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 38 deletions.
85 changes: 52 additions & 33 deletions port/entity/refreshEntityState.go → port/entity/refreshEntityToState.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ import (
"github.com/port-labs/terraform-provider-port-labs/internal/cli"
)

func refreshArrayEntityState(ctx context.Context, state *EntityModel, k string, t []interface{}) {
func 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)
mapObjectItems := make(map[string][]string)

if state.Properties.ArrayProps == nil {
state.Properties.ArrayProps = &ArrayPropsModel{
StringItems: types.MapNull(types.ListType{ElemType: types.StringType}),
Expand All @@ -18,41 +23,53 @@ func refreshArrayEntityState(ctx context.Context, state *EntityModel, k string,
ObjectItems: types.MapNull(types.ListType{ElemType: types.StringType}),
}
}
switch t[0].(type) {
case string:
mapItems := make(map[string][]string)
for _, item := range t {
mapItems[k] = append(mapItems[k], item.(string))
}
state.Properties.ArrayProps.StringItems, _ = types.MapValueFrom(ctx, types.ListType{ElemType: types.StringType}, mapItems)
for k, t := range arrayProperties {

case float64:
mapItems := make(map[string][]float64)
for _, item := range t {
mapItems[k] = append(mapItems[k], item.(float64))
}
state.Properties.ArrayProps.NumberItems, _ = types.MapValueFrom(ctx, types.ListType{ElemType: types.NumberType}, mapItems)
switch blueprint.Schema.Properties[k].Items["type"] {
case "string":
for _, item := range t {
mapStringItems[k] = append(mapStringItems[k], item.(string))
}
if len(t) == 0 {
mapStringItems[k] = []string{}
}
state.Properties.ArrayProps.StringItems, _ = types.MapValueFrom(ctx, types.ListType{ElemType: types.StringType}, mapStringItems)

case bool:
mapItems := make(map[string][]bool)
for _, item := range t {
mapItems[k] = append(mapItems[k], item.(bool))
}
state.Properties.ArrayProps.BooleanItems, _ = types.MapValueFrom(ctx, types.ListType{ElemType: types.BoolType}, mapItems)
case "number":
for _, item := range t {
mapNumberItems[k] = append(mapNumberItems[k], item.(float64))
}
if len(t) == 0 {
mapNumberItems[k] = []float64{}
}
state.Properties.ArrayProps.NumberItems, _ = types.MapValueFrom(ctx, types.ListType{ElemType: types.NumberType}, mapNumberItems)

case map[string]interface{}:
mapItems := make(map[string][]string)
for _, item := range t {
js, _ := json.Marshal(&item)
mapItems[k] = append(mapItems[k], string(js))
}
state.Properties.ArrayProps.ObjectItems, _ = types.MapValueFrom(ctx, types.ListType{ElemType: types.StringType}, mapItems)
case "boolean":
for _, item := range t {
mapBooleanItems[k] = append(mapBooleanItems[k], item.(bool))
}
if len(t) == 0 {
mapBooleanItems[k] = []bool{}
}
state.Properties.ArrayProps.BooleanItems, _ = types.MapValueFrom(ctx, types.ListType{ElemType: types.BoolType}, mapBooleanItems)

case "object":
for _, item := range t {
js, _ := json.Marshal(&item)
mapObjectItems[k] = append(mapObjectItems[k], string(js))
}
if len(t) == 0 {
mapObjectItems[k] = []string{}
}
state.Properties.ArrayProps.ObjectItems, _ = types.MapValueFrom(ctx, types.ListType{ElemType: types.StringType}, mapObjectItems)

}
}
}

func refreshPropertiesEntityState(ctx context.Context, state *EntityModel, e *cli.Entity) {
func 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 {
switch t := v.(type) {
case float64:
Expand All @@ -73,16 +90,18 @@ func refreshPropertiesEntityState(ctx context.Context, state *EntityModel, e *cl
state.Properties.BooleanProps[k] = t

case []interface{}:
refreshArrayEntityState(ctx, state, k, t)
arrayProperties[k] = t
case interface{}:
if state.Properties.ObjectProps == nil {
state.Properties.ObjectProps = make(map[string]string)
}

js, _ := json.Marshal(&t)
state.Properties.ObjectProps[k] = string(js)
}
}
if len(arrayProperties) != 0 {
refreshArrayEntityState(ctx, state, arrayProperties, blueprint)
}
}

func refreshRelationsEntityState(ctx context.Context, state *EntityModel, e *cli.Entity) {
Expand All @@ -106,10 +125,10 @@ func refreshRelationsEntityState(ctx context.Context, state *EntityModel, e *cli
}
}

func refreshEntityState(ctx context.Context, state *EntityModel, e *cli.Entity, blueprint string) error {
func refreshEntityState(ctx context.Context, state *EntityModel, e *cli.Entity, blueprint *cli.Blueprint) error {
state.ID = types.StringValue(e.Identifier)
state.Identifier = types.StringValue(e.Identifier)
state.Blueprint = types.StringValue(blueprint)
state.Blueprint = types.StringValue(blueprint.Identifier)
state.Title = types.StringValue(e.Title)
state.CreatedAt = types.StringValue(e.CreatedAt.String())
state.CreatedBy = types.StringValue(e.CreatedBy)
Expand All @@ -124,7 +143,7 @@ func refreshEntityState(ctx context.Context, state *EntityModel, e *cli.Entity,
}

if len(e.Properties) != 0 {
refreshPropertiesEntityState(ctx, state, e)
refreshPropertiesEntityState(ctx, state, e, blueprint)
}

if len(e.Relations) != 0 {
Expand Down
7 changes: 6 additions & 1 deletion port/entity/resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,13 @@ func (r *EntityResource) Read(ctx context.Context, req resource.ReadRequest, res
resp.Diagnostics.AddError("failed to read entity", err.Error())
return
}
b, _, err := r.portClient.ReadBlueprint(ctx, blueprintIdentifier)
if err != nil {
resp.Diagnostics.AddError("failed to read blueprint", err.Error())
return
}

err = refreshEntityState(ctx, state, e, blueprintIdentifier)
err = refreshEntityState(ctx, state, e, b)
if err != nil {
resp.Diagnostics.AddError("failed writing entity fields to resource", err.Error())
return
Expand Down
12 changes: 8 additions & 4 deletions port/entity/resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,16 @@ func TestAccPortEntity(t *testing.T) {
}
"array_props" = {
string_items = {
"myStringArrayIdentifier" = ["My Array Value"]
"myStringArrayIdentifier" = ["My Array Value", "My Array Value2"]
}
number_items = {
"myNumberArrayIdentifier" = [123]
"myNumberArrayIdentifier" = [123, 456]
}
boolean_items = {
"myBooleanArrayIdentifier" = [true]
"myBooleanArrayIdentifier" = [true, false]
}
object_items = {
"myObjectArrayIdentifier" = [jsonencode({"foo": "bar"})]
"myObjectArrayIdentifier" = [jsonencode({"foo": "bar"}), jsonencode({"foo": "bar2"})]
}
}
}
Expand All @@ -106,9 +106,13 @@ func TestAccPortEntity(t *testing.T) {
resource.TestCheckResourceAttr("port_entity.microservice", "properties.boolean_props.myBooleanIdentifier", "true"),
resource.TestCheckResourceAttr("port_entity.microservice", "properties.object_props.myObjectIdentifier", "{\"foo\":\"bar\"}"),
resource.TestCheckResourceAttr("port_entity.microservice", "properties.array_props.string_items.myStringArrayIdentifier.0", "My Array Value"),
resource.TestCheckResourceAttr("port_entity.microservice", "properties.array_props.string_items.myStringArrayIdentifier.1", "My Array Value2"),
resource.TestCheckResourceAttr("port_entity.microservice", "properties.array_props.number_items.myNumberArrayIdentifier.0", "123"),
resource.TestCheckResourceAttr("port_entity.microservice", "properties.array_props.number_items.myNumberArrayIdentifier.1", "456"),
resource.TestCheckResourceAttr("port_entity.microservice", "properties.array_props.boolean_items.myBooleanArrayIdentifier.0", "true"),
resource.TestCheckResourceAttr("port_entity.microservice", "properties.array_props.boolean_items.myBooleanArrayIdentifier.1", "false"),
resource.TestCheckResourceAttr("port_entity.microservice", "properties.array_props.object_items.myObjectArrayIdentifier.0", "{\"foo\":\"bar\"}"),
resource.TestCheckResourceAttr("port_entity.microservice", "properties.array_props.object_items.myObjectArrayIdentifier.1", "{\"foo\":\"bar2\"}"),
),
},
},
Expand Down

0 comments on commit 2730797

Please sign in to comment.