Skip to content

Fix Go client generation #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
5 changes: 4 additions & 1 deletion generate.go
Original file line number Diff line number Diff line change
@@ -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
36 changes: 18 additions & 18 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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
)
219 changes: 193 additions & 26 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion go/models/repo_info.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 22 additions & 43 deletions go/models/split_tests.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions go/plumbing/operations/add_member_to_account_responses.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions go/plumbing/operations/cancel_account_responses.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions go/plumbing/operations/configure_dns_for_site_responses.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions go/plumbing/operations/create_account_responses.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions go/plumbing/operations/create_deploy_key_responses.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions go/plumbing/operations/create_hook_by_site_id_responses.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading