Skip to content

Commit

Permalink
Remove unnecessary cmd.ServiceConfig embeds (#6699)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
beautifulentropy authored Feb 27, 2023
1 parent 28de3c0 commit 242c3ae
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cmd/boulder-wfe2/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (

type Config struct {
WFE struct {
cmd.ServiceConfig
DebugAddr string
ListenAddress string
TLSListenAddress string

Expand Down
5 changes: 4 additions & 1 deletion cmd/crl-updater/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cmd/expiration-mailer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions cmd/ocsp-responder/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion cmd/ocsp-updater/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 242c3ae

Please sign in to comment.