diff --git a/endpoint-monitor/config.go b/endpoint-monitor/config.go index 9de8be4292e5..77fe6fd96ee4 100644 --- a/endpoint-monitor/config.go +++ b/endpoint-monitor/config.go @@ -25,7 +25,7 @@ const ( func CLIFlags(envPrefix string) []cli.Flag { prefixEnvVars := func(name string) []string { - return []string{opservice.PrefixEnvVar(envPrefix, name)} + return opservice.PrefixEnvVar(envPrefix, name) } flags := []cli.Flag{ &cli.StringSliceFlag{ diff --git a/op-batcher/compressor/cli.go b/op-batcher/compressor/cli.go index 65ffdbe44d86..5da3cd164310 100644 --- a/op-batcher/compressor/cli.go +++ b/op-batcher/compressor/cli.go @@ -15,32 +15,29 @@ const ( ) func CLIFlags(envPrefix string) []cli.Flag { - prefixEnvVars := func(name string) []string { - return []string{opservice.PrefixEnvVar(envPrefix, name)} - } return []cli.Flag{ &cli.Uint64Flag{ Name: TargetL1TxSizeBytesFlagName, Usage: "The target size of a batch tx submitted to L1.", Value: 100_000, - EnvVars: prefixEnvVars("TARGET_L1_TX_SIZE_BYTES"), + EnvVars: opservice.PrefixEnvVar(envPrefix, "TARGET_L1_TX_SIZE_BYTES"), }, &cli.IntFlag{ Name: TargetNumFramesFlagName, Usage: "The target number of frames to create per channel", Value: 1, - EnvVars: prefixEnvVars("TARGET_NUM_FRAMES"), + EnvVars: opservice.PrefixEnvVar(envPrefix, "TARGET_NUM_FRAMES"), }, &cli.Float64Flag{ Name: ApproxComprRatioFlagName, Usage: "The approximate compression ratio (<= 1.0)", Value: 0.4, - EnvVars: prefixEnvVars("APPROX_COMPR_RATIO"), + EnvVars: opservice.PrefixEnvVar(envPrefix, "APPROX_COMPR_RATIO"), }, &cli.StringFlag{ Name: KindFlagName, Usage: "The type of compressor. Valid options: " + strings.Join(KindKeys, ", "), - EnvVars: prefixEnvVars("COMPRESSOR"), + EnvVars: opservice.PrefixEnvVar(envPrefix, "COMPRESSOR"), Value: RatioKind, }, } diff --git a/op-batcher/flags/flags.go b/op-batcher/flags/flags.go index 286864683ee2..6beb8d01ab9e 100644 --- a/op-batcher/flags/flags.go +++ b/op-batcher/flags/flags.go @@ -19,7 +19,7 @@ import ( const EnvVarPrefix = "OP_BATCHER" func prefixEnvVars(name string) []string { - return []string{opservice.PrefixEnvVar(EnvVarPrefix, name)} + return opservice.PrefixEnvVar(EnvVarPrefix, name) } var ( diff --git a/op-batcher/rpc/config.go b/op-batcher/rpc/config.go index 10f3ca36af85..3aafdb649819 100644 --- a/op-batcher/rpc/config.go +++ b/op-batcher/rpc/config.go @@ -16,7 +16,7 @@ func CLIFlags(envPrefix string) []cli.Flag { &cli.BoolFlag{ Name: EnableAdminFlagName, Usage: "Enable the admin API (experimental)", - EnvVars: []string{opservice.PrefixEnvVar(envPrefix, "RPC_ENABLE_ADMIN")}, + EnvVars: opservice.PrefixEnvVar(envPrefix, "RPC_ENABLE_ADMIN"), }, } } diff --git a/op-bootnode/flags/flags.go b/op-bootnode/flags/flags.go index c4bffa0eeb8d..eaf02530f93c 100644 --- a/op-bootnode/flags/flags.go +++ b/op-bootnode/flags/flags.go @@ -14,7 +14,7 @@ import ( const envVarPrefix = "OP_BOOTNODE" func prefixEnvVars(name string) []string { - return []string{opservice.PrefixEnvVar(envVarPrefix, name)} + return opservice.PrefixEnvVar(envVarPrefix, name) } var ( diff --git a/op-challenger/flags/flags.go b/op-challenger/flags/flags.go index 855f0277925c..1d95d0f0dc6d 100644 --- a/op-challenger/flags/flags.go +++ b/op-challenger/flags/flags.go @@ -16,7 +16,7 @@ import ( const envVarPrefix = "OP_CHALLENGER" func prefixEnvVars(name string) []string { - return []string{opservice.PrefixEnvVar(envVarPrefix, name)} + return opservice.PrefixEnvVar(envVarPrefix, name) } var ( diff --git a/op-heartbeat/flags/flags.go b/op-heartbeat/flags/flags.go index 97765dbbb175..a5bd8123d687 100644 --- a/op-heartbeat/flags/flags.go +++ b/op-heartbeat/flags/flags.go @@ -10,7 +10,7 @@ import ( const envPrefix = "OP_HEARTBEAT" func prefixEnvVars(name string) []string { - return []string{opservice.PrefixEnvVar(envPrefix, name)} + return opservice.PrefixEnvVar(envPrefix, name) } const ( diff --git a/op-program/host/flags/flags.go b/op-program/host/flags/flags.go index c9c41445002d..b334d3dd12db 100644 --- a/op-program/host/flags/flags.go +++ b/op-program/host/flags/flags.go @@ -16,7 +16,7 @@ import ( const EnvVarPrefix = "OP_PROGRAM" func prefixEnvVars(name string) []string { - return []string{service.PrefixEnvVar(EnvVarPrefix, name)} + return service.PrefixEnvVar(EnvVarPrefix, name) } var ( diff --git a/op-proposer/flags/flags.go b/op-proposer/flags/flags.go index d3ef5a466004..d9acde95dcd4 100644 --- a/op-proposer/flags/flags.go +++ b/op-proposer/flags/flags.go @@ -17,7 +17,7 @@ import ( const EnvVarPrefix = "OP_PROPOSER" func prefixEnvVars(name string) []string { - return []string{opservice.PrefixEnvVar(EnvVarPrefix, name)} + return opservice.PrefixEnvVar(EnvVarPrefix, name) } var ( diff --git a/op-service/log/cli.go b/op-service/log/cli.go index 1e70ebf4f236..df449599b6f4 100644 --- a/op-service/log/cli.go +++ b/op-service/log/cli.go @@ -24,18 +24,18 @@ func CLIFlags(envPrefix string) []cli.Flag { Name: LevelFlagName, Usage: "The lowest log level that will be output", Value: "info", - EnvVars: []string{opservice.PrefixEnvVar(envPrefix, "LOG_LEVEL")}, + EnvVars: opservice.PrefixEnvVar(envPrefix, "LOG_LEVEL"), }, &cli.StringFlag{ Name: FormatFlagName, Usage: "Format the log output. Supported formats: 'text', 'terminal', 'logfmt', 'json', 'json-pretty',", Value: "text", - EnvVars: []string{opservice.PrefixEnvVar(envPrefix, "LOG_FORMAT")}, + EnvVars: opservice.PrefixEnvVar(envPrefix, "LOG_FORMAT"), }, &cli.BoolFlag{ Name: ColorFlagName, Usage: "Color the log output if in terminal mode", - EnvVars: []string{opservice.PrefixEnvVar(envPrefix, "LOG_COLOR")}, + EnvVars: opservice.PrefixEnvVar(envPrefix, "LOG_COLOR"), }, } } diff --git a/op-service/metrics/cli.go b/op-service/metrics/cli.go index a0888fbac7ec..f9782b68f321 100644 --- a/op-service/metrics/cli.go +++ b/op-service/metrics/cli.go @@ -20,19 +20,19 @@ func CLIFlags(envPrefix string) []cli.Flag { &cli.BoolFlag{ Name: EnabledFlagName, Usage: "Enable the metrics server", - EnvVars: []string{opservice.PrefixEnvVar(envPrefix, "METRICS_ENABLED")}, + EnvVars: opservice.PrefixEnvVar(envPrefix, "METRICS_ENABLED"), }, &cli.StringFlag{ Name: ListenAddrFlagName, Usage: "Metrics listening address", Value: "0.0.0.0", - EnvVars: []string{opservice.PrefixEnvVar(envPrefix, "METRICS_ADDR")}, + EnvVars: opservice.PrefixEnvVar(envPrefix, "METRICS_ADDR"), }, &cli.IntFlag{ Name: PortFlagName, Usage: "Metrics listening port", Value: 7300, - EnvVars: []string{opservice.PrefixEnvVar(envPrefix, "METRICS_PORT")}, + EnvVars: opservice.PrefixEnvVar(envPrefix, "METRICS_PORT"), }, } } diff --git a/op-service/pprof/cli.go b/op-service/pprof/cli.go index e12f199d561b..f9d9c361f14b 100644 --- a/op-service/pprof/cli.go +++ b/op-service/pprof/cli.go @@ -19,19 +19,19 @@ func CLIFlags(envPrefix string) []cli.Flag { &cli.BoolFlag{ Name: EnabledFlagName, Usage: "Enable the pprof server", - EnvVars: []string{opservice.PrefixEnvVar(envPrefix, "PPROF_ENABLED")}, + EnvVars: opservice.PrefixEnvVar(envPrefix, "PPROF_ENABLED"), }, &cli.StringFlag{ Name: ListenAddrFlagName, Usage: "pprof listening address", Value: "0.0.0.0", - EnvVars: []string{opservice.PrefixEnvVar(envPrefix, "PPROF_ADDR")}, + EnvVars: opservice.PrefixEnvVar(envPrefix, "PPROF_ADDR"), }, &cli.IntFlag{ Name: PortFlagName, Usage: "pprof listening port", Value: 6060, - EnvVars: []string{opservice.PrefixEnvVar(envPrefix, "PPROF_PORT")}, + EnvVars: opservice.PrefixEnvVar(envPrefix, "PPROF_PORT"), }, } } diff --git a/op-service/rpc/cli.go b/op-service/rpc/cli.go index 789bbd0e6a56..f1c4db4b063b 100644 --- a/op-service/rpc/cli.go +++ b/op-service/rpc/cli.go @@ -19,13 +19,13 @@ func CLIFlags(envPrefix string) []cli.Flag { Name: ListenAddrFlagName, Usage: "rpc listening address", Value: "0.0.0.0", - EnvVars: []string{opservice.PrefixEnvVar(envPrefix, "RPC_ADDR")}, + EnvVars: opservice.PrefixEnvVar(envPrefix, "RPC_ADDR"), }, &cli.IntFlag{ Name: PortFlagName, Usage: "rpc listening port", Value: 8545, - EnvVars: []string{opservice.PrefixEnvVar(envPrefix, "RPC_PORT")}, + EnvVars: opservice.PrefixEnvVar(envPrefix, "RPC_PORT"), }, } } diff --git a/op-service/tls/cli.go b/op-service/tls/cli.go index ab24eb56f63b..28a772ab49fc 100644 --- a/op-service/tls/cli.go +++ b/op-service/tls/cli.go @@ -30,7 +30,7 @@ func CLIFlagsWithFlagPrefix(envPrefix string, flagPrefix string) []cli.Flag { return strings.Trim(fmt.Sprintf("%s.%s", flagPrefix, flagName), ".") } prefixEnvVars := func(name string) []string { - return []string{opservice.PrefixEnvVar(envPrefix, name)} + return opservice.PrefixEnvVar(envPrefix, name) } return []cli.Flag{ &cli.StringFlag{ diff --git a/op-service/txmgr/cli.go b/op-service/txmgr/cli.go index 6a2d869d42a3..d4ab7b650147 100644 --- a/op-service/txmgr/cli.go +++ b/op-service/txmgr/cli.go @@ -50,7 +50,7 @@ var ( func CLIFlags(envPrefix string) []cli.Flag { prefixEnvVars := func(name string) []string { - return []string{opservice.PrefixEnvVar(envPrefix, name)} + return opservice.PrefixEnvVar(envPrefix, name) } return append([]cli.Flag{ &cli.StringFlag{ diff --git a/op-service/util.go b/op-service/util.go index f9572a7d65ec..81ffd1d9bc40 100644 --- a/op-service/util.go +++ b/op-service/util.go @@ -16,8 +16,10 @@ import ( "github.com/urfave/cli/v2" ) -func PrefixEnvVar(prefix, suffix string) string { - return prefix + "_" + suffix +// PrefixEnvVar adds a prefix to the environment variable, +// and returns the env-var wrapped in a slice for usage with urfave CLI v2. +func PrefixEnvVar(prefix, suffix string) []string { + return []string{prefix + "_" + suffix} } // ValidateEnvVars logs all env vars that are found where the env var is diff --git a/op-signer/client/config.go b/op-signer/client/config.go index fc6e01c01d1e..8332af8a550e 100644 --- a/op-signer/client/config.go +++ b/op-signer/client/config.go @@ -20,12 +20,12 @@ func CLIFlags(envPrefix string) []cli.Flag { &cli.StringFlag{ Name: EndpointFlagName, Usage: "Signer endpoint the client will connect to", - EnvVars: []string{opservice.PrefixEnvVar(envPrefix, "ENDPOINT")}, + EnvVars: opservice.PrefixEnvVar(envPrefix, "ENDPOINT"), }, &cli.StringFlag{ Name: AddressFlagName, Usage: "Address the signer is signing transactions for", - EnvVars: []string{opservice.PrefixEnvVar(envPrefix, "ADDRESS")}, + EnvVars: opservice.PrefixEnvVar(envPrefix, "ADDRESS"), }, } flags = append(flags, optls.CLIFlagsWithFlagPrefix(envPrefix, "signer")...)