Merge pull request #213 from secrethub/release/v0.31.0

Release v0.31.0

Author: jpcoenen

.circleci/config.yml

@@ -5,6 +5,14 @@ jobs:
       - image: circleci/golang:1.12
     steps:
       - checkout
+      - restore_cache:
+          keys:
+            - go-modules-{{ checksum "go.mod" }}
+      - run: go mod download
+      - save_cache:
+          key: go-modules-{{ checksum "go.mod" }}
+          paths:
+            - /go/pkg/mod
       - run: make test
   verify-goreleaser:
     docker:

.goreleaser.yml

@@ -1,4 +1,4 @@
-project_name: secrethub
+project_name: secrethub-cli
 
 builds:
   - &default
@@ -40,7 +40,7 @@ builds:
     binary: "secrethub"
 
 archives:
-  - name_template: "{{ .ProjectName }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
+  - name_template: "secrethub-{{ .Tag }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
     builds:
       - default
     format_overrides:
@@ -50,7 +50,7 @@ archives:
     - LICENSE
 
 checksum:
-  name_template: "{{ .ProjectName }}-{{ .Tag }}-checksums.txt"
+  name_template: "secrethub-{{ .Tag }}-checksums.txt"
 
 brews:
   - name: secrethub-cli
@@ -90,7 +90,7 @@ scoop:
   license: Apache-2.0
 
 nfpms:
-  -
+  - name_template: "secrethub-{{ .Tag }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
     builds:
       - without-bin-dir
     vendor: SecretHub
@@ -102,6 +102,8 @@ nfpms:
     formats:
       - rpm
       - deb
+    dependencies:
+      - ca-certificates
     recommends:
       - xclip
     scripts:

go.mod

@@ -4,21 +4,19 @@ go 1.12
 
 require (
 	bitbucket.org/zombiezen/cardcpx v0.0.0-20150417151802-902f68ff43ef
-	github.com/alecthomas/kingpin v0.0.0-20190930021037-0a108b7f5563
+	github.com/alecthomas/kingpin v0.0.0-20191009151950-9e366cbf24ad
 	github.com/atotto/clipboard v0.1.2
 	github.com/aws/aws-sdk-go v1.19.38
-	github.com/danieljoos/wincred v1.0.2 // indirect
 	github.com/docker/go-units v0.3.3
 	github.com/fatih/color v1.7.0
-	github.com/godbus/dbus v4.1.0+incompatible // indirect
 	github.com/masterzen/winrm v0.0.0-20190308153735-1d17eaf15943
 	github.com/mattn/go-colorable v0.1.1
 	github.com/mattn/go-isatty v0.0.7
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/mapstructure v1.1.2
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
-	github.com/secrethub/secrethub-go v0.21.0
-	github.com/stretchr/objx v0.2.0 // indirect
+	github.com/secrethub/demo-app v0.1.0
+	github.com/secrethub/secrethub-go v0.23.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

@@ -8,6 +8,8 @@ github.com/alecthomas/kingpin v0.0.0-20190705085659-95eb9edaa399 h1:NoJOfPUP5uDd
 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=
+github.com/alecthomas/kingpin v0.0.0-20191009151950-9e366cbf24ad/go.mod h1:idxgS9pV6OOpAhZvx+gcoGRMX9/tt0iqkw/pNxI0C14=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY=
@@ -68,10 +70,21 @@ 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/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

@@ -3,6 +3,7 @@ package ui
 import (
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
 	"strconv"
 	"strings"
@@ -57,6 +58,27 @@ func AskSecret(io IO, question string) (string, error) {
 	return string(raw), nil
 }
 
+// AskMultiline prints out the question and reads back the input until an EOF is reached.
+// The input is displayed to the user.
+func AskMultiline(io IO, question string) ([]byte, error) {
+	promptIn, promptOut, err := io.Prompts()
+	if err != nil {
+		return nil, err
+	}
+
+	_, err = fmt.Fprintf(promptOut, "%s\n", question)
+	if err != nil {
+		return nil, err
+	}
+
+	raw, err := ioutil.ReadAll(promptIn)
+	if err != nil {
+		return nil, err
+	}
+	fmt.Fprintln(promptOut)
+	return raw, nil
+}
+
 // AskAndValidate asks the user a question and re-prompts the configured amount of times
 // when the users answer does not validate.
 func AskAndValidate(io IO, question string, n int, validationFunc func(string) error) (string, error) {

internals/cli/ui/io.go

@@ -115,3 +115,9 @@ func (f file) IsPiped() bool {
 
 	return (stat.Mode() & os.ModeCharDevice) == 0
 }
+
+// EOFKey returns the key that should be pressed to enter an EOF.
+// This can be used to end multiline input.
+func EOFKey() string {
+	return eofKey()
+}

internals/cli/ui/io_unix.go

@@ -18,3 +18,7 @@ func NewUserIO() UserIO {
 
 	return NewStdUserIO()
 }
+
+func eofKey() string {
+	return "CTRL-D"
+}

internals/cli/ui/io_windows.go

@@ -30,3 +30,7 @@ func (c colorStdout) IsPiped() bool {
 	return os.Getenv("TERM") == "dumb" ||
 		(!isatty.IsTerminal(os.Stdout.Fd()) && !isatty.IsCygwinTerminal(os.Stdout.Fd()))
 }
+
+func eofKey() string {
+	return "CTRL-Z + ENTER"
+}