Add new v1 prefixed route (#76)

* Add new v1 prefixed route

The route is duplicated, so it keeps compatibility.

* Make integration test use the new route

pkg/adapters/http_in/api.go

@@ -17,6 +17,7 @@ import (
 )
 
 const API_COMPONENT_TYPE = "api"
+const apiVersion = "v1"
 
 type Api struct {
 	mux  *chi.Mux
@@ -46,7 +47,7 @@ func New(l *zap.SugaredLogger, conf config.ApiConfig, metricRegistry *prometheus
 	initializeMetrics(metricRegistry)
 	registerDefaultMiddlewares(api, sizeLimit, logg, metricRegistry)
 
-	RegisterIngestingRoutes(api, flws)
+	RegisterIngestingRoutes(api, apiVersion, flws)
 	RegisterOperatinalRoutes(api, appVersion, metricRegistry)
 	api.mux.Mount("/debug", middleware.Profiler())
 

pkg/adapters/http_in/api_test.go

@@ -76,12 +76,24 @@ func TestPassesDataFlows(t *testing.T) {
 
 	resp, err = http.Post(fmt.Sprintf("%s/flow2/async_ingestion", srvr.URL), "application/json", strings.NewReader("world!"))
 	assert.NoError(t, err, "error on posting data to flow2", err)
+	resp.Body.Close()
+	assert.Equal(t, http.StatusOK, resp.StatusCode, "status should be OK(200) on flow 2")
 
+	//Same test, but with v1 on URL
+	resp, err = http.Post(fmt.Sprintf("%s/v1/flow-1/async_ingestion", srvr.URL), "application/json", strings.NewReader("helloooooo1"))
+	assert.NoError(t, err, "error on posting data to flow1", err)
+	resp.Body.Close()
+	assert.Equal(t, http.StatusOK, resp.StatusCode, "status should be OK(200) on flow 1")
+
+	resp, err = http.Post(fmt.Sprintf("%s/v1/flow2/async_ingestion", srvr.URL), "application/json", strings.NewReader("world2"))
+	assert.NoError(t, err, "error on posting data to flow2", err)
 	resp.Body.Close()
 	assert.Equal(t, http.StatusOK, resp.StatusCode, "status should be OK(200) on flow 2")
 
-	assert.Equal(t, [][]byte{[]byte("helloooooo")}, mockDF.calledWith, "the posted data should have been sent to flow 1")
-	assert.Equal(t, [][]byte{[]byte("world!")}, mockDF2.calledWith, "the posted data should have been sent to flow 2")
+	assert.Equal(t, [][]byte{[]byte("helloooooo"), []byte("helloooooo1")},
+		mockDF.calledWith, "the posted data should have been sent to flow 1")
+	assert.Equal(t, [][]byte{[]byte("world!"), []byte("world2")},
+		mockDF2.calledWith, "the posted data should have been sent to flow 2")
 }
 
 func TestAnswersAnErrorIfNoBodyIsSent(t *testing.T) {

pkg/adapters/http_in/ingest_routes.go

@@ -15,19 +15,22 @@ var payloadMaxSizeErr *http.MaxBytesError
 
 func RegisterIngestingRoutes(
 	api *Api,
+	version string,
 	flws []flow.Flow,
 ) {
 
 	for _, flw := range flws {
 		flwCopy := flw
 
+		path := fmt.Sprintf("/%s/async_ingestion", flwCopy.Name)
 		if flwCopy.Token != "" {
 			api.mux.With(httpmiddleware.Auth(flwCopy.Token)).
-				Post(fmt.Sprintf("/%s/async_ingestion", flwCopy.Name),
-					asyncIngestion(api.log, &flwCopy))
+				Post(path, asyncIngestion(api.log, &flwCopy))
+			api.mux.With(httpmiddleware.Auth(flwCopy.Token)).
+				Post("/"+version+path, asyncIngestion(api.log, &flwCopy))
 		} else {
-			api.mux.Post(fmt.Sprintf("/%s/async_ingestion", flwCopy.Name),
-				asyncIngestion(api.log, &flwCopy))
+			api.mux.Post(path, asyncIngestion(api.log, &flwCopy))
+			api.mux.Post("/"+version+path, asyncIngestion(api.log, &flwCopy))
 		}
 	}
 

pkg/app/app_test.go

@@ -528,7 +528,7 @@ func testWithBatchSize(t *testing.T, confYaml string, stringExemplarSizes ...int
 
 		generatedValuesWithoutAcc = append(generatedValuesWithoutAcc, expected)
 
-		response, err = http.Post("http://localhost:9099/int_flow2/async_ingestion", "application/json", strings.NewReader(expected))
+		response, err = http.Post("http://localhost:9099/v1/int_flow2/async_ingestion", "application/json", strings.NewReader(expected))
 		assert.NoError(t, err, "enqueueing items should not return error on int_flow2")
 		assert.Equal(t, 200, response.StatusCode, "data enqueueing should have been successful on int_flow2")
 		response.Body.Close()