Merge 50a4c3f into a1827e9

pace · Nov 25, 2020 · 7b020b2 · 7b020b2
2 parents a1827e9 + 50a4c3f
commit 7b020b2
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 24 deletions.
diff --git a/backend/objstore/health_objstore_test.go b/backend/objstore/health_objstore_test.go
@@ -26,6 +26,7 @@ func TestIntegrationHealthCheck(t *testing.T) {
 	if testing.Short() {
 		t.SkipNow()
 	}
+	RegisterHealthchecks()
 	resp := setup()
 	if resp.StatusCode != 200 {
 		t.Errorf("Expected /health/check to respond with 200, got: %d", resp.StatusCode)

diff --git a/http/jsonapi/generator/generate_handler.go b/http/jsonapi/generator/generate_handler.go
@@ -353,18 +353,21 @@ func (g *Generator) buildRouter(routes []*route, schema *openapi3.Swagger) error
 	routeStmts[startInd] = jen.Id("router").Op(":=").Qual(pkgGorillaMux, "NewRouter").Call()
 
 	// Note: we don't restrict host, scheme and port to ease development
-	paths := make(map[string]struct{})
+	pathsIdx := make(map[string]struct{})
+	var paths []string
 	for _, server := range schema.Servers {
 		serverUrl, err := url.Parse(server.URL)
 		if err != nil {
 			return err
 		}
-		paths[serverUrl.Path] = struct{}{}
+		if _, ok := pathsIdx[serverUrl.Path]; !ok {
+			paths = append(paths, serverUrl.Path)
+		}
+		pathsIdx[serverUrl.Path] = struct{}{}
 	}
 
 	// but generate subrouters for each server
-	i := 0
-	for path := range paths {
+	for i, path := range paths {
 		subrouterID := fmt.Sprintf("s%d", i+1)
 
 		// init and return the router

diff --git a/http/jsonapi/generator/internal/fueling/open-api.json b/http/jsonapi/generator/internal/fueling/open-api.json
@@ -10,14 +10,17 @@
   },
   "servers": [
     {
-      "url": "https://api.pace.cloud/fueling"
+      "url": "https://api.pace.cloud/fueling/beta/"
     },
     {
-      "url": "https://localhost/fueling"
+      "url": "https://api.pace.cloud/fueling/v1/"
+    },
+    {
+      "url": "https://localhost/fueling/beta/"
     }
   ],
   "paths": {
-    "/beta/gas-stations/{gasStationId}/approaching": {
+    "/gas-stations/{gasStationId}/approaching": {
       "post": {
         "tags": [
           "Fueling"
@@ -258,7 +261,7 @@
         }
       }
     },
-    "/beta/gas-stations/{gasStationId}/pumps/{pumpId}": {
+    "/gas-stations/{gasStationId}/pumps/{pumpId}": {
       "get": {
         "tags": [
           "Fueling"
@@ -316,7 +319,7 @@
         }
       }
     },
-    "/beta/gas-stations/{gasStationId}/pumps/{pumpId}/wait-for-status-change": {
+    "/gas-stations/{gasStationId}/pumps/{pumpId}/wait-for-status-change": {
       "get": {
         "tags": [
           "Fueling"
@@ -412,7 +415,7 @@
         }
       }
     },
-    "/beta/gas-station/{gasStationId}/payment": {
+    "/gas-station/{gasStationId}/payment": {
       "post": {
         "tags": [
           "Fueling"

diff --git a/http/jsonapi/generator/internal/fueling/open-api_test.go b/http/jsonapi/generator/internal/fueling/open-api_test.go