From c21b44bdc22804e751e06d2f33996c6588a0580a Mon Sep 17 00:00:00 2001 From: Matthew McPherrin Date: Mon, 15 May 2023 14:17:07 -0400 Subject: [PATCH] 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. --- cmd/boulder-ca/main.go | 6 +++--- test/startservers.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/boulder-ca/main.go b/cmd/boulder-ca/main.go index b9e7125ec..3c9f5e5c2 100644 --- a/cmd/boulder-ca/main.go +++ b/cmd/boulder-ca/main.go @@ -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 diff --git a/test/startservers.py b/test/startservers.py index 3f6c0cd20..629cc42af 100644 --- a/test/startservers.py +++ b/test/startservers.py @@ -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,