added calculated properties (#24)

* added calculated properties

* fixed tests

* added support for team array

* fixed issues with teams state

---------

Co-authored-by: root <[email protected]>

Author: danielsinai

.github/CODEOWNERS

@@ -0,0 +1 @@
+@talsabagport @danielsinai @dvirsegev

port/cli/models.go

@@ -42,6 +42,19 @@ type (
 		EnumColors  map[string]string `json:"enumColors,omitempty"`
 	}
 
+	BlueprintCalculationProperty struct {
+		Type        string            `json:"type,omitempty"`
+		Title       string            `json:"title,omitempty"`
+		Identifier  string            `json:"identifier,omitempty"`
+		Calculation string            `json:"calculation,omitempty"`
+		Default     interface{}       `json:"default,omitempty"`
+		Icon        string            `json:"icon,omitempty"`
+		Format      string            `json:"format,omitempty"`
+		Description string            `json:"description,omitempty"`
+		Colorized   bool              `json:"colorized,omitempty"`
+		Colors      map[string]string `json:"colors,omitempty"`
+	}
+
 	BlueprintMirrorProperty struct {
 		Identifier string `json:"identifier,omitempty"`
 		Title      string `json:"title,omitempty"`
@@ -74,14 +87,15 @@ type (
 
 	Blueprint struct {
 		Meta
-		Identifier           string                             `json:"identifier,omitempty"`
-		Title                string                             `json:"title"`
-		Icon                 string                             `json:"icon"`
-		Description          string                             `json:"description"`
-		Schema               BlueprintSchema                    `json:"schema"`
-		MirrorProperties     map[string]BlueprintMirrorProperty `json:"mirrorProperties"`
-		ChangelogDestination *ChangelogDestination              `json:"changelogDestination,omitempty"`
-		Relations            map[string]Relation                `json:"relations"`
+		Identifier            string                                  `json:"identifier,omitempty"`
+		Title                 string                                  `json:"title"`
+		Icon                  string                                  `json:"icon"`
+		Description           string                                  `json:"description"`
+		Schema                BlueprintSchema                         `json:"schema"`
+		MirrorProperties      map[string]BlueprintMirrorProperty      `json:"mirrorProperties"`
+		CalculationProperties map[string]BlueprintCalculationProperty `json:"calculationProperties"`
+		ChangelogDestination  *ChangelogDestination                   `json:"changelogDestination,omitempty"`
+		Relations             map[string]Relation                     `json:"relations"`
 	}
 
 	Action struct {

port/resource_port_blueprint.go

@@ -43,7 +43,7 @@ func newBlueprintResource() *schema.Resource {
 				Type:         schema.TypeString,
 				Description:  "The icon of the blueprint",
 				ValidateFunc: validation.StringInSlice(ICONS, false),
-				Required:     true,
+				Optional:     true,
 			},
 			"description": {
 				Type:        schema.TypeString,
@@ -182,6 +182,64 @@ func newBlueprintResource() *schema.Resource {
 				},
 				Optional: true,
 			},
+			"calculation_properties": {
+				Type:        schema.TypeSet,
+				Description: "A set of properties that are calculated upon Entitys regular properties.",
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"identifier": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "The identifier of the property",
+						},
+						"title": {
+							Type:        schema.TypeString,
+							Optional:    true,
+							Description: "The name of this property",
+						},
+						"calculation": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "A jq expression that calculates the value of the property, for instance \"'https://grafana.' + .identifier\"",
+						},
+						"icon": {
+							Type:         schema.TypeString,
+							ValidateFunc: validation.StringInSlice(ICONS, false),
+							Optional:     true,
+							Description:  "The icon of the property",
+						},
+						"type": {
+							Type:        schema.TypeString,
+							Required:    true,
+							Description: "The type of the property",
+						},
+						"description": {
+							Type:        schema.TypeString,
+							Optional:    true,
+							Description: "The description of the property",
+						},
+						"format": {
+							Type:        schema.TypeString,
+							Optional:    true,
+							Description: "The format of the Property",
+						},
+						"colorized": {
+							Type:        schema.TypeBool,
+							Optional:    true,
+							Description: "Whether or not the property is colorized",
+						},
+						"colors": {
+							Type: schema.TypeMap,
+							Elem: &schema.Schema{
+								Type: schema.TypeString,
+							},
+							Optional:    true,
+							Description: "A map of colors for the property",
+						},
+					},
+				},
+				Optional: true,
+			},
 			"changelog_destination": {
 				Type:        schema.TypeList,
 				MinItems:    1,
@@ -256,7 +314,12 @@ func writeBlueprintFieldsToResource(d *schema.ResourceData, b *cli.Blueprint) {
 		return schema.HashString(id)
 	}}
 
