internal/validate: New Go packages: hashicorp/terraform-plugin-framew…

…ork#432.
hashicorp · Aug 18, 2022 · 61c8805 · 61c8805
1 parent a1ee399
commit 61c8805
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/internal/validate/required.go b/internal/validate/required.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	tfdiag "github.com/hashicorp/terraform-plugin-framework/diag"
+	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/tfsdk"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
@@ -257,7 +258,7 @@ func (validator resourceConfigRequiredAttributesValidator) MarkdownDescription(c
 }
 
 // Validate performs the validation.
-func (validator resourceConfigRequiredAttributesValidator) ValidateResource(ctx context.Context, request tfsdk.ValidateResourceConfigRequest, response *tfsdk.ValidateResourceConfigResponse) {
+func (validator resourceConfigRequiredAttributesValidator) ValidateResource(ctx context.Context, request resource.ValidateConfigRequest, response *resource.ValidateConfigResponse) {
 	val := request.Config.Raw
 
 	if val.IsNull() || !val.IsFullyKnown() {
@@ -288,7 +289,7 @@ func (validator resourceConfigRequiredAttributesValidator) ValidateResource(ctx
 }
 
 // ResourceConfigRequiredAttributes returns a new resource schema-level required Attributes validator.
-func ResourceConfigRequiredAttributes(fs ...RequiredAttributesFunc) tfsdk.ResourceConfigValidator {
+func ResourceConfigRequiredAttributes(fs ...RequiredAttributesFunc) resource.ConfigValidator {
 	return resourceConfigRequiredAttributesValidator{
 		fs: fs,
 	}

diff --git a/internal/validate/required_test.go b/internal/validate/required_test.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework/attr"
 	"github.com/hashicorp/terraform-plugin-framework/path"
+	"github.com/hashicorp/terraform-plugin-framework/resource"
 	"github.com/hashicorp/terraform-plugin-framework/tfsdk"
 	"github.com/hashicorp/terraform-plugin-framework/types"
 	"github.com/hashicorp/terraform-plugin-go/tftypes"
@@ -787,12 +788,12 @@ func TestResourceConfigRequiredAttributesValidator(t *testing.T) {
 		name, test := name, test
 		t.Run(name, func(t *testing.T) {
 			ctx := context.TODO()
-			request := tfsdk.ValidateResourceConfigRequest{
+			request := resource.ValidateConfigRequest{
 				Config: tfsdk.Config{
 					Raw: test.val,
 				},
 			}
-			response := tfsdk.ValidateResourceConfigResponse{}
+			response := resource.ValidateConfigResponse{}
 			ResourceConfigRequiredAttributes(test.fs...).ValidateResource(ctx, request, &response)
 
 			if !response.Diagnostics.HasError() && test.expectError {