feat: add ownership field to blueprint (#193)

Add support to the new ownership field for blueprints

Author: devin-ai-integration[bot]

bin/golangci-lint

@@ -201,6 +201,11 @@ type (
 		Path string `json:"path,omitempty"`
 	}
 
+	Ownership struct {
+		Type string  `json:"type"`
+		Path *string `json:"path,omitempty"`
+	}
+
 	Step = struct {
 		Title string   `json:"title"`
 		Order []string `json:"order"`
@@ -249,6 +254,7 @@ type (
 		ChangelogDestination  *ChangelogDestination                   `json:"changelogDestination,omitempty"`
 		TeamInheritance       *TeamInheritance                        `json:"teamInheritance,omitempty"`
 		Relations             map[string]Relation                     `json:"relations"`
+		Ownership             *Ownership                                `json:"ownership,omitempty"`
 	}
 
 	Action struct {

internal/cli/models.go

@@ -12,6 +12,11 @@ type TeamInheritanceModel struct {
 	Path types.String `tfsdk:"path"`
 }
 
+type OwnershipModel struct {
+	Type types.String `tfsdk:"type"`
+	Path types.String `tfsdk:"path"`
+}
+
 type SpecAuthenticationModel struct {
 	AuthorizationUrl types.String `tfsdk:"authorization_url"`
 	TokenUrl         types.String `tfsdk:"token_url"`
@@ -176,4 +181,5 @@ type BlueprintModel struct {
 	CalculationProperties       map[string]CalculationPropertyModel `tfsdk:"calculation_properties"`
 	ForceDeleteEntities         types.Bool                          `tfsdk:"force_delete_entities"`
 	CreateCatalogPage           types.Bool                          `tfsdk:"create_catalog_page"`
+	Ownership                   *OwnershipModel                     `tfsdk:"ownership"`
 }

port/blueprint/model.go

@@ -3,15 +3,16 @@ package blueprint
 import (
 	"context"
 	"fmt"
+	"strings"
+	"time"
+
 	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-log/tflog"
 	"github.com/port-labs/terraform-provider-port-labs/v2/internal/cli"
 	"github.com/port-labs/terraform-provider-port-labs/v2/internal/consts"
 	"github.com/port-labs/terraform-provider-port-labs/v2/internal/flex"
-	"strings"
-	"time"
 )
 
 var _ resource.Resource = &BlueprintResource{}
@@ -103,6 +104,15 @@ func refreshBlueprintState(ctx context.Context, bm *BlueprintModel, b *cli.Bluep
 		}
 	}
 
+	if b.Ownership != nil {
+		bm.Ownership = &OwnershipModel{
+			Type: types.StringValue(b.Ownership.Type),
+		}
+		if b.Ownership.Path != nil {
+			bm.Ownership.Path = types.StringValue(*b.Ownership.Path)
+		}
+	}
+
 	if len(b.Schema.Properties) > 0 {
 		err := updatePropertiesToState(ctx, b, bm)
 		if err != nil {
@@ -335,6 +345,22 @@ func blueprintResourceToPortRequest(ctx context.Context, state *BlueprintModel)
 		}
 	}
 
+	if state.Ownership != nil && !state.Ownership.Type.IsNull() {
+		ownershipType := state.Ownership.Type.ValueString()
+		if ownershipType == "Inherited" && state.Ownership.Path.IsNull() {
+			return nil, fmt.Errorf("path is required when ownership type is Inherited")
+		}
+
+		ownership := &cli.Ownership{
+			Type: ownershipType,
+		}
+		if !state.Ownership.Path.IsNull() {
+			path := state.Ownership.Path.ValueString()
+			ownership.Path = &path
+		}
+		b.Ownership = ownership
+	}
+
 	required := []string{}
 	props := map[string]cli.BlueprintProperty{}
 	var err error

port/blueprint/resource.go

@@ -832,6 +832,103 @@ func TestAccPortDestroyDeleteAllEntities(t *testing.T) {
 	})
 }
 
+// Commented out until we have a way to mock feature flags in Terraform tests
+// func TestAccPortBlueprintOwnership(t *testing.T) {
+// 	parentIdentifier := utils.GenID()
+// 	var testAccConfigDirect = fmt.Sprintf(`
+// 	resource "port_blueprint" "parent_blueprint" {
+// 		title = "Parent Blueprint"
+// 		icon = "Terraform"
+// 		identifier = "%s"
+// 		properties = {
+// 			string_props = {
+// 				team = {
+// 					type = "string"
+// 					format = "team"
+// 					title = "Team"
+// 				}
+// 			}
+// 		}
+// 		ownership = {
+// 			type = "Direct"
+// 		}
+// 	}
+// `, parentIdentifier)
+
+// 	childIdentifier := utils.GenID()
+// 	var testAccConfigInherited = fmt.Sprintf(`
+// 	resource "port_blueprint" "parent_blueprint" {
+// 		title = "Parent Blueprint"
+// 		icon = "Terraform"
+// 		identifier = "%s"
+// 		properties = {
+// 			string_props = {
+// 				team = {
+// 					type = "string"
+// 					format = "team"
+// 					title = "Team"
+// 				}
+// 			}
+// 		}
+// 		ownership = {
+// 			type = "Direct"
+// 		}
+// 	}
+
+// 	resource "port_blueprint" "child_blueprint" {
+// 		title = "Child Blueprint"
+// 		icon = "Terraform"
+// 		identifier = "%s"
+// 		properties = {
+// 			string_props = {
+// 				team = {
+// 					type = "string"
+// 					format = "team"
+// 					title = "Team"
+// 				}
+// 			}
+// 		}
+// 		relations = {
+// 			parent = {
+// 				target = port_blueprint.parent_blueprint.identifier
+// 				title = "Parent Service"
+// 				required = false
+// 				many = false
+// 			}
+// 		}
+// 		ownership = {
+// 			type = "Inherited"
+// 			path = "parent"
+// 		}
+// 	}
+// `, parentIdentifier, childIdentifier)
+
+// 	resource.Test(t, resource.TestCase{
+// 		PreCheck:                 func() { acctest.TestAccPreCheck(t) },
+// 		ProtoV6ProviderFactories: acctest.TestAccProtoV6ProviderFactories,
+// 		Steps: []resource.TestStep{
+// 			{
+// 				Config: acctest.ProviderConfig + testAccConfigDirect,
+// 				Check: resource.ComposeTestCheckFunc(
+// 					resource.TestCheckResourceAttr("port_blueprint.parent_blueprint", "title", "Parent Blueprint"),
+// 					resource.TestCheckResourceAttr("port_blueprint.parent_blueprint", "identifier", parentIdentifier),
+// 					resource.TestCheckResourceAttr("port_blueprint.parent_blueprint", "ownership.type", "Direct"),
+// 					resource.TestCheckNoResourceAttr("port_blueprint.parent_blueprint", "ownership.path"),
+// 				),
+// 			},
+// 			{
+// 				Config: acctest.ProviderConfig + testAccConfigInherited,
+// 				Check: resource.ComposeTestCheckFunc(
+// 					resource.TestCheckResourceAttr("port_blueprint.child_blueprint", "title", "Child Blueprint"),
+// 					resource.TestCheckResourceAttr("port_blueprint.child_blueprint", "identifier", childIdentifier),
+// 					resource.TestCheckResourceAttr("port_blueprint.child_blueprint", "ownership.type", "Inherited"),
+// 					resource.TestCheckResourceAttr("port_blueprint.child_blueprint", "ownership.path", "parent"),
+// 				),
+// 			},
+// 		},
+// 	})
+// }
+
 func TestAccPortBlueprintCatalogPageCreation(t *testing.T) {
 	testCases := []struct {
 		name               string

port/blueprint/resource_test.go

@@ -253,6 +253,27 @@ func ArrayPropertySchema() schema.MapNestedAttribute {
 	}
 }
 
+func OwnershipSchema() schema.Attribute {
+	return schema.SingleNestedAttribute{
+		MarkdownDescription: "Optional ownership field for Blueprint. 'type' can be Inherited or Direct. If 'Inherited', then 'path' is required and must be a valid relation identifiers path.",
+		Optional:            true,
+
+		Attributes: map[string]schema.Attribute{
+			"type": schema.StringAttribute{
+				MarkdownDescription: "Ownership type: either 'Inherited' or 'Direct'.",
+				Required:            true,
+				Validators: []validator.String{
+					stringvalidator.OneOf("Inherited", "Direct"),
+				},
+			},
+			"path": schema.StringAttribute{
+				MarkdownDescription: "Path for the Inherited ownership type. Required when type is 'Inherited'. Must be a valid relation identifiers path.",
+				Optional:            true,
+			},
+		},
+	}
+}
+
 func ObjectPropertySchema() schema.MapNestedAttribute {
 
 	objectPropertySchema := map[string]schema.Attribute{
@@ -464,6 +485,7 @@ func BlueprintSchema() map[string]schema.Attribute {
 			Computed:            true,
 			Default:             booldefault.StaticBool(true),
 		},
+		"ownership": OwnershipSchema(),
 	}
 }