Rename CA's "--ca-addr" flag to "--addr" (#6889)

Most boulder components have a command line flag to override what gRPC
and debug port they listen on, which is used in tests to run multiple
instances with the same configuration.

However, CA's flag is named "--ca-addr", and not "--addr". This is
inconsistent with SA, RA, VA, nonce, publisher, and purger.

This flag isn't used in production, where we set it in the config file,
so it shouldn't be a breaking change to rename it.
This commit is contained in:
Matthew McPherrin 2023-05-15 14:17:07 -04:00 committed by GitHub
parent 9e8101ff3a
commit c21b44bdc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -144,7 +144,7 @@ func loadBoulderIssuers(profileConfig issuance.ProfileConfig, issuerConfigs []is
}
func main() {
caAddr := flag.String("ca-addr", "", "CA gRPC listen address override")
grpcAddr := flag.String("addr", "", "gRPC listen address override")
debugAddr := flag.String("debug-addr", "", "Debug server address override")
configFile := flag.String("config", "", "File path to the configuration file for this service")
flag.Parse()
@ -160,8 +160,8 @@ func main() {
err = features.Set(c.CA.Features)
cmd.FailOnError(err, "Failed to set feature flags")
if *caAddr != "" {
c.CA.GRPCCA.Address = *caAddr
if *grpcAddr != "" {
c.CA.GRPCCA.Address = *grpcAddr
}
if *debugAddr != "" {
c.CA.DebugAddr = *debugAddr

View File

@ -59,11 +59,11 @@ SERVICES = (
('boulder-remoteva-a', 'boulder-remoteva-b')),
Service('boulder-ca-a',
8001, 'ca1.service.consul:9093',
('./bin/boulder', 'boulder-ca', '--config', os.path.join(config_dir, 'ca-a.json'), '--ca-addr', 'ca1.service.consul:9093', '--debug-addr', ':8001'),
('./bin/boulder', 'boulder-ca', '--config', os.path.join(config_dir, 'ca-a.json'), '--addr', 'ca1.service.consul:9093', '--debug-addr', ':8001'),
('boulder-sa-1', 'boulder-sa-2')),
Service('boulder-ca-b',
8101, 'ca2.service.consul:9093',
('./bin/boulder', 'boulder-ca', '--config', os.path.join(config_dir, 'ca-b.json'), '--ca-addr', 'ca2.service.consul:9093', '--debug-addr', ':8101'),
('./bin/boulder', 'boulder-ca', '--config', os.path.join(config_dir, 'ca-b.json'), '--addr', 'ca2.service.consul:9093', '--debug-addr', ':8101'),
('boulder-sa-1', 'boulder-sa-2')),
Service('akamai-test-srv',
6789, None,