maska/traefik-certs-dumper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ifelsechain & remove error catching for ParseBool

Browse Source
This commit is contained in:
Stephan Müller 2019-04-19 17:28:32 +02:00
parent c5cd7b0a0b
commit c484f77326
No known key found for this signature in database
GPG Key ID: 4650F39E5B5E1894
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
main.go
View File

@ -33,13 +33,20 @@ func main() {
source := cmd.Flag("source").Value.String() source := cmd.Flag("source").Value.String()
sourceFile := cmd.Flag("source.file").Value.String() sourceFile := cmd.Flag("source.file").Value.String()
watch, _ := strconv.ParseBool(cmd.Flag("watch").Value.String()) watch, _ := strconv.ParseBool(cmd.Flag("watch").Value.String())
if source == FILE {
switch source {
case FILE:
if _, err := os.Stat(sourceFile); os.IsNotExist(err) { if _, err := os.Stat(sourceFile); os.IsNotExist(err) {
return fmt.Errorf("--source.file (%q) does not exist", sourceFile) return fmt.Errorf("--source.file (%q) does not exist", sourceFile)
} }
} else if source == BOLTDB && watch { case BOLTDB:
return fmt.Errorf("--watch=true is not supported for boltdb") if watch {
} else if source != CONSUL && source != ETCD && source != ZOOKEEPER && source != BOLTDB { return fmt.Errorf("--watch=true is not supported for boltdb")
}
case CONSUL:
case ETCD:
case ZOOKEEPER:
default:
return fmt.Errorf("--source (%q) is not allowed, use one of 'file', 'consul', 'etcd', 'zookeeper', 'boltdb'", source) return fmt.Errorf("--source (%q) is not allowed, use one of 'file', 'consul', 'etcd', 'zookeeper', 'boltdb'", source)
} }
@ -69,17 +76,11 @@ func main() {
storeConfig.Username = cmd.Flag("source.kv.username").Value.String() storeConfig.Username = cmd.Flag("source.kv.username").Value.String()
storeConfig.Password = cmd.Flag("source.kv.password").Value.String() storeConfig.Password = cmd.Flag("source.kv.password").Value.String()
enableTLS, err := strconv.ParseBool(cmd.Flag("source.kv.tls.enable").Value.String()) enableTLS, _ := strconv.ParseBool(cmd.Flag("source.kv.tls.enable").Value.String())
if err != nil {
return err
}
if enableTLS { if enableTLS {
tlsConfig := &tls.Config{} tlsConfig := &tls.Config{}
insecureSkipVerify, err := strconv.ParseBool(cmd.Flag("source.kv.tls.insecureskipverify").Value.String()) insecureSkipVerify, _ := strconv.ParseBool(cmd.Flag("source.kv.tls.insecureskipverify").Value.String())
if err != nil {
return err
}
tlsConfig.InsecureSkipVerify = insecureSkipVerify tlsConfig.InsecureSkipVerify = insecureSkipVerify
if cmd.Flag("source.kv.tls.ca-cert-file").Value.String() != "" { if cmd.Flag("source.kv.tls.ca-cert-file").Value.String() != "" {
caFile := cmd.Flag("source.kv.tls.ca-cert-file").Value.String() caFile := cmd.Flag("source.kv.tls.ca-cert-file").Value.String()
@ -101,10 +102,7 @@ func main() {
timeout, _ = strconv.Atoi(cmd.Flag("source.kv.etcd.sync-period").Value.String()) timeout, _ = strconv.Atoi(cmd.Flag("source.kv.etcd.sync-period").Value.String())
storeConfig.SyncPeriod = time.Second * time.Duration(timeout) storeConfig.SyncPeriod = time.Second * time.Duration(timeout)
// Special parameters for boltdb // Special parameters for boltdb
persistConnection, err := strconv.ParseBool(cmd.Flag("source.kv.boltdb.persist-connection").Value.String()) persistConnection, _ := strconv.ParseBool(cmd.Flag("source.kv.boltdb.persist-connection").Value.String())
if err != nil {
return err
}
storeConfig.PersistConnection = persistConnection storeConfig.PersistConnection = persistConnection
storeConfig.Bucket = cmd.Flag("source.kv.boltdb.bucket").Value.String() storeConfig.Bucket = cmd.Flag("source.kv.boltdb.bucket").Value.String()
// Special parameters for consul // Special parameters for consul