From e47b1a49b34a00eb622d836015909e5f6907b793 Mon Sep 17 00:00:00 2001 From: beautifulentropy Date: Thu, 18 Mar 2021 13:01:13 -0700 Subject: [PATCH] Remove dbconfig migration deployability code --- cmd/admin-revoker/main.go | 6 ----- cmd/bad-key-revoker/main.go | 8 +------ cmd/boulder-ca/main.go | 5 +--- cmd/boulder-janitor/janitor/janitor.go | 7 ------ cmd/boulder-sa/main.go | 8 ------- cmd/cert-checker/main.go | 8 +------ cmd/config.go | 25 ------------------- cmd/config_test.go | 33 -------------------------- cmd/expiration-mailer/main.go | 6 ----- cmd/expired-authz-purger2/config.json | 6 +++-- cmd/expired-authz-purger2/main.go | 8 +------ cmd/id-exporter/main.go | 6 ----- cmd/notify-mailer/main.go | 6 ----- cmd/ocsp-responder/main.go | 8 ------- cmd/ocsp-updater/main.go | 7 ------ test/authz-filler/main.go | 8 +------ test/config/admin-revoker.json | 6 +++-- test/config/bad-key-revoker.json | 6 +++-- test/config/cert-checker.json | 6 +++-- test/config/contact-exporter.json | 6 +++-- test/config/expiration-mailer.json | 6 +++-- test/config/janitor.json | 6 +++-- test/config/notify-mailer.json | 6 +++-- test/config/ocsp-responder.json | 6 +++-- test/config/ocsp-updater.json | 6 +++-- test/config/sa.json | 6 +++-- 26 files changed, 49 insertions(+), 166 deletions(-) diff --git a/cmd/admin-revoker/main.go b/cmd/admin-revoker/main.go index 69d9db033e4..94d1b46a45e 100644 --- a/cmd/admin-revoker/main.go +++ b/cmd/admin-revoker/main.go @@ -47,9 +47,6 @@ args: type config struct { Revoker struct { DB cmd.DBConfig - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DeprecatedDBConfig // Similarly, the Revoker needs a TLSConfig to set up its GRPC client certs, // but doesn't get the TLS field from ServiceConfig, so declares its own. TLS cmd.TLSConfig @@ -76,9 +73,6 @@ func setupContext(c config) (core.RegistrationAuthority, blog.Logger, *db.Wrappe cmd.FailOnError(err, "Failed to load credentials and create gRPC connection to RA") rac := bgrpc.NewRegistrationAuthorityClient(rapb.NewRegistrationAuthorityClient(raConn)) - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DefaultDBConfig(&c.Revoker.DB, &c.Revoker.DeprecatedDBConfig) dbURL, err := c.Revoker.DB.URL() cmd.FailOnError(err, "Couldn't load DB URL") dbSettings := sa.DbSettings{ diff --git a/cmd/bad-key-revoker/main.go b/cmd/bad-key-revoker/main.go index 32b0ab0852e..a1f2ae9777f 100644 --- a/cmd/bad-key-revoker/main.go +++ b/cmd/bad-key-revoker/main.go @@ -339,10 +339,7 @@ func (bkr *badKeyRevoker) invoke() (bool, error) { func main() { var config struct { BadKeyRevoker struct { - DB cmd.DBConfig - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DeprecatedDBConfig + DB cmd.DBConfig DebugAddr string TLS cmd.TLSConfig @@ -392,9 +389,6 @@ func main() { scope.MustRegister(certsRevoked) scope.MustRegister(mailErrors) - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DefaultDBConfig(&config.BadKeyRevoker.DB, &config.BadKeyRevoker.DeprecatedDBConfig) dbURL, err := config.BadKeyRevoker.DB.URL() cmd.FailOnError(err, "Couldn't load DB URL") diff --git a/cmd/boulder-ca/main.go b/cmd/boulder-ca/main.go index 9edc8f3a7bf..24fe93eb581 100644 --- a/cmd/boulder-ca/main.go +++ b/cmd/boulder-ca/main.go @@ -34,10 +34,7 @@ type config struct { CA struct { cmd.ServiceConfig - // TODO(#5275): Refactor to named field once all configs in dev, - // staging and prod have been updated to contain `dbconfig` - // field - cmd.DBConfig + DB cmd.DBConfig cmd.HostnamePolicyConfig GRPCCA *cmd.GRPCServerConfig diff --git a/cmd/boulder-janitor/janitor/janitor.go b/cmd/boulder-janitor/janitor/janitor.go index 65802003439..2c3b320abaa 100644 --- a/cmd/boulder-janitor/janitor/janitor.go +++ b/cmd/boulder-janitor/janitor/janitor.go @@ -30,10 +30,6 @@ type JanitorConfig struct { // Common database connection configuration. DB cmd.DBConfig - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DeprecatedDBConfig - // JobConfigs is a list of configs for individual cleanup jobs. JobConfigs []JobConfig } @@ -67,9 +63,6 @@ func New(clk clock.Clock, config JanitorConfig) (*Janitor, error) { defer logger.AuditPanic() logger.Info(cmd.VersionString()) - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DefaultDBConfig(&config.DB, &config.DeprecatedDBConfig) // Create DB Map dbURL, err := config.DB.URL() if err != nil { diff --git a/cmd/boulder-sa/main.go b/cmd/boulder-sa/main.go index 57abc3baf9a..9c166479529 100644 --- a/cmd/boulder-sa/main.go +++ b/cmd/boulder-sa/main.go @@ -18,9 +18,6 @@ type config struct { SA struct { cmd.ServiceConfig DB cmd.DBConfig - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DeprecatedDBConfig Features map[string]bool @@ -60,11 +57,6 @@ func main() { logger.Info(cmd.VersionString()) saConf := c.SA - - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DefaultDBConfig(&saConf.DB, &saConf.DeprecatedDBConfig) - saDbSettings := sa.DbSettings{ MaxOpenConns: saConf.DB.MaxOpenConns, MaxIdleConns: saConf.DB.MaxIdleConns, diff --git a/cmd/cert-checker/main.go b/cmd/cert-checker/main.go index 8f97f4eccdb..db1dd4a69e1 100644 --- a/cmd/cert-checker/main.go +++ b/cmd/cert-checker/main.go @@ -310,9 +310,6 @@ func (c *certChecker) checkCert(cert core.Certificate, ignoredLints map[string]b type config struct { CertChecker struct { DB cmd.DBConfig - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DeprecatedDBConfig cmd.HostnamePolicyConfig Workers int @@ -362,7 +359,7 @@ func main() { cmd.FailOnError(err, "Failed to set audit logger") if *connect != "" { - config.CertChecker.DBConnect = *connect + config.CertChecker.DB.DBConnect = *connect } if *workers != 0 { config.CertChecker.Workers = *workers @@ -374,9 +371,6 @@ func main() { // Validate PA config and set defaults if needed cmd.FailOnError(config.PA.CheckChallenges(), "Invalid PA configuration") - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DefaultDBConfig(&config.CertChecker.DB, &config.CertChecker.DeprecatedDBConfig) saDbURL, err := config.CertChecker.DB.URL() cmd.FailOnError(err, "Couldn't load DB URL") dbSettings := sa.DbSettings{ diff --git a/cmd/config.go b/cmd/config.go index 92e85c6d273..64aa0942174 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -75,13 +75,6 @@ type DBConfig struct { ConnMaxIdleTime ConfigDuration } -// DeprecatedDBConfig is a temporary type that acts as a receiver for -// fields unmarshalled from the root of a component's JSON config -// (deprecated). -// TODO(#5275): Remove once all configs in dev, staging and prod -// have been updated to contain the `dbconfig` field -type DeprecatedDBConfig DBConfig - // URL returns the DBConnect URL represented by this DBConfig object, either // loading it from disk or returning a default value. Leading and trailing // whitespace is stripped. @@ -93,24 +86,6 @@ func (d *DBConfig) URL() (string, error) { return d.DBConnect, nil } -// DefaultDBConfig is a temporary helper function that copies DBConfig -// fields unmarshalled from the root of a component's JSON config -// (deprecated) to the named `DBConfig` substruct of the service config. -// TODO(#5275): Remove once all configs in dev, staging and prod -// have been updated to contain the `dbconfig` field -func DefaultDBConfig(dbConfig *DBConfig, databaseConfig *DeprecatedDBConfig) { - if dbConfig.DBConnectFile != "" { - // dbConfig was specified properly in the JSON return early - return - } - dbConfig.DBConnect = databaseConfig.DBConnect - dbConfig.DBConnectFile = databaseConfig.DBConnectFile - dbConfig.MaxOpenConns = databaseConfig.MaxOpenConns - dbConfig.MaxIdleConns = databaseConfig.MaxIdleConns - dbConfig.ConnMaxIdleTime = databaseConfig.ConnMaxIdleTime - dbConfig.ConnMaxLifetime = databaseConfig.ConnMaxLifetime -} - type SMTPConfig struct { PasswordConfig Server string diff --git a/cmd/config_test.go b/cmd/config_test.go index f0c4e70825a..0078ee5d6b8 100644 --- a/cmd/config_test.go +++ b/cmd/config_test.go @@ -98,36 +98,3 @@ func TestTLSConfigLoad(t *testing.T) { }) } } - -func TestDefaultDBConfig(t *testing.T) { - exampleDBConfig := &DBConfig{} - exampleDatabaseConfig := &DeprecatedDBConfig{ - DBConnect: "some secret", - DBConnectFile: "foo/bar", - MaxOpenConns: 100, - MaxIdleConns: 100, - ConnMaxLifetime: ConfigDuration{10000}, - ConnMaxIdleTime: ConfigDuration{10000}, - } - expected := &DBConfig{ - DBConnect: "some secret", - DBConnectFile: "foo/bar", - MaxOpenConns: 100, - MaxIdleConns: 100, - ConnMaxLifetime: ConfigDuration{10000}, - ConnMaxIdleTime: ConfigDuration{10000}, - } - DefaultDBConfig(exampleDBConfig, exampleDatabaseConfig) - test.AssertDeepEquals(t, exampleDBConfig, expected) - - exampleDBConfig = &DBConfig{ - DBConnect: "some secret", - DBConnectFile: "foo/bar", - MaxOpenConns: 100, - MaxIdleConns: 100, - ConnMaxLifetime: ConfigDuration{10000}, - ConnMaxIdleTime: ConfigDuration{10000}} - exampleDatabaseConfig = &DeprecatedDBConfig{} - DefaultDBConfig(exampleDBConfig, exampleDatabaseConfig) - test.AssertDeepEquals(t, exampleDBConfig, expected) -} diff --git a/cmd/expiration-mailer/main.go b/cmd/expiration-mailer/main.go index 62464ac2fa6..701e179bad3 100644 --- a/cmd/expiration-mailer/main.go +++ b/cmd/expiration-mailer/main.go @@ -364,9 +364,6 @@ type config struct { Mailer struct { cmd.ServiceConfig DB cmd.DBConfig - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DeprecatedDBConfig cmd.SMTPConfig From string @@ -477,9 +474,6 @@ func main() { c.Mailer.CertLimit = 100 } - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DefaultDBConfig(&c.Mailer.DB, &c.Mailer.DeprecatedDBConfig) // Configure DB dbURL, err := c.Mailer.DB.URL() cmd.FailOnError(err, "Couldn't load DB URL") diff --git a/cmd/expired-authz-purger2/config.json b/cmd/expired-authz-purger2/config.json index 94c3977ef81..2f765960502 100644 --- a/cmd/expired-authz-purger2/config.json +++ b/cmd/expired-authz-purger2/config.json @@ -3,8 +3,10 @@ "syslog": { "stdoutLevel": 6 }, - "dbConnectFile": "test/secrets/purger_dburl", - "maxOpenConns": 10, + "db": { + "dbConnectFile": "test/secrets/purger_dburl", + "maxOpenConns": 10 + }, "gracePeriod": "168h", "batchSize": 1000, "debugAddr": ":8015" diff --git a/cmd/expired-authz-purger2/main.go b/cmd/expired-authz-purger2/main.go index 0f2e8fc8ca2..efcebb6c872 100644 --- a/cmd/expired-authz-purger2/main.go +++ b/cmd/expired-authz-purger2/main.go @@ -17,10 +17,7 @@ import ( type config struct { ExpiredAuthzPurger2 struct { - DB cmd.DBConfig - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DeprecatedDBConfig + DB cmd.DBConfig DebugAddr string Syslog cmd.SyslogConfig Features map[string]bool @@ -79,9 +76,6 @@ func main() { clk := cmd.Clock() - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DefaultDBConfig(&c.ExpiredAuthzPurger2.DB, &c.ExpiredAuthzPurger2.DeprecatedDBConfig) dbURL, err := c.ExpiredAuthzPurger2.DB.URL() cmd.FailOnError(err, "Couldn't load DB URL") dbSettings := sa.DbSettings{ diff --git a/cmd/id-exporter/main.go b/cmd/id-exporter/main.go index 51d012156b5..1e4e6fe7f4a 100644 --- a/cmd/id-exporter/main.go +++ b/cmd/id-exporter/main.go @@ -146,9 +146,6 @@ func main() { type config struct { ContactExporter struct { DB cmd.DBConfig - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DeprecatedDBConfig cmd.PasswordConfig Features map[string]bool } @@ -177,9 +174,6 @@ func main() { err = features.Set(cfg.ContactExporter.Features) cmd.FailOnError(err, "Failed to set feature flags") - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DefaultDBConfig(&cfg.ContactExporter.DB, &cfg.ContactExporter.DeprecatedDBConfig) dbURL, err := cfg.ContactExporter.DB.URL() cmd.FailOnError(err, "Couldn't load DB URL") dbSettings := sa.DbSettings{ diff --git a/cmd/notify-mailer/main.go b/cmd/notify-mailer/main.go index c8e1c36ff7e..a511e400696 100644 --- a/cmd/notify-mailer/main.go +++ b/cmd/notify-mailer/main.go @@ -407,9 +407,6 @@ func main() { type config struct { NotifyMailer struct { DB cmd.DBConfig - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DeprecatedDBConfig cmd.PasswordConfig cmd.SMTPConfig Features map[string]bool @@ -442,9 +439,6 @@ func main() { log := cmd.NewLogger(cfg.Syslog) defer log.AuditPanic() - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DefaultDBConfig(&cfg.NotifyMailer.DB, &cfg.NotifyMailer.DeprecatedDBConfig) dbURL, err := cfg.NotifyMailer.DB.URL() cmd.FailOnError(err, "Couldn't load DB URL") dbSettings := sa.DbSettings{ diff --git a/cmd/ocsp-responder/main.go b/cmd/ocsp-responder/main.go index a623232629b..1bd05951709 100644 --- a/cmd/ocsp-responder/main.go +++ b/cmd/ocsp-responder/main.go @@ -195,13 +195,8 @@ func (src *dbSource) Response(req *ocsp.Request) ([]byte, http.Header, error) { type config struct { OCSPResponder struct { cmd.ServiceConfig - DB cmd.DBConfig - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DeprecatedDBConfig - // 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 // when responding from a static file for intermediates and roots. @@ -275,9 +270,6 @@ as generated by Boulder's ceremony command. source, err = bocsp.NewMemorySourceFromFile(filename, logger) cmd.FailOnError(err, fmt.Sprintf("Couldn't read file: %s", url.Path)) } else { - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DefaultDBConfig(&config.DB, &config.DeprecatedDBConfig) // For databases, DBConfig takes precedence over Source, if present. dbConnect, err := config.DB.URL() cmd.FailOnError(err, "Reading DB config") diff --git a/cmd/ocsp-updater/main.go b/cmd/ocsp-updater/main.go index b3a6e6fb4f0..41d94c02bd0 100644 --- a/cmd/ocsp-updater/main.go +++ b/cmd/ocsp-updater/main.go @@ -281,10 +281,6 @@ type OCSPUpdaterConfig struct { cmd.ServiceConfig DB cmd.DBConfig - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DeprecatedDBConfig - OldOCSPWindow cmd.ConfigDuration OldOCSPBatchSize int @@ -345,9 +341,6 @@ func main() { defer logger.AuditPanic() logger.Info(cmd.VersionString()) - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DefaultDBConfig(&conf.DB, &conf.DeprecatedDBConfig) // Configure DB dbURL, err := conf.DB.URL() cmd.FailOnError(err, "Couldn't load DB URL") diff --git a/test/authz-filler/main.go b/test/authz-filler/main.go index 8ed8e711cdc..6e8214dea1d 100644 --- a/test/authz-filler/main.go +++ b/test/authz-filler/main.go @@ -19,10 +19,7 @@ import ( type fillerConfig struct { Filler struct { - DB cmd.DBConfig - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DeprecatedDBConfig + DB cmd.DBConfig Parallelism uint } } @@ -47,9 +44,6 @@ func main() { err = json.Unmarshal(configJSON, &config) cmd.FailOnError(err, "Failed to parse config") - // TODO(#5275): Remove once all configs in dev, staging and prod - // have been updated to contain the `dbconfig` field - cmd.DefaultDBConfig(&config.Filler.DB, &config.Filler.DeprecatedDBConfig) // Configure DB dbURL, err := config.Filler.DB.URL() cmd.FailOnError(err, "Couldn't load DB URL") diff --git a/test/config/admin-revoker.json b/test/config/admin-revoker.json index fe262e04d0f..d91026a1b76 100644 --- a/test/config/admin-revoker.json +++ b/test/config/admin-revoker.json @@ -1,7 +1,9 @@ { "revoker": { - "dbConnectFile": "test/secrets/revoker_dburl", - "maxOpenConns": 1, + "db": { + "dbConnectFile": "test/secrets/revoker_dburl", + "maxOpenConns": 1 + }, "tls": { "caCertFile": "test/grpc-creds/minica.pem", "certFile": "test/grpc-creds/admin-revoker.boulder/cert.pem", diff --git a/test/config/bad-key-revoker.json b/test/config/bad-key-revoker.json index fac0dc17bc6..19817e23ef2 100644 --- a/test/config/bad-key-revoker.json +++ b/test/config/bad-key-revoker.json @@ -1,7 +1,9 @@ { "BadKeyRevoker": { - "dbConnectFile": "test/secrets/badkeyrevoker_dburl", - "maxOpenConns": 10, + "db": { + "dbConnectFile": "test/secrets/badkeyrevoker_dburl", + "maxOpenConns": 10 + }, "debugAddr": ":8020", "tls": { "caCertFile": "test/grpc-creds/minica.pem", diff --git a/test/config/cert-checker.json b/test/config/cert-checker.json index 6fff9ead6e0..4c9f6d9b72b 100644 --- a/test/config/cert-checker.json +++ b/test/config/cert-checker.json @@ -1,7 +1,9 @@ { "certChecker": { - "dbConnectFile": "test/secrets/cert_checker_dburl", - "maxOpenConns": 10, + "db": { + "dbConnectFile": "test/secrets/cert_checker_dburl", + "maxOpenConns": 10 + }, "hostnamePolicyFile": "test/hostname-policy.yaml", "ignoredLints": [ "n_subject_common_name_included" diff --git a/test/config/contact-exporter.json b/test/config/contact-exporter.json index fca93d52a14..a304ceaf716 100644 --- a/test/config/contact-exporter.json +++ b/test/config/contact-exporter.json @@ -1,7 +1,9 @@ { "contactExporter": { "passwordFile": "test/secrets/smtp_password", - "dbConnectFile": "test/secrets/mailer_dburl", - "maxOpenConns": 10 + "db": { + "dbConnectFile": "test/secrets/mailer_dburl", + "maxOpenConns": 10 + } } } diff --git a/test/config/expiration-mailer.json b/test/config/expiration-mailer.json index 7a62a626505..56658562854 100644 --- a/test/config/expiration-mailer.json +++ b/test/config/expiration-mailer.json @@ -5,8 +5,10 @@ "username": "cert-manager@example.com", "from": "Expiry bot ", "passwordFile": "test/secrets/smtp_password", - "dbConnectFile": "test/secrets/mailer_dburl", - "maxOpenConns": 10, + "db": { + "dbConnectFile": "test/secrets/mailer_dburl", + "maxOpenConns": 10 + }, "nagTimes": ["24h", "72h", "168h", "336h"], "nagCheckInterval": "24h", "emailTemplate": "test/example-expiration-template", diff --git a/test/config/janitor.json b/test/config/janitor.json index 1a87600497b..55cfe815adf 100644 --- a/test/config/janitor.json +++ b/test/config/janitor.json @@ -3,8 +3,10 @@ "syslog": { "stdoutLevel": 6 }, - "dbConnectFile": "test/secrets/janitor_dburl", - "maxOpenConns": 10, + "db": { + "dbConnectFile": "test/secrets/janitor_dburl", + "maxOpenConns": 10 + }, "debugAddr": ":8014", "jobConfigs": [ { diff --git a/test/config/notify-mailer.json b/test/config/notify-mailer.json index 1d17012e114..261b689e475 100644 --- a/test/config/notify-mailer.json +++ b/test/config/notify-mailer.json @@ -4,8 +4,10 @@ "port": "9380", "username": "cert-manager@example.com", "passwordFile": "test/secrets/smtp_password", - "dbConnectFile": "test/secrets/mailer_dburl", - "maxOpenConns": 10 + "db": { + "dbConnectFile": "test/secrets/mailer_dburl", + "maxOpenConns": 10 + } }, "syslog": { "stdoutLevel": 7, diff --git a/test/config/ocsp-responder.json b/test/config/ocsp-responder.json index 2918d1740ef..746d366706b 100644 --- a/test/config/ocsp-responder.json +++ b/test/config/ocsp-responder.json @@ -1,7 +1,9 @@ { "ocspResponder": { - "dbConnectFile": "test/secrets/ocsp_responder_dburl", - "maxOpenConns": 10, + "db": { + "dbConnectFile": "test/secrets/ocsp_responder_dburl", + "maxOpenConns": 10 + }, "path": "/", "listenAddress": "0.0.0.0:4002", "maxAge": "10s", diff --git a/test/config/ocsp-updater.json b/test/config/ocsp-updater.json index 35a1bf5c8e5..3dbc4f9eb9d 100644 --- a/test/config/ocsp-updater.json +++ b/test/config/ocsp-updater.json @@ -1,7 +1,9 @@ { "ocspUpdater": { - "dbConnectFile": "test/secrets/ocsp_updater_dburl", - "maxOpenConns": 10, + "db": { + "dbConnectFile": "test/secrets/ocsp_updater_dburl", + "maxOpenConns": 10 + }, "oldOCSPWindow": "2s", "oldOCSPBatchSize": 5000, "parallelGenerateOCSPRequests": 10, diff --git a/test/config/sa.json b/test/config/sa.json index 6d67cce4814..035de2b838c 100644 --- a/test/config/sa.json +++ b/test/config/sa.json @@ -1,7 +1,9 @@ { "sa": { - "dbConnectFile": "test/secrets/sa_dburl", - "maxOpenConns": 100, + "db": { + "dbConnectFile": "test/secrets/sa_dburl", + "maxOpenConns": 100 + }, "ParallelismPerRPC": 20, "debugAddr": ":8003", "tls": {