Port 3216 add support for enum of number (#42)

Author: dvirsegev

port/cli/models.go

@@ -41,7 +41,7 @@ type (
 		Description        string              `json:"description,omitempty"`
 		Blueprint          string              `json:"blueprint,omitempty"`
 		Pattern            string              `json:"pattern,omitempty"`
-		Enum               []string            `json:"enum,omitempty"`
+		Enum               []interface{}       `json:"enum,omitempty"`
 		Spec               string              `json:"spec,omitempty"`
 		SpecAuthentication *SpecAuthentication `json:"specAuthentication,omitempty"`
 		EnumColors         map[string]string   `json:"enumColors,omitempty"`

port/resource_port_blueprint.go

@@ -445,14 +445,26 @@ func writeBlueprintFieldsToResource(d *schema.ResourceData, b *cli.Blueprint) {
 		p["min_length"] = v.MinLength
 		p["icon"] = v.Icon
 		p["spec"] = v.Spec
-		p["enum"] = v.Enum
 		p["enum_colors"] = v.EnumColors
 		if lo.Contains(b.Schema.Required, k) {
 			p["required"] = true
 		} else {
 			p["required"] = false
 		}
 
+		enumValue := []string{}
+
+		for _, value := range v.Enum {
+			if v.Type == "number" {
+				enumValue = append(enumValue, fmt.Sprintf("%v", value))
+			}
+			if v.Type == "string" {
+				enumValue = append(enumValue, value.(string))
+			}
+		}
+
+		p["enum"] = enumValue
+
 		if v.Default != nil {
 			writeDefaultFieldToResource(v, k, d, p)
 		}
@@ -664,10 +676,25 @@ func blueprintResourceToBody(d *schema.ResourceData) (*cli.Blueprint, error) {
 		if r, ok := p["required"]; ok && r.(bool) {
 			required = append(required, p["identifier"].(string))
 		}
-		if e, ok := p["enum"]; ok && e != nil {
+		if e, ok := p["enum"]; ok && len(e.([]interface{})) > 0 {
+			if propFields.Type != "number" && propFields.Type != "string" {
+				return nil, fmt.Errorf("enum can only be used when type is number or string for property %s", p["identifier"].(string))
+			}
 			for _, v := range e.([]interface{}) {
-				propFields.Enum = append(propFields.Enum, v.(string))
+				if propFields.Type == "number" {
+					enumValue, err := strconv.ParseInt(v.(string), 10, 0)
+					if err != nil {
+						return nil, fmt.Errorf("enum value %s is not a valid number for property %s", v.(string), p["identifier"].(string))
+					}
+					propFields.Enum = append(propFields.Enum, enumValue)
+				}
+				if propFields.Type == "string" {
+					enumValue := v.(string)
+					propFields.Enum = append(propFields.Enum, enumValue)
+				}
+
 			}
+
 		}
 		if e, ok := p["enum_colors"]; ok && e != nil {
 			enumColors := make(map[string]string)

port/resource_port_blueprint_test.go

@@ -17,6 +17,56 @@ func genID() string {
 	return fmt.Sprintf("t-%s", id[:18])
 }
 
+func TestAccPortBlueprintEnum(t *testing.T) {
+	identifier := genID()
+	var testAccActionConfigCreate = fmt.Sprintf(`
+	resource "port-labs_blueprint" "enumTest" {
+		title = "TF Provider Test BP0"
+		icon = "Terraform"
+		identifier = "%s"
+		properties {
+			identifier = "text"
+			type = "string"
+			title = "text"
+			icon = "Terraform"
+			enum = ["a", "b", "c"]
+			enum_colors = {
+				a = "red"
+				b = "blue"
+			}
+		}
+		properties {
+			identifier = "number"
+			type = "number"
+			title = "number"
+			enum = [1, 2]
+			
+		}
+	}
+`, identifier)
+	resource.Test(t, resource.TestCase{
+		Providers: map[string]*schema.Provider{
+			"port-labs": Provider(),
+		},
+		Steps: []resource.TestStep{
+			{
+				Config: testAccActionConfigCreate,
+				Check: resource.ComposeTestCheckFunc(
+
+					resource.TestCheckResourceAttr("port-labs_blueprint.enumTest", "properties.1.enum.0", "a"),
+					resource.TestCheckResourceAttr("port-labs_blueprint.enumTest", "properties.1.enum.1", "b"),
+					resource.TestCheckResourceAttr("port-labs_blueprint.enumTest", "properties.1.enum.2", "c"),
+					resource.TestCheckResourceAttr("port-labs_blueprint.enumTest", "properties.1.enum_colors.a", "red"),
+					resource.TestCheckResourceAttr("port-labs_blueprint.enumTest", "properties.1.enum_colors.b", "blue"),
+
+					resource.TestCheckResourceAttr("port-labs_blueprint.enumTest", "properties.0.enum.0", "1"),
+					resource.TestCheckResourceAttr("port-labs_blueprint.enumTest", "properties.0.enum.1", "2"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccPortBlueprint(t *testing.T) {
 	identifier := genID()
 	var testAccActionConfigCreate = fmt.Sprintf(`