Skip to content

Commit 8534d0a

Browse files
committed
loop: Global flags to accept ENV vars overrides.
1 parent a253b40 commit 8534d0a

File tree

1 file changed

+25
-13
lines changed

1 file changed

+25
-13
lines changed

cmd/loop/main.go

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,26 +51,30 @@ var (
5151
defaultInitiator = "loop-cli"
5252

5353
loopDirFlag = cli.StringFlag{
54-
Name: "loopdir",
55-
Value: loopd.LoopDirBase,
56-
Usage: "path to loop's base directory",
54+
Name: "loopdir",
55+
Value: loopd.LoopDirBase,
56+
Usage: "path to loop's base directory",
57+
EnvVar: envVarLoopDir,
5758
}
5859
networkFlag = cli.StringFlag{
5960
Name: "network, n",
6061
Usage: "the network loop is running on e.g. mainnet, " +
6162
"testnet, etc.",
62-
Value: loopd.DefaultNetwork,
63+
Value: loopd.DefaultNetwork,
64+
EnvVar: envVarNetwork,
6365
}
6466

6567
tlsCertFlag = cli.StringFlag{
66-
Name: "tlscertpath",
67-
Usage: "path to loop's TLS certificate",
68-
Value: loopd.DefaultTLSCertPath,
68+
Name: "tlscertpath",
69+
Usage: "path to loop's TLS certificate",
70+
Value: loopd.DefaultTLSCertPath,
71+
EnvVar: envVarTLSCertPath,
6972
}
7073
macaroonPathFlag = cli.StringFlag{
71-
Name: "macaroonpath",
72-
Usage: "path to macaroon file",
73-
Value: loopd.DefaultMacaroonPath,
74+
Name: "macaroonpath",
75+
Usage: "path to macaroon file",
76+
Value: loopd.DefaultMacaroonPath,
77+
EnvVar: envVarMacaroonPath,
7478
}
7579
verboseFlag = cli.BoolFlag{
7680
Name: "verbose, v",
@@ -116,6 +120,13 @@ const (
116120
// prints out as,
117121
// Conf target: 9 block
118122
blkFmt = "%-36s %12d block\n"
123+
124+
// Environment variables names that can be used to set the global flags.
125+
envVarRPCServer = "LOOPCLI_RPCSERVER"
126+
envVarNetwork = "LOOPCLI_NETWORK"
127+
envVarLoopDir = "LOOPCLI_LOOPDIR"
128+
envVarTLSCertPath = "LOOPCLI_TLSCERTPATH"
129+
envVarMacaroonPath = "LOOPCLI_MACAROONPATH"
119130
)
120131

121132
func printJSON(resp interface{}) {
@@ -156,9 +167,10 @@ func main() {
156167
app.Usage = "control plane for your loopd"
157168
app.Flags = []cli.Flag{
158169
cli.StringFlag{
159-
Name: "rpcserver",
160-
Value: "localhost:11010",
161-
Usage: "loopd daemon address host:port",
170+
Name: "rpcserver",
171+
Value: "localhost:11010",
172+
Usage: "loopd daemon address host:port",
173+
EnvVar: envVarRPCServer,
162174
},
163175
networkFlag,
164176
loopDirFlag,

0 commit comments

Comments
 (0)