From 242c3aee0e68ee17d9cc57459c7efd8d3ad62acc Mon Sep 17 00:00:00 2001
From: Samantha <hello@entropy.cat>
Date: Mon, 27 Feb 2023 12:39:52 -0500
Subject: [PATCH] Remove unnecessary cmd.ServiceConfig embeds (#6699)

Replace the cmd.ServiceConfig embed with just its components (i.e.
DebugAddr and sometimes TLS) in the WFE, crl-updater, ocsp-updater,
ocsp-responder, and expiration-mailer. These services are not gRPC
services, and therefore do not need the full suite of config keys
introduced by cmd.ServiceConfig.

Blocks #6674
Part of #6052
---
 cmd/boulder-wfe2/main.go      | 2 +-
 cmd/crl-updater/main.go       | 5 ++++-
 cmd/expiration-mailer/main.go | 4 ++--
 cmd/ocsp-responder/main.go    | 4 ++--
 cmd/ocsp-updater/main.go      | 5 ++++-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/cmd/boulder-wfe2/main.go b/cmd/boulder-wfe2/main.go
index b314f389235..58461d19860 100644
--- a/cmd/boulder-wfe2/main.go
+++ b/cmd/boulder-wfe2/main.go
@@ -31,7 +31,7 @@ import (
 
 type Config struct {
 	WFE struct {
-		cmd.ServiceConfig
+		DebugAddr        string
 		ListenAddress    string
 		TLSListenAddress string
 
diff --git a/cmd/crl-updater/main.go b/cmd/crl-updater/main.go
index f5da12c25f0..d19af367b41 100644
--- a/cmd/crl-updater/main.go
+++ b/cmd/crl-updater/main.go
@@ -20,7 +20,10 @@ import (
 
 type Config struct {
 	CRLUpdater struct {
-		cmd.ServiceConfig
+		DebugAddr string
+
+		// TLS client certificate, private key, and trusted root bundle.
+		TLS cmd.TLSConfig
 
 		SAService           *cmd.GRPCClientConfig
 		CRLGeneratorService *cmd.GRPCClientConfig
diff --git a/cmd/expiration-mailer/main.go b/cmd/expiration-mailer/main.go
index 4cc51566cb4..7bd5a3eef6e 100644
--- a/cmd/expiration-mailer/main.go
+++ b/cmd/expiration-mailer/main.go
@@ -640,8 +640,8 @@ func (ds durationSlice) Swap(a, b int) {
 
 type Config struct {
 	Mailer struct {
-		cmd.ServiceConfig
-		DB cmd.DBConfig
+		DebugAddr string
+		DB        cmd.DBConfig
 		cmd.SMTPConfig
 
 		// From is the "From" address for reminder messages.
diff --git a/cmd/ocsp-responder/main.go b/cmd/ocsp-responder/main.go
index ed88332cdbe..4c582750c86 100644
--- a/cmd/ocsp-responder/main.go
+++ b/cmd/ocsp-responder/main.go
@@ -32,8 +32,8 @@ import (
 
 type Config struct {
 	OCSPResponder struct {
-		cmd.ServiceConfig
-		DB cmd.DBConfig
+		DebugAddr string
+		DB        cmd.DBConfig
 
 		// Source indicates the source of pre-signed OCSP responses to be used. It
 		// can be a DBConnect string or a file URL. The file URL style is used
diff --git a/cmd/ocsp-updater/main.go b/cmd/ocsp-updater/main.go
index 413b06fa906..fbe3bc37662 100644
--- a/cmd/ocsp-updater/main.go
+++ b/cmd/ocsp-updater/main.go
@@ -18,7 +18,10 @@ import (
 
 type Config struct {
 	OCSPUpdater struct {
-		cmd.ServiceConfig
+		DebugAddr string
+
+		// TLS client certificate, private key, and trusted root bundle.
+		TLS        cmd.TLSConfig
 		DB         cmd.DBConfig
 		ReadOnlyDB cmd.DBConfig