PR review

Ivan De Marino · bendbennett · Ivan De Marino · commit f006676d08ba · 2022-06-20T10:14:47.000+01:00
Co-authored-by: Benjamin Bennett &lt;ben.bennett@hashicorp.com&gt;
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"),

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ func (av atLeastOneOfAttributeValidator) Validate(ctx context.Context, req tfsdk`
`44`	`44`	`paths = append(av.attrPaths, req.AttributePath)`
`45`	`45`	`}`
`46`	`46`
`47`		`- count := 0`
`48`	`47`	`for _, path := range paths {`
`49`	`48`	`var v attr.Value`
`50`	`49`	`diags := req.Config.GetAttribute(ctx, path, &v)`
`@@ -54,14 +53,12 @@ func (av atLeastOneOfAttributeValidator) Validate(ctx context.Context, req tfsdk`
`54`	`53`	`}`
`55`	`54`
`56`	`55`	`if !v.IsNull() {`
`57`		`- count++`
	`56`	`+ return`
`58`	`57`	`}`
`59`	`58`	`}`
`60`	`59`
`61`		`- if count == 0 {`
`62`		`- res.Diagnostics.Append(validatordiag.InvalidCombinationDiagnostic(`
`63`		`- req.AttributePath,`
`64`		`- fmt.Sprintf("At least one attribute out of %q must be specified", attributepath.JoinToString(paths...)),`
`65`		`- ))`
`66`		`- }`
	`60`	`+ res.Diagnostics.Append(validatordiag.InvalidCombinationDiagnostic(`
	`61`	`+ req.AttributePath,`
	`62`	`+ fmt.Sprintf("At least one attribute out of %q must be specified", attributepath.JoinToString(paths...)),`
	`63`	`+ ))`
`67`	`64`	`}`