chore(branch-protection): add RequiresTrueIfConfigured for sets

Signed-off-by: Martin Weissbach <martin.weissbach@sva.de>

Author: cmdaltent

internal/provider/branch_protection_resource.go

@@ -29,6 +29,7 @@ import (
 
 	forgejoBoolValidator "terraform-provider-forgejo/internal/provider/boolvalidator"
 	forgejoListValidator "terraform-provider-forgejo/internal/provider/listvalidator"
+	forgejoSetValidator "terraform-provider-forgejo/internal/provider/setvalidator"
 )
 
 // Ensure the implementation satisfies the expected interfaces.
@@ -131,7 +132,7 @@ func (r *branchProtectionResource) Schema(ctx context.Context, req resource.Sche
 					setvalidator.AlsoRequires(path.Expressions{
 						path.MatchRoot("enable_push_whitelist"),
 					}...),
-					forgejoListValidator.RequiresTrueIfConfigured(path.Expressions{
+					forgejoSetValidator.RequiresTrueIfConfigured(path.Expressions{
 						path.MatchRoot("enable_push_whitelist"),
 					}...),
 				},
@@ -151,7 +152,7 @@ func (r *branchProtectionResource) Schema(ctx context.Context, req resource.Sche
 					setvalidator.AlsoRequires(path.Expressions{
 						path.MatchRoot("enable_push_whitelist"),
 					}...),
-					forgejoListValidator.RequiresTrueIfConfigured(path.Expressions{
+					forgejoSetValidator.RequiresTrueIfConfigured(path.Expressions{
 						path.MatchRoot("enable_push_whitelist"),
 					}...),
 				},
@@ -235,7 +236,7 @@ func (r *branchProtectionResource) Schema(ctx context.Context, req resource.Sche
 					setvalidator.AlsoRequires(path.Expressions{
 						path.MatchRoot("enable_merge_whitelist"),
 					}...),
-					forgejoListValidator.RequiresTrueIfConfigured(path.Expressions{
+					forgejoSetValidator.RequiresTrueIfConfigured(path.Expressions{
 						path.MatchRoot("enable_merge_whitelist"),
 					}...),
 				},
@@ -255,7 +256,7 @@ func (r *branchProtectionResource) Schema(ctx context.Context, req resource.Sche
 					setvalidator.AlsoRequires(path.Expressions{
 						path.MatchRoot("enable_merge_whitelist"),
 					}...),
-					forgejoListValidator.RequiresTrueIfConfigured(path.Expressions{
+					forgejoSetValidator.RequiresTrueIfConfigured(path.Expressions{
 						path.MatchRoot("enable_merge_whitelist"),
 					}...),
 				},
@@ -281,7 +282,7 @@ func (r *branchProtectionResource) Schema(ctx context.Context, req resource.Sche
 					setvalidator.AlsoRequires(path.Expressions{
 						path.MatchRoot("enable_approvals_whitelist"),
 					}...),
-					forgejoListValidator.RequiresTrueIfConfigured(path.Expressions{
+					forgejoSetValidator.RequiresTrueIfConfigured(path.Expressions{
 						path.MatchRoot("enable_approvals_whitelist"),
 					}...),
 				},
@@ -301,7 +302,7 @@ func (r *branchProtectionResource) Schema(ctx context.Context, req resource.Sche
 					setvalidator.AlsoRequires(path.Expressions{
 						path.MatchRoot("enable_approvals_whitelist"),
 					}...),
-					forgejoListValidator.RequiresTrueIfConfigured(path.Expressions{
+					forgejoSetValidator.RequiresTrueIfConfigured(path.Expressions{
 						path.MatchRoot("enable_approvals_whitelist"),
 					}...),
 				},

internal/provider/setvalidator/requires_true_if_configured.go

@@ -0,0 +1,17 @@
+package setvalidator
+
+import (
+	"github.com/hashicorp/terraform-plugin-framework/path"
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+
+	"terraform-provider-forgejo/internal/schemavalidator"
+)
+
+// RequiresTrueIfConfigured checks that any Bool values in the paths described by the
+// path.Expression are true if the current attribute value is configured to a non-empty
+// list.
+func RequiresTrueIfConfigured(expressions ...path.Expression) validator.Set {
+	return &schemavalidator.RequiresTrueIfConfiguredValidator{
+		Expressions: expressions,
+	}
+}

internal/schemavalidator/require_true_if_configured.go

@@ -16,6 +16,7 @@ import (
 var (
 	_ validator.Bool = &RequiresTrueIfConfiguredValidator{}
 	_ validator.List = &RequiresTrueIfConfiguredValidator{}
+	_ validator.Set  = &RequiresTrueIfConfiguredValidator{}
 )
 
 // RequiresTrueIfConfiguredValidator is the underlying type implementing RequiresTrueIfConfigured.
@@ -56,6 +57,28 @@ func (v RequiresTrueIfConfiguredValidator) ValidateList(ctx context.Context, req
 	v.validate(ctx, validateReq, &resp.Diagnostics, fmt.Sprintf("If %s is not empty, %%s must also be 'true'", req.Path))
 }
 
+func (v RequiresTrueIfConfiguredValidator) ValidateSet(ctx context.Context, req validator.SetRequest, resp *validator.SetResponse) {
+	if req.ConfigValue.IsNull() || req.ConfigValue.IsUnknown() {
+		return
+	}
+
+	opts := basetypes.CollectionLengthOptions{
+		UnhandledNullAsZero:    true,
+		UnhandledUnknownAsZero: true,
+	}
+	if req.ConfigValue.Length(opts) == 0 {
+		return
+	}
+
+	validateReq := requiresTrueIfConfiguredValidatorRequest{
+		Config:         req.Config,
+		Path:           req.Path,
+		PathExpression: req.PathExpression,
+	}
+
+	v.validate(ctx, validateReq, &resp.Diagnostics, fmt.Sprintf("If %s is not empty, %%s must also be 'true'", req.Path))
+}
+
 func (v RequiresTrueIfConfiguredValidator) ValidateBool(ctx context.Context, req validator.BoolRequest, resp *validator.BoolResponse) {
 	if req.ConfigValue.IsNull() || req.ConfigValue.IsUnknown() {
 		return