oh nice

Author: aslilac

internal/codersdkvalidator/display_name.go

@@ -1,47 +1,10 @@
 package codersdkvalidator
 
 import (
-	"context"
-
 	"github.com/coder/coder/v2/codersdk"
-	"github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 )
 
-type displayNameValidator struct {
-	err error
-}
-
 func DisplayName() validator.String {
-	return displayNameValidator{}
-}
-
-var _ validator.String = displayNameValidator{}
-
-func (v displayNameValidator) ValidateString(ctx context.Context, req validator.StringRequest, resp *validator.StringResponse) {
-	if req.ConfigValue.IsNull() || req.ConfigValue.IsUnknown() {
-		return
-	}
-
-	name := req.ConfigValue.ValueString()
-	if v.err = codersdk.DisplayNameValid(name); v.err != nil {
-		resp.Diagnostics.Append(validatordiag.InvalidAttributeValueDiagnostic(
-			req.Path,
-			v.Description(ctx),
-			name,
-		))
-	}
-}
-
-var _ validator.Describer = displayNameValidator{}
-
-func (v displayNameValidator) Description(_ context.Context) string {
-	if v.err != nil {
-		return v.err.Error()
-	}
-	return "value must be a valid display name"
-}
-
-func (v displayNameValidator) MarkdownDescription(ctx context.Context) string {
-	return v.Description(ctx)
+	return validatorFromFunc(codersdk.DisplayNameValid, "value must be a valid display name")
 }

internal/codersdkvalidator/name.go

@@ -1,47 +1,10 @@
 package codersdkvalidator
 
 import (
-	"context"
-
 	"github.com/coder/coder/v2/codersdk"
-	"github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 )
 
-type nameValidator struct {
-	err error
-}
-
 func Name() validator.String {
-	return nameValidator{}
-}
-
-var _ validator.String = nameValidator{}
-
-func (v nameValidator) ValidateString(ctx context.Context, req validator.StringRequest, resp *validator.StringResponse) {
-	if req.ConfigValue.IsNull() || req.ConfigValue.IsUnknown() {
-		return
-	}
-
-	name := req.ConfigValue.ValueString()
-	if v.err = codersdk.NameValid(name); v.err != nil {
-		resp.Diagnostics.Append(validatordiag.InvalidAttributeValueDiagnostic(
-			req.Path,
-			v.Description(ctx),
-			name,
-		))
-	}
-}
-
-var _ validator.Describer = nameValidator{}
-
-func (v nameValidator) Description(_ context.Context) string {
-	if v.err != nil {
-		return v.err.Error()
-	}
-	return "value must be a valid name"
-}
-
-func (v nameValidator) MarkdownDescription(ctx context.Context) string {
-	return v.Description(ctx)
+	return validatorFromFunc(codersdk.NameValid, "value must be a valid name")
 }

internal/codersdkvalidator/template_version_name.go

@@ -1,47 +1,10 @@
 package codersdkvalidator
 
 import (
-	"context"
-
 	"github.com/coder/coder/v2/codersdk"
-	"github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 )
 
-type templateVersionNameValidator struct {
-	err error
-}
-
 func TemplateVersionName() validator.String {
-	return templateVersionNameValidator{}
-}
-
-var _ validator.String = templateVersionNameValidator{}
-
-func (v templateVersionNameValidator) ValidateString(ctx context.Context, req validator.StringRequest, resp *validator.StringResponse) {
-	if req.ConfigValue.IsNull() || req.ConfigValue.IsUnknown() {
-		return
-	}
-
-	name := req.ConfigValue.ValueString()
-	if v.err = codersdk.TemplateVersionNameValid(name); v.err != nil {
-		resp.Diagnostics.Append(validatordiag.InvalidAttributeValueDiagnostic(
-			req.Path,
-			v.Description(ctx),
-			name,
-		))
-	}
-}
-
-var _ validator.Describer = templateVersionNameValidator{}
-
-func (v templateVersionNameValidator) Description(_ context.Context) string {
-	if v.err != nil {
-		return v.err.Error()
-	}
-	return "value must be a valid template version name"
-}
-
-func (v templateVersionNameValidator) MarkdownDescription(ctx context.Context) string {
-	return v.Description(ctx)
+	return validatorFromFunc(codersdk.TemplateVersionNameValid, "value must be a valid template version name")
 }

internal/codersdkvalidator/user_real_name.go

@@ -1,47 +1,10 @@
 package codersdkvalidator
 
 import (
-	"context"
-
 	"github.com/coder/coder/v2/codersdk"
-	"github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag"
 	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
 )
 
-type userRealNameValidator struct {
-	err error
-}
-
 func UserRealName() validator.String {
-	return userRealNameValidator{}
-}
-
-var _ validator.String = userRealNameValidator{}
-
-func (v userRealNameValidator) ValidateString(ctx context.Context, req validator.StringRequest, resp *validator.StringResponse) {
-	if req.ConfigValue.IsNull() || req.ConfigValue.IsUnknown() {
-		return
-	}
-
-	name := req.ConfigValue.ValueString()
-	if v.err = codersdk.UserRealNameValid(name); v.err != nil {
-		resp.Diagnostics.Append(validatordiag.InvalidAttributeValueDiagnostic(
-			req.Path,
-			v.Description(ctx),
-			name,
-		))
-	}
-}
-
-var _ validator.Describer = userRealNameValidator{}
-
-func (v userRealNameValidator) Description(_ context.Context) string {
-	if v.err != nil {
-		return v.err.Error()
-	}
-	return "value must be a valid name for a user"
-}
-
-func (v userRealNameValidator) MarkdownDescription(ctx context.Context) string {
-	return v.Description(ctx)
+	return validatorFromFunc(codersdk.UserRealNameValid, "value must be a valid name for a user")
 }

internal/codersdkvalidator/validator_from_func.go

@@ -0,0 +1,51 @@
+package codersdkvalidator
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-framework-validators/helpers/validatordiag"
+	"github.com/hashicorp/terraform-plugin-framework/schema/validator"
+)
+
+type functionValidator struct {
+	check          func(string) error
+	defaultMessage string
+	err            error
+}
+
+func validatorFromFunc(check func(string) error, defaultMessage string) functionValidator {
+	return functionValidator{
+		check:          check,
+		defaultMessage: defaultMessage,
+	}
+}
+
+var _ validator.String = functionValidator{}
+
+func (v functionValidator) ValidateString(ctx context.Context, req validator.StringRequest, resp *validator.StringResponse) {
+	if req.ConfigValue.IsNull() || req.ConfigValue.IsUnknown() {
+		return
+	}
+
+	name := req.ConfigValue.ValueString()
+	if v.err = v.check(name); v.err != nil {
+		resp.Diagnostics.Append(validatordiag.InvalidAttributeValueDiagnostic(
+			req.Path,
+			v.Description(ctx),
+			name,
+		))
+	}
+}
+
+var _ validator.Describer = functionValidator{}
+
+func (v functionValidator) Description(_ context.Context) string {
+	if v.err != nil {
+		return v.err.Error()
+	}
+	return "value must be a valid name"
+}
+
+func (v functionValidator) MarkdownDescription(ctx context.Context) string {
+	return v.Description(ctx)
+}