From 74b279aefaffa979c76b7ca26357ab8162a8b55d Mon Sep 17 00:00:00 2001 From: FUJIWARA Shunichiro Date: Tue, 7 Apr 2020 12:07:06 +0900 Subject: [PATCH] fix handling for empty global options. --- cmd/lambroll/main.go | 8 ++++---- lambroll.go | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/lambroll/main.go b/cmd/lambroll/main.go index bc7db23..8b84afe 100644 --- a/cmd/lambroll/main.go +++ b/cmd/lambroll/main.go @@ -83,6 +83,10 @@ func _main() int { } command := kingpin.Parse() + if command == "version" { + fmt.Println("lambroll", Version) + return 0 + } filter := &logutils.LevelFilter{ Levels: []logutils.LogLevel{"trace", "debug", "info", "warn", "error"}, @@ -96,10 +100,6 @@ func _main() int { log.Println("[error]", err) return 1 } - if command == "version" { - fmt.Println("lambroll", Version) - return 0 - } log.Println("[info] lambroll", Version) switch command { diff --git a/lambroll.go b/lambroll.go index f9d24b3..dabb020 100644 --- a/lambroll.go +++ b/lambroll.go @@ -64,19 +64,19 @@ type App struct { // New creates an application func New(opt *Option) (*App, error) { awsCfg := &aws.Config{} - if opt.Region != nil { + if opt.Region != nil && *opt.Region != "" { awsCfg.Region = aws.String(*opt.Region) } sessOpt := session.Options{Config: *awsCfg} var profile string - if opt.Profile != nil { + if opt.Profile != nil && *opt.Profile != "" { sessOpt.Profile = *opt.Profile profile = *opt.Profile } sess := session.Must(session.NewSessionWithOptions(sessOpt)) loader := config.New() - if opt.TFState != nil { + if opt.TFState != nil && *opt.TFState != "" { funcs, err := tfstate.Load(*opt.TFState) if err != nil { return nil, err