Merge pull request #320 from port-labs/task_t7nvy9/add-labeled-url

Added support for object formats - for labeledUrl

Author: gilmor-port

docs/resources/port_blueprint.md

@@ -409,6 +409,7 @@ Optional:
 Optional:
 
 - `default` (List of String) The default of the items
+- `format` (String) The format of the object items
 
 
 <a id="nestedatt--properties--array_props--string_items"></a>
@@ -459,6 +460,7 @@ Optional:
 
 - `default` (String) The default of the object property
 - `description` (String) The description of the property
+- `format` (String) The format of the object property
 - `icon` (String) The icon of the property
 - `required` (Boolean) Whether the property is required
 - `spec` (String) The spec of the object property

docs/resources/port_system_blueprint.md

@@ -121,6 +121,7 @@ Optional:
 Optional:
 
 - `default` (List of String) The default of the items
+- `format` (String) The format of the object items
 
 
 <a id="nestedatt--properties--array_props--string_items"></a>
@@ -171,6 +172,7 @@ Optional:
 
 - `default` (String) The default of the object property
 - `description` (String) The description of the property
+- `format` (String) The format of the object property
 - `icon` (String) The icon of the property
 - `required` (Boolean) Whether the property is required
 - `spec` (String) The spec of the object property

port/blueprint/array.go

@@ -112,6 +112,9 @@ func arrayPropResourceToBody(ctx context.Context, state *PropertiesModel, props
 			if prop.ObjectItems != nil {
 				items := map[string]interface{}{}
 				items["type"] = "object"
+				if !prop.ObjectItems.Format.IsNull() {
+					items["format"] = prop.ObjectItems.Format.ValueString()
+				}
 				if !prop.ObjectItems.Default.IsNull() {
 					defaultList, err := utils.TerraformListToGoArray(ctx, prop.ObjectItems.Default, "object")
 					if err != nil {
@@ -205,6 +208,9 @@ func AddArrayPropertiesToState(ctx context.Context, v *cli.BlueprintProperty, js
 
 			case "object":
 				arrayProp.ObjectItems = &ObjectItems{}
+				if value, ok := v.Items["format"]; ok && value != nil {
+					arrayProp.ObjectItems.Format = types.StringValue(v.Items["format"].(string))
+				}
 				if v.Default != nil {
 					objectArray := make([]map[string]interface{}, len(v.Default.([]interface{})))
 					for i, v := range v.Default.([]interface{}) {

port/blueprint/model.go

@@ -13,8 +13,8 @@ type TeamInheritanceModel struct {
 }
 
 type OwnershipModel struct {
-	Type types.String `tfsdk:"type"`
-	Path types.String `tfsdk:"path"`
+	Type  types.String `tfsdk:"type"`
+	Path  types.String `tfsdk:"path"`
 	Title types.String `tfsdk:"title"`
 }
 
@@ -61,11 +61,11 @@ type BooleanPropModel struct {
 }
 
 type StringItems struct {
-	Format  types.String  `tfsdk:"format"`
-	Default types.List    `tfsdk:"default"`
-	Pattern types.String  `tfsdk:"pattern"`
-	Enum    types.List    `tfsdk:"enum"`
-	EnumColors types.Map  `tfsdk:"enum_colors"`
+	Format     types.String `tfsdk:"format"`
+	Default    types.List   `tfsdk:"default"`
+	Pattern    types.String `tfsdk:"pattern"`
+	Enum       types.List   `tfsdk:"enum"`
+	EnumColors types.Map    `tfsdk:"enum_colors"`
 }
 
 type NumberItems struct {
@@ -77,7 +77,8 @@ type BooleanItems struct {
 }
 
 type ObjectItems struct {
-	Default types.List `tfsdk:"default"`
+	Default types.List   `tfsdk:"default"`
+	Format  types.String `tfsdk:"format"`
 }
 
 type ArrayPropModel struct {
@@ -100,6 +101,7 @@ type ObjectPropModel struct {
 	Required    types.Bool   `tfsdk:"required"`
 	Default     types.String `tfsdk:"default"`
 	Spec        types.String `tfsdk:"spec"`
+	Format      types.String `tfsdk:"format"`
 }
 
 type PropertiesModel struct {

port/blueprint/object.go

@@ -46,6 +46,11 @@ func objectPropResourceToBody(state *PropertiesModel, props map[string]cli.Bluep
 				property.Spec = &spec
 			}
 
+			if !prop.Format.IsNull() {
+				format := prop.Format.ValueString()
+				property.Format = &format
+			}
+
 			props[propIdentifier] = property
 		}
 
@@ -62,5 +67,9 @@ func AddObjectPropertiesToState(v *cli.BlueprintProperty) *ObjectPropModel {
 		objectProp.Spec = types.StringValue(*v.Spec)
 	}
 
+	if v.Format != nil {
+		objectProp.Format = types.StringValue(*v.Format)
+	}
+
 	return objectProp
 }

port/blueprint/schema.go

@@ -252,6 +252,10 @@ func ArrayPropertySchema() schema.MapNestedAttribute {
 			MarkdownDescription: "The items of the array property",
 			Optional:            true,
 			Attributes: map[string]schema.Attribute{
+				"format": schema.StringAttribute{
+					MarkdownDescription: "The format of the object items",
+					Optional:            true,
+				},
 				"default": schema.ListAttribute{
 					MarkdownDescription: "The default of the items",
 					Optional:            true,
@@ -307,6 +311,10 @@ func ObjectPropertySchema() schema.MapNestedAttribute {
 				stringvalidator.OneOf("async-api", "open-api"),
 			},
 		},
+		"format": schema.StringAttribute{
+			MarkdownDescription: "The format of the object property",
+			Optional:            true,
+		},
 		"default": schema.StringAttribute{
 			Optional:            true,
 			MarkdownDescription: "The default of the object property",