PR review

Co-authored-by: Benjamin Bennett <ben.bennett@hashicorp.com>
hashicorp · Jun 1, 2022 · 587307a · 587307a
1 parent 2d5bec1
commit 587307a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/combovalidator/at_least_one_of.go b/combovalidator/at_least_one_of.go
@@ -44,7 +44,6 @@ func (av atLeastOneOfAttributeValidator) Validate(ctx context.Context, req tfsdk
 		paths = append(av.attrPaths, req.AttributePath)
 	}
 
-	count := 0
 	for _, path := range paths {
 		var v attr.Value
 		diags := req.Config.GetAttribute(ctx, path, &v)
@@ -54,14 +53,12 @@ func (av atLeastOneOfAttributeValidator) Validate(ctx context.Context, req tfsdk
 		}
 
 		if !v.IsNull() {
-			count++
+			return
 		}
 	}
 
-	if count == 0 {
-		res.Diagnostics.Append(validatordiag.InvalidCombinationDiagnostic(
-			req.AttributePath,
-			fmt.Sprintf("At least one attribute out of %q must be specified", attributepath.JoinToString(paths...)),
-		))
-	}
+	res.Diagnostics.Append(validatordiag.InvalidCombinationDiagnostic(
+		req.AttributePath,
+		fmt.Sprintf("At least one attribute out of %q must be specified", attributepath.JoinToString(paths...)),
+	))
 }
diff --git a/combovalidator/at_least_one_of_test.go b/combovalidator/at_least_one_of_test.go
@@ -51,7 +51,7 @@ func TestAtLeastOneOfValidator(t *testing.T) {
 				tftypes.NewAttributePath().WithAttributeName("foo"),
 			},
 		},
-		"missing-self": {
+		"self-is-null": {
 			req: tfsdk.ValidateAttributeRequest{
 				AttributeConfig: types.String{Null: true},
 				AttributePath:   tftypes.NewAttributePath().WithAttributeName("bar"),

diff --git a/combovalidator/conflicts_with_test.go b/combovalidator/conflicts_with_test.go
@@ -119,7 +119,7 @@ func TestConflictsWithValidator(t *testing.T) {
 			},
 			expErrors: 1,
 		},
-		"missing-self": {
+		"self-is-null": {
 			req: tfsdk.ValidateAttributeRequest{
 				AttributeConfig: types.String{Null: true},
 				AttributePath:   tftypes.NewAttributePath().WithAttributeName("bar"),

diff --git a/combovalidator/exactly_one_of_test.go b/combovalidator/exactly_one_of_test.go
@@ -52,7 +52,7 @@ func TestExactlyOneOfValidator(t *testing.T) {
 			},
 			expErrors: 1,
 		},
-		"missing-self": {
+		"self-is-null": {
 			req: tfsdk.ValidateAttributeRequest{
 				AttributeConfig: types.String{Null: true},
 				AttributePath:   tftypes.NewAttributePath().WithAttributeName("bar"),

diff --git a/combovalidator/required_with_test.go b/combovalidator/required_with_test.go
@@ -51,7 +51,7 @@ func TestRequiredWithValidator(t *testing.T) {
 				tftypes.NewAttributePath().WithAttributeName("foo"),
 			},
 		},
-		"missing-self": {
+		"self-is-null": {
 			req: tfsdk.ValidateAttributeRequest{
 				AttributeConfig: types.String{Null: true},
 				AttributePath:   tftypes.NewAttributePath().WithAttributeName("bar"),