sdk: Ignore sdk directory when generating OA spec

Previously, the SDK directory was included when generating the Swagger specification. This caused issues due to duplicate models. This patch resolves that issue. Closes #1384 Signed-off-by: aeneasr <aeneas@ory.sh>
ory · Apr 26, 2019 · a09ab90 · a09ab90
1 parent a4a75d4
commit a09ab90
Show file tree

Hide file tree

Showing 250 changed files with 977 additions and 18,524 deletions.
diff --git a/Makefile b/Makefile
@@ -83,7 +83,7 @@ sdk:
 		rm -rf ./vendor/
 		GO111MODULE=on go mod tidy
 		GO111MODULE=on go mod vendor
-		GO111MODULE=off swagger generate spec -m -o ./docs/api.swagger.json
+		GO111MODULE=off swagger generate spec -m -o ./docs/api.swagger.json -x sdk
 		GO111MODULE=off swagger validate ./docs/api.swagger.json
 
 		rm -rf ./sdk/go/hydra

diff --git a/docs/api.swagger.json b/docs/api.swagger.json
diff --git a/go.sum b/go.sum
@@ -503,11 +503,6 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ
 github.com/ory/dockertest v3.3.4+incompatible h1:VrpM6Gqg7CrPm3bL4Wm1skO+zFWLbh7/Xb5kGEbJRh8=
 github.com/ory/dockertest v3.3.4+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs=
 github.com/ory/fosite v0.29.0/go.mod h1:0atSZmXO7CAcs6NPMI/Qtot8tmZYj04Nddoold4S2h0=
-github.com/ory/fosite v0.29.3 h1:YKv7Mf0EDS+JVSucgr6NbXCIjTDcs6jEs1VLtlA2dFc=
-github.com/ory/fosite v0.29.3/go.mod h1:0atSZmXO7CAcs6NPMI/Qtot8tmZYj04Nddoold4S2h0=
-github.com/ory/fosite v0.29.4/go.mod h1:0atSZmXO7CAcs6NPMI/Qtot8tmZYj04Nddoold4S2h0=
-github.com/ory/fosite v0.29.5 h1:+d79no+JKQIMDqunY6a5XpScbUVomTY2Z/ylO3USFCU=
-github.com/ory/fosite v0.29.5/go.mod h1:0atSZmXO7CAcs6NPMI/Qtot8tmZYj04Nddoold4S2h0=
 github.com/ory/fosite v0.29.6 h1:ZL5O6t71sAioew2u9gi41FpyjN5wEOC1Is6mEM/hI9w=
 github.com/ory/fosite v0.29.6/go.mod h1:0atSZmXO7CAcs6NPMI/Qtot8tmZYj04Nddoold4S2h0=
 github.com/ory/go-acc v0.0.0-20181118080137-ddc355013f90 h1:Bpk3eqc3rbJT2mE+uS9ETzmi2cEL4RuIKz2iUeteh04=

diff --git a/sdk/go/hydra/models/authentication_request.go b/sdk/go/hydra/models/authentication_request.go
diff --git a/sdk/go/hydra/models/authentication_session.go b/sdk/go/hydra/models/authentication_session.go
diff --git a/sdk/go/hydra/models/client.go b/sdk/go/hydra/models/client.go
diff --git a/sdk/go/hydra/models/consent_request_session_data.go b/sdk/go/hydra/models/consent_request_session_data.go
diff --git a/sdk/go/hydra/models/empty_response.go b/sdk/go/hydra/models/empty_response.go
diff --git a/sdk/go/hydra/models/generic_error.go b/sdk/go/hydra/models/generic_error.go