Merge pull request #112 from redbubble/lw-go-1.18

Bump to go 1.18 and update deps

Author: lokulin

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v2
         with:
-          go-version: '^1.16.1'
+          go-version: '^1.18.5'
       - run: make fmt && git diff --exit-code
       - run: GO111MODULE=off go get gotest.tools/gotestsum
       - run: make test

Makefile

@@ -1,10 +1,11 @@
-VERSION ?= 1.5.11
+VERSION ?= 1.6.0
 GIT_HASH = $(shell git rev-parse --short HEAD)
 DELIVERY_ENGINEERING_GPG_KEY = 0x877817E441F4F9B0
 
 .PHONY: test install
 
 test:
+	command -v gotestsum || go install gotest.tools/gotestsum@latest
 	gotestsum
 
 fmt:

README.md

@@ -8,7 +8,7 @@ A tool to generate access keys for AWS using Okta. If you want a backronym, try
 
 ### Installation
 
-We produce builds of `yak` for OSX and Linux. Windows is not currently supported.
+We produce builds of `yak` for macOS and Linux.
 
 #### macOS with Homebrew
 
@@ -220,27 +220,13 @@ yak prod [<command>]
 
 ## Development
 
-### Go Get
-
-To hack on `yak`, you'll want to get a copy of the source.  To do
-that:
+To hack on `yak`, you'll want to get a copy of the source.  Then:
 
 ```
-go get -u github.com/redbubble/yak
- ```
-
-### Installing dependencies
-
-You'll need the [dep](https://github.com/golang/dep) tool (if you're
-on macOS, `brew install dep`. Linux is a bit tricker; see the [dep
-README](https://github.com/golang/dep#installation) for details).
-
-Then run (inside your `$GOPATH/src/github.com/redbubble/yak` directory):
-```
-make vendor
+go build
 ```
 
-This will install all your dependencies into the `vendor` directory.
+### Releasing changes
 
 If you want to do releases, you'll also want the `deb-s3` package.
 You'll also want `gnupg2` to be able to sign releases, but i'll leave
@@ -258,12 +244,15 @@ You can then run `$GOPATH/bin/yak`.
 
 ### Running tests
 
-To run all the tests in the project through [go-passe](https://github.com/redbubble/go-passe), run:
+Just run:
+
 ```
 make test
 ```
 
-To run them without go-passe, or to run the tests for any individual package, you can run:
+If `gotestsum` isn't available we'll try and install it.
+To run tests without gotestsum, or to run the tests for any individual package, you can run:
+
 ```
 go test <package-directory>
 ```

go.mod

@@ -1,29 +1,40 @@
 module github.com/redbubble/yak
 
-go 1.14
+go 1.18
 
 require (
-	github.com/BurntSushi/toml v0.3.1 // indirect
-	github.com/aws/aws-sdk-go v1.35.5
-	github.com/fsnotify/fsnotify v1.4.7 // indirect
-	github.com/gopasspw/pinentry v0.0.0-00010101000000-000000000000
-	github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/magiconair/properties v1.7.6 // indirect
-	github.com/mitchellh/go-homedir v0.0.0-20161203194507-b8bc1bf76747
-	github.com/mitchellh/mapstructure v0.0.0-20180220230111-00c29f56e238 // indirect
+	github.com/aws/aws-sdk-go v1.44.78
+	github.com/gopasspw/pinentry v0.0.2
+	github.com/mitchellh/go-homedir v1.1.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/pelletier/go-toml v1.1.0 // indirect
-	github.com/sirupsen/logrus v1.8.1
-	github.com/spf13/afero v1.1.0 // indirect
-	github.com/spf13/cast v1.2.0 // indirect
-	github.com/spf13/cobra v0.0.2
-	github.com/spf13/jwalterweatherman v0.0.0-20180109140146-7c0cea34c8ec // indirect
-	github.com/spf13/pflag v1.0.1 // indirect
-	github.com/spf13/viper v1.0.2
-	github.com/stretchr/testify v1.6.1 // indirect
-	golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
-	golang.org/x/net v0.0.0-20200202094626-16171245cfb2
+	github.com/sirupsen/logrus v1.9.0
+	github.com/spf13/cobra v1.5.0
+	github.com/spf13/viper v1.12.0
+	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
+	golang.org/x/net v0.0.0-20220812174116-3211cb980234
+)
+
+require (
+	github.com/fsnotify/fsnotify v1.5.4 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.1 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.3 // indirect
+	github.com/spf13/afero v1.9.2 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/subosito/gotenv v1.4.0 // indirect
+	golang.org/x/sys v0.0.0-20220817070843-5a390386f1f2 // indirect
+	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 replace github.com/gopasspw/pinentry => github.com/redbubble/pinentry v0.0.3-0.20211015012734-36081cf01f93