fix azblob not seeing --debug

actions/log.go

@@ -1,7 +1,7 @@
 package actions
 
-import "github.com/sirupsen/logrus"
+import "github.com/jpicht/azcat/internal"
 
 var (
- log = logrus.StandardLogger().WithField("module", "azcat")
+ log = internal.GetLog("actions")
 )

actions/main.go

@@ -0,0 +1,33 @@
+package actions
+
+import (
+ "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
+ "github.com/jpicht/azcat/internal"
+ "github.com/spf13/pflag"
+)
+
+func Main(mode Mode) {
+ pflag.Parse()
+
+ log := internal.GetLog("internal.Main")
+
+ if pflag.NArg() != 1 {
+ log.Fatal("Invalid number of arguments")
+ }
+
+ raw := pflag.Arg(0)
+
+ if raw == "" {
+ log.Fatal("Azure URL cannot be empty")
+ }
+
+ parsed, err := azblob.NewBlobURLParts(raw)
+
+ if err != nil {
+ log.WithError(err).WithField("url", raw).Fatalf("invalid URL")
+ }
+
+ serviceClient := internal.GetClient(parsed)
+
+ Run(mode, parsed, serviceClient)
+}

cmd/azblob/guess.go

@@ -40,7 +40,7 @@ func getExplicitMode() actions.Mode {
  return modes[0]
  }
 
- log.Fatal("list, remove and write are mutually exclusive")
+ log.Fatal("list, ping, read, remove and write are mutually exclusive")
 
  panic("unreachable")
 }

cmd/azblob/main.go

@@ -4,11 +4,12 @@ import (
  "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
  "github.com/jpicht/azcat/actions"
  "github.com/jpicht/azcat/internal"
+ "github.com/sirupsen/logrus"
  "github.com/spf13/pflag"
 )
 
 var (
- log = internal.GetLog("azblob")
+ log logrus.FieldLogger
 
  list = pflag.BoolP("list", "l", false, "Enable list mode")
  ping = pflag.BoolP("ping", "p", false, "Enable ping mode")
@@ -19,20 +20,30 @@ var (
 
 func main() {
  pflag.Parse()
+ log = internal.GetLog("azblob")
 
  mode := getExplicitMode()
 
- parsed, err := azblob.NewBlobURLParts(pflag.Arg(0))
+ log.WithField("mode", mode).Debug()
+
+ raw := pflag.Arg(0)
+
+ if raw == "" {
+ log.Fatal("Azure URL cannot be empty")
+ }
+
+ parsed, err := azblob.NewBlobURLParts(raw)
 
  if err != nil {
- log.WithError(err).Fatalf("Invalid URL %#v", pflag.Arg(0))
+ log.WithError(err).Fatalf("Invalid URL %#v", raw)
  return
  }
 
  serviceClient := internal.GetClient(parsed)
 
  if mode == actions.EMode.None() {
  mode = guessMode(parsed, serviceClient)
+ log.WithField("mode", mode).Debug("guessMode")
  }
 
  actions.Run(mode, parsed, serviceClient)

cmd/multi/azcat/main.go

@@ -2,9 +2,8 @@ package main
 
 import (
  "github.com/jpicht/azcat/actions"
- "github.com/jpicht/azcat/internal"
 )
 
 func main() {
- internal.Main(actions.EMode.Read())
+ actions.Main(actions.EMode.Read())
 }

cmd/multi/azls/main.go

@@ -2,9 +2,8 @@ package main
 
 import (
  "github.com/jpicht/azcat/actions"
- "github.com/jpicht/azcat/internal"
 )
 
 func main() {
- internal.Main(actions.EMode.List())
+ actions.Main(actions.EMode.List())
 }

cmd/multi/azping/main.go

@@ -2,9 +2,8 @@ package main
 
 import (
  "github.com/jpicht/azcat/actions"
- "github.com/jpicht/azcat/internal"
 )
 
 func main() {
- internal.Main(actions.EMode.Ping())
+ actions.Main(actions.EMode.Ping())
 }

cmd/multi/azput/main.go

@@ -2,9 +2,8 @@ package main
 
 import (
  "github.com/jpicht/azcat/actions"
- "github.com/jpicht/azcat/internal"
 )
 
 func main() {
- internal.Main(actions.EMode.Write())
+ actions.Main(actions.EMode.Write())
 }

cmd/multi/azrm/main.go

@@ -2,9 +2,8 @@ package main
 
 import (
  "github.com/jpicht/azcat/actions"
- "github.com/jpicht/azcat/internal"
 )
 
 func main() {
- internal.Main(actions.EMode.Remove())
+ actions.Main(actions.EMode.Remove())
 }

internal/client.go

@@ -9,6 +9,7 @@ import (
 )
 
 func GetClient(parsed azblob.BlobURLParts) *azblob.ServiceClient {
+ log := GetLog("internal.GetClient")
  clientBuilder := auth.AuthFromEnv()
  if clientBuilder == nil {
  log.Fatal("No client credentials could be detected")

internal/log.go

@@ -6,14 +6,17 @@ import (
 )
 
 var (
- log = GetLog("internal")
-
  debug = pflag.BoolP("debug", "d", false, "Enable debug output")
 )
 
 func GetLog(module string) logrus.FieldLogger {
- if debug != nil && *debug {
+ if debug == nil {
+ pflag.Parse()
+ }
+
+ if *debug {
  logrus.SetLevel(logrus.DebugLevel)
  }
+
  return logrus.StandardLogger().WithField("module", module)
 }