removed all non control plane routes

frain-dev · Nov 15, 2024 · 2191acc · 2191acc
1 parent c9e882f
commit 2191acc
Show file tree

Hide file tree

Showing 5 changed files with 114 additions and 192 deletions.
diff --git a/api/api.go b/api/api.go
@@ -124,14 +124,6 @@ func (a *ApplicationHandler) BuildControlPlaneRoutes() *chi.Mux {
 
 	handler := &handlers.Handler{A: a.A, RM: a.rm}
 
-	// TODO(subomi): left this here temporarily till the data plane is stable.
-	// Ingestion API.
-	router.Route("/ingest", func(ingestRouter chi.Router) {
-		ingestRouter.Use(middleware.RateLimiterHandler(a.A.Rate, a.cfg.ApiRateLimit))
-		ingestRouter.Get("/{maskID}", a.HandleCrcCheck)
-		ingestRouter.Post("/{maskID}", a.IngestEvent)
-	})
-
 	// Public API.
 	router.Route("/api", func(v1Router chi.Router) {
 		v1Router.Route("/v1", func(r chi.Router) {
@@ -165,49 +157,6 @@ func (a *ApplicationHandler) BuildControlPlaneRoutes() *chi.Mux {
 						})
 					})
 
-					// TODO(subomi): left this here temporarily till the data plane is stable.
-					projectSubRouter.Route("/events", func(eventRouter chi.Router) {
-						eventRouter.Route("/", func(writeEventRouter chi.Router) {
-							eventRouter.With(middleware.Pagination).Get("/", handler.GetEventsPaged)
-							eventRouter.Get("/countbatchreplayevents", handler.CountAffectedEvents)
-
-							// TODO(all): should the InstrumentPath change?
-							eventRouter.With(handler.RequireEnabledProject(), middleware.InstrumentPath(a.A.Licenser)).Post("/", handler.CreateEndpointEvent)
-							eventRouter.With(handler.RequireEnabledProject(), middleware.InstrumentPath(a.A.Licenser)).Post("/fanout", handler.CreateEndpointFanoutEvent)
-							eventRouter.With(handler.RequireEnabledProject(), middleware.InstrumentPath(a.A.Licenser)).Post("/broadcast", handler.CreateBroadcastEvent)
-							eventRouter.With(handler.RequireEnabledProject(), middleware.InstrumentPath(a.A.Licenser)).Post("/dynamic", handler.CreateDynamicEvent)
-							eventRouter.With(handler.RequireEnabledProject()).Post("/batchreplay", handler.BatchReplayEvents)
-
-							eventRouter.Route("/{eventID}", func(eventSubRouter chi.Router) {
-								eventSubRouter.With(handler.RequireEnabledProject()).Put("/replay", handler.ReplayEndpointEvent)
-								eventSubRouter.Get("/", handler.GetEndpointEvent)
-							})
-						})
-					})
-
-					projectSubRouter.Route("/event-types", func(eventTypesRouter chi.Router) {
-						eventTypesRouter.Get("/", handler.GetEventTypes)
-						eventTypesRouter.With(handler.RequireEnabledProject()).Post("/", handler.CreateEventType)
-						eventTypesRouter.With(handler.RequireEnabledProject()).Put("/{eventTypeId}", handler.UpdateEventType)
-						eventTypesRouter.With(handler.RequireEnabledProject()).Post("/{eventTypeId}/deprecate", handler.DeprecateEventType)
-					})
-
-					projectSubRouter.Route("/eventdeliveries", func(eventDeliveryRouter chi.Router) {
-						eventDeliveryRouter.With(middleware.Pagination).Get("/", handler.GetEventDeliveriesPaged)
-						eventDeliveryRouter.With(handler.RequireEnabledProject()).Post("/forceresend", handler.ForceResendEventDeliveries)
-						eventDeliveryRouter.With(handler.RequireEnabledProject()).Post("/batchretry", handler.BatchRetryEventDelivery)
-
-						eventDeliveryRouter.Route("/{eventDeliveryID}", func(eventDeliverySubRouter chi.Router) {
-							eventDeliverySubRouter.Get("/", handler.GetEventDelivery)
-							eventDeliverySubRouter.With(handler.RequireEnabledProject()).Put("/resend", handler.ResendEventDelivery)
-
-							eventDeliverySubRouter.Route("/deliveryattempts", func(deliveryRouter chi.Router) {
-								deliveryRouter.Get("/", handler.GetDeliveryAttempts)
-								deliveryRouter.Get("/{deliveryAttemptID}", handler.GetDeliveryAttempt)
-							})
-						})
-					})
-
 					projectSubRouter.Route("/subscriptions", func(subscriptionRouter chi.Router) {
 						subscriptionRouter.With(handler.RequireEnabledProject()).Post("/", handler.CreateSubscription)
 						subscriptionRouter.Post("/test_filter", handler.TestSubscriptionFilter)
@@ -250,8 +199,6 @@ func (a *ApplicationHandler) BuildControlPlaneRoutes() *chi.Mux {
 		})
 	})
 
-
-
 	// Dashboard API.
 	router.Route("/ui", func(uiRouter chi.Router) {
 		uiRouter.Use(middleware.JsonResponse)
@@ -274,11 +221,11 @@ func (a *ApplicationHandler) BuildControlPlaneRoutes() *chi.Mux {
 			authRouter.Post("/logout", handler.LogoutUser)
 		})
 
-        uiRouter.Route("/saml", func(samlRouter chi.Router) {
-            samlRouter.Use(middleware.RequireValidEnterpriseSSOLicense(handler.A.Licenser))
-            samlRouter.Get("/login", handler.RedeemLoginSSOToken)
-            samlRouter.Get("/register", handler.RedeemRegisterSSOToken)
-        })
+		uiRouter.Route("/saml", func(samlRouter chi.Router) {
+			samlRouter.Use(middleware.RequireValidEnterpriseSSOLicense(handler.A.Licenser))
+			samlRouter.Get("/login", handler.RedeemLoginSSOToken)
+			samlRouter.Get("/register", handler.RedeemRegisterSSOToken)
+		})
 
 		uiRouter.Route("/users", func(userRouter chi.Router) {
 			userRouter.Route("/{userID}", func(userSubRouter chi.Router) {
@@ -350,48 +297,6 @@ func (a *ApplicationHandler) BuildControlPlaneRoutes() *chi.Mux {
 							})
 						})
 
-						// TODO(subomi): left this here temporarily till the data plane is stable.
-						projectSubRouter.Route("/events", func(eventRouter chi.Router) {
-							eventRouter.With(middleware.Pagination).Get("/", handler.GetEventsPaged)
-							eventRouter.Get("/countbatchreplayevents", handler.CountAffectedEvents)
-
-							// TODO(all): should the InstrumentPath change?
-							eventRouter.With(handler.RequireEnabledProject()).Post("/", handler.CreateEndpointEvent)
-							eventRouter.With(handler.RequireEnabledProject()).Post("/fanout", handler.CreateEndpointFanoutEvent)
-							eventRouter.With(handler.RequireEnabledProject()).Post("/broadcast", handler.CreateBroadcastEvent)
-							eventRouter.With(handler.RequireEnabledProject()).Post("/dynamic", handler.CreateDynamicEvent)
-							eventRouter.With(handler.RequireEnabledProject()).Post("/batchreplay", handler.BatchReplayEvents)
-
-							eventRouter.Route("/{eventID}", func(eventSubRouter chi.Router) {
-								eventSubRouter.With(handler.RequireEnabledProject()).Put("/replay", handler.ReplayEndpointEvent)
-								eventSubRouter.Get("/", handler.GetEndpointEvent)
-							})
-						})
-
-						projectSubRouter.Route("/event-types", func(eventTypesRouter chi.Router) {
-							eventTypesRouter.Get("/", handler.GetEventTypes)
-							eventTypesRouter.With(handler.RequireEnabledProject()).Post("/", handler.CreateEventType)
-							eventTypesRouter.With(handler.RequireEnabledProject()).Put("/{eventTypeId}", handler.UpdateEventType)
-							eventTypesRouter.With(handler.RequireEnabledProject()).Post("/{eventTypeId}/deprecate", handler.DeprecateEventType)
-						})
-
-						projectSubRouter.Route("/eventdeliveries", func(eventDeliveryRouter chi.Router) {
-							eventDeliveryRouter.With(middleware.Pagination).Get("/", handler.GetEventDeliveriesPaged)
-							eventDeliveryRouter.With(handler.RequireEnabledProject()).Post("/forceresend", handler.ForceResendEventDeliveries)
-							eventDeliveryRouter.With(handler.RequireEnabledProject()).Post("/batchretry", handler.BatchRetryEventDelivery)
-							eventDeliveryRouter.Get("/countbatchretryevents", handler.CountAffectedEventDeliveries)
-
-							eventDeliveryRouter.Route("/{eventDeliveryID}", func(eventDeliverySubRouter chi.Router) {
-								eventDeliverySubRouter.Get("/", handler.GetEventDelivery)
-								eventDeliverySubRouter.With(handler.RequireEnabledProject()).Put("/resend", handler.ResendEventDelivery)
-
-								eventDeliverySubRouter.Route("/deliveryattempts", func(deliveryRouter chi.Router) {
-									deliveryRouter.Get("/", handler.GetDeliveryAttempts)
-									deliveryRouter.Get("/{deliveryAttemptID}", handler.GetDeliveryAttempt)
-								})
-							})
-						})
-
 						projectSubRouter.Route("/subscriptions", func(subscriptionRouter chi.Router) {
 							subscriptionRouter.With(handler.RequireEnabledProject()).Post("/", handler.CreateSubscription)
 							subscriptionRouter.Post("/test_filter", handler.TestSubscriptionFilter)
@@ -462,43 +367,6 @@ func (a *ApplicationHandler) BuildControlPlaneRoutes() *chi.Mux {
 			endpointRouter.With(handler.CanManageEndpoint()).Put("/{endpointID}/expire_secret", handler.ExpireSecret)
 		})
 
-		// TODO(subomi): left this here temporarily till the data plane is stable.
-		portalLinkRouter.Route("/events", func(eventRouter chi.Router) {
-			eventRouter.Post("/", handler.CreateEndpointEvent)
-			eventRouter.With(middleware.Pagination).Get("/", handler.GetEventsPaged)
-			eventRouter.Post("/batchreplay", handler.BatchReplayEvents)
-			eventRouter.Get("/countbatchreplayevents", handler.CountAffectedEvents)
-
-			eventRouter.Route("/{eventID}", func(eventSubRouter chi.Router) {
-				eventSubRouter.Get("/", handler.GetEndpointEvent)
-				eventSubRouter.Put("/replay", handler.ReplayEndpointEvent)
-			})
-		})
-
-    portalLinkRouter.Route("/event-types", func(eventTypesRouter chi.Router) {
-      eventTypesRouter.Get("/", handler.GetEventTypes)
-      eventTypesRouter.With(handler.RequireEnabledProject()).Post("/", handler.CreateEventType)
-      eventTypesRouter.With(handler.RequireEnabledProject()).Put("/{eventTypeId}", handler.UpdateEventType)
-      eventTypesRouter.With(handler.RequireEnabledProject()).Post("/{eventTypeId}/deprecate", handler.DeprecateEventType)
-    })
-
-    portalLinkRouter.Route("/eventdeliveries", func(eventDeliveryRouter chi.Router) {
-      eventDeliveryRouter.With(middleware.Pagination).Get("/", handler.GetEventDeliveriesPaged)
-      eventDeliveryRouter.Post("/forceresend", handler.ForceResendEventDeliveries)
-      eventDeliveryRouter.Post("/batchretry", handler.BatchRetryEventDelivery)
-      eventDeliveryRouter.Get("/countbatchretryevents", handler.CountAffectedEventDeliveries)
-
-      eventDeliveryRouter.Route("/{eventDeliveryID}", func(eventDeliverySubRouter chi.Router) {
-        eventDeliverySubRouter.Get("/", handler.GetEventDelivery)
-        eventDeliverySubRouter.Put("/resend", handler.ResendEventDelivery)
-
-        eventDeliverySubRouter.Route("/deliveryattempts", func(deliveryRouter chi.Router) {
-          deliveryRouter.Get("/", handler.GetDeliveryAttempts)
-          deliveryRouter.Get("/{deliveryAttemptID}", handler.GetDeliveryAttempt)
-        })
-      })
-    })
-
 		portalLinkRouter.Route("/subscriptions", func(subscriptionRouter chi.Router) {
 			subscriptionRouter.Post("/", handler.CreateSubscription)
 			subscriptionRouter.Post("/test_filter", handler.TestSubscriptionFilter)
@@ -575,6 +443,13 @@ func (a *ApplicationHandler) BuildDataPlaneRoutes() *chi.Mux {
 						})
 					})
 
+					projectSubRouter.Route("/event-types", func(eventTypesRouter chi.Router) {
+						eventTypesRouter.Get("/", handler.GetEventTypes)
+						eventTypesRouter.With(handler.RequireEnabledProject()).Post("/", handler.CreateEventType)
+						eventTypesRouter.With(handler.RequireEnabledProject()).Put("/{eventTypeId}", handler.UpdateEventType)
+						eventTypesRouter.With(handler.RequireEnabledProject()).Post("/{eventTypeId}/deprecate", handler.DeprecateEventType)
+					})
+
 					projectSubRouter.Route("/eventdeliveries", func(eventDeliveryRouter chi.Router) {
 						eventDeliveryRouter.With(middleware.Pagination).Get("/", handler.GetEventDeliveriesPaged)
 						eventDeliveryRouter.Post("/forceresend", handler.ForceResendEventDeliveries)
@@ -595,8 +470,6 @@ func (a *ApplicationHandler) BuildDataPlaneRoutes() *chi.Mux {
 		})
 	})
 
-
-
 	// Dashboard API.
 	router.Route("/ui", func(uiRouter chi.Router) {
 		uiRouter.Use(middleware.JsonResponse)
@@ -612,11 +485,11 @@ func (a *ApplicationHandler) BuildDataPlaneRoutes() *chi.Mux {
 			authRouter.Post("/logout", handler.LogoutUser)
 		})
 
-        uiRouter.Route("/saml", func(samlRouter chi.Router) {
-            samlRouter.Use(middleware.RequireValidEnterpriseSSOLicense(handler.A.Licenser))
-            samlRouter.Get("/login", handler.RedeemLoginSSOToken)
-            samlRouter.Get("/register", handler.RedeemRegisterSSOToken)
-        })
+		uiRouter.Route("/saml", func(samlRouter chi.Router) {
+			samlRouter.Use(middleware.RequireValidEnterpriseSSOLicense(handler.A.Licenser))
+			samlRouter.Get("/login", handler.RedeemLoginSSOToken)
+			samlRouter.Get("/register", handler.RedeemRegisterSSOToken)
+		})
 
 		uiRouter.Route("/organisations", func(orgRouter chi.Router) {
 			orgRouter.Route("/{orgID}", func(orgSubRouter chi.Router) {
@@ -635,6 +508,13 @@ func (a *ApplicationHandler) BuildDataPlaneRoutes() *chi.Mux {
 							})
 						})
 
+						projectSubRouter.Route("/event-types", func(eventTypesRouter chi.Router) {
+							eventTypesRouter.Get("/", handler.GetEventTypes)
+							eventTypesRouter.With(handler.RequireEnabledProject()).Post("/", handler.CreateEventType)
+							eventTypesRouter.With(handler.RequireEnabledProject()).Put("/{eventTypeId}", handler.UpdateEventType)
+							eventTypesRouter.With(handler.RequireEnabledProject()).Post("/{eventTypeId}/deprecate", handler.DeprecateEventType)
+						})
+
 						projectSubRouter.Route("/eventdeliveries", func(eventDeliveryRouter chi.Router) {
 							eventDeliveryRouter.With(middleware.Pagination).Get("/", handler.GetEventDeliveriesPaged)
 							eventDeliveryRouter.Post("/forceresend", handler.ForceResendEventDeliveries)

diff --git a/api/dashboard_integration_test.go b/api/dashboard_integration_test.go
@@ -1041,6 +1041,7 @@ type EventIntegrationTestSuite struct {
 	suite.Suite
 	DB              database.Database
 	Router          http.Handler
+	DPRouter        http.Handler
 	ConvoyApp       *ApplicationHandler
 	AuthenticatorFn AuthenticatorFn
 	DefaultOrg      *datastore.Organisation
@@ -1052,6 +1053,7 @@ func (s *EventIntegrationTestSuite) SetupSuite() {
 	s.DB = getDB()
 	s.ConvoyApp = buildServer()
 	s.Router = s.ConvoyApp.BuildControlPlaneRoutes()
+	s.DPRouter = s.ConvoyApp.BuildDataPlaneRoutes()
 }
 
 func (s *EventIntegrationTestSuite) SetupTest() {
@@ -1109,7 +1111,7 @@ func (s *EventIntegrationTestSuite) Test_CreateEndpointEvent() {
 	w := httptest.NewRecorder()
 
 	// Act.
-	s.Router.ServeHTTP(w, req)
+	s.DPRouter.ServeHTTP(w, req)
 
 	// Assert.
 	require.Equal(s.T(), expectedStatusCode, w.Code)
@@ -1147,7 +1149,7 @@ func (s *EventIntegrationTestSuite) Test_CreateEndpointEvent_With_App_ID_Valid_E
 
 	w := httptest.NewRecorder()
 	// Act.
-	s.Router.ServeHTTP(w, req)
+	s.DPRouter.ServeHTTP(w, req)
 
 	// Assert.
 	require.Equal(s.T(), expectedStatusCode, w.Code)
@@ -1171,7 +1173,7 @@ func (s *EventIntegrationTestSuite) Test_CreateEndpointEvent_Endpoint_is_disable
 
 	w := httptest.NewRecorder()
 	// Act.
-	s.Router.ServeHTTP(w, req)
+	s.DPRouter.ServeHTTP(w, req)
 
 	// Assert.
 	require.Equal(s.T(), expectedStatusCode, w.Code)
@@ -1197,7 +1199,7 @@ func (s *EventIntegrationTestSuite) Test_GetEndpointEvent_Valid_Event() {
 	w := httptest.NewRecorder()
 
 	// Act.
-	s.Router.ServeHTTP(w, req)
+	s.DPRouter.ServeHTTP(w, req)
 
 	// Assert.
 	require.Equal(s.T(), expectedStatusCode, w.Code)
@@ -1225,7 +1227,7 @@ func (s *EventIntegrationTestSuite) Test_ReplayEndpointEvent_Valid_Event() {
 	w := httptest.NewRecorder()
 
 	// Act.
-	s.Router.ServeHTTP(w, req)
+	s.DPRouter.ServeHTTP(w, req)
 
 	// Assert.
 	require.Equal(s.T(), expectedStatusCode, w.Code)
@@ -1275,7 +1277,7 @@ func (s *EventIntegrationTestSuite) Test_GetEventDelivery_Valid_EventDelivery()
 	w := httptest.NewRecorder()
 
 	// Act.
-	s.Router.ServeHTTP(w, req)
+	s.DPRouter.ServeHTTP(w, req)
 
 	// Assert.
 	require.Equal(s.T(), expectedStatusCode, w.Code)
@@ -1334,7 +1336,7 @@ func (s *EventIntegrationTestSuite) Test_ResendEventDelivery_Valid_Resend() {
 	w := httptest.NewRecorder()
 
 	// Act.
-	s.Router.ServeHTTP(w, req)
+	s.DPRouter.ServeHTTP(w, req)
 
 	// Assert.
 	require.Equal(s.T(), expectedStatusCode, w.Code)
@@ -1376,7 +1378,7 @@ func (s *EventIntegrationTestSuite) Test_BatchRetryEventDelivery_Valid_EventDeli
 	w := httptest.NewRecorder()
 
 	// Act.
-	s.Router.ServeHTTP(w, req)
+	s.DPRouter.ServeHTTP(w, req)
 
 	// Assert.
 	require.Equal(s.T(), expectedStatusCode, w.Code)
@@ -1412,7 +1414,7 @@ func (s *EventIntegrationTestSuite) Test_CountAffectedEventDeliveries_Valid_Filt
 	w := httptest.NewRecorder()
 
 	// Act.
-	s.Router.ServeHTTP(w, req)
+	s.DPRouter.ServeHTTP(w, req)
 
 	// Assert.
 	require.Equal(s.T(), expectedStatusCode, w.Code)
@@ -1457,7 +1459,7 @@ func (s *EventIntegrationTestSuite) Test_ForceResendEventDeliveries_Valid_EventD
 	w := httptest.NewRecorder()
 
 	// Act.
-	s.Router.ServeHTTP(w, req)
+	s.DPRouter.ServeHTTP(w, req)
 
 	// Assert.
 	require.Equal(s.T(), expectedStatusCode, w.Code)
@@ -1510,7 +1512,7 @@ func (s *EventIntegrationTestSuite) Test_GetEventsPaged() {
 	w := httptest.NewRecorder()
 
 	// Act.
-	s.Router.ServeHTTP(w, req)
+	s.DPRouter.ServeHTTP(w, req)
 
 	// Assert.
 	require.Equal(s.T(), expectedStatusCode, w.Code)
@@ -1568,7 +1570,7 @@ func (s *EventIntegrationTestSuite) Test_GetEventDeliveriesPaged() {
 	w := httptest.NewRecorder()
 
 	// Act.
-	s.Router.ServeHTTP(w, req)
+	s.DPRouter.ServeHTTP(w, req)
 
 	// Assert.
 	require.Equal(s.T(), expectedStatusCode, w.Code)