Merge pull request #400 from secrethub/fix/migrate-item-creation-cli-2

Fix item creation with 1Password CLI 2 when migrating secrets from SecretHub

Author: edif2008

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 jobs:
   lint:
     docker:
-      - image: golangci/golangci-lint:v1.41.1-alpine
+      - image: golangci/golangci-lint:v1.50.1-alpine
     steps:
       - checkout
       - restore_cache:
@@ -30,13 +30,13 @@ jobs:
       arch:
         type: string
     docker:
-      - image: circleci/golang:1.14
+      - image: cimg/go:1.18
     steps:
       - checkout
       - run: GOOS=<< parameters.os >> GOARCH=<< parameters.arch >> go build ./cmd/secrethub
   test:
     docker:
-      - image: circleci/golang:1.14
+      - image: cimg/go:1.18
     steps:
       - checkout
       - restore_cache:
@@ -50,7 +50,7 @@ jobs:
       - run: make test
   verify-goreleaser:
     docker:
-      - image: goreleaser/goreleaser:v0.133
+      - image: goreleaser/goreleaser:v1.12.3
     steps:
       - checkout
       - run: goreleaser check

.goreleaser.yml

@@ -60,7 +60,7 @@ brews:
   - name: secrethub-cli
     ids:
       - default
-    github:
+    tap:
       owner: secrethub
       name: homebrew-tools
     folder: Formula

go.mod

@@ -1,6 +1,6 @@
 module github.com/secrethub/secrethub-cli
 
-go 1.14
+go 1.18
 
 require (
 	bitbucket.org/zombiezen/cardcpx v0.0.0-20150417151802-902f68ff43ef
@@ -19,10 +19,39 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/zalando/go-keyring v0.0.0-20190208082241-fbe81aec3a07
 	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
-	golang.org/x/sys v0.0.0-20201119102817-f84b799fce68
+	golang.org/x/sys v0.2.0
 	golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf
 	golang.org/x/text v0.3.2
 	google.golang.org/api v0.26.0
 	gopkg.in/yaml.v2 v2.4.0
 	gotest.tools v2.2.0+incompatible
 )
+
+require (
+	cloud.google.com/go v0.57.0 // indirect
+	github.com/Azure/go-ntlmssp v0.0.0-20180810175552-4a21cbd618b4 // indirect
+	github.com/ChrisTrenkamp/goxpath v0.0.0-20170922090931-c385f95c6022 // indirect
+	github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf // indirect
+	github.com/danieljoos/wincred v1.0.2 // indirect
+	github.com/docker/docker v1.13.1 // indirect
+	github.com/godbus/dbus v4.1.0+incompatible // indirect
+	github.com/gofrs/uuid v3.2.0+incompatible // indirect
+	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
+	github.com/golang/protobuf v1.4.0 // indirect
+	github.com/google/go-cmp v0.4.0 // indirect
+	github.com/google/go-querystring v1.0.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
+	github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 // indirect
+	github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9 // indirect
+	github.com/mattn/go-shellwords v1.0.6 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	go.opencensus.io v0.22.3 // indirect
+	golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5 // indirect
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
+	google.golang.org/appengine v1.6.6 // indirect
+	google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84 // indirect
+	google.golang.org/grpc v1.29.1 // indirect
+	google.golang.org/protobuf v1.21.0 // indirect
+)

go.sum

@@ -343,8 +343,9 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M=
 golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

internals/cli/clip/fakeclip/clip.go

@@ -1,4 +1,4 @@
-// +build !production
+//go:build !production
 
 // Package fakeclip provides fake implementations of the clip.Clipper interface
 // to be used for testing.

internals/cli/cloneproc/spawn_unix.go

@@ -1,4 +1,4 @@
-// +build linux darwin
+//go:build linux || darwin
 
 package cloneproc
 

internals/cli/cobra_template.go

@@ -378,21 +378,21 @@ func numFlags(flagSet pflag.FlagSet) int {
 
 // UsageTemplate is the custom usage template of the command.
 // Changes in comparison to cobra's default template:
-// 1. Usage section
-//	  a. `[flags]` is placed before the arguments.
-//	  b. All arguments are put in the usage in their proper order.
-//    c. Where applicable, the argument name is replaced with its placeholder.
-// 2. Commands section
-// 	  a. For the root command (`secrethub`) the commands are grouped into
-//		 `Management commands` and `Commands`
-// 2. Flags section
-// 	  a. Flag's type was removed.
-// 	  b. The help text for flags is well divided into its own column, thus
-//		 making the visibility of the flags better.
-// 	  c. At the end of a flag's help text, the name of its environment variable is
-//       displayed between brackets.
-//    d. The section is hidden if the only flag is `--help`.
-// 4. Arguments section (created by us)
+//  1. Usage section
+//     a. `[flags]` is placed before the arguments.
+//     b. All arguments are put in the usage in their proper order.
+//     c. Where applicable, the argument name is replaced with its placeholder.
+//  2. Commands section
+//     a. For the root command (`secrethub`) the commands are grouped into
+//     `Management commands` and `Commands`
+//  2. Flags section
+//     a. Flag's type was removed.
+//     b. The help text for flags is well divided into its own column, thus
+//     making the visibility of the flags better.
+//     c. At the end of a flag's help text, the name of its environment variable is
+//     displayed between brackets.
+//     d. The section is hidden if the only flag is `--help`.
+//  4. Arguments section (created by us)
 var UsageTemplate = `Usage:
 {{if .Cmd.Runnable}} {{(useLine .Cmd .Args)}}{{end}}
 {{- if .Cmd.HasAvailableSubCommands}}  {{ .Cmd.CommandPath}} [command]{{end}}

internals/cli/masker/stream.go

@@ -3,7 +3,6 @@ package masker
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"sync"
 	"time"
 )
@@ -80,7 +79,7 @@ func (s *stream) flush(n int) error {
 			}
 
 			// Drop all bytes until the end of the mask.
-			_, err = s.buf.writeUpToIndex(ioutil.Discard, i+int64(length))
+			_, err = s.buf.writeUpToIndex(io.Discard, i+int64(length))
 			if err != nil {
 				return err
 			}

internals/cli/mlock/mlock_unavailable.go

@@ -1,4 +1,4 @@
-// +build android darwin nacl netbsd plan9 windows
+//go:build android || darwin || nacl || netbsd || plan9 || windows
 
 package mlock
 

internals/cli/mlock/mlock_unix.go

@@ -1,4 +1,4 @@
-// +build dragonfly freebsd linux openbsd solaris
+//go:build dragonfly || freebsd || linux || openbsd || solaris
 
 package mlock