Merge pull request #9 from hooksie1/requests

add request type with client to make it easier to call service

Author: hooksie1

.gitignore

@@ -1,8 +1,8 @@
 *.db
 deployment/
-piggybank
-piggybank.exe
-piggybank-darwin
+piggybankctl
+piggybankctl.exe
+piggybankctl-darwin
 piggybank*.tar.gz
 piggybank*.zip
 

cmd/secrets.go

@@ -3,8 +3,8 @@ package cmd
 import (
 	"fmt"
 	"strings"
-	"time"
 
+	"github.com/hooksie1/piggybank/service"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -38,35 +38,34 @@ func secrets(cmd *cobra.Command, args []string) error {
 	}
 	id := viper.GetString("id")
 
+	client := service.Client{Conn: nc}
+
 	switch args[0] {
 	case "get":
-		subject := fmt.Sprintf("piggybank.secrets.GET.%s", id)
-		msg, err := nc.Request(subject, nil, 1*time.Second)
+		msg, err := client.Get(id)
 		if err != nil {
 			return err
 		}
 
-		fmt.Println(string(msg.Data))
+		fmt.Println(msg)
 	case "add":
 		val := viper.GetString("value")
 		if val == "" {
 			return fmt.Errorf("value flag is required to add a secret")
 		}
-		subject := fmt.Sprintf("piggybank.secrets.POST.%s", id)
-		msg, err := nc.Request(subject, []byte(val), 1*time.Second)
+		msg, err := client.Post(id, []byte(val))
 		if err != nil {
 			return err
 		}
 
-		fmt.Println(string(msg.Data))
+		fmt.Println(msg)
 	case "delete":
-		subject := fmt.Sprintf("piggybank.secrets.DELETE.%s", id)
-		msg, err := nc.Request(subject, nil, 1*time.Second)
+		msg, err := client.Delete(id)
 		if err != nil {
 			return err
 		}
 
-		fmt.Println(string(msg.Data))
+		fmt.Println(msg)
 	}
 
 	return nil

piggybankctl

@@ -8,22 +8,6 @@ import (
 	"github.com/nats-io/nats.go"
 )
 
-type DBVerb string
-
-const (
-	DBInit   DBVerb = "init"
-	DBLock   DBVerb = "lock"
-	DBUnlock DBVerb = "unlock"
-	DBStatus DBVerb = "status"
-)
-
-var subjectVerbs = map[DBVerb]string{
-	DBInit:   fmt.Sprintf("%s.%s", databaseSubject, databaseInitSubject),
-	DBLock:   fmt.Sprintf("%s.%s", databaseSubject, databaseLockSubject),
-	DBUnlock: fmt.Sprintf("%s.%s", databaseSubject, databaseUnlockSubject),
-	DBStatus: fmt.Sprintf("%s.%s", databaseSubject, databaseStatusSubject),
-}
-
 type Client struct {
 	Conn *nats.Conn
 }
@@ -38,16 +22,8 @@ type Request struct {
 	Data    []byte
 }
 
-func (d DBVerb) String() string {
-	return string(d)
-}
-
-func GetClientDBVerbs() []string {
-	return []string{DBInit.String(), DBLock.String(), DBUnlock.String(), DBStatus.String()}
-}
-
 func NewDBRequest(verb DBVerb, key string) (Request, error) {
-	subject, ok := subjectVerbs[verb]
+	subject, ok := SubjectVerbs[verb]
 	if !ok {
 		return Request{}, fmt.Errorf("invalid verb")
 	}
@@ -63,6 +39,29 @@ func NewDBRequest(verb DBVerb, key string) (Request, error) {
 	}, nil
 }
 
+func NewRequest(verb Verb, key string) (Request, error) {
+	subject := fmt.Sprintf("%s.%s", verb, key)
+	return Request{
+		Subject: subject,
+		Data:    nil,
+	}, nil
+}
+
+func (c *Client) Get(key string) (string, error) {
+	subject := fmt.Sprintf("%s.%s.%s", secretSubject, GET, key)
+	return c.Do(Request{Subject: subject, Data: nil})
+}
+
+func (c *Client) Post(key string, data []byte) (string, error) {
+	subject := fmt.Sprintf("%s.%s.%s", secretSubject, POST, key)
+	return c.Do(Request{Subject: subject, Data: data})
+}
+
+func (c *Client) Delete(key string) (string, error) {
+	subject := fmt.Sprintf("%s.%s.%s", secretSubject, DELETE, key)
+	return c.Do(Request{Subject: subject, Data: nil})
+}
+
 func (c *Client) Do(request Request) (string, error) {
 	msg, err := c.Conn.Request(request.Subject, request.Data, 1*time.Second)
 	if err != nil {

service/client.go

@@ -9,13 +9,36 @@ import (
 )
 
 const (
-	databaseSubject       = "piggybank.database"
-	databaseInitSubject   = "initialize"
-	databaseUnlockSubject = "unlock"
-	databaseLockSubject   = "lock"
-	databaseStatusSubject = "status"
+	databaseSubject              = "piggybank.database"
+	databaseInitSubject          = "initialize"
+	databaseUnlockSubject        = "unlock"
+	databaseLockSubject          = "lock"
+	databaseStatusSubject        = "status"
+	DBInit                DBVerb = "init"
+	DBLock                DBVerb = "lock"
+	DBUnlock              DBVerb = "unlock"
+	DBStatus              DBVerb = "status"
+	GET                   Verb   = "GET"
+	POST                  Verb   = "POST"
+	DELETE                Verb   = "DELETE"
+	secretSubject                = "piggybank.secrets"
 )
 
+var SubjectVerbs = map[DBVerb]string{
+	DBInit:   fmt.Sprintf("%s.%s", databaseSubject, databaseInitSubject),
+	DBLock:   fmt.Sprintf("%s.%s", databaseSubject, databaseLockSubject),
+	DBUnlock: fmt.Sprintf("%s.%s", databaseSubject, databaseUnlockSubject),
+	DBStatus: fmt.Sprintf("%s.%s", databaseSubject, databaseStatusSubject),
+}
+
+type DBVerb string
+
+type Verb string
+
+func (d DBVerb) String() string {
+	return string(d)
+}
+
 type KV interface {
 	Bucket() string
 	Key() string
@@ -31,6 +54,10 @@ type Backend interface {
 	Watcher
 }
 
+func GetClientDBVerbs() []string {
+	return []string{DBInit.String(), DBLock.String(), DBUnlock.String(), DBStatus.String()}
+}
+
 // initialize sets the initialization key. Once this is set it does not need to be run again, unless you lose the encryption key.
 // If you lose the encryption key, everything is lost.
 func (a *AppContext) initialize() ([]byte, error) {