nit: re-add default for CODER_EMAIL_HELLO

DanielleMaywood · DanielleMaywood · commit 4689e5bb4c14 · 2024-11-13T14:04:27.000Z
temporarily using new branch from coder/serpent for this
diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -1037,6 +1037,7 @@ when required by your organization's security policy.`,
 		Description: "The hostname identifying the SMTP server.",
 		Flag:        "email-hello",
 		Env:         "CODER_EMAIL_HELLO",
+		Default:     "localhost",
 		Value:       &c.Notifications.SMTP.Hello,
 		Group:       &deploymentGroupEmail,
 		YAML:        "hello",
@@ -2625,6 +2626,7 @@ Write out the current server config as YAML to stdout.`,
 			Description: "The hostname identifying the SMTP server.",
 			Flag:        "notifications-email-hello",
 			Env:         "CODER_NOTIFICATIONS_EMAIL_HELLO",
+			Default:     "localhost",
 			Value:       &c.Notifications.SMTP.Hello,
 			Group:       &deploymentGroupNotificationsEmail,
 			YAML:        "hello",
diff --git a/codersdk/deployment_test.go b/codersdk/deployment_test.go
@@ -619,6 +619,30 @@ func TestEmailValuesTakeCorrectPrecedent(t *testing.T) {
 			newEnv:        "CODER_EMAIL_SMARTHOST",
 			expectedValue: "localhost:1000",
 		},
+		{
+			name: "CODER_NOTIFICATIONS_EMAIL_HELLO is not discarded",
+			envs: []serpent.EnvVar{
+				{
+					Name:  "CODER_NOTIFICATIONS_EMAIL_HELLO",
+					Value: "not-localhost",
+				},
+			},
+			oldEnv:        "CODER_NOTIFICATIONS_EMAIL_HELLO",
+			newEnv:        "CODER_EMAIL_HELLO",
+			expectedValue: "not-localhost",
+		},
+		{
+			name: "CODER_EMAIL_HELLO is not discarded",
+			envs: []serpent.EnvVar{
+				{
+					Name:  "CODER_EMAIL_HELLO",
+					Value: "not-localhost",
+				},
+			},
+			oldEnv:        "CODER_NOTIFICATIONS_EMAIL_HELLO",
+			newEnv:        "CODER_EMAIL_HELLO",
+			expectedValue: "not-localhost",
+		},
 	}
 
 	for _, tt := range tests {
diff --git a/go.mod b/go.mod
@@ -204,7 +204,7 @@ require (
 	github.com/charmbracelet/bubbles v0.20.0
 	github.com/charmbracelet/bubbletea v1.2.1
 	github.com/charmbracelet/lipgloss v1.0.0
-	github.com/coder/serpent v0.8.0
+	github.com/coder/serpent v0.8.1-0.20241113113009-ad8fe148f0d8
 	github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21
 	github.com/emersion/go-smtp v0.21.2
 	github.com/go-jose/go-jose/v4 v4.0.2
diff --git a/go.sum b/go.sum
@@ -230,6 +230,8 @@ github.com/coder/retry v1.5.1 h1:iWu8YnD8YqHs3XwqrqsjoBTAVqT9ml6z9ViJ2wlMiqc=
 github.com/coder/retry v1.5.1/go.mod h1:blHMk9vs6LkoRT9ZHyuZo360cufXEhrxqvEzeMtRGoY=
 github.com/coder/serpent v0.8.0 h1:6OR+k6fekhSeEDmwwzBgnSjaa7FfGGrMlc3GoAEH9dg=
 github.com/coder/serpent v0.8.0/go.mod h1:cZFW6/fP+kE9nd/oRkEHJpG6sXCtQ+AX7WMMEHv0Y3Q=
+github.com/coder/serpent v0.8.1-0.20241113113009-ad8fe148f0d8 h1:xBsCXOg2KBd5eq2uJFjXjVEJCZn6QaflS7qgzzipqZE=
+github.com/coder/serpent v0.8.1-0.20241113113009-ad8fe148f0d8/go.mod h1:cZFW6/fP+kE9nd/oRkEHJpG6sXCtQ+AX7WMMEHv0Y3Q=
 github.com/coder/ssh v0.0.0-20231128192721-70855dedb788 h1:YoUSJ19E8AtuUFVYBpXuOD6a/zVP3rcxezNsoDseTUw=
 github.com/coder/ssh v0.0.0-20231128192721-70855dedb788/go.mod h1:aGQbuCLyhRLMzZF067xc84Lh7JDs1FKwCmF1Crl9dxQ=
 github.com/coder/tailscale v1.1.1-0.20241003034647-02286e537fc2 h1:mBbPFyJ2i9o490IwWGvWgtG0qmvIk45R7GWJpoaXotI=