-	mirror_properties := schema.Set{F: func(i interface{}) int {
+	mirrorPoperties := schema.Set{F: func(i interface{}) int {
+		id := (i.(map[string]interface{}))["identifier"].(string)
+		return schema.HashString(id)
+	}}
+
+	calculationProperties := schema.Set{F: func(i interface{}) int {
 		id := (i.(map[string]interface{}))["identifier"].(string)
 		return schema.HashString(id)
 	}}
@@ -304,11 +367,27 @@ func writeBlueprintFieldsToResource(d *schema.ResourceData, b *cli.Blueprint) {
 		p["identifier"] = k
 		p["title"] = v.Title
 		p["path"] = v.Path
-		mirror_properties.Add(p)
+		mirrorPoperties.Add(p)
+	}
+
+	for k, v := range b.CalculationProperties {
+		p := map[string]interface{}{}
+		p["identifier"] = k
+		p["title"] = v.Title
+		p["description"] = v.Description
+		p["icon"] = v.Icon
+		p["calculation"] = v.Calculation
+		p["type"] = v.Type
+		p["format"] = v.Format
+		p["colorized"] = v.Colorized
+		p["colors"] = v.Colors
+
+		calculationProperties.Add(p)
 	}
 
 	d.Set("properties", &properties)
-	d.Set("mirror_properties", &mirror_properties)
+	d.Set("mirror_properties", &mirrorPoperties)
+	d.Set("calculation_properties", &calculationProperties)
 }
 
 func blueprintResourceToBody(d *schema.ResourceData) (*cli.Blueprint, error) {
@@ -325,7 +404,8 @@ func blueprintResourceToBody(d *schema.ResourceData) (*cli.Blueprint, error) {
 	b.Icon = d.Get("icon").(string)
 	b.Description = d.Get("description").(string)
 	props := d.Get("properties").(*schema.Set)
-	mirror_props := d.Get("mirror_properties").(*schema.Set)
+	mirrorProps := d.Get("mirror_properties").(*schema.Set)
+	calcProps := d.Get("calculation_properties").(*schema.Set)
 
 	if changelogDestination, ok := d.GetOk("changelog_destination"); ok {
 		if b.ChangelogDestination == nil {
@@ -411,8 +491,8 @@ func blueprintResourceToBody(d *schema.ResourceData) (*cli.Blueprint, error) {
 		}
 	}
 
-	mirror_properties := make(map[string]cli.BlueprintMirrorProperty, mirror_props.Len())
-	for _, prop := range mirror_props.List() {
+	mirrorProperties := make(map[string]cli.BlueprintMirrorProperty, mirrorProps.Len())
+	for _, prop := range mirrorProps.List() {
 		p := prop.(map[string]interface{})
 		propFields := cli.BlueprintMirrorProperty{}
 		if t, ok := p["title"]; ok && t != "" {
@@ -421,7 +501,43 @@ func blueprintResourceToBody(d *schema.ResourceData) (*cli.Blueprint, error) {
 		if p, ok := p["path"]; ok && p != "" {
 			propFields.Path = p.(string)
 		}
-		mirror_properties[p["identifier"].(string)] = propFields
+		mirrorProperties[p["identifier"].(string)] = propFields
+	}
+
+	calculationProperties := make(map[string]cli.BlueprintCalculationProperty, calcProps.Len())
+	for _, prop := range calcProps.List() {
+		p := prop.(map[string]interface{})
+		calcFields := cli.BlueprintCalculationProperty{}
+		if t, ok := p["type"]; ok && t != "" {
+			calcFields.Type = t.(string)
+		}
+		if t, ok := p["title"]; ok && t != "" {
+			calcFields.Title = t.(string)
+		}
+		if d, ok := p["description"]; ok && d != "" {
+			calcFields.Description = d.(string)
+		}
+		if f, ok := p["format"]; ok && f != "" {
+			calcFields.Format = f.(string)
+		}
+		if i, ok := p["icon"]; ok && i != "" {
+			calcFields.Icon = i.(string)
+		}
+		if r, ok := p["colorized"]; ok && r.(bool) {
+			calcFields.Colorized = r.(bool)
+		}
+		if e, ok := p["colors"]; ok && e != nil {
+			colors := make(map[string]string)
+			for key, value := range e.(map[string]interface{}) {
+				colors[key] = value.(string)
+			}
+			calcFields.Colors = colors
+		}
+		calcFields.Calculation = p["calculation"].(string)
+		// TODO: remove the if statement when this issues is solved, https://github.com/hashicorp/terraform-plugin-sdk/pull/1042/files
+		if p["identifier"] != "" {
+			calculationProperties[p["identifier"].(string)] = calcFields
+		}
 	}
 
 	rels := d.Get("relations").(*schema.Set)
@@ -447,7 +563,8 @@ func blueprintResourceToBody(d *schema.ResourceData) (*cli.Blueprint, error) {
 
 	b.Schema = cli.BlueprintSchema{Properties: properties, Required: required}
 	b.Relations = relations
-	b.MirrorProperties = mirror_properties
+	b.MirrorProperties = mirrorProperties
+	b.CalculationProperties = calculationProperties
 	return b, nil
 }
 

port/resource_port_blueprint_test.go

@@ -181,6 +181,18 @@ func TestAccPortBlueprintUpdate(t *testing.T) {
 				b = "blue"
 			}
 		}
+		calculation_properties {
+			identifier = "calc"
+			type = "number"
+			icon = "Terraform"
+			title = "calc"
+			calculation = "2"
+			colorized = true
+			colors = {
+				0 = "red"
+				1 = "blue"
+			}
+		}
 	}
 `, identifier)
 	var testAccActionConfigUpdate = fmt.Sprintf(`
@@ -225,6 +237,12 @@ func TestAccPortBlueprintUpdate(t *testing.T) {
 					resource.TestCheckResourceAttr("port-labs_blueprint.microservice1", "properties.0.title", "text"),
 					resource.TestCheckResourceAttr("port-labs_blueprint.microservice1", "properties.0.required", "true"),
 					resource.TestCheckResourceAttr("port-labs_blueprint.microservice1", "properties.0.icon", "Terraform"),
+					resource.TestCheckResourceAttr("port-labs_blueprint.microservice1", "calculation_properties.0.identifier", "calc"),
+					resource.TestCheckResourceAttr("port-labs_blueprint.microservice1", "calculation_properties.0.icon", "Terraform"),
+					resource.TestCheckResourceAttr("port-labs_blueprint.microservice1", "calculation_properties.0.type", "number"),
+					resource.TestCheckResourceAttr("port-labs_blueprint.microservice1", "calculation_properties.0.colorized", "true"),
+					resource.TestCheckResourceAttr("port-labs_blueprint.microservice1", "calculation_properties.0.colors.0", "red"),
+					resource.TestCheckResourceAttr("port-labs_blueprint.microservice1", "calculation_properties.0.colors.1", "blue"),
 				),
 			},
 			{

port/resource_port_entity.go

@@ -36,9 +36,19 @@ func newEntityResource() *schema.Resource {
 				Optional:    true,
 			},
 			"team": {
-				Type:        schema.TypeString,
-				Description: "The team related to the entity",
-				Optional:    true,
+				Type:          schema.TypeString,
+				Description:   "The team related to the entity",
+				Optional:      true,
+				ConflictsWith: []string{"teams"},
+			},
+			"teams": {
+				Type:        schema.TypeSet,
+				Description: "The teams related to the entity",
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},
+				Optional:      true,
+				ConflictsWith: []string{"team"},
 			},
 			"blueprint": {
 				Type:        schema.TypeString,
@@ -164,10 +174,21 @@ func entityResourceToBody(d *schema.ResourceData, bp *cli.Blueprint) (*cli.Entit
 	}
 	e.Title = d.Get("title").(string)
 	e.Blueprint = d.Get("blueprint").(string)
+
+	teams := []string{}
+
 	if team, ok := d.GetOk("team"); ok {
-		teams := []string{team.(string)}
-		e.Team = teams
+		teams = append(teams, team.(string))
+
+	}
+
+	if resourceTeams, ok := d.Get("teams").(*schema.Set); ok {
+		for _, team := range resourceTeams.List() {
+			teams = append(teams, team.(string))
+		}
 	}
+	e.Team = teams
+
 	rels := d.Get("relations").(*schema.Set)
 	relations := make(map[string]string)
 	for _, rel := range rels.List() {
@@ -200,9 +221,19 @@ func writeEntityComputedFieldsToResource(d *schema.ResourceData, e *cli.Entity)
 func writeEntityFieldsToResource(d *schema.ResourceData, e *cli.Entity) {
 	d.SetId(e.Identifier)
 	d.Set("title", e.Title)
-	if len(e.Team) > 0 {
+
+	team := d.Get("team")
+
+	if team != "" {
 		d.Set("team", e.Team[0])
 	}
+
+	teams := d.Get("teams").(*schema.Set)
+
+	if len(teams.List()) > 0 {
+		d.Set("teams", e.Team)
+	}
+
 	d.Set("created_at", e.CreatedAt.String())
 	d.Set("created_by", e.CreatedBy)
 	d.Set("updated_at", e.UpdatedAt.String())