Update to go-swagger 0.13

A lot of files changed but actually not much changed Fixes #92
sapcc · Dec 12, 2017 · 0327395 · 0327395
1 parent ca5afde
commit 0327395
Show file tree

Hide file tree

Showing 64 changed files with 379 additions and 1,582 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ endif
 
 HAS_GLIDE := $(shell command -v glide;)
 HAS_GLIDE_VC := $(shell command -v glide-vc;)
-GO_SWAGGER_VERSION := 0.12.0
+GO_SWAGGER_VERSION := 0.13.0
 SWAGGER_BIN        := bin/$(GOOS)/swagger-$(GO_SWAGGER_VERSION)
 
 .PHONY: all test clean code-gen client-gen informer-gen lister-gen vendor
@@ -71,7 +71,8 @@ gh-pages:
 pkg/api/rest/operations/kubernikus_api.go: swagger.yml
 ifneq (,$(wildcard $(SWAGGER_BIN)))
 	$(SWAGGER_BIN) generate server --name kubernikus --target pkg/api --model-package models \
-		--server-package rest --flag-strategy pflag --principal models.Principal --exclude-main
+		--server-package rest --flag-strategy pflag --principal models.Principal --exclude-main \
+		--skip-flatten
 	sed -i '' -e 's/int64 `json:"\([^,]*\),omitempty"`/int64 `json:"\1"`/' pkg/api/models/*.go
 	sed -e's/^package.*/package spec/' pkg/api/rest/embedded_spec.go > pkg/api/spec/embedded_spec.go
 	rm pkg/api/rest/embedded_spec.go
@@ -87,7 +88,7 @@ pkg/api/client/kubernikus_client.go: swagger.yml
 ifneq (,$(wildcard $(SWAGGER_BIN)))
 	$(SWAGGER_BIN) generate client --name kubernikus --target pkg/api --client-package client \
 		--existing-models github.com/sapcc/kubernikus/pkg/api/models \
-		--default-scheme=https \
+		--default-scheme=https --skip-flatten \
 		--principal models.Principal
 else
 	$(warning WARNING: $(SWAGGER_BIN) missing. Run `make bootstrap` to fix.)

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -29,46 +29,45 @@ import:
   version: 0.6.0
   subpackages:
   - log
-# Dependencies extracted from go-swagger 0.12.0
-- package: github.com/databus23/guttle
-- package: github.com/go-openapi/jsonpointer
-  version: 779f45308c19820f1a69e9a4cd965f496e0da10f
-- package: github.com/go-openapi/loads
-  version: a80dea3052f00e5f032e860dd7355cd0cc67e24d
+- package: github.com/prometheus/prometheus
+  version: ^2.0.0
+  subpackages:
+  - client_go
+  - client_model
+  - common
+  - procfs
+# Dependencies extracted from go-swagger 0.13.0
+- package: github.com/go-openapi/errors
+  version: 03cfca65330da08a5a440053faf994a3c682b5bf
+- package: github.com/go-openapi/jsonreference
+  version: 36d33bfe519efae5632669801b180bf1a245da3b
+- package: github.com/go-openapi/runtime
+  version: 2da70401d8fa078b6fecdd7afdf3b589ae9669e4
+- package: github.com/go-openapi/spec
+  version: a4fa9574c7aa73b2fc54e251eb9524d0482bb592
 - package: gopkg.in/yaml.v2
   version: eb3733d160e74a9c7e442f435eb3bea458e1d19f
+- package: github.com/PuerkitoBio/purell
+  version: 0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4
 - package: github.com/PuerkitoBio/urlesc
   version: de5bf2ad457846296e2031421a34e2568e304e35
-- package: github.com/go-openapi/analysis
-  version: 8ed83f2ea9f00f945516462951a288eaa68bf0d6
+- package: github.com/go-openapi/loads
+  version: c3e1ca4c0b6160cac10aeef7e8b425cc95b9c820
+- package: github.com/mitchellh/mapstructure
+  version: 06020f85339e21b2478f756a78e295255ffa4d6a
+- package: github.com/go-openapi/jsonpointer
+  version: 779f45308c19820f1a69e9a4cd965f496e0da10f
+- package: github.com/go-openapi/strfmt
+  version: 610b6cacdcde6852f4de68998bd20ce1dac85b22
 - package: github.com/go-openapi/swag
-  version: f3f9494671f93fcff853e3c6e9e948b3eb71e590
-- package: github.com/mailru/easyjson
-  version: 2a92e673c9a6302dd05c3a691ae1f24aef46457d
+  version: cf0bdb963811675a4d7e74901cefc7411a1df939
 - package: gopkg.in/mgo.v2
   version: 3f83fa5005286a7fe593b055f0d7771a7dce4655
-- package: github.com/PuerkitoBio/purell
-  version: 0bcb03f4b4d0a9428594752bd2a3b9aa0a9d4bd4
-- package: github.com/go-openapi/strfmt
-  version: 610b6cacdcde6852f4de68998bd20ce1dac85b22
-- package: github.com/go-openapi/validate
-  version: 8a82927c942c94794a5cd8b8b50ce2f48a955c0c
-- package: github.com/go-openapi/runtime
-  version: bf2ff8f7150788b1c7256abb0805ba0410cbbabb
-- package: github.com/go-openapi/spec
-  version: 3faa0055dbbf2110abc1f3b4e3adbb22721e96e7
-- package: github.com/mitchellh/mapstructure
-  version: d0303fe809921458f417bcf828397a65db30a7e4
 - package: github.com/asaskevich/govalidator
   version: 73945b6115bfbbcc57d89b7316e28109364124e1
-- package: github.com/go-openapi/errors
-  version: 03cfca65330da08a5a440053faf994a3c682b5bf
-- package: github.com/go-openapi/jsonreference
-  version: 36d33bfe519efae5632669801b180bf1a245da3b
-- package: github.com/prometheus/prometheus
-  version: ^2.0.0
-  subpackages:
-  - client_go
-  - client_model
-  - common
-  - procfs
+- package: github.com/go-openapi/analysis
+  version: 8ed83f2ea9f00f945516462951a288eaa68bf0d6
+- package: github.com/go-openapi/validate
+  version: a52193aca9d575f354d8be388254c134765ea793
+- package: github.com/mailru/easyjson
+  version: 5f62e4f3afa2f576dc86531b7df4d966b19ef8f8
diff --git a/pkg/api/client/operations/create_cluster_parameters.go b/pkg/api/client/operations/create_cluster_parameters.go
diff --git a/pkg/api/client/operations/terminate_cluster_responses.go b/pkg/api/client/operations/terminate_cluster_responses.go
diff --git a/pkg/api/client/operations/update_cluster_parameters.go b/pkg/api/client/operations/update_cluster_parameters.go
diff --git a/pkg/api/models/api_versions.go b/pkg/api/models/api_versions.go
diff --git a/pkg/api/models/credentials.go b/pkg/api/models/credentials.go
diff --git a/pkg/api/models/error.go b/pkg/api/models/error.go
diff --git a/pkg/api/models/event.go b/pkg/api/models/event.go
diff --git a/pkg/api/models/info.go b/pkg/api/models/info.go
diff --git a/pkg/api/models/kluster.go b/pkg/api/models/kluster.go