vault-token

cmd/folder.go

@@ -10,5 +10,5 @@ var folderCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(folderCmd)
+	vakuCmd.AddCommand(folderCmd)
 }

cmd/helpers.go

@@ -3,29 +3,46 @@ package cmd
 import (
 	"encoding/json"
 	"fmt"
+	"io/ioutil"
 	"log"
 	"os"
+	"strings"
 
 	"github.com/Lingrino/vaku/vaku"
 	"github.com/pkg/errors"
 
 	vapi "github.com/hashicorp/vault/api"
+	homedir "github.com/mitchellh/go-homedir"
 )
 
 // vgc is the vaku client used by CLI commands
 var vgc *vaku.Client
 
-// authVGC initializes the vgc, vakuGlobalClient, to be used by all CLI commands
-// TODO - try read from ~/.vault-token
+// authVGC initializes the vgc (vaku global client) to be used by all CLI commands
 func authVGC() {
 	// Initialize a new vault client
 	vclient, err := vapi.NewClient(vapi.DefaultConfig())
 	if err != nil {
 		fmt.Println(errors.Wrap(err, "Failed to create vault client"))
 		os.Exit(1)
 	} else if vclient.Token() == "" {
-		fmt.Println(errors.New("VAULT_TOKEN not set"))
-		os.Exit(1)
+		home, err := homedir.Dir()
+		if err != nil {
+			fmt.Println(errors.Wrap(err, "Could not find home directory to check ~/.vault-token"))
+		} else {
+			token, err := ioutil.ReadFile(home + "/.vault-token")
+			if err != nil {
+				if strings.Contains(err.Error(), "no such file or directory") {
+					fmt.Println("INFO: Attempted to read token at ~/.vault-token, but the file does not exist")
+					fmt.Println("Could not find token at VAULT_TOKEN or ~/.vault-token, exiting")
+					os.Exit(1)
+				} else {
+					fmt.Println(errors.Wrap(err, "Failed to read ~/.vault-token file"))
+					os.Exit(1)
+				}
+			}
+			vclient.SetToken(string(token))
+		}
 	}
 
 	// Add the Vault client to the Vaku client

cmd/path.go

@@ -10,5 +10,5 @@ var pathCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(pathCmd)
+	vakuCmd.AddCommand(pathCmd)
 }

cmd/root.go → cmd/vaku.go

@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var rootCmd = &cobra.Command{
+var vakuCmd = &cobra.Command{
 	Use:   "vaku",
 	Short: "Vaku CLI extends the official Vault CLI with useful high-level functions",
 	Long: `Vaku CLI extends the official Vault CLI with useful high-level functions
@@ -31,9 +31,9 @@ API documentation is available at https://godoc.org/github.com/Lingrino/vaku/vak
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.
-// This is called by main.main(). It only needs to happen once to the rootCmd.
+// This is called by main.main(). It only needs to happen once to the vakuCmd.
 func Execute() {
-	if err := rootCmd.Execute(); err != nil {
+	if err := vakuCmd.Execute(); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	}

cmd/version.go

@@ -13,12 +13,12 @@ var versionCmd = &cobra.Command{
 
 	Run: func(cmd *cobra.Command, args []string) {
 		print(map[string]interface{}{
-			"CLI": "1.0",
+			"CLI": "1.0.0",
 			"API": vaku.Version(),
 		})
 	},
 }
 
 func init() {
-	rootCmd.AddCommand(versionCmd)
+	vakuCmd.AddCommand(versionCmd)
 }

vaku/version.go

@@ -2,5 +2,5 @@ package vaku
 
 // Version returns the current Vaku API version
 func Version() string {
-	return "1.0"
+	return "1.0.0"
 }

vaku/version_test.go

@@ -8,5 +8,6 @@ import (
 )
 
 func TestVersion(t *testing.T) {
-	assert.Equal(t, vaku.Version(), "1.0")
+	t.Parallel()
+	assert.Equal(t, vaku.Version(), "1.0.0")
 }