Skip to content

Commit 3adbf95

Browse files
committed
Logging improvements
1 parent ae98102 commit 3adbf95

File tree

3 files changed

+23
-3
lines changed

3 files changed

+23
-3
lines changed

main.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@ package main
22

33
import (
44
"flag"
5-
"log"
5+
"fmt"
6+
7+
"go.uber.org/zap"
68
)
79

810
var (
11+
logger, _ = zap.NewProduction()
12+
913
providers = map[string]SecretProvider{
1014
"gcp": &GCPSecretManager{},
1115
}
@@ -36,7 +40,15 @@ type Options struct {
3640
Output string
3741
}
3842

43+
func (o *Options) String() string {
44+
return fmt.Sprintf(
45+
"provider: %s, project: %s, filter: %s, parser: %s, template: %s, output: %s",
46+
o.Provider, o.Project, o.Filter, o.Parser, o.Template, o.Output,
47+
)
48+
}
49+
3950
func main() {
51+
4052
options := &Options{}
4153

4254
flag.StringVar(&options.Provider, "provider", "gcp", "name of the provider that manages the secrets")
@@ -56,6 +68,6 @@ func main() {
5668

5769
err := Run(options)
5870
if err != nil {
59-
log.Fatal(err)
71+
logger.Fatal("error getting the secrets", zap.Error(err))
6072
}
6173
}

parser.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package main
33
import (
44
"encoding/json"
55
"fmt"
6+
7+
"go.uber.org/zap"
68
)
79

810
// ContentParser defines secret content parser behaviors
@@ -34,7 +36,7 @@ type JSONContentParser struct {
3436
func (j *JSONContentParser) Parse(s *SecretData) []*SecretData {
3537
m := map[string]interface{}{}
3638
if err := json.Unmarshal([]byte(s.Data), &m); err != nil {
37-
fmt.Printf("\nWARN: [%s] invalid json\n", s.Name)
39+
logger.Warn("invalid json", zap.String("name", s.Name))
3840
}
3941

4042
var secrets []*SecretData

runner.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package main
33
import (
44
"errors"
55
"os"
6+
7+
"go.uber.org/zap"
68
)
79

810
var (
@@ -32,6 +34,8 @@ func Run(options *Options) error {
3234

3335
}
3436

37+
logger.Info("using options", zap.Any("values", options))
38+
3539
if err := provider.Init(); err != nil {
3640
return err
3741
}
@@ -41,6 +45,8 @@ func Run(options *Options) error {
4145
return err
4246
}
4347

48+
logger.Info("secrets found", zap.Int("len", len(data)))
49+
4450
output := os.Stdin
4551
if options.Output != "" {
4652
output, err = os.Create(options.Output)

0 commit comments

Comments
 (0)