Merge pull request #224 from secrethub/release/v0.33.0

Release v0.33.0

Author: jpcoenen

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/mitchellh/mapstructure v1.1.2
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/secrethub/demo-app v0.1.0
-	github.com/secrethub/secrethub-go v0.24.0
+	github.com/secrethub/secrethub-go v0.25.0
 	github.com/zalando/go-keyring v0.0.0-20190208082241-fbe81aec3a07
 	golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a
 	golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223

go.sum

@@ -4,8 +4,6 @@ github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4 h1:pSm8mp0T2OH2CP
 github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
 github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022 h1:y8Gs8CzNfDF5AZvjr+5UyGQvQEBL7pwo+v+wX6q9JI8=
 github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022/go.mod h1:nuWgzSkT5PnyOd+272uUmV0dnAnAn42Mk7PiQC5VzN4=
-github.com/alecthomas/kingpin v0.0.0-20190705085659-95eb9edaa399 h1:NoJOfPUP5uDdYYuWS/+I6UQDH4+Fo1wDlaw4CUEeHmk=
-github.com/alecthomas/kingpin v0.0.0-20190705085659-95eb9edaa399/go.mod h1:idxgS9pV6OOpAhZvx+gcoGRMX9/tt0iqkw/pNxI0C14=
 github.com/alecthomas/kingpin v0.0.0-20190930021037-0a108b7f5563 h1:YT8l7Flq7VNXnjqwtjCF9bzffTPGgedBC+xyj88lVe4=
 github.com/alecthomas/kingpin v0.0.0-20190930021037-0a108b7f5563/go.mod h1:idxgS9pV6OOpAhZvx+gcoGRMX9/tt0iqkw/pNxI0C14=
 github.com/alecthomas/kingpin v0.0.0-20191009151950-9e366cbf24ad h1:tMnaQBlddYTQC6SHj8IrLTuOf006vB7yUmYn79/QXlM=
@@ -70,29 +68,12 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/secrethub/demo-app v0.0.0-20191015143627-8b86c8671e54 h1:u1tfHZH5FE6Lv8CcV9dnimz5uMZUFvHKTyOqbsqlGFo=
-github.com/secrethub/demo-app v0.0.0-20191015143627-8b86c8671e54/go.mod h1:ymjm8+WXTSDTFqsGVBNVmHSnwtZMYi7KptHvpo/fLH4=
-github.com/secrethub/demo-app v0.0.0-20191015144738-eed4af2178f4 h1:04IDTEVBJUVXqXAFwdoOvHeO87a8uTzMHb5nzqHtIVk=
-github.com/secrethub/demo-app v0.0.0-20191015144738-eed4af2178f4/go.mod h1:ymjm8+WXTSDTFqsGVBNVmHSnwtZMYi7KptHvpo/fLH4=
-github.com/secrethub/demo-app v0.0.0-20191015145040-d297a9c939a6 h1:BA2nciOEMOjuy0xMcMyEDcaKhvAyB7cVG8H6LW1/XUg=
-github.com/secrethub/demo-app v0.0.0-20191015145040-d297a9c939a6/go.mod h1:ymjm8+WXTSDTFqsGVBNVmHSnwtZMYi7KptHvpo/fLH4=
 github.com/secrethub/demo-app v0.1.0 h1:HwPPxuiSvx4TBE7Qppzu3A9eHqmsBrIz4Ko8u8pqMqw=
 github.com/secrethub/demo-app v0.1.0/go.mod h1:ymjm8+WXTSDTFqsGVBNVmHSnwtZMYi7KptHvpo/fLH4=
-github.com/secrethub/kingpin v0.0.0-20190920111600-67b1cb231087 h1:n4V94OQPe04crRRmcyAURLk3AImueFd44Ne99sN5TO8=
-github.com/secrethub/kingpin v0.0.0-20190920111600-67b1cb231087/go.mod h1:idxgS9pV6OOpAhZvx+gcoGRMX9/tt0iqkw/pNxI0C14=
 github.com/secrethub/secrethub-cli v0.30.0/go.mod h1:dC0wd40v+iQdV83/0rUrOa01LYq+8Yj2AtJB1vzh2ao=
-github.com/secrethub/secrethub-go v0.21.0 h1:5xbC+gdku7MXUQmlP5SPhAPLF+/U31soLKbyXwNyM+M=
 github.com/secrethub/secrethub-go v0.21.0/go.mod h1:rc2IfKKBJ4L0wGec0u4XnF5/pe0FFPE4Q1MWfrFso7s=
-github.com/secrethub/secrethub-go v0.23.0 h1:6NzVGcAJDXeORUc2uZyuaYRCXCawmOKYvhNPP3ASNSM=
-github.com/secrethub/secrethub-go v0.23.0/go.mod h1:rc2IfKKBJ4L0wGec0u4XnF5/pe0FFPE4Q1MWfrFso7s=
-github.com/secrethub/secrethub-go v0.23.1-0.20191120150410-759ed0ccde7e h1:9FjAfwJiwGWGo7I0LbQ7CTS2qvjpaI5DTeZVIWisGBQ=
-github.com/secrethub/secrethub-go v0.23.1-0.20191120150410-759ed0ccde7e/go.mod h1:rc2IfKKBJ4L0wGec0u4XnF5/pe0FFPE4Q1MWfrFso7s=
-github.com/secrethub/secrethub-go v0.23.1-0.20191126142216-0736401365d7 h1:GH23+Ig/6Gsqyat8FQ06bMUVJvy1tisKuWhj22oS344=
-github.com/secrethub/secrethub-go v0.23.1-0.20191126142216-0736401365d7/go.mod h1:rc2IfKKBJ4L0wGec0u4XnF5/pe0FFPE4Q1MWfrFso7s=
-github.com/secrethub/secrethub-go v0.23.1-0.20191126145052-23fd5b7a4363 h1:0lHIjcVCBFrlpKv6Ag2JhuI5FlvxiGXXRnJUqgrFiaE=
-github.com/secrethub/secrethub-go v0.23.1-0.20191126145052-23fd5b7a4363/go.mod h1:rc2IfKKBJ4L0wGec0u4XnF5/pe0FFPE4Q1MWfrFso7s=
-github.com/secrethub/secrethub-go v0.24.0 h1:psxPZzPk5DrZTTTvnIE9F1oj43QVwHjJ2ZnBvsXn0wc=
-github.com/secrethub/secrethub-go v0.24.0/go.mod h1:rc2IfKKBJ4L0wGec0u4XnF5/pe0FFPE4Q1MWfrFso7s=
+github.com/secrethub/secrethub-go v0.25.0 h1:cpYmkLRurrrw6NNE4PagPNDOn7kvY6UMrnnDxrvuI1M=
+github.com/secrethub/secrethub-go v0.25.0/go.mod h1:rc2IfKKBJ4L0wGec0u4XnF5/pe0FFPE4Q1MWfrFso7s=
 github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=

internals/cli/ui/ask.go

@@ -1,6 +1,7 @@
 package ui
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"io/ioutil"
@@ -35,6 +36,19 @@ func Ask(io IO, question string) (string, error) {
 	return Readln(r)
 }
 
+// AskWithDefault  prints out the question and reads the first line of input.
+// If no input is given, the default value is returned.
+func AskWithDefault(io IO, question, defaultValue string) (string, error) {
+	res, err := Ask(io, fmt.Sprintf("%s [%s] ", question, defaultValue))
+	if err != nil {
+		return "", err
+	}
+	if res == "" {
+		return defaultValue, nil
+	}
+	return res, nil
+}
+
 // AskSecret prints out the question and reads back the input,
 // without echoing it back. Useful for passwords and other sensitive inputs.
 func AskSecret(io IO, question string) (string, error) {
@@ -211,6 +225,44 @@ func AskYesNo(io IO, question string, t ConfirmationType) (bool, error) {
 	return false, nil
 }
 
+// Choose gives the user the provided options asks them to choose one.
+// It returns the index of the option chosen, starting with 0.
+func Choose(io IO, question string, options []string, n int) (int, error) {
+	_, w, err := io.Prompts()
+	if err != nil {
+		return 0, err
+	}
+
+	_, err = fmt.Fprintf(w, "%s\n", question)
+	if err != nil {
+		return 0, err
+	}
+
+	for i, option := range options {
+		fmt.Fprintf(w, "  %d) %s\n", i+1, option)
+	}
+
+	parseFunc := func(in string) (int, error) {
+		res, err := strconv.Atoi(strings.Trim(in, " )."))
+		if err != nil {
+			return 0, errors.New("not a valid number")
+		}
+		if res < 1 || res > len(options) {
+			return 0, errors.New("out of bounds")
+		}
+		return res - 1, nil
+	}
+
+	res, err := AskAndValidate(io, "Give the number of an option: ", n, func(option string) error {
+		_, err := parseFunc(option)
+		return err
+	})
+	if err != nil {
+		return 0, err
+	}
+	return parseFunc(res)
+}
+
 type Option struct {
 	Value   string
 	Display string
@@ -220,7 +272,7 @@ func (o Option) String() string {
 	return o.Display
 }
 
-func Choose(io IO, question string, getOptions func() ([]Option, bool, error), addOwn bool, optionName string) (string, error) {
+func ChooseDynamicOptions(io IO, question string, getOptions func() ([]Option, bool, error), addOwn bool, optionName string) (string, error) {
 	r, w, err := io.Prompts()
 	if err != nil {
 		return "", err

internals/cli/ui/ask_test.go

@@ -2,12 +2,52 @@ package ui
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"testing"
 
 	"github.com/secrethub/secrethub-go/internals/assert"
 )
 
+func TestAskWithDefault(t *testing.T) {
+	question := "foo?"
+	defaultValue := "bar"
+	defaultOutput := "foo? [" + defaultValue + "] "
+	cases := map[string]struct {
+		in          []string
+		expected    string
+		expectedOut string
+	}{
+		"value entered": {
+			in:          []string{"foobar\n"},
+			expected:    "foobar",
+			expectedOut: defaultOutput,
+		},
+		"no value entered": {
+			in:          []string{"\n"},
+			expected:    defaultValue,
+			expectedOut: defaultOutput,
+		},
+	}
+
+	for name, tc := range cases {
+		t.Run(name, func(t *testing.T) {
+			// Setup
+			io := NewFakeIO()
+			io.PromptIn.Reads = tc.in
+
+			// Run
+			actual, err := AskWithDefault(io, question, defaultValue)
+
+			// Assert
+			assert.OK(t, err)
+			assert.Equal(t, actual, tc.expected)
+
+			assert.Equal(t, io.PromptOut.String(), tc.expectedOut)
+		})
+	}
+}
+
 func TestConfirmCaseInsensitive(t *testing.T) {
 	cases := map[string]struct {
 		expectedConfirmation []string
@@ -214,6 +254,88 @@ func TestAskYesNo(t *testing.T) {
 }
 
 func TestChoose(t *testing.T) {
+	question := "foo?"
+	defaultOptions := []string{
+		"option 1",
+		"second option",
+	}
+	defaultOutput := "foo?\n" +
+		"  1) option 1\n" +
+		"  2) second option\n" +
+		"Give the number of an option: "
+
+	cases := map[string]struct {
+		in          []string
+		options     []string
+		n           int
+		expected    int
+		expectedErr error
+		expectedOut string
+	}{
+		"first option": {
+			in:          []string{"1\n"},
+			options:     defaultOptions,
+			n:           3,
+			expected:    0,
+			expectedOut: defaultOutput,
+		},
+		"retry": {
+			in:          []string{"a\n", "1\n"},
+			options:     defaultOptions,
+			n:           3,
+			expected:    0,
+			expectedOut: defaultOutput + "\nInvalid input: not a valid number\nPlease try again.\nGive the number of an option: ",
+		},
+		"filter out )": {
+			in:          []string{"1)\n"},
+			options:     defaultOptions,
+			n:           3,
+			expected:    0,
+			expectedOut: defaultOutput,
+		},
+		"out of bounds lower": {
+			in:          []string{"0\n"},
+			options:     defaultOptions,
+			n:           1,
+			expectedErr: errors.New("out of bounds"),
+			expectedOut: defaultOutput + "\nInvalid input: out of bounds\n",
+		},
+		"out of bounds upper": {
+			in:          []string{"3\n"},
+			options:     defaultOptions,
+			n:           1,
+			expectedErr: errors.New("out of bounds"),
+			expectedOut: defaultOutput + "\nInvalid input: out of bounds\n",
+		},
+		"not a number": {
+			in:          []string{"abc\n"},
+			options:     defaultOptions,
+			n:           1,
+			expectedErr: errors.New("not a valid number"),
+			expectedOut: defaultOutput + "\nInvalid input: not a valid number\n",
+		},
+	}
+
+	for name, tc := range cases {
+		t.Run(name, func(t *testing.T) {
+			// Setup
+			io := NewFakeIO()
+			io.PromptIn.Reads = tc.in
+
+			// Run
+			actual, err := Choose(io, question, tc.options, tc.n)
+
+			// Assert
+			assert.Equal(t, err, tc.expectedErr)
+			if tc.expectedErr == nil {
+				assert.Equal(t, actual, tc.expected)
+			}
+			assert.Equal(t, io.PromptOut.String(), tc.expectedOut)
+		})
+	}
+}
+
+func TestChooseDynamicOptions(t *testing.T) {
 	cases := map[string]struct {
 		question   string
 		getOptions func() ([]Option, bool, error)
@@ -302,7 +424,7 @@ func TestChoose(t *testing.T) {
 			}
 
 			// Run
-			actual, err := Choose(io, tc.question, tc.getOptions, tc.addOwn, "value")
+			actual, err := ChooseDynamicOptions(io, tc.question, tc.getOptions, tc.addOwn, "value")
 
 			// Assert
 			assert.Equal(t, err, nil)

internals/secrethub/app.go

@@ -161,9 +161,11 @@ func (app *App) registerCommands() {
 	NewACLCommand(app.io, app.clientFactory.NewClient).Register(app.cli)
 	NewServiceCommand(app.io, app.clientFactory.NewClient).Register(app.cli)
 	NewAccountCommand(app.io, app.clientFactory.NewClient, app.credentialStore).Register(app.cli)
+	NewCredentialCommand(app.io, app.clientFactory, app.credentialStore).Register(app.cli)
 	NewConfigCommand(app.io, app.credentialStore).Register(app.cli)
 
 	// Commands
+	NewInitCommand(app.io, app.clientFactory.NewUnauthenticatedClient, app.clientFactory.NewClientWithCredentials, app.credentialStore).Register(app.cli)
 	NewSignUpCommand(app.io, app.clientFactory.NewUnauthenticatedClient, app.credentialStore).Register(app.cli)
 	NewWriteCommand(app.io, app.clientFactory.NewClient).Register(app.cli)
 	NewReadCommand(app.io, app.clientFactory.NewClient).Register(app.cli)

internals/secrethub/client_factory.go

@@ -18,6 +18,7 @@ var (
 type ClientFactory interface {
 	// NewClient returns a new SecretHub client.
 	NewClient() (secrethub.ClientInterface, error)
+	NewClientWithCredentials(credentials.Provider) (secrethub.ClientInterface, error)
 	NewUnauthenticatedClient() (secrethub.ClientInterface, error)
 	Register(FlagRegisterer)
 }
@@ -70,6 +71,18 @@ func (f *clientFactory) NewClient() (secrethub.ClientInterface, error) {
 	return f.client, nil
 }
 
+func (f *clientFactory) NewClientWithCredentials(provider credentials.Provider) (secrethub.ClientInterface, error) {
+	options := f.baseClientOptions()
+	options = append(options, secrethub.WithCredentials(provider))
+
+	client, err := secrethub.NewClient(options...)
+	if err != nil {
+		return nil, err
+	}
+
+	return client, nil
+}
+
 func (f *clientFactory) NewUnauthenticatedClient() (secrethub.ClientInterface, error) {
 	options := f.baseClientOptions()
 

internals/secrethub/credential.go

@@ -0,0 +1,30 @@
+package secrethub
+
+import (
+	"github.com/secrethub/secrethub-cli/internals/cli/ui"
+	"github.com/secrethub/secrethub-cli/internals/secrethub/command"
+)
+
+// CredentialCommand handles operations on SecretHub credentials.
+type CredentialCommand struct {
+	io              ui.IO
+	clientFactory   ClientFactory
+	credentialStore CredentialConfig
+}
+
+// NewCredentialCommand creates a new CredentialCommand.
+func NewCredentialCommand(io ui.IO, clientFactory ClientFactory, credentialStore CredentialConfig) *CredentialCommand {
+	return &CredentialCommand{
+		io:              io,
+		clientFactory:   clientFactory,
+		credentialStore: credentialStore,
+	}
+}
+
+// Register registers the command and its sub-commands on the provided Registerer.
+func (cmd *CredentialCommand) Register(r command.Registerer) {
+	clause := r.Command("credential", "Manage your credentials.")
+	NewCredentialListCommand(cmd.io, cmd.clientFactory.NewClient).Register(clause)
+	NewCredentialBackupCommand(cmd.io, cmd.clientFactory.NewClient).Register(clause)
+	NewCredentialDisableCommand(cmd.io, cmd.clientFactory.NewClient).Register(clause)
+}