remove custom validators

Author: roncodingenthusiast

internal/helper/validation/position_coordinates.go

@@ -17,11 +17,9 @@ import (
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringplanmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 	"github.com/hashicorp/terraform-plugin-framework/types"
-	"github.com/hashicorp/terraform-plugin-framework/types/basetypes"
 
 	"github.com/honeycombio/terraform-provider-honeycombio/client"
 	"github.com/honeycombio/terraform-provider-honeycombio/internal/helper"
-	"github.com/honeycombio/terraform-provider-honeycombio/internal/helper/validation"
 	"github.com/honeycombio/terraform-provider-honeycombio/internal/models"
 )
 
@@ -101,9 +99,6 @@ func (*flexibleBoardResource) Schema(_ context.Context, _ resource.SchemaRequest
 		Blocks: map[string]schema.Block{
 			"panel": schema.ListNestedBlock{
 				Description: "List of panels to render on the board.",
-				Validators: []validator.List{
-					validation.RequireConsistentPanelPositions(),
-				},
 				NestedObject: schema.NestedBlockObject{
 					Attributes: map[string]schema.Attribute{
 						"type": schema.StringAttribute{
@@ -125,6 +120,7 @@ func (*flexibleBoardResource) Schema(_ context.Context, _ resource.SchemaRequest
 									Description: "The X coordinate of the panel.",
 									Validators: []validator.Int64{
 										int64validator.AtLeast(0),
+										int64validator.AlsoRequires(path.MatchRelative().AtParent().AtName("y_coordinate")),
 									},
 								},
 								"y_coordinate": schema.Int64Attribute{
@@ -134,6 +130,7 @@ func (*flexibleBoardResource) Schema(_ context.Context, _ resource.SchemaRequest
 									Description: "The Y coordinate of the panel.",
 									Validators: []validator.Int64{
 										int64validator.AtLeast(0),
+										int64validator.AlsoRequires(path.MatchRelative().AtParent().AtName("x_coordinate")),
 									},
 								},
 								"height": schema.Int64Attribute{
@@ -155,9 +152,6 @@ func (*flexibleBoardResource) Schema(_ context.Context, _ resource.SchemaRequest
 									},
 								},
 							},
-							Validators: []validator.Object{
-								validation.RequireBothCoordinates(),
-							},
 						},
 						"slo_panel": schema.ListNestedBlock{
 							Description: "A Service Level Objective(SLO) panel to be displayed on the Board.",
@@ -580,26 +574,31 @@ func expandBoardPanels(
 // This is a workaround for the limitations of the terraform v5 protocol.
 func expandPanelPosition(
 	ctx context.Context,
-	panelPosition types.Object,
+	panelPosition types.List,
 	diags *diag.Diagnostics,
 ) client.BoardPanelPosition {
 	if panelPosition.IsNull() || panelPosition.IsUnknown() {
 		return client.BoardPanelPosition{
-			X:      -1,
-			Y:      -1,
-			Width:  -1,
-			Height: -1,
+			X: -1,
+			Y: -1,
 		}
 	}
 
-	var position models.BoardPanelPositionModel
-	diags.Append(panelPosition.As(ctx, &position, basetypes.ObjectAsOptions{})...)
+	var position []models.BoardPanelPositionModel
+	diags.Append(panelPosition.ElementsAs(ctx, &position, false)...)
+
+	if len(position) == 0 {
+		return client.BoardPanelPosition{
+			X: -1,
+			Y: -1,
+		}
+	}
 
 	return client.BoardPanelPosition{
-		X:      int(position.XCoordinate.ValueInt64()),
-		Y:      int(position.YCoordinate.ValueInt64()),
-		Height: int(position.Height.ValueInt64()),
-		Width:  int(position.Width.ValueInt64()),
+		X:      int(position[0].XCoordinate.ValueInt64()),
+		Y:      int(position[0].YCoordinate.ValueInt64()),
+		Height: int(position[0].Height.ValueInt64()),
+		Width:  int(position[0].Width.ValueInt64()),
 	}
 }
 
@@ -717,38 +716,33 @@ func flattenBoardPanel(
 }
 
 func flattenBoardPanelPosition(
-	_ context.Context,
+	ctx context.Context,
 	position client.BoardPanelPosition,
 	diags *diag.Diagnostics,
 	statePosition client.BoardPanelPosition,
-) types.Object {
+) types.List {
 	// we use negative numbers to indicate that the panel position was never set. We use this to not write to state when panel position is not set.
 	// This is a workaround for the various limitations that terraform v5 protocol presents.
 	// Without this workaround, whenever the API generates a default position, terraform would complain about a schema mismatch between config and applied results.
-	if statePosition.Height == -1 && statePosition.Width == -1 && statePosition.X == -1 && statePosition.Y == -1 {
-		return types.ObjectNull(models.BoardPanelPositionModelAttrType)
-	}
-	x := position.X
-	y := position.Y
-	width := position.Width
-	height := position.Height
-
-	attrs := map[string]attr.Value{}
-	if statePosition.X != -1 && statePosition.Y != -1 {
-		attrs["x_coordinate"] = types.Int64Value(int64(x))
-		attrs["y_coordinate"] = types.Int64Value(int64(y))
-	}
-	if statePosition.Width != -1 {
-		attrs["width"] = types.Int64Value(int64(width))
-	}
-	if statePosition.Height != -1 {
-		attrs["height"] = types.Int64Value(int64(height))
-	}
+	if statePosition.Height == 0 && statePosition.Width == 0 && statePosition.X == -1 && statePosition.Y == -1 {
+		return types.ListNull(types.ObjectType{AttrTypes: models.BoardPanelPositionModelAttrType})
+	}
+	obj, d := types.ObjectValue(models.BoardPanelPositionModelAttrType, map[string]attr.Value{
+		"x_coordinate": types.Int64Value(int64(position.X)),
+		"y_coordinate": types.Int64Value(int64(position.Y)),
+		"height":       types.Int64Value(int64(position.Height)),
+		"width":        types.Int64Value(int64(position.Width)),
+	})
+	diags.Append(d...)
 
-	obj, d := types.ObjectValue(models.BoardPanelPositionModelAttrType, attrs)
+	result, d := types.ListValueFrom(
+		ctx,
+		types.ObjectType{AttrTypes: models.BoardPanelPositionModelAttrType},
+		[]attr.Value{obj},
+	)
 	diags.Append(d...)
 
-	return obj
+	return result
 }
 
 func flattenBoardQueryPanel(
@@ -883,12 +877,6 @@ func removeDefaultNegativeNumbers(panels []client.BoardPanel) []client.BoardPane
 			resp[i].PanelPosition.X = 0
 			resp[i].PanelPosition.Y = 0
 		}
-		if resp[i].PanelPosition.Width == -1 {
-			resp[i].PanelPosition.Width = 0
-		}
-		if resp[i].PanelPosition.Height == -1 {
-			resp[i].PanelPosition.Height = 0
-		}
 	}
 
 	return resp