Merge pull request #169 from secrethub/release/v0.26.0

Release v0.26.0

Author: SimonBarendse

.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2
 jobs:
-  build:
+  test:
     docker:
       - image: circleci/golang:1.12
     steps:
@@ -14,3 +14,27 @@ jobs:
           paths:
             - /go/pkg/mod
       - run: make test
+  verify-version:
+    docker:
+      - 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 check-version
+workflows:
+  version: 2
+  pipeline:
+    jobs:
+      - test
+      - verify-version:
+          filters:
+            branches:
+              only:
+                - /release/v[0-9]*\.[0-9]*\.[0-9]*/

Makefile

@@ -16,3 +16,6 @@ format-tools:
 
 lint-tools:
 	@curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.15.0
+
+check-version:
+	./scripts/check-version/check-version.sh

go.mod

@@ -3,19 +3,19 @@ module github.com/secrethub/secrethub-go
 require (
 	bitbucket.org/zombiezen/cardcpx v0.0.0-20150417151802-902f68ff43ef
 	github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf
-	github.com/aws/aws-sdk-go v1.19.38
+	github.com/aws/aws-sdk-go v1.25.49
 	github.com/docker/docker v1.13.1
 	github.com/docker/go-units v0.3.3
 	github.com/go-chi/chi v4.0.1+incompatible
+	github.com/gofrs/uuid v3.2.0+incompatible
 	github.com/google/go-querystring v1.0.0
-	github.com/kr/pretty v0.1.0 // indirect
 	github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348
 	github.com/mattn/go-shellwords v1.0.6 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
-	github.com/satori/go.uuid v1.2.0
 	github.com/stretchr/testify v1.3.0 // indirect
 	golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
 	golang.org/x/net v0.0.0-20190522155817-f3200d17e092 // indirect
-	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )
+
+go 1.13

go.sum

@@ -2,8 +2,8 @@ bitbucket.org/zombiezen/cardcpx v0.0.0-20150417151802-902f68ff43ef h1:Y5Zf3CYdrd
 bitbucket.org/zombiezen/cardcpx v0.0.0-20150417151802-902f68ff43ef/go.mod h1:ZJR5FpaQx7Bt2bzIV3gBaCInI1+kG949WhNYYlRr8eA=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf h1:eg0MeVzsP1G42dRafH3vf+al2vQIJU0YHX+1Tw87oco=
 github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/aws/aws-sdk-go v1.19.38 h1:WKjobgPO4Ua1ww2NJJl2/zQNreUZxvqmEzwMlRjjm9g=
-github.com/aws/aws-sdk-go v1.19.38/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
+github.com/aws/aws-sdk-go v1.25.49 h1:j5R2Ey+g8qaiy2NJ9iH+KWzDWS4SjXRCjhc22EeQVE4=
+github.com/aws/aws-sdk-go v1.25.49/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo=
@@ -12,15 +12,12 @@ github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/go-chi/chi v4.0.1+incompatible h1:RSRC5qmFPtO90t7pTL0DBMNpZFsb/sHF3RXVlDgFisA=
 github.com/go-chi/chi v4.0.1+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ=
+github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
+github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4=
 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 github.com/mattn/go-shellwords v1.0.6 h1:9Jok5pILi5S1MnDirGVTufYGtksUs/V2BWUP3ZkeUUI=
@@ -31,8 +28,6 @@ github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0C
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -43,5 +38,3 @@ golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

internals/api/uuid/uuid.go

@@ -2,7 +2,9 @@
 package uuid
 
 import (
-	gid "github.com/satori/go.uuid"
+	"bytes"
+
+	gid "github.com/gofrs/uuid"
 
 	"github.com/secrethub/secrethub-go/internals/errio"
 )
@@ -12,14 +14,17 @@ var (
 	ErrInvalidUUID = errio.Namespace("uuid").Code("invalid").ErrorPref("invalid uuid: %s")
 )
 
-// UUID is a wrapper around go.uuid.UUID
+// UUID is a wrapper around github.com/gofrs/uuid.UUID.
 type UUID struct {
 	gid.UUID
 }
 
 // New generates a new UUID.
 func New() UUID {
-	id := gid.NewV4()
+	id, err := gid.NewV4()
+	if err != nil {
+		panic(err)
+	}
 	return UUID{id}
 }
 
@@ -44,7 +49,7 @@ func (u *UUID) IsZero() bool {
 
 // Equal returns true if both argument UUIDs contain the same value.
 func Equal(a UUID, b UUID) bool {
-	return gid.Equal(a.UUID, b.UUID)
+	return bytes.Equal(a.UUID[:], b.UUID[:])
 }
 
 // Validate validates a uuid string is a valid UUID.

pkg/randchar/example_test.go

@@ -0,0 +1,65 @@
+package randchar_test
+
+import (
+	"github.com/secrethub/secrethub-go/pkg/randchar"
+	"log"
+)
+
+// Generate a random slice of 30 alphanumeric characters.
+func ExampleRand_Generate() {
+	val, err := randchar.Generate(30)
+	if err != nil {
+		log.Fatal(err)
+	}
+	print(string(val))
+}
+
+// Generate a 15 character alphanumeric string with at least 3 symbols, 1 uppercase letter,
+// 1 lowercase letter and 1 digit.
+func ExampleRand_Generate_withRules() {
+	symbolsRule := randchar.Min(3, randchar.Symbols)
+	uppercaseRule := randchar.Min(1, randchar.Uppercase)
+	lowercaseRule := randchar.Min(1, randchar.Lowercase)
+	numberRule := randchar.Min(1, randchar.Numeric)
+
+	rand, err := randchar.NewRand(randchar.All, symbolsRule, uppercaseRule, lowercaseRule, numberRule)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	val, err := rand.Generate(15)
+	if err != nil {
+		log.Fatal(err)
+	}
+	print(string(val))
+}
+
+// Generate a 10 character alphanumeric string containing lowercase letters and digits.
+func ExampleRand_Generate_combineCharsets() {
+	customCharset := randchar.Lowercase.Add(randchar.Numeric)
+	rand, err := randchar.NewRand(customCharset)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	val, err := rand.Generate(10)
+	if err != nil {
+		log.Fatal(err)
+	}
+	print(string(val))
+}
+
+// Generate an 8 character long hexadecimal string.
+func ExampleRand_Generate_customCharset() {
+	hexCharset := randchar.NewCharset("0123456789ABCDEF")
+	rand, err := randchar.NewRand(hexCharset)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	val, err := rand.Generate(8)
+	if err != nil {
+		log.Fatal(err)
+	}
+	print(string(val))
+}

pkg/randchar/generator.go

@@ -244,6 +244,30 @@ func NewCharset(characters string) Charset {
 	}
 }
 
+// CharsetByName returns the charset with the specified name.
+func CharsetByName(charsetName string) (Charset, bool) {
+	switch charsetName {
+	case "numeric", "numbers", "digits":
+		return Numeric, true
+	case "lowercase":
+		return Lowercase, true
+	case "uppercase":
+		return Uppercase, true
+	case "letters":
+		return Letters, true
+	case "symbols":
+		return Symbols, true
+	case "alphanumeric":
+		return Alphanumeric, true
+	case "all":
+		return All, true
+	case "similar":
+		return Similar, true
+	default:
+		return Charset{}, false
+	}
+}
+
 // Add merges two character sets into one, removing duplicates.
 func (c Charset) Add(set Charset) Charset {
 	uniques := make(map[byte]struct{})

pkg/secrethub/account_key.go

@@ -49,7 +49,7 @@ func (s accountKeyService) Create(verifier credentials.Verifier, encrypter crede
 // Exists returns whether an account key exists for the client's credential.
 func (s accountKeyService) Exists() (bool, error) {
 	_, err := s.client.getAccountKey()
-	if err == api.ErrAccountKeyNotFound || err == api.ErrCredentialNotKeyed {
+	if api.IsErrNotFound(err) {
 		return false, nil
 	}
 	if err != nil {

pkg/secrethub/acl.go

@@ -8,19 +8,19 @@ import (
 
 // AccessRuleService handles operations on access rules from SecretHub.
 type AccessRuleService interface {
-	// Delete removes the accessrule for the given directory and account.
-	Delete(path string, accountName string) error
 	// Get retrieves the access rule for the given account on the given directory.
 	Get(path string, accountName string) (*api.AccessRule, error)
+	// Set sets an access rule with a certain permission level for an account to a path.
+	Set(path string, permission string, accountName string) (*api.AccessRule, error)
+	// Delete removes the accessrule for the given directory and account.
+	Delete(path string, accountName string) error
 	// List etrieves all access rules that apply to a directory, including
 	// rules that apply to its children up to a specified depth. When ancestors is set
 	// to true, it also includes rules for any parent directories. When the depth is
 	// set to -1, all children are retrieved without limit.
 	List(path string, depth int, ancestors bool) ([]*api.AccessRule, error)
 	// ListLevels lists the access levels on the given directory.
 	ListLevels(path string) ([]*api.AccessLevel, error)
-	// Set sets an access rule with a certain permission level for an account to a path.
-	Set(path string, permission string, accountName string) (*api.AccessRule, error)
 }
 
 func newAccessRuleService(client *Client) AccessRuleService {
@@ -181,9 +181,9 @@ func (s accessRuleService) Set(path string, permission string, accountName strin
 	}
 
 	_, err = s.Get(path, accountName)
-	if err != nil && err != api.ErrAccessRuleNotFound {
+	if err != nil && !api.IsErrNotFound(err) {
 		return nil, errio.Error(err)
-	} else if err == api.ErrAccessRuleNotFound {
+	} else if api.IsErrNotFound(err) {
 		return s.create(p, perm, an)
 	}
 	return s.update(p, perm, an)

pkg/secrethub/client_version.go

@@ -2,4 +2,4 @@ package secrethub
 
 // ClientVersion is the current version of the client
 // Do not edit this unless you know what you're doing.
-const ClientVersion = "v0.23.0"
+const ClientVersion = "v0.26.0"