restructure sub-packages

Makefile

@@ -1,7 +1,7 @@
 MULTI=$(shell ls cmd/multi)
-SOURCES=$(shell find pkg internal -name \*.go)
+SOURCES=$(shell find auth actions internal -name \*.go)
 
-all: ${MULTI}
+all: ${MULTI} azblob
 
 ${MULTI}: cmd/multi/$@ $(shell find cmd/multi -name \*.go) ${SOURCES}
  go build ./cmd/multi/$@

pkg/azcat/list.go → actions/list.go

@@ -1,4 +1,4 @@
-package azcat
+package actions
 
 import (
  "context"

pkg/azcat/log.go → actions/log.go

@@ -1,4 +1,4 @@
-package azcat
+package actions
 
 import "github.com/sirupsen/logrus"
 

pkg/azcat/mode.go → actions/mode.go

@@ -1,4 +1,4 @@
-package azcat
+package actions
 
 import (
  "reflect"

pkg/azcat/read.go → actions/read.go

@@ -1,4 +1,4 @@
-package azcat
+package actions
 
 import (
  "context"

pkg/azcat/remove.go → actions/remove.go

@@ -1,4 +1,4 @@
-package azcat
+package actions
 
 import (
  "context"

pkg/azcat/run.go → actions/run.go

@@ -1,4 +1,4 @@
-package azcat
+package actions
 
 import "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
 

pkg/azcat/write.go → actions/write.go

@@ -1,4 +1,4 @@
-package azcat
+package actions
 
 import (
  "context"

cmd/azblob/guess.go

@@ -6,30 +6,30 @@ import (
  "strings"
 
  "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
- "github.com/jpicht/azcat/pkg/azcat"
+ "github.com/jpicht/azcat/actions"
 )
 
-func getExplicitMode() azcat.Mode {
- modes := []azcat.Mode{}
+func getExplicitMode() actions.Mode {
+ modes := []actions.Mode{}
 
  if *read {
- modes = append(modes, azcat.EMode.List())
+ modes = append(modes, actions.EMode.List())
  }
 
  if *list {
- modes = append(modes, azcat.EMode.List())
+ modes = append(modes, actions.EMode.List())
  }
 
  if *remove {
- modes = append(modes, azcat.EMode.Remove())
+ modes = append(modes, actions.EMode.Remove())
  }
 
  if *write {
- modes = append(modes, azcat.EMode.Write())
+ modes = append(modes, actions.EMode.Write())
  }
 
  if len(modes) == 0 {
- return azcat.EMode.None()
+ return actions.EMode.None()
  }
 
  if len(modes) == 1 {
@@ -41,20 +41,20 @@ func getExplicitMode() azcat.Mode {
  panic("unreachable")
 }
 
-func guessMode(blobUrl azblob.BlobURLParts, serviceClient *azblob.ServiceClient) azcat.Mode {
+func guessMode(blobUrl azblob.BlobURLParts, serviceClient *azblob.ServiceClient) actions.Mode {
  switch os.Args[0] {
  case "azls":
- return azcat.EMode.List()
+ return actions.EMode.List()
  case "azcat":
- return azcat.EMode.Read()
+ return actions.EMode.Read()
  case "azput":
- return azcat.EMode.Write()
+ return actions.EMode.Write()
  case "azrm":
- return azcat.EMode.Remove()
+ return actions.EMode.Remove()
  }
 
  if blobUrl.BlobName == "/" || blobUrl.BlobName == "" {
- return azcat.EMode.List()
+ return actions.EMode.List()
  }
 
  blobClient := serviceClient.NewContainerClient(blobUrl.ContainerName).NewBlobClient(blobUrl.BlobName)
@@ -74,14 +74,14 @@ func guessMode(blobUrl azblob.BlobURLParts, serviceClient *azblob.ServiceClient)
  }
 
  if !exists {
- return azcat.EMode.Write()
+ return actions.EMode.Write()
  }
 
  if !stdInIsPipe {
- return azcat.EMode.Read()
+ return actions.EMode.Read()
  }
 
- return azcat.EMode.None()
+ return actions.EMode.None()
 }
 
 func isPipe(f *os.File) bool {

cmd/azblob/main.go

@@ -2,8 +2,8 @@ package main
 
 import (
  "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
+ "github.com/jpicht/azcat/actions"
  "github.com/jpicht/azcat/internal"
- "github.com/jpicht/azcat/pkg/azcat"
  "github.com/sirupsen/logrus"
  "github.com/spf13/pflag"
 )
@@ -36,9 +36,9 @@ func main() {
 
  serviceClient := internal.GetClient(parsed)
 
- if mode == azcat.EMode.None() {
+ if mode == actions.EMode.None() {
  mode = guessMode(parsed, serviceClient)
  }
 
- azcat.Run(mode, parsed, serviceClient)
+ actions.Run(mode, parsed, serviceClient)
 }

cmd/multi/azcat/main.go

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

cmd/multi/azls/main.go

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

cmd/multi/azput/main.go

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

cmd/multi/azrm/main.go

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

internal/client.go

@@ -4,7 +4,7 @@ import (
  "net/url"
 
  "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
- "github.com/jpicht/azcat/pkg/auth"
+ "github.com/jpicht/azcat/auth"
  "github.com/sirupsen/logrus"
 )
 

internal/main.go

@@ -2,12 +2,12 @@ package internal
 
 import (
  "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob"
- "github.com/jpicht/azcat/pkg/azcat"
+ "github.com/jpicht/azcat/actions"
  "github.com/sirupsen/logrus"
  "github.com/spf13/pflag"
 )
 
-func Main(mode azcat.Mode) {
+func Main(mode actions.Mode) {
  pflag.Parse()
 
  if *debug {
@@ -26,5 +26,5 @@ func Main(mode azcat.Mode) {
 
  serviceClient := GetClient(parsed)
 
- azcat.Run(mode, parsed, serviceClient)
+ actions.Run(mode, parsed, serviceClient)
 }