implement yaml methods

f0ssel · f0ssel · commit 802993c2a9da · 2024-03-14T18:37:26.000Z
diff --git a/cli/clibase/values.go b/cli/clibase/values.go
@@ -517,6 +517,17 @@ func (e *Enum) String() string {
 	return *e.Value
 }
 
+func (e *Enum) MarshalYAML() (interface{}, error) {
+	return yaml.Node{
+		Kind:  yaml.ScalarNode,
+		Value: e.String(),
+	}, nil
+}
+
+func (e *Enum) UnmarshalYAML(n *yaml.Node) error {
+	return e.Set(n.Value)
+}
+
 type Regexp regexp.Regexp
 
 func (r *Regexp) MarshalJSON() ([]byte, error) {
diff --git a/cli/testdata/server-config.yaml.golden b/cli/testdata/server-config.yaml.golden
@@ -402,18 +402,9 @@ cacheDir: [cache dir]
 # Controls whether data will be stored in an in-memory database.
 # (default: <unset>, type: bool)
 inMemoryDatabase: false
-# URL of a PostgreSQL database. If empty, PostgreSQL binaries will be downloaded
-# from Maven (https://repo1.maven.org/maven2) and store all data in the config
-# root. Access the built-in database with "coder server postgres-builtin-url".
-# (default: <unset>, type: string)
-pgConnectionURL: ""
 # Type of auth to use when connecting to postgres.
 # (default: password, type: enum[password\|awsrdsiam])
-pgAuth:
-  choices:
-    - password
-    - awsrdsiam
-  value: password
+pgAuth: password
 # The algorithm to use for generating ssh keys. Accepted values are "ed25519",
 # "ecdsa", or "rsa4096".
 # (default: ed25519, type: string)
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -1623,7 +1623,6 @@ when required by your organization's security policy.`,
 			Env:         "CODER_PG_CONNECTION_URL",
 			Annotations: clibase.Annotations{}.Mark(annotationSecretKey, "true"),
 			Value:       &c.PostgresURL,
-			YAML:        "pgConnectionURL",
 		},
 		{
 			Name:        "Postgres Auth",
diff --git a/docs/cli/server.md b/docs/cli/server.md

Original file line number	Diff line number	Diff line change
@@ -1623,7 +1623,6 @@ when required by your organization's security policy.`,
`1623`	`1623`	`Env: "CODER_PG_CONNECTION_URL",`
`1624`	`1624`	`Annotations: clibase.Annotations{}.Mark(annotationSecretKey, "true"),`
`1625`	`1625`	`Value: &c.PostgresURL,`
`1626`		`- YAML: "pgConnectionURL",`
`1627`	`1626`	`},`
`1628`	`1627`	`{`
`1629`	`1628`	`Name: "Postgres Auth",`