update golden files

Emyrk · Emyrk · commit 0ef1e621e9a5 · 2024-01-16T14:06:42.000-06:00
diff --git a/cli/clibase/values.go b/cli/clibase/values.go
@@ -59,6 +59,28 @@ func (i *Validator[T]) Type() string {
 	return i.Value.Type()
 }
 
+func (u *Validator[T]) MarshalYAML() (interface{}, error) {
+	m, ok := any(u.Value).(yaml.Marshaler)
+	if !ok {
+		return u.Value, nil
+	}
+	return m.MarshalYAML()
+}
+
+func (u *Validator[T]) UnmarshalYAML(n *yaml.Node) error {
+	return n.Decode(u.Value)
+}
+
+func (u *Validator[T]) MarshalJSON() ([]byte, error) {
+	return json.Marshal(u.Value)
+}
+
+func (u *Validator[T]) UnmarshalJSON(b []byte) error {
+	return json.Unmarshal(b, u.Value)
+}
+
+func (*Validator[T]) IsValidator() {}
+
 // values.go contains a standard set of value types that can be used as
 // Option Values.
 
diff --git a/cli/clibase/yaml.go b/cli/clibase/yaml.go
@@ -74,13 +74,17 @@ func (optSet *OptionSet) MarshalYAML() (any, error) {
 			Value:       opt.YAML,
 			HeadComment: comment,
 		}
+
+		_, isValidator := opt.Value.(interface{ IsValidator() })
+
 		var valueNode yaml.Node
 		if opt.Value == nil {
 			valueNode = yaml.Node{
 				Kind:  yaml.ScalarNode,
 				Value: "null",
 			}
-		} else if m, ok := opt.Value.(yaml.Marshaler); ok {
+		} else if m, ok := opt.Value.(yaml.Marshaler); ok && !isValidator {
+			// Validators do a wrap, and should be handled by the else statement.
 			v, err := m.MarshalYAML()
 			if err != nil {
 				return nil, xerrors.Errorf(
diff --git a/cli/testdata/coder_server_--help.golden b/cli/testdata/coder_server_--help.golden
@@ -167,7 +167,7 @@ NETWORKING OPTIONS:
       --secure-auth-cookie bool, $CODER_SECURE_AUTH_COOKIE
           Controls if the 'Secure' property is set on browser session cookies.
 
-      --wildcard-access-url url, $CODER_WILDCARD_ACCESS_URL
+      --wildcard-access-url string, $CODER_WILDCARD_ACCESS_URL
           Specifies the wildcard hostname to use for workspace applications in
           the form "*.example.com".
 
diff --git a/cli/testdata/server-config.yaml.golden b/cli/testdata/server-config.yaml.golden
@@ -4,8 +4,8 @@ networking:
   accessURL:
   # Specifies the wildcard hostname to use for workspace applications in the form
   # "*.example.com".
-  # (default: <unset>, type: url)
-  wildcardAccessURL:
+  # (default: <unset>, type: string)
+  wildcardAccessURL: ""
   # Specifies the custom docs URL.
   # (default: <unset>, type: url)
   docsURL:
diff --git a/enterprise/cli/testdata/coder_server_--help.golden b/enterprise/cli/testdata/coder_server_--help.golden
@@ -168,7 +168,7 @@ NETWORKING OPTIONS:
       --secure-auth-cookie bool, $CODER_SECURE_AUTH_COOKIE
           Controls if the 'Secure' property is set on browser session cookies.
 
-      --wildcard-access-url url, $CODER_WILDCARD_ACCESS_URL
+      --wildcard-access-url string, $CODER_WILDCARD_ACCESS_URL
           Specifies the wildcard hostname to use for workspace applications in
           the form "*.example.com".
 
