Merge pull request #372 from checkr/zz/bump-vendor-and-swagger-gen

Bump vendor and go swagger

.circleci/config.yml

@@ -10,6 +10,7 @@ jobs:
     steps:
       - checkout
       - run: make deps
+      - run: make verify_swagger_nochange
       - run: make ci
       - run: bash <(curl -s https://codecov.io/bash)
 

Makefile

@@ -41,13 +41,9 @@ gen: api_docs swagger
 
 deps:
 	@GO111MODULE=off go get -u github.com/myitcv/gobin
-	@gobin github.com/go-swagger/go-swagger/cmd/[email protected]
-	@gobin github.com/codeskyblue/fswatch
+	@gobin github.com/go-swagger/go-swagger/cmd/[email protected]
 	@gobin github.com/golangci/golangci-lint/cmd/[email protected]
 
-watch:
-	@fswatch
-
 serve_docs:
 	@npm install -g docsify-cli@4
 	@docsify serve $(PWD)/docs
@@ -70,6 +66,10 @@ verify_swagger:
 	@echo "Running $@"
 	@swagger validate $(PWD)/docs/api_docs/bundle.yaml
 
+verify_swagger_nochange: swagger
+	@echo "Running verify_swagger_nochange to make sure the swagger generated code is checked in"
+	@git diff --exit-code
+
 clean:
 	@echo "Cleaning up all the generated files"
 	@find . -name '*.test' | xargs rm -fv

README.md

@@ -48,17 +48,17 @@ Or try it on [https://try-flagr.herokuapp.com](https://try-flagr.herokuapp.com),
 
 ```
 curl --request POST \
-       --url https://try-flagr.herokuapp.com/api/v1/evaluation \
-       --header 'content-type: application/json' \
-       --data '{
-         "entityID": "127",
-         "entityType": "user",
-         "entityContext": {
-           "state": "NY"
-         },
-         "flagID": 1,
-         "enableDebug": true
-       }'
+     --url https://try-flagr.herokuapp.com/api/v1/evaluation \
+     --header 'content-type: application/json' \
+     --data '{
+       "entityID": "127",
+       "entityType": "user",
+       "entityContext": {
+         "state": "NY"
+       },
+       "flagID": 1,
+       "enableDebug": true
+     }'
 ```
 
 

go.mod

@@ -5,11 +5,8 @@ go 1.14
 require (
 	cloud.google.com/go v0.37.4
 	github.com/DataDog/datadog-go v0.0.0-20180330214955-e67964b4021a
-	github.com/PuerkitoBio/purell v1.1.0 // indirect
-	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/Shopify/sarama v1.19.0
 	github.com/a8m/kinesis-producer v0.0.0-20180723062609-03228a9f79b3
-	github.com/asaskevich/govalidator v0.0.0-20180315120708-ccb8e960c48f // indirect
 	github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7
 	github.com/avast/retry-go v2.2.0+incompatible
 	github.com/aws/aws-sdk-go v1.15.32
@@ -22,22 +19,17 @@ require (
 	github.com/dchest/uniuri v0.0.0-20160212164326-8902c56451e9
 	github.com/denisenkom/go-mssqldb v0.0.0-20190418034912-35416408c946 // indirect
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/docker/go-units v0.3.3 // indirect
 	github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 // indirect
 	github.com/evalphobia/logrus_sentry v0.4.6
 	github.com/getsentry/raven-go v0.0.0-20180903072508-084a9de9eb03
-	github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb // indirect
 	github.com/go-ini/ini v1.38.2 // indirect
-	github.com/go-openapi/analysis v0.0.0-20180801175213-7c1bef8f6d9f // indirect
-	github.com/go-openapi/errors v0.0.0-20180827163446-87bb65328877
-	github.com/go-openapi/jsonpointer v0.0.0-20180322222829-3a0015ad55fa // indirect
-	github.com/go-openapi/jsonreference v0.0.0-20180322222742-3fb327e6747d // indirect
-	github.com/go-openapi/loads v0.0.0-20180825180312-fd899182a268
-	github.com/go-openapi/runtime v0.0.0-20180910204625-41cb9a631c39
-	github.com/go-openapi/spec v0.0.0-20180825180323-f1468acb3b29
-	github.com/go-openapi/strfmt v0.0.0-20180910212104-776114108ccc
-	github.com/go-openapi/swag v0.0.0-20180908172849-dd0dad036e67
-	github.com/go-openapi/validate v0.0.0-20180825180342-e0648ff40507
+	github.com/go-openapi/errors v0.19.6
+	github.com/go-openapi/loads v0.19.5
+	github.com/go-openapi/runtime v0.19.19
+	github.com/go-openapi/spec v0.19.8
+	github.com/go-openapi/strfmt v0.19.5
+	github.com/go-openapi/swag v0.19.9
+	github.com/go-openapi/validate v0.19.10
 	github.com/go-sql-driver/mysql v1.4.0 // indirect
 	github.com/gohttp/pprof v0.0.0-20141119085724-c9d246cbb3ba
 	github.com/gorilla/mux v1.7.1 // indirect
@@ -46,35 +38,31 @@ require (
 	github.com/jinzhu/inflection v0.0.0-20180308033659-04140366298a // indirect
 	github.com/jinzhu/now v1.0.0 // indirect
 	github.com/jpillora/backoff v0.0.0-20170918002102-8eab2debe79d // indirect
-	github.com/kr/pretty v0.1.0 // indirect
 	github.com/lib/pq v1.0.0 // indirect
-	github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 // indirect
 	github.com/mattn/go-sqlite3 v1.9.0 // indirect
 	github.com/meatballhat/negroni-logrus v0.0.0-20170801195057-31067281800f
-	github.com/mitchellh/mapstructure v1.1.2 // indirect
 	github.com/newrelic/go-agent v2.1.0+incompatible
 	github.com/onsi/ginkgo v1.8.0 // indirect
 	github.com/onsi/gomega v1.5.0 // indirect
 	github.com/opentracing/opentracing-go v1.1.0 // indirect
-	github.com/pborman/uuid v1.2.0 // indirect
 	github.com/philhofer/fwd v1.0.0 // indirect
 	github.com/phyber/negroni-gzip v0.0.0-20180113114010-ef6356a5d029
 	github.com/prashantv/gostub v0.0.0-20170112001514-5c68b99bb088
 	github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829
 	github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
 	github.com/prometheus/procfs v0.0.0-20190219184716-e4d4a2206da0 // indirect
 	github.com/rs/cors v1.5.0
-	github.com/sirupsen/logrus v1.2.0
+	github.com/sirupsen/logrus v1.4.2
 	github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a // indirect
 	github.com/spf13/cast v1.3.0
-	github.com/stretchr/testify v1.3.0
+	github.com/stretchr/testify v1.6.1
 	github.com/tinylib/msgp v1.1.0 // indirect
 	github.com/urfave/negroni v0.3.0
 	github.com/yadvendar/negroni-newrelic-go-agent v0.0.0-20160803090806-3dc58758cb67
 	github.com/zhouzhuojie/conditions v0.0.0-20190705160302-784df330cb87
 	github.com/zhouzhuojie/withtimeout v0.0.0-20190405051827-12b39eb2edd5
-	golang.org/x/net v0.0.0-20190313220215-9f648a60d977
-	golang.org/x/sys v0.0.0-20190312061237-fead79001313 // indirect
+	golang.org/x/net v0.0.0-20200602114024-627f9648deb9
+	golang.org/x/text v0.3.3 // indirect
 	google.golang.org/api v0.3.1
 	google.golang.org/grpc v1.19.0
 	gopkg.in/DataDog/dd-trace-go.v1 v1.9.0