use validator to mark object as required

DataDog · Aug 9, 2023 · 7dc58f0 · 7dc58f0
1 parent dc1060c
commit 7dc58f0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 36 deletions.
diff --git a/datadog/fwprovider/resource_datadog_downtime_schedule.go b/datadog/fwprovider/resource_datadog_downtime_schedule.go
@@ -128,8 +128,8 @@ func (r *DowntimeScheduleResource) Schema(_ context.Context, _ resource.SchemaRe
 						ElementType: types.StringType,
 					},
 				},
-				PlanModifiers: []planmodifier.Object{
-					planmodifiers.ObjectRequired(),
+				Validators: []validator.Object{
+					objectvalidator.IsRequired(),
 				},
 			},
 			"one_time_schedule": schema.SingleNestedBlock{

diff --git a/datadog/fwprovider/resource_datadog_spans_metric.go b/datadog/fwprovider/resource_datadog_spans_metric.go
@@ -4,16 +4,17 @@ import (
 	"context"
 
 	"github.com/DataDog/datadog-api-client-go/v2/api/datadogV2"
+	"github.com/hashicorp/terraform-plugin-framework-validators/objectvalidator"
 	"github.com/hashicorp/terraform-plugin-framework/diag"
 	frameworkPath "github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
 	"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault"
 	"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/terraform-providers/terraform-provider-datadog/datadog/internal/planmodifiers"
 	"github.com/terraform-providers/terraform-provider-datadog/datadog/internal/utils"
 )
 
@@ -114,8 +115,8 @@ func (r *spansMetricResource) Schema(_ context.Context, _ resource.SchemaRequest
 				// This attritbute is treated as required by the framework sdk.
 				// See: https://github.com/hashicorp/terraform-plugin-framework/issues/740
 				// In case this will be allowed in the future, explicitly add validation to the object.
-				PlanModifiers: []planmodifier.Object{
-					planmodifiers.ObjectRequired(),
+				Validators: []validator.Object{
+					objectvalidator.IsRequired(),
 				},
 			},
 			"filter": schema.SingleNestedBlock{
@@ -129,8 +130,8 @@ func (r *spansMetricResource) Schema(_ context.Context, _ resource.SchemaRequest
 				},
 				// This field is marked as required for now since the framework does not allow
 				// blocks with default values.
-				PlanModifiers: []planmodifier.Object{
-					planmodifiers.ObjectRequired(),
+				Validators: []validator.Object{
+					objectvalidator.IsRequired(),
 				},
 			},
 		},

diff --git a/datadog/internal/planmodifiers/types_object_required.go b/datadog/internal/planmodifiers/types_object_required.go