Skip to content

Commit 61c8805

Browse files
committed
internal/validate: New Go packages: hashicorp/terraform-plugin-framework#432.
1 parent a1ee399 commit 61c8805

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

internal/validate/required.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66

77
tfdiag "github.com/hashicorp/terraform-plugin-framework/diag"
8+
"github.com/hashicorp/terraform-plugin-framework/resource"
89
"github.com/hashicorp/terraform-plugin-framework/tfsdk"
910
"github.com/hashicorp/terraform-plugin-framework/types"
1011
"github.com/hashicorp/terraform-plugin-go/tftypes"
@@ -257,7 +258,7 @@ func (validator resourceConfigRequiredAttributesValidator) MarkdownDescription(c
257258
}
258259

259260
// Validate performs the validation.
260-
func (validator resourceConfigRequiredAttributesValidator) ValidateResource(ctx context.Context, request tfsdk.ValidateResourceConfigRequest, response *tfsdk.ValidateResourceConfigResponse) {
261+
func (validator resourceConfigRequiredAttributesValidator) ValidateResource(ctx context.Context, request resource.ValidateConfigRequest, response *resource.ValidateConfigResponse) {
261262
val := request.Config.Raw
262263

263264
if val.IsNull() || !val.IsFullyKnown() {
@@ -288,7 +289,7 @@ func (validator resourceConfigRequiredAttributesValidator) ValidateResource(ctx
288289
}
289290

290291
// ResourceConfigRequiredAttributes returns a new resource schema-level required Attributes validator.
291-
func ResourceConfigRequiredAttributes(fs ...RequiredAttributesFunc) tfsdk.ResourceConfigValidator {
292+
func ResourceConfigRequiredAttributes(fs ...RequiredAttributesFunc) resource.ConfigValidator {
292293
return resourceConfigRequiredAttributesValidator{
293294
fs: fs,
294295
}

internal/validate/required_test.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66

77
"github.com/hashicorp/terraform-plugin-framework/attr"
88
"github.com/hashicorp/terraform-plugin-framework/path"
9+
"github.com/hashicorp/terraform-plugin-framework/resource"
910
"github.com/hashicorp/terraform-plugin-framework/tfsdk"
1011
"github.com/hashicorp/terraform-plugin-framework/types"
1112
"github.com/hashicorp/terraform-plugin-go/tftypes"
@@ -787,12 +788,12 @@ func TestResourceConfigRequiredAttributesValidator(t *testing.T) {
787788
name, test := name, test
788789
t.Run(name, func(t *testing.T) {
789790
ctx := context.TODO()
790-
request := tfsdk.ValidateResourceConfigRequest{
791+
request := resource.ValidateConfigRequest{
791792
Config: tfsdk.Config{
792793
Raw: test.val,
793794
},
794795
}
795-
response := tfsdk.ValidateResourceConfigResponse{}
796+
response := resource.ValidateConfigResponse{}
796797
ResourceConfigRequiredAttributes(test.fs...).ValidateResource(ctx, request, &response)
797798

798799
if !response.Diagnostics.HasError() && test.expectError {

0 commit comments

Comments
 (0)