Merge pull request #200 from netlify/fix/go-generation

Fix Go client generation

Author: Marcus Weiner

.travis.yml

@@ -2,12 +2,10 @@
 language: go
 
 go:
-  - '1.12'
-env:
-  global:
-    - GO111MODULE=on
-    - GOPROXY=https://proxy.golang.org
+  - "1.13"
+
 install: make deps
 script: make test
+
 notifications:
   email: false

Makefile

@@ -20,4 +20,4 @@ test: ## Test the go code.
 	gobin -m -run github.com/kyoh86/richgo test -v $(CHECK_FILES)
 
 validate: ## Check that the swagger spec is valid.
-	gobin -m -run github.com/go-swagger/go-swagger/cmd/swagger validate $(SWAGGER_SPEC)
+	gobin -m -run github.com/go-swagger/go-swagger/cmd/swagger@c49ea4ca2112a67af0faa06ffdc994b036860a0c validate $(SWAGGER_SPEC)

generate.go

@@ -1,3 +1,6 @@
 package tools
 
-//go:generate gobin -m -run github.com/go-swagger/go-swagger/cmd/swagger generate client -A netlify -f swagger.yml -t go -c plumbing --with-flatten=full
+// 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 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

go.mod

@@ -1,28 +1,28 @@
 module github.com/netlify/open-api
 
-go 1.12
+go 1.13
 
 require (
 	contrib.go.opencensus.io/exporter/ocagent v0.4.12 // indirect
 	github.com/Azure/go-autorest v12.0.0+incompatible
 	github.com/cenkalti/backoff v2.1.1+incompatible
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
-	github.com/go-openapi/errors v0.19.0
-	github.com/go-openapi/inflect v0.19.0 // indirect
-	github.com/go-openapi/runtime v0.19.0
-	github.com/go-openapi/strfmt v0.19.0
-	github.com/go-openapi/swag v0.19.0
-	github.com/go-openapi/validate v0.19.0
-	github.com/go-swagger/go-swagger v0.19.0
-	github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013 // indirect
-	github.com/gorilla/handlers v1.4.0 // indirect
-	github.com/jessevdk/go-flags v1.4.0 // indirect
+	github.com/go-openapi/errors v0.19.2
+	github.com/go-openapi/runtime v0.19.5
+	github.com/go-openapi/strfmt v0.19.3
+	github.com/go-openapi/swag v0.19.5
+	github.com/go-openapi/validate v0.19.3
+	github.com/go-swagger/go-swagger v0.20.2-0.20190910212040-c49ea4ca2112
+	github.com/grpc-ecosystem/grpc-gateway v1.9.6 // indirect
+	github.com/hashicorp/golang-lru v0.5.3 // indirect
+	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/kyoh86/richgo v0.3.1
+	github.com/myitcv/gobin v0.0.13 // indirect
+	github.com/rogpeppe/go-internal v1.3.2 // indirect
 	github.com/rsc/goversion v1.2.0
-	github.com/sirupsen/logrus v1.4.1
-	github.com/spf13/viper v1.3.2 // indirect
-	github.com/stretchr/testify v1.3.0
-	github.com/toqueteos/webbrowser v1.1.0 // indirect
-	golang.org/x/net v0.0.0-20190415214537-1da14a5a36f2
-	golang.org/x/tools v0.0.0-20190418235243-4796d4bd3df0 // indirect
+	github.com/sirupsen/logrus v1.4.2
+	github.com/stretchr/testify v1.4.0
+	go.opencensus.io v0.22.0 // indirect
+	google.golang.org/api v0.8.0 // indirect
+	google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect
+	google.golang.org/grpc v1.23.0 // indirect
 )