different workaround for loading facility-based VLANs

Author: ctreatma

internal/resources/metal/vlan/models.go

@@ -31,18 +31,13 @@ func (m *DataSourceModel) parse(vlan *metalv1.VirtualNetwork) (d diag.Diagnostic
 		m.Description = types.StringValue(vlan.GetDescription())
 	}
 
-	if vlan.AdditionalProperties["project"] != nil {
-		project := vlan.AdditionalProperties["project"].(map[string]interface{})
-		project_id := project["id"].(string)
-		m.ProjectID = types.StringValue(project_id)
+	if vlan.AssignedTo != nil {
+		m.ProjectID = types.StringValue(vlan.AssignedTo.GetId())
 	}
 
 	if vlan.Facility != nil {
-		facility_code := vlan.Facility.AdditionalProperties["code"].(string)
-		metro := vlan.Facility.AdditionalProperties["metro"].(map[string]interface{})
-		metro_code := metro["code"].(string)
+		facility_code := vlan.Facility.AdditionalProperties["facility_code"].(string)
 		m.Facility = types.StringValue(strings.ToLower(facility_code))
-		m.Metro = types.StringValue(strings.ToLower(metro_code))
 	}
 
 	if vlan.Metro != nil {
@@ -82,18 +77,13 @@ func (m *ResourceModel) parse(vlan *metalv1.VirtualNetwork) (d diag.Diagnostics)
 		m.Description = types.StringValue(vlan.GetDescription())
 	}
 
-	if vlan.AdditionalProperties["project"] != nil {
-		project := vlan.AdditionalProperties["project"].(map[string]interface{})
-		project_id := project["id"].(string)
-		m.ProjectID = types.StringValue(project_id)
+	if vlan.AssignedTo != nil {
+		m.ProjectID = types.StringValue(vlan.AssignedTo.GetId())
 	}
 
 	if vlan.Facility != nil {
-		facility_code := vlan.Facility.AdditionalProperties["code"].(string)
-		metro := vlan.Facility.AdditionalProperties["metro"].(map[string]interface{})
-		metro_code := metro["code"].(string)
+		facility_code := vlan.Facility.AdditionalProperties["facility_code"].(string)
 		m.Facility = types.StringValue(strings.ToLower(facility_code))
-		m.Metro = types.StringValue(strings.ToLower(metro_code))
 	}
 
 	if vlan.Metro != nil {

internal/resources/metal/vlan/resource.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"path"
 	"strings"
 
 	equinix_errors "github.com/equinix/terraform-provider-equinix/internal/errors"
@@ -15,7 +16,7 @@ import (
 )
 
 var (
-	vlanDefaultIncludes = []string{"assigned_to", "facility", "metro"}
+	vlanDefaultIncludes = []string{"assigned_to", "metro"}
 )
 
 type Resource struct {
@@ -87,7 +88,7 @@ func (r *Resource) Create(ctx context.Context, request resource.CreateRequest, r
 	}
 
 	// get the current state of newly created vlan with default include fields
-	vlan, _, err = client.VLANsApi.GetVirtualNetwork(ctx, vlan.GetId()).Include(vlanDefaultIncludes).Execute()
+	vlan, err = loadVlan(ctx, client, vlan.GetId())
 	if err != nil {
 		response.Diagnostics.AddError("Error reading Vlan after create", err.Error())
 		return
@@ -112,10 +113,7 @@ func (r *Resource) Read(ctx context.Context, request resource.ReadRequest, respo
 		return
 	}
 
-	vlan, _, err := client.VLANsApi.GetVirtualNetwork(
-		ctx,
-		data.ID.ValueString(),
-	).Include(vlanDefaultIncludes).Execute()
+	vlan, err := loadVlan(ctx, client, data.ID.ValueString())
 	if err != nil {
 		if equinix_errors.IsNotFound(err) {
 			response.Diagnostics.AddWarning(
@@ -163,7 +161,7 @@ func (r *Resource) Delete(ctx context.Context, request resource.DeleteRequest, r
 	vlan, resp, err := client.VLANsApi.GetVirtualNetwork(
 		ctx,
 		data.ID.ValueString(),
-	).Include([]string{"instances", "virtual_network", "meta_gateway"}).Execute()
+	).Include([]string{"instances", "virtual_networks"}).Execute()
 	if err != nil {
 		if err := equinix_errors.IgnoreHttpResponseErrors(http.StatusForbidden, http.StatusNotFound)(resp, err); err != nil {
 			response.Diagnostics.AddWarning(
@@ -201,3 +199,27 @@ func (r *Resource) Delete(ctx context.Context, request resource.DeleteRequest, r
 		return
 	}
 }
+
+func loadVlan(ctx context.Context, client *metalv1.APIClient, id string) (*metalv1.VirtualNetwork, error) {
+	vlan, _, err := client.VLANsApi.GetVirtualNetwork(ctx, id).Include(vlanDefaultIncludes).Execute()
+
+	// If this is a facility-based VLAN we have to find the facility separately
+	// because if we include `facility`, the facility.href attribute becomes
+	// unreachable and the API response above won't validate against the VLAN schema
+	if err == nil && vlan.Facility != nil {
+		facilityId := path.Base(vlan.Facility.GetHref())
+		facilities, _, err := client.FacilitiesApi.FindFacilities(ctx).Include([]metalv1.FindFacilitiesIncludeParameterInner{"metro"}).Execute()
+		if err == nil {
+			for _, facility := range facilities.GetFacilities() {
+				if facility.GetId() == facilityId {
+					vlan.Metro = (*metalv1.Metro)(facility.Metro)
+				}
+			}
+			if vlan.Metro == nil {
+				return vlan, fmt.Errorf("could not find facility %v for VLAN %v", facilityId, vlan.GetId())
+			}
+		}
+	}
+
+	return vlan, err
+}