chore: test with go 1.20 and cleanup tooling (#444)

* chore: test with go 1.20 and cleanup tooling

* chore: remove labeler

* Downgrade to swagger 0.24

* chore: remove go 1.16 and 1.17

* chore: install go-swagger

Author: danez

.github/workflows/labeler.yml

@@ -17,7 +17,7 @@ jobs:
         node_version: ['*']
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Install Node.js ${{ matrix.node }}
+      - name: Install Node.js ${{ matrix.node_version }}
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node_version }}
@@ -33,10 +33,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        go_version: [1.17.x, 1.18.x, 1.19.x]
+        go_version: [1.19.x, 1.20.x]
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Install Go ${{ matrix.go }}
+      - name: Install Go ${{ matrix.go_version }}
         uses: actions/setup-go@v2.1.3
         with:
           go-version: ${{ matrix.go_version }}

.github/workflows/test.yml

@@ -13,10 +13,10 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        go_version: [1.19.x]
+        go_version: [1.20.x]
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Install Go ${{ matrix.go }}
+      - name: Install Go ${{ matrix.go_version }}
         uses: actions/setup-go@v2.1.3
         with:
           go-version: ${{ matrix.go_version }}

.github/workflows/verify-go-src.yml

@@ -8,8 +8,6 @@ The go-client is an [netlify/open-api][open-api] derived http client generated u
 - You have cloned this repo OUTSIDE of the go path. (So go modules work).
 - You have a $GOPATH set up and $GOPATH/bin is added to your \$PATH
 
-See [GMBE:Tools as dependencies](https://github.com/go-modules-by-example/index/tree/master/010_tools) and [GMBE:Using `gobin` to install/run tools](https://github.com/go-modules-by-example/index/tree/master/017_using_gobin) for a deeper explanation of how a tools.go file works.
-
 ## Spec validation
 
 All spec changes must pass go-swagger spec validation.
@@ -53,7 +51,6 @@ under its [MIT license](LICENSE).
 [goreport]: https://goreportcard.com/report/github.com/netlify/go-client
 [git-img]: https://img.shields.io/github/release/netlify/go-client.svg
 [git]: https://github.com/netlify/go-client/releases/latest
-[gobin]: https://github.com/myitcv/gobin
 [modules]: https://github.com/golang/go/wiki/Modules
 [open-api]: https://github.com/netlify/open-api
 [go-swagger]: https://github.com/go-swagger/go-swagger

CONTRIBUTING.md

@@ -1,5 +1,4 @@
 .PHONY: all build deps generate help test validate
-CHECK_FILES?=$$(go list ./... | grep -v /vendor/)
 SWAGGER_SPEC=swagger.yml
 
 help: ## Show this help.
@@ -11,13 +10,13 @@ build: ## Build the API Go client.
 	go build ./go/...
 
 deps: ## Download dependencies.
-	GO111MODULE=off go get -u github.com/myitcv/gobin && go mod download
+	go mod download
 
 generate: validate ## Generate the API Go client and the JSON document for the UI.
 	go generate
 
 test: ## Test the go code.
-	gobin -m -run github.com/kyoh86/richgo test -v $(CHECK_FILES)
+	go test -v ./...
 
 validate: deps ## Check that the swagger spec is valid.
-	gobin -m -run github.com/go-swagger/go-swagger/cmd/swagger@v0.23.0 validate $(SWAGGER_SPEC)
+	go run github.com/go-swagger/go-swagger/cmd/swagger validate $(SWAGGER_SPEC)

Makefile

@@ -1,6 +1,6 @@
 package tools
 
 // todo: Find a better way to ignore tags or make a breaking release
-//go:generate gobin -m -run github.com/go-swagger/go-swagger/cmd/swagger flatten swagger.yml -o swagger_flat.json
+//go:generate go run github.com/go-swagger/go-swagger/cmd/swagger flatten swagger.yml -o swagger_flat.json
 //go:generate sh -c "cat swagger_flat.json | jq '[., (.paths | map_values(.[] |= del(.tags?)) | {paths: .})] | add' > swagger_go.json"
-//go:generate gobin -m -run github.com/go-swagger/go-swagger/cmd/swagger generate client -A netlify -f swagger_go.json -t go -c plumbing --default-scheme=https --with-flatten=full
+//go:generate go run github.com/go-swagger/go-swagger/cmd/swagger generate client -A netlify -f swagger_go.json -t go -c plumbing --default-scheme=https --with-flatten=full

generate.go

@@ -10,13 +10,10 @@ require (
 	github.com/go-openapi/strfmt v0.19.11
 	github.com/go-openapi/swag v0.19.12
 	github.com/go-openapi/validate v0.20.0
-	github.com/go-swagger/go-swagger v0.23.0
-	github.com/kyoh86/richgo v0.3.3
-	github.com/myitcv/gobin v0.0.14
+	github.com/go-swagger/go-swagger v0.24.0
 	github.com/pkg/errors v0.9.1
-	github.com/rogpeppe/go-internal v1.9.0 // indirect
 	github.com/rsc/goversion v1.2.0
 	github.com/sirupsen/logrus v1.6.0
-	github.com/stretchr/testify v1.7.0
+	github.com/stretchr/testify v1.8.2
 	golang.org/x/net v0.7.0 // indirect
 )