helper/validation: Wrapper function for legacy SchemaValidateFunc

helper/validation/meta.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"reflect"
 
+	"github.com/hashicorp/go-cty/cty"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -57,3 +59,30 @@ func Any(validators ...schema.SchemaValidateFunc) schema.SchemaValidateFunc {
 		return allWarnings, allErrors
 	}
 }
+
+// ToDiagFunc is a wrapper for legacy schema.SchemaValidateFunc
+// converting it to schema.SchemaValidateDiagFunc
+func ToDiagFunc(validator schema.SchemaValidateFunc) schema.SchemaValidateDiagFunc {
+	return func(i interface{}, p cty.Path) diag.Diagnostics {
+		var diags diag.Diagnostics
+
+		attr := p[len(p)-1].(cty.GetAttrStep)
+		ws, es := validator(i, attr.Name)
+
+		for _, w := range ws {
+			diags = append(diags, diag.Diagnostic{
+				Severity:      diag.Warning,
+				Summary:       w,
+				AttributePath: p,
+			})
+		}
+		for _, e := range es {
+			diags = append(diags, diag.Diagnostic{
+				Severity:      diag.Error,
+				Summary:       e.Error(),
+				AttributePath: p,
+			})
+		}
+		return diags
+	}
+}

helper/validation/meta_test.go

@@ -99,3 +99,38 @@ func TestValidationAny(t *testing.T) {
 		},
 	})
 }
+
+func TestToDiagFunc(t *testing.T) {
+	runDiagTestCases(t, []diagTestCase{
+		{
+			val: 43,
+			f: ToDiagFunc(Any(
+				IntAtLeast(42),
+				IntAtMost(5),
+			)),
+		},
+		{
+			val: "foo",
+			f: ToDiagFunc(All(
+				StringLenBetween(1, 10),
+				StringIsNotWhiteSpace,
+			)),
+		},
+		{
+			val: 7,
+			f: ToDiagFunc(Any(
+				IntAtLeast(42),
+				IntAtMost(5),
+			)),
+			expectedErr: regexp.MustCompile("expected [\\w]+ to be at least \\(42\\), got 7"),
+		},
+		{
+			val: 7,
+			f: ToDiagFunc(Any(
+				IntAtLeast(42),
+				IntAtMost(5),
+			)),
+			expectedErr: regexp.MustCompile("expected [\\w]+ to be at most \\(5\\), got 7"),
+		},
+	})
+}

helper/validation/testing.go

@@ -5,6 +5,8 @@ import (
 
 	testing "github.com/mitchellh/go-testing-interface"
 
+	"github.com/hashicorp/go-cty/cty"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
@@ -14,20 +16,15 @@ type testCase struct {
 	expectedErr *regexp.Regexp
 }
 
+type diagTestCase struct {
+	val         interface{}
+	f           schema.SchemaValidateDiagFunc
+	expectedErr *regexp.Regexp
+}
+
 func runTestCases(t testing.T, cases []testCase) {
 	t.Helper()
 
-	matchErr := func(errs []error, r *regexp.Regexp) bool {
-		// err must match one provided
-		for _, err := range errs {
-			if r.MatchString(err.Error()) {
-				return true
-			}
-		}
-
-		return false
-	}
-
 	for i, tc := range cases {
 		_, errs := tc.f(tc.val, "test_property")
 
@@ -39,8 +36,50 @@ func runTestCases(t testing.T, cases []testCase) {
 			t.Fatalf("expected test case %d to produce no errors, got %v", i, errs)
 		}
 
-		if !matchErr(errs, tc.expectedErr) {
+		if !matchAnyError(errs, tc.expectedErr) {
 			t.Fatalf("expected test case %d to produce error matching \"%s\", got %v", i, tc.expectedErr, errs)
 		}
 	}
 }
+
+func matchAnyError(errs []error, r *regexp.Regexp) bool {
+	// err must match one provided
+	for _, err := range errs {
+		if r.MatchString(err.Error()) {
+			return true
+		}
+	}
+	return false
+}
+
+func runDiagTestCases(t testing.T, cases []diagTestCase) {
+	t.Helper()
+
+	for i, tc := range cases {
+		p := cty.Path{
+			cty.GetAttrStep{Name: "test_property"},
+		}
+		diags := tc.f(tc.val, p)
+
+		if !diags.HasError() && tc.expectedErr == nil {
+			continue
+		}
+
+		if diags.HasError() && tc.expectedErr == nil {
+			t.Fatalf("expected test case %d to produce no errors, got %v", i, diags)
+		}
+
+		if !matchAnyDiagSummary(diags, tc.expectedErr) {
+			t.Fatalf("expected test case %d to produce error matching \"%s\", got %v", i, tc.expectedErr, diags)
+		}
+	}
+}
+
+func matchAnyDiagSummary(ds diag.Diagnostics, r *regexp.Regexp) bool {
+	for _, d := range ds {
+		if r.MatchString(d.Summary) {
+			return true
+		}
+	}
+	return false
+}