Merge pull request #223 from port-labs/PORT-10159-bug-tf-provider-property-enum-color-bug

PORT-10159: Fix enum color bug in action properties

Author: peroman86

Makefile

@@ -40,7 +40,7 @@ setup:
 acctest:
 	# TEST_FILTER can be any regex, E.g: .*PageResource.*
 	# TEST_FILTER='TestAccPortPageResource*' make acctest
-	TF_ACC=1 PORT_CLIENT_ID=$(PORT_CLIENT_ID) PORT_CLIENT_SECRET=$(PORT_CLIENT_SECRET) PORT_BASE_URL=$(PORT_BASE_URL) go test -timeout 20m -p 1 ./... -run "$(TEST_FILTER)"
+	TF_ACC=1 PORT_CLIENT_ID=$(PORT_CLIENT_ID) PORT_CLIENT_SECRET=$(PORT_CLIENT_SECRET) PORT_BASE_URL=$(PORT_BASE_URL) go test -timeout 40m -p 1 ./... -run "$(TEST_FILTER)"
 
 gen-docs:
 	tfplugindocs

docs/resources/port_action.md

@@ -627,6 +627,7 @@ Optional:
 - `depends_on` (List of String) The properties that this property depends on
 - `description` (String) The description of the property
 - `enum` (List of Number) The enum of the number property
+- `enum_colors` (Map of String) The enum colors of the number property
 - `enum_jq_query` (String) The enum jq query of the string property
 - `icon` (String) The icon of the property
 - `maximum` (Number) The min of the number property
@@ -667,6 +668,7 @@ Optional:
 - `description` (String) The description of the property
 - `encryption` (String) The algorithm to encrypt the property with. Accepted value: `aes256-gcm`
 - `enum` (List of String) The enum of the string property
+- `enum_colors` (Map of String) The enum colors of the string property
 - `enum_jq_query` (String) The enum jq query of the string property
 - `format` (String) The format of the string property, Accepted values include `date-time`, `url`, `email`, `ipv4`, `ipv6`, `yaml`, `entity`, `user`, `team`, `proto`, `markdown`
 - `icon` (String) The icon of the property

examples/resources/port_action/main.tf

@@ -92,12 +92,34 @@ resource "port_action" "restart_microservice" {
           title       = "Service"
           description = "The service to restart"
           format      = "entity"
-          blueprint   = "service"
+          blueprint   = "Service"
           sort        = {
             property = "$updatedAt"
             order    = "DESC"
           }
         }
+        testString = {
+          type        = "string"
+          title       = "String enum"
+          icon        = "Terraform"
+          default     = "a"
+          enum        = ["a","b"]
+          enum_colors = {
+            a  ="darkGray"
+            b = "turquoise"
+          }
+        }
+        testNumber = {
+          type        = "number"
+          title       = "Number enum"
+          icon        = "Terraform"
+          default     = 1
+          enum        = [1, 2]
+          enum_colors = {
+            "1"  ="darkGray"
+            "2" = "turquoise"
+          }
+        }
       }
     }
   }

port/action/model.go

@@ -37,6 +37,7 @@ type StringPropModel struct {
 	MinLength   types.Int64        `tfsdk:"min_length"`
 	Pattern     types.String       `tfsdk:"pattern"`
 	Enum        types.List         `tfsdk:"enum"`
+	EnumColors  types.Map          `tfsdk:"enum_colors"`
 	EnumJqQuery types.String       `tfsdk:"enum_jq_query"`
 	Encryption  types.String       `tfsdk:"encryption"`
 	Sort        *EntitiesSortModel `tfsdk:"sort"`
@@ -191,6 +192,7 @@ type NumberPropModel struct {
 	Maximum     types.Float64 `tfsdk:"maximum"`
 	Minimum     types.Float64 `tfsdk:"minimum"`
 	Enum        types.List    `tfsdk:"enum"`
+	EnumColors  types.Map     `tfsdk:"enum_colors"`
 	EnumJqQuery types.String  `tfsdk:"enum_jq_query"`
 }
 

port/action/number.go

@@ -72,6 +72,19 @@ func numberPropResourceToBody(ctx context.Context, state *SelfServiceTriggerMode
 				property.Enum = enumJqQueryMap
 			}
 
+			if !prop.EnumColors.IsNull() {
+				property.EnumColors = map[string]string{}
+				for k, v := range prop.EnumColors.Elements() {
+					value, _ := v.ToTerraformValue(ctx)
+					var keyValue string
+					err := value.As(&keyValue)
+					if err != nil {
+						return err
+					}
+					property.EnumColors[k] = keyValue
+				}
+			}
+
 			if !prop.DependsOn.IsNull() {
 				dependsOn, err := utils.TerraformListToGoArray(ctx, prop.DependsOn, "string")
 				if err != nil {
@@ -130,5 +143,11 @@ func addNumberPropertiesToResource(ctx context.Context, v *cli.ActionProperty) *
 		numberProp.EnumJqQuery = types.StringNull()
 	}
 
+	if v.EnumColors != nil {
+		numberProp.EnumColors, _ = types.MapValueFrom(ctx, types.StringType, v.EnumColors)
+	} else {
+		numberProp.EnumColors = types.MapNull(types.StringType)
+	}
+
 	return numberProp
 }

port/action/resource_test.go

@@ -85,6 +85,11 @@ func TestAccPortAction(t *testing.T) {
 						"required" = true
 						maximum = 100
 						minimum = 0
+						enum = [1, 2]
+						enum_colors = {
+							"1" = "red"
+							"2" = "blue"
+						}
 					}
 				}
 				"boolean_props" = {
@@ -131,6 +136,10 @@ func TestAccPortAction(t *testing.T) {
 					resource.TestCheckResourceAttr("port_action.create_microservice", "self_service_trigger.user_properties.number_props.myNumberIdentifier.required", "true"),
 					resource.TestCheckResourceAttr("port_action.create_microservice", "self_service_trigger.user_properties.number_props.myNumberIdentifier.maximum", "100"),
 					resource.TestCheckResourceAttr("port_action.create_microservice", "self_service_trigger.user_properties.number_props.myNumberIdentifier.minimum", "0"),
+					resource.TestCheckResourceAttr("port_action.create_microservice", "self_service_trigger.user_properties.number_props.myNumberIdentifier.enum.0", "1"),
+					resource.TestCheckResourceAttr("port_action.create_microservice", "self_service_trigger.user_properties.number_props.myNumberIdentifier.enum.1", "2"),
+					resource.TestCheckResourceAttr("port_action.create_microservice", "self_service_trigger.user_properties.number_props.myNumberIdentifier.enum_colors.1", "red"),
+					resource.TestCheckResourceAttr("port_action.create_microservice", "self_service_trigger.user_properties.number_props.myNumberIdentifier.enum_colors.2", "blue"),
 					resource.TestCheckResourceAttr("port_action.create_microservice", "self_service_trigger.user_properties.boolean_props.myBooleanIdentifier.title", "My Boolean Identifier"),
 					resource.TestCheckResourceAttr("port_action.create_microservice", "self_service_trigger.user_properties.boolean_props.myBooleanIdentifier.required", "true"),
 					resource.TestCheckResourceAttr("port_action.create_microservice", "self_service_trigger.user_properties.object_props.myObjectIdentifier.title", "My Object Identifier"),

port/action/schema.go

@@ -540,6 +540,11 @@ func StringPropertySchema() schema.Attribute {
 				listvalidator.SizeAtLeast(1),
 			},
 		},
+		"enum_colors": schema.MapAttribute{
+			MarkdownDescription: "The enum colors of the string property",
+			Optional:            true,
+			ElementType:         types.StringType,
+		},
 		"enum_jq_query": schema.StringAttribute{
 			MarkdownDescription: "The enum jq query of the string property",
 			Optional:            true,
@@ -666,6 +671,11 @@ func NumberPropertySchema() schema.Attribute {
 				listvalidator.SizeAtLeast(1),
 			},
 		},
+		"enum_colors": schema.MapAttribute{
+			MarkdownDescription: "The enum colors of the number property",
+			Optional:            true,
+			ElementType:         types.StringType,
+		},
 		"enum_jq_query": schema.StringAttribute{
 			MarkdownDescription: "The enum jq query of the string property",
 			Optional:            true,

port/action/string.go

@@ -79,6 +79,21 @@ func stringPropResourceToBody(ctx context.Context, d *SelfServiceTriggerModel, p
 			property.Enum = enumList
 		}
 
+		if !prop.EnumColors.IsNull() {
+			enumColor := map[string]string{}
+			for k, v := range prop.EnumColors.Elements() {
+				value, _ := v.ToTerraformValue(ctx)
+				var keyValue string
+				err := value.As(&keyValue)
+				if err != nil {
+					return err
+				}
+				enumColor[k] = keyValue
+			}
+
+			property.EnumColors = enumColor
+		}
+
 		if !prop.EnumJqQuery.IsNull() {
 			enumJqQueryMap := map[string]string{
 				"jqQuery": prop.EnumJqQuery.ValueString(),
@@ -164,6 +179,12 @@ func addStringPropertiesToResource(ctx context.Context, v *cli.ActionProperty) *
 		stringProp.EnumJqQuery = types.StringNull()
 	}
 
+	if v.EnumColors != nil {
+		stringProp.EnumColors, _ = types.MapValueFrom(ctx, types.StringType, v.EnumColors)
+	} else {
+		stringProp.EnumColors = types.MapNull(types.StringType)
+	}
+
 	if v.Sort != nil {
 		stringProp.Sort = &EntitiesSortModel{
 			Property: types.StringValue(v.Sort.Property),