Merge pull request #284 from checkr/zz/bump-go-swagger

Bump go-swagger
openflagr · Aug 30, 2019 · 13fcae7 · 13fcae7
2 parents 9a0c6d9 + 006cfa5
commit 13fcae7
Show file tree

Hide file tree

Showing 15 changed files with 78 additions and 61 deletions.
diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ gen: api_docs swagger
 
 deps: checks
 	@GO111MODULE=off go get -u github.com/myitcv/gobin
-	@gobin github.com/go-swagger/go-swagger/cmd/swagger@v0.19.0
+	@gobin github.com/go-swagger/go-swagger/cmd/swagger@v0.20.1
 	@gobin github.com/codeskyblue/fswatch
 	@gobin github.com/golangci/golangci-lint/cmd/golangci-lint@v1.16.0
 	@echo "Sqlite3" && sqlite3 -version

diff --git a/docs/api_docs/bundle.yaml b/docs/api_docs/bundle.yaml
@@ -770,7 +770,7 @@ paths:
     get:
       tags:
         - export
-      operationId: getExportSQLite
+      operationId: getExportSqlite
       description: >-
         Export sqlite3 format of the db dump, which is converted from the main
         database.

diff --git a/integration_tests/test.sh b/integration_tests/test.sh
@@ -287,7 +287,6 @@ step_7_test_evaluation()
 step_8_test_preload()
 {
     flagr_url=$1:18000/api/v1
-    sleep 5
 
     ################################################
     # Test preload for /flags (depends on ?preload=true/false
@@ -312,6 +311,22 @@ step_8_test_preload()
         matches "\"variantID\":1"
 }
 
+step_9_test_export()
+{
+    flagr_url=$1:18000/api/v1
+
+    ################################################
+    # Test export
+    ################################################
+    shakedown GET $flagr_url/export/sqlite
+        status 200
+
+    shakedown GET $flagr_url/export/eval_cache/json
+        status 200
+        matches "\"VariantKey\":\"key_1\""
+        matches "\"VariantID\":1"
+}
+
 
 start_test()
 {
@@ -331,6 +346,7 @@ start_test()
     step_6_test_crud_distribution $flagr_host
     step_7_test_evaluation $flagr_host
     step_8_test_preload $flagr_host
+    step_9_test_export $flagr_host
 }
 
 start(){

diff --git a/pkg/handler/crud.go b/pkg/handler/crud.go
@@ -346,7 +346,7 @@ func (c *crud) PutSegment(params segment.PutSegmentParams) middleware.Responder
 
 func (c *crud) PutSegmentsReorder(params segment.PutSegmentsReorderParams) middleware.Responder {
 	tx := getDB().Begin()
-	for i, segmentID := range params.Body.SegmentIds {
+	for i, segmentID := range params.Body.SegmentIDs {
 		s := &entity.Segment{}
 		if err := tx.First(s, segmentID).Error; err != nil {
 			tx.Rollback()

diff --git a/pkg/handler/crud_test.go b/pkg/handler/crud_test.go
@@ -457,7 +457,7 @@ func TestCrudSegments(t *testing.T) {
 	res = c.PutSegmentsReorder(segment.PutSegmentsReorderParams{
 		FlagID: int64(1),
 		Body: &models.PutSegmentReorderRequest{
-			SegmentIds: []int64{int64(2), int64(1)},
+			SegmentIDs: []int64{int64(2), int64(1)},
 		},
 	})
 	assert.NotZero(t, res.(*segment.PutSegmentsReorderOK))
@@ -525,7 +525,7 @@ func TestCrudSegmentsWithFailures(t *testing.T) {
 		res = c.PutSegmentsReorder(segment.PutSegmentsReorderParams{
 			FlagID: int64(1),
 			Body: &models.PutSegmentReorderRequest{
-				SegmentIds: []int64{int64(999998), int64(1)},
+				SegmentIDs: []int64{int64(999998), int64(1)},
 			},
 		})
 		assert.NotZero(t, res.(*segment.PutSegmentsReorderDefault).Payload)

diff --git a/pkg/handler/eval.go b/pkg/handler/eval.go
@@ -47,7 +47,7 @@ func (e *eval) PostEvaluation(params evaluation.PostEvaluationParams) middleware
 
 func (e *eval) PostEvaluationBatch(params evaluation.PostEvaluationBatchParams) middleware.Responder {
 	entities := params.Body.Entities
-	flagIDs := params.Body.FlagIds
+	flagIDs := params.Body.FlagIDs
 	flagKeys := params.Body.FlagKeys
 	results := &models.EvaluationBatchResponse{}
 

diff --git a/pkg/handler/eval_test.go b/pkg/handler/eval_test.go
@@ -373,7 +373,7 @@ func TestPostEvaluationBatch(t *testing.T) {
 						EntityType:    "entityType1",
 					},
 				},
-				FlagIds:  []int64{100, 200},
+				FlagIDs:  []int64{100, 200},
 				FlagKeys: []string{"flag_key_1", "flag_key_2"},
 			},
 		})

diff --git a/swagger/export_sqlite.yaml b/swagger/export_sqlite.yaml
@@ -1,7 +1,7 @@
 get:
   tags:
     - export
-  operationId: getExportSQLite
+  operationId: getExportSqlite
   description: Export sqlite3 format of the db dump, which is converted from the main database.
   produces:
     - application/octet-stream

diff --git a/swagger_gen/models/evaluation_batch_request.go b/swagger_gen/models/evaluation_batch_request.go
diff --git a/swagger_gen/models/put_segment_reorder_request.go b/swagger_gen/models/put_segment_reorder_request.go
diff --git a/swagger_gen/restapi/configure_flagr.go b/swagger_gen/restapi/configure_flagr.go
diff --git a/swagger_gen/restapi/embedded_spec.go b/swagger_gen/restapi/embedded_spec.go
diff --git a/swagger_gen/restapi/operations/export/get_export_sqlite_parameters.go b/swagger_gen/restapi/operations/export/get_export_sqlite_parameters.go
diff --git a/swagger_gen/restapi/operations/flag/find_flags_urlbuilder.go b/swagger_gen/restapi/operations/flag/find_flags_urlbuilder.go
diff --git a/swagger_gen/restapi/server.go b/swagger_gen/restapi/server.go