Adding Any/Or Generic Validator (#43)

* Adding Any validator (#28)

* Adding All validator for use with Any validator (#28)

* Adding .changelog file (#28)

* Rewording test (#28)

* Apply suggestions from code review

Co-authored-by: Ivan De Marino <[email protected]>

* Checking diagnostics for error with each validator (#28)

* Updated following code review (#28)

* Returning all accumulated warnings when Any() validation passes (#28)

* Linting (#28)

* Adding AnyWithAllWarningsValidator (#28)

* Updating CHANGELOG and formatting (#28)

* Refactoring to use diags.Warnings convenience func and updating to use path.Root() to replace tftypes.NewAttributePath().WithAttrrtibuteName() (#28)

* Updating docs (#28)

* Apply suggestions from code review

Co-authored-by: Brian Flad <[email protected]>

* Removing unneeded diag file (#28)

* Adding tests for type mismatch (#28)

* Removing duplicated interface check (#28)

Co-authored-by: Ivan De Marino <[email protected]>
Co-authored-by: Brian Flad <[email protected]>

Author: 3 people

.changelog/43.txt

@@ -0,0 +1,3 @@
+```release-note:feature
+Introduced `metavalidator` package with `Any()`, `AnyWithAllWarnings()`, and `All()` validation functions
+```

float64validator/at_least.go

@@ -4,8 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag"
 	"github.com/hashicorp/terraform-plugin-framework/tfsdk"
+
+	"github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag"
 )
 
 var _ tfsdk.AttributeValidator = atLeastValidator{}

float64validator/at_least_test.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework-validators/float64validator"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/tfsdk"
 	"github.com/hashicorp/terraform-plugin-framework/types"
-	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
 func TestAtLeastValidator(t *testing.T) {
@@ -55,7 +55,7 @@ func TestAtLeastValidator(t *testing.T) {
 		name, test := name, test
 		t.Run(name, func(t *testing.T) {
 			request := tfsdk.ValidateAttributeRequest{
-				AttributePath:   tftypes.NewAttributePath().WithAttributeName("test"),
+				AttributePath:   path.Root("test"),
 				AttributeConfig: test.val,
 			}
 			response := tfsdk.ValidateAttributeResponse{}

float64validator/at_most_test.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework-validators/float64validator"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/tfsdk"
 	"github.com/hashicorp/terraform-plugin-framework/types"
-	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
 func TestAtMostValidator(t *testing.T) {
@@ -55,7 +55,7 @@ func TestAtMostValidator(t *testing.T) {
 		name, test := name, test
 		t.Run(name, func(t *testing.T) {
 			request := tfsdk.ValidateAttributeRequest{
-				AttributePath:   tftypes.NewAttributePath().WithAttributeName("test"),
+				AttributePath:   path.Root("test"),
 				AttributeConfig: test.val,
 			}
 			response := tfsdk.ValidateAttributeResponse{}

float64validator/between_test.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework-validators/float64validator"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/tfsdk"
 	"github.com/hashicorp/terraform-plugin-framework/types"
-	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
 func TestBetweenValidator(t *testing.T) {
@@ -73,7 +73,7 @@ func TestBetweenValidator(t *testing.T) {
 		name, test := name, test
 		t.Run(name, func(t *testing.T) {
 			request := tfsdk.ValidateAttributeRequest{
-				AttributePath:   tftypes.NewAttributePath().WithAttributeName("test"),
+				AttributePath:   path.Root("test"),
 				AttributeConfig: test.val,
 			}
 			response := tfsdk.ValidateAttributeResponse{}

float64validator/type_validation_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/tfsdk"
 	"github.com/hashicorp/terraform-plugin-framework/types"
-	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
 func TestValidateFloat(t *testing.T) {
@@ -21,31 +21,31 @@ func TestValidateFloat(t *testing.T) {
 		"invalid-type": {
 			request: tfsdk.ValidateAttributeRequest{
 				AttributeConfig: types.Bool{Value: true},
-				AttributePath:   tftypes.NewAttributePath().WithAttributeName("test"),
+				AttributePath:   path.Root("test"),
 			},
 			expectedFloat64: 0.0,
 			expectedOk:      false,
 		},
 		"float64-null": {
 			request: tfsdk.ValidateAttributeRequest{
 				AttributeConfig: types.Float64{Null: true},
-				AttributePath:   tftypes.NewAttributePath().WithAttributeName("test"),
+				AttributePath:   path.Root("test"),
 			},
 			expectedFloat64: 0.0,
 			expectedOk:      false,
 		},
 		"float64-value": {
 			request: tfsdk.ValidateAttributeRequest{
 				AttributeConfig: types.Float64{Value: 1.2},
-				AttributePath:   tftypes.NewAttributePath().WithAttributeName("test"),
+				AttributePath:   path.Root("test"),
 			},
 			expectedFloat64: 1.2,
 			expectedOk:      true,
 		},
 		"float64-unknown": {
 			request: tfsdk.ValidateAttributeRequest{
 				AttributeConfig: types.Float64{Unknown: true},
-				AttributePath:   tftypes.NewAttributePath().WithAttributeName("test"),
+				AttributePath:   path.Root("test"),
 			},
 			expectedFloat64: 0.0,
 			expectedOk:      false,

go.mod

@@ -4,7 +4,7 @@ go 1.17
 
 require (
 	github.com/google/go-cmp v0.5.8
-	github.com/hashicorp/terraform-plugin-framework v0.9.0
+	github.com/hashicorp/terraform-plugin-framework v0.9.1-0.20220627174514-5a338a7dd906
 	github.com/hashicorp/terraform-plugin-go v0.9.1
 )
 

go.sum

@@ -65,6 +65,8 @@ github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/terraform-plugin-framework v0.9.0 h1:vOKG9+keJv062zGhXFgfOFEuGcfgV6LHciwleFTSek0=
 github.com/hashicorp/terraform-plugin-framework v0.9.0/go.mod h1:ActelD2V6yt2m0MwIX4jESGDYJ573rAvZswGjSGm1rY=
+github.com/hashicorp/terraform-plugin-framework v0.9.1-0.20220627174514-5a338a7dd906 h1:Y9JWkRpLhbJfdN85Dx+joLWRiwzLlZQkhf1qSbyPJI8=
+github.com/hashicorp/terraform-plugin-framework v0.9.1-0.20220627174514-5a338a7dd906/go.mod h1:ActelD2V6yt2m0MwIX4jESGDYJ573rAvZswGjSGm1rY=
 github.com/hashicorp/terraform-plugin-go v0.9.1 h1:vXdHaQ6aqL+OF076nMSBV+JKPdmXlzG5mzVDD04WyPs=
 github.com/hashicorp/terraform-plugin-go v0.9.1/go.mod h1:ItjVSlQs70otlzcCwlPcU8FRXLdO973oYFRZwAOxy8M=
 github.com/hashicorp/terraform-plugin-log v0.4.0/go.mod h1:9KclxdunFownr4pIm1jdmwKRmE4d6HVG2c9XDq47rpg=

helpers/validatordiag/diag.go

@@ -5,11 +5,11 @@ import (
 	"unicode/utf8"
 
 	"github.com/hashicorp/terraform-plugin-framework/diag"
-	"github.com/hashicorp/terraform-plugin-go/tftypes"
+	"github.com/hashicorp/terraform-plugin-framework/path"
 )
 
 // InvalidAttributeValueDiagnostic returns an error Diagnostic to be used when an attribute has an invalid value.
-func InvalidAttributeValueDiagnostic(path *tftypes.AttributePath, description string, value string) diag.Diagnostic {
+func InvalidAttributeValueDiagnostic(path path.Path, description string, value string) diag.Diagnostic {
 	return diag.NewAttributeErrorDiagnostic(
 		path,
 		"Invalid Attribute Value",
@@ -18,7 +18,7 @@ func InvalidAttributeValueDiagnostic(path *tftypes.AttributePath, description st
 }
 
 // InvalidAttributeValueLengthDiagnostic returns an error Diagnostic to be used when an attribute's value has an invalid length.
-func InvalidAttributeValueLengthDiagnostic(path *tftypes.AttributePath, description string, value string) diag.Diagnostic {
+func InvalidAttributeValueLengthDiagnostic(path path.Path, description string, value string) diag.Diagnostic {
 	return diag.NewAttributeErrorDiagnostic(
 		path,
 		"Invalid Attribute Value Length",
@@ -27,7 +27,7 @@ func InvalidAttributeValueLengthDiagnostic(path *tftypes.AttributePath, descript
 }
 
 // InvalidAttributeValueMatchDiagnostic returns an error Diagnostic to be used when an attribute's value has an invalid match.
-func InvalidAttributeValueMatchDiagnostic(path *tftypes.AttributePath, description string, value string) diag.Diagnostic {
+func InvalidAttributeValueMatchDiagnostic(path path.Path, description string, value string) diag.Diagnostic {
 	return diag.NewAttributeErrorDiagnostic(
 		path,
 		"Invalid Attribute Value Match",
@@ -36,7 +36,7 @@ func InvalidAttributeValueMatchDiagnostic(path *tftypes.AttributePath, descripti
 }
 
 // InvalidAttributeSchemaDiagnostic returns an error Diagnostic to be used when a schemavalidator of attributes is invalid.
-func InvalidAttributeSchemaDiagnostic(path *tftypes.AttributePath, description string) diag.Diagnostic {
+func InvalidAttributeSchemaDiagnostic(path path.Path, description string) diag.Diagnostic {
 	return diag.NewAttributeErrorDiagnostic(
 		path,
 		"Invalid Attribute Combination",
@@ -45,7 +45,7 @@ func InvalidAttributeSchemaDiagnostic(path *tftypes.AttributePath, description s
 }
 
 // InvalidAttributeTypeDiagnostic returns an error Diagnostic to be used when an attribute has an invalid type.
-func InvalidAttributeTypeDiagnostic(path *tftypes.AttributePath, description string, value string) diag.Diagnostic {
+func InvalidAttributeTypeDiagnostic(path path.Path, description string, value string) diag.Diagnostic {
 	return diag.NewAttributeErrorDiagnostic(
 		path,
 		"Invalid Attribute Type",

int64validator/at_least_test.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-framework-validators/int64validator"
 	"github.com/hashicorp/terraform-plugin-framework/attr"
+	"github.com/hashicorp/terraform-plugin-framework/path"
 	"github.com/hashicorp/terraform-plugin-framework/tfsdk"
 	"github.com/hashicorp/terraform-plugin-framework/types"
-	"github.com/hashicorp/terraform-plugin-go/tftypes"
 )
 
 func TestAtLeastValidator(t *testing.T) {
@@ -51,7 +51,7 @@ func TestAtLeastValidator(t *testing.T) {
 		name, test := name, test
 		t.Run(name, func(t *testing.T) {
 			request := tfsdk.ValidateAttributeRequest{
-				AttributePath:   tftypes.NewAttributePath().WithAttributeName("test"),
+				AttributePath:   path.Root("test"),
 				AttributeConfig: test.val,
 			}
 			response := tfsdk.ValidateAttributeResponse{}