Impl header command (#23)

Author: ktr

adapter/controller/cli.go

@@ -203,15 +203,14 @@ func isCommandLineMode(opt *Options) bool {
 }
 
 func setupEnv(conf *config.Config, opt *Options) (*entity.Env, error) {
-
 	if len(opt.Header) > 0 {
 		for _, h := range opt.Header {
 			s := strings.SplitN(h, "=", 2)
 			if len(s) != 2 {
 				return nil, errors.New(`header must be specified "key=val" format`)
 			}
 			key, val := s[0], s[1]
-			conf.Env.Request.Header = append(conf.Env.Request.Header, config.Header{Key: key, Value: val})
+			conf.Env.Request.Header = append(conf.Env.Request.Header, config.Header{Key: key, Val: val})
 		}
 	}
 	if opt.Host != "" {

adapter/controller/repl.go

@@ -12,6 +12,7 @@ import (
 	"github.com/ktr0731/evans/config"
 	"github.com/ktr0731/evans/entity"
 	"github.com/ktr0731/evans/usecase/port"
+	shellstring "github.com/ktr0731/go-shellstring"
 	homedir "github.com/mitchellh/go-homedir"
 	"github.com/pkg/errors"
 )
@@ -37,6 +38,7 @@ func NewREPL(config *config.REPL, env *entity.Env, ui ui, inputPort port.InputPo
 		"package": &packageCommand{inputPort},
 		"service": &serviceCommand{inputPort},
 		"show":    &showCommand{inputPort},
+		"header":  &headerCommand{inputPort},
 	}
 	repl := &REPL{
 		ui:     ui,
@@ -68,7 +70,15 @@ func NewREPL(config *config.REPL, env *entity.Env, ui ui, inputPort port.InputPo
 }
 
 func (r *REPL) eval(l string) (string, error) {
-	part := strings.Split(l, " ")
+	// trim quote
+	// e.g. key='foo' is interpreted to `foo`
+	//      key='foo bar' is `foo bar`
+	//      key='"foo bar"' is `"foo bar"`
+	//      key=foo bar is also `foo bar`
+	part, err := shellstring.Parse(l)
+	if err != nil {
+		return "", err
+	}
 
 	if part[0] == "help" {
 		r.showHelp(r.cmds)

adapter/controller/repl_commands.go

@@ -2,9 +2,12 @@ package controller
 
 import (
 	"bytes"
+	"fmt"
 	"io"
 	"strings"
+	"unicode"
 
+	"github.com/ktr0731/evans/entity"
 	"github.com/ktr0731/evans/usecase/port"
 	"github.com/pkg/errors"
 )
@@ -109,7 +112,7 @@ func (c *showCommand) Synopsis() string {
 }
 
 func (c *showCommand) Help() string {
-	return "usage: show <package | service | message | rpc>"
+	return "usage: show <package | service | message | rpc | header>"
 }
 
 func (c *showCommand) Validate(args []string) error {
@@ -132,6 +135,8 @@ func (c *showCommand) Run(args []string) (string, error) {
 		params.Type = port.ShowTypeMessage
 	case "a", "r", "rpc", "api":
 		params.Type = port.ShowTypeRPC
+	case "h", "header", "headers":
+		params.Type = port.ShowTypeHeader
 	default:
 		return "", errors.Wrap(ErrUnknownTarget, target)
 	}
@@ -170,6 +175,53 @@ func (c *callCommand) Run(args []string) (string, error) {
 	return read(res)
 }
 
+type headerCommand struct {
+	inputPort port.InputPort
+}
+
+func (c *headerCommand) Synopsis() string {
+	return "set/unset headers to each request. if header value is empty, the header is removed."
+}
+
+func (c *headerCommand) Help() string {
+	return "usage: header <key>=<value>[, <key>=<value>...]"
+}
+
+func (c *headerCommand) Validate(args []string) error {
+	if len(args) < 1 {
+		return errors.Wrap(ErrArgumentRequired, "<key>=<value> or <key>")
+	}
+	return nil
+}
+
+func (c *headerCommand) Run(args []string) (string, error) {
+	headers := []*entity.Header{}
+	for _, h := range args {
+		sp := strings.SplitN(h, "=", 2)
+		header := &entity.Header{
+			Key: sp[0],
+		}
+		for _, r := range sp[0] {
+			if !unicode.IsLetter(r) && !unicode.IsDigit(r) && r != '-' && r != '_' && r != '.' {
+				return "", fmt.Errorf("invalid char in key: %c", r)
+			}
+		}
+		// remove the key
+		if len(sp) == 1 || sp[1] == "" {
+			header.NeedToRemove = true
+		} else {
+			header.Val = sp[1]
+		}
+		headers = append(headers, header)
+	}
+	params := &port.HeaderParams{headers}
+	res, err := c.inputPort.Header(params)
+	if err != nil {
+		return "", err
+	}
+	return read(res)
+}
+
 func read(r io.Reader) (string, error) {
 	if r == nil {
 		return "", nil

adapter/controller/repl_commands_test.go

@@ -0,0 +1,50 @@
+package controller
+
+import (
+	"io"
+	"testing"
+
+	"github.com/ktr0731/evans/entity"
+	"github.com/ktr0731/evans/usecase/port"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+type headInputPort struct {
+	port.InputPort
+	received *port.HeaderParams
+}
+
+func (i *headInputPort) Header(p *port.HeaderParams) (io.Reader, error) {
+	i.received = p
+	return nil, nil
+}
+
+func Test_headCommand(t *testing.T) {
+	cases := map[string]struct {
+		in       string
+		expected *entity.Header
+		hasError bool
+	}{
+		"normal":                      {in: "tanamachi=kaoru", expected: &entity.Header{Key: "tanamachi", Val: "kaoru"}},
+		"normal (has a double-quote)": {in: `nanasaki=ai"`, expected: &entity.Header{Key: "nanasaki", Val: `ai"`}},
+		"normal (has a = in value)":   {in: "morishima=lovely=haruka", expected: &entity.Header{Key: "morishima", Val: "lovely=haruka"}},
+		"remove key1":                 {in: "amagami-_.0", expected: &entity.Header{Key: "amagami-_.0", NeedToRemove: true}},
+		"remove key2":                 {in: "rihoko=", expected: &entity.Header{Key: "rihoko", Val: "", NeedToRemove: true}},
+	}
+
+	for name, c := range cases {
+		t.Run(name, func(t *testing.T) {
+			inputPort := &headInputPort{}
+			cmd := &headerCommand{inputPort}
+
+			_, err := cmd.Run([]string{c.in})
+			if c.hasError {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+			assert.Exactly(t, c.expected, inputPort.received.Headers[0])
+		})
+	}
+}

adapter/controller/repl_completer.go

@@ -29,6 +29,7 @@ func (c *completer) complete(d prompt.Document) []prompt.Suggest {
 				{Text: "service"},
 				{Text: "message"},
 				{Text: "rpc"},
+				{Text: "header"},
 			}
 		}
 

adapter/presenter/stub.go

@@ -32,7 +32,6 @@ func (p *StubPresenter) Show(showable port.Showable) (io.Reader, error) {
 }
 
 func (p *StubPresenter) Header() (io.Reader, error) {
-	panic("not supported yet")
 	return nil, nil
 }
 

config/config.go

@@ -26,8 +26,8 @@ type Server struct {
 }
 
 type Header struct {
-	Key   string `toml:"key"`
-	Value string `toml:"value"`
+	Key string `toml:"key"`
+	Val string `toml:"value"`
 }
 
 type Request struct {
@@ -49,7 +49,6 @@ type REPL struct {
 
 type Env struct {
 	Server            *Server  `toml:"-"`
-	AncestorDelimiter string   `default:":"`
 	InputPromptFormat string   `default:"{ancestor}{name} ({type}) => " toml:"inputPromptFormat"`
 	Request           *Request `toml:"request"`
 }
@@ -68,8 +67,8 @@ type Config struct {
 }
 
 type Default struct {
-	Package string `toml:"package"`
-	Service string `toml:"service"`
+	Package string `toml:"package" default:""`
+	Service string `toml:"service" default:""`
 }
 
 type Log struct {
@@ -91,17 +90,17 @@ func init() {
 	conf.REPL.Server = conf.Server
 	conf.Env.Server = conf.Server
 
-	local, err := getLocalConfig()
+	mConfig, err = configure.NewConfigure(conf.Meta.Path, conf, nil)
 	if err != nil {
 		panic(err)
 	}
 
-	applyLocalConfig(&conf, local)
-
-	mConfig, err = configure.NewConfigure(conf.Meta.Path, conf, nil)
+	local, err := getLocalConfig()
 	if err != nil {
 		panic(err)
 	}
+
+	applyLocalConfig(&conf, local)
 }
 
 func Get() *Config {

entity/env.go

@@ -1,6 +1,7 @@
 package entity
 
 import (
+	"fmt"
 	"strings"
 
 	"github.com/golang/protobuf/protoc-gen-go/descriptor"
@@ -29,17 +30,15 @@ type Environment interface {
 	RPC(name string) (*RPC, error)
 
 	Headers() []*Header
+	AddHeader(header *Header) error
+	RemoveHeader(key string)
 
 	UsePackage(name string) error
 	UseService(name string) error
 
 	DSN() string
 }
 
-type Header struct {
-	Key, Val string
-}
-
 // pkgList is used by showing all packages
 // pkg is used by extract a package by package name
 type cache struct {
@@ -52,20 +51,25 @@ type state struct {
 	currentService string
 }
 
-type Env struct {
-	pkgs Packages
-
-	state state
+type option struct {
+	headers []*Header
+}
 
+type Env struct {
+	pkgs   Packages
+	state  state
+	option option
 	config *config.Env
-
-	cache cache
+	cache  cache
 }
 
 func New(pkgs Packages, config *config.Env) (*Env, error) {
 	return &Env{
 		pkgs:   pkgs,
 		config: config,
+		option: option{
+		// headers: config.Request.Header,
+		},
 		cache: cache{
 			pkg: map[string]*Package{},
 		},
@@ -142,13 +146,45 @@ func (e *Env) Message(name string) (*Message, error) {
 
 func (e *Env) Headers() (headers []*Header) {
 	headers = make([]*Header, 0, len(e.config.Request.Header))
-	for _, header := range e.config.Request.Header {
-		headers = append(headers, &Header{Key: header.Key, Val: header.Value})
+	for _, header := range e.option.headers {
+		headers = append(headers, &Header{Key: header.Key, Val: header.Val})
 	}
 
 	return headers
 }
 
+func (e *Env) AddHeader(h *Header) error {
+	_, header := e.findHeader(h.Key)
+	if header != nil {
+		return fmt.Errorf("already registered key: %s", h.Key)
+	}
+	e.option.headers = append(e.option.headers, h)
+	return nil
+}
+
+func (e *Env) RemoveHeader(key string) {
+	i, h := e.findHeader(key)
+	// not found
+	if h == nil {
+		return
+	}
+	if len(e.option.headers) == i+1 {
+		e.option.headers = e.option.headers[:i]
+	} else {
+		e.option.headers = append(e.option.headers[:i], e.option.headers[i+1:]...)
+	}
+	return
+}
+
+func (e *Env) findHeader(key string) (int, *Header) {
+	for i, pair := range e.option.headers {
+		if pair.Key == key {
+			return i, pair
+		}
+	}
+	return 0, nil
+}
+
 func (e *Env) RPC(name string) (*RPC, error) {
 	rpcs, err := e.RPCs()
 	if err != nil {