@@ -264,7 +264,6 @@ var _ = Describe("Gateway Enterprise", func() {
264264 conf = config .New ()
265265 conf .Set ("Gateway.enableRateLimit" , false )
266266 conf .Set ("Gateway.enableSuppressUserFeature" , true )
267- conf .Set ("Gateway.enableEventSchemasFeature" , false )
268267 })
269268
270269 AfterEach (func () {
@@ -402,7 +401,6 @@ var _ = Describe("Gateway", func() {
402401 BeforeEach (func () {
403402 conf = config .New ()
404403 conf .Set ("Gateway.enableRateLimit" , false )
405- conf .Set ("Gateway.enableEventSchemasFeature" , false )
406404 c = & testContext {}
407405 c .Setup ()
408406 })
@@ -415,7 +413,7 @@ var _ = Describe("Gateway", func() {
415413 It ("should wait for backend config" , func () {
416414 c .initializeAppFeatures ()
417415 gateway := & Handle {}
418- err := gateway .Setup (context .Background (), conf , logger .NOP , stats .NOP , c .mockApp , c .mockBackendConfig , c .mockJobsDB , nil , c .mockVersionHandler , rsources .NewNoOpService (), transformer .NewNoOpService (), sourcedebugger .NewNoOpService (), nil )
416+ err := gateway .Setup (context .Background (), conf , logger .NOP , stats .NOP , c .mockApp , c .mockBackendConfig , c .mockJobsDB , nil , c .mockVersionHandler , rsources .NewNoOpService (), transformer .NewNoOpService (), sourcedebugger .NewNoOpService (), nil , WithInternalEndpointsEnabled ( true ) )
419417 Expect (err ).To (BeNil ())
420418 waitForBackendConfigInit (gateway )
421419 err = gateway .Shutdown ()
@@ -448,7 +446,7 @@ var _ = Describe("Gateway", func() {
448446 GinkgoT ().Setenv ("RSERVER_GATEWAY_WEB_PORT" , strconv .Itoa (serverPort ))
449447
450448 gateway = & Handle {}
451- err = gateway .Setup (context .Background (), conf , logger .NOP , stats .NOP , c .mockApp , c .mockBackendConfig , c .mockJobsDB , nil , c .mockVersionHandler , rsources .NewNoOpService (), transformer .NewNoOpService (), sourcedebugger .NewNoOpService (), nil )
449+ err = gateway .Setup (context .Background (), conf , logger .NOP , stats .NOP , c .mockApp , c .mockBackendConfig , c .mockJobsDB , nil , c .mockVersionHandler , rsources .NewNoOpService (), transformer .NewNoOpService (), sourcedebugger .NewNoOpService (), nil , WithInternalEndpointsEnabled ( true ) )
452450 Expect (err ).To (BeNil ())
453451 waitForBackendConfigInit (gateway )
454452 gateway .irh = mockRequestHandler {}
@@ -495,7 +493,7 @@ var _ = Describe("Gateway", func() {
495493 }
496494 resp , err := client .Do (req )
497495 Expect (err ).To (BeNil ())
498- Expect (resp .StatusCode ).To (SatisfyAny (Equal (http .StatusOK ), Equal (http .StatusNoContent )), "endpoint: " + ep )
496+ Expect (resp .StatusCode ).To (SatisfyAny (Equal (http .StatusOK ), Equal (http .StatusNoContent )), "endpoint: " + ep , "method: " + method )
499497
500498 }
501499 }
@@ -543,7 +541,7 @@ var _ = Describe("Gateway", func() {
543541 Expect (err ).To (BeNil ())
544542
545543 gateway = & Handle {}
546- err := gateway .Setup (context .Background (), conf , logger .NOP , statsStore , c .mockApp , c .mockBackendConfig , c .mockJobsDB , nil , c .mockVersionHandler , rsources .NewNoOpService (), transformer .NewNoOpService (), sourcedebugger .NewNoOpService (), nil )
544+ err := gateway .Setup (context .Background (), conf , logger .NOP , statsStore , c .mockApp , c .mockBackendConfig , c .mockJobsDB , nil , c .mockVersionHandler , rsources .NewNoOpService (), transformer .NewNoOpService (), sourcedebugger .NewNoOpService (), nil , WithInternalEndpointsEnabled ( true ) )
547545 Expect (err ).To (BeNil ())
548546 waitForBackendConfigInit (gateway )
549547 })
@@ -1783,7 +1781,6 @@ var _ = Describe("Gateway", func() {
17831781 conf = config .New ()
17841782 conf .Set ("Gateway.enableRateLimit" , false )
17851783 conf .Set ("Gateway.enableSuppressUserFeature" , true )
1786- conf .Set ("Gateway.enableEventSchemasFeature" , false )
17871784
17881785 serverPort , err := kithelper .GetFreePort ()
17891786 Expect (err ).To (BeNil ())
@@ -1799,7 +1796,7 @@ var _ = Describe("Gateway", func() {
17991796
18001797 gateway = & Handle {}
18011798 srcDebugger = mocksrcdebugger .NewMockSourceDebugger (c .mockCtrl )
1802- err = gateway .Setup (context .Background (), conf , logger .NOP , statStore , c .mockApp , c .mockBackendConfig , c .mockJobsDB , nil , c .mockVersionHandler , rsources .NewNoOpService (), transformer .NewNoOpService (), srcDebugger , nil )
1799+ err = gateway .Setup (context .Background (), conf , logger .NOP , statStore , c .mockApp , c .mockBackendConfig , c .mockJobsDB , nil , c .mockVersionHandler , rsources .NewNoOpService (), transformer .NewNoOpService (), srcDebugger , nil , WithInternalEndpointsEnabled ( true ) )
18031800 Expect (err ).To (BeNil ())
18041801 waitForBackendConfigInit (gateway )
18051802 c .mockBackendConfig .EXPECT ().WaitForConfig (gomock .Any ()).AnyTimes ()
@@ -2138,7 +2135,7 @@ var _ = Describe("Gateway", func() {
21382135 BeforeEach (func () {
21392136 c .initializeAppFeatures ()
21402137 gateway = & Handle {}
2141- err := gateway .Setup (context .Background (), conf , logger .NOP , stats .NOP , c .mockApp , c .mockBackendConfig , c .mockJobsDB , nil , c .mockVersionHandler , rsources .NewNoOpService (), transformer .NewNoOpService (), sourcedebugger .NewNoOpService (), nil )
2138+ err := gateway .Setup (context .Background (), conf , logger .NOP , stats .NOP , c .mockApp , c .mockBackendConfig , c .mockJobsDB , nil , c .mockVersionHandler , rsources .NewNoOpService (), transformer .NewNoOpService (), sourcedebugger .NewNoOpService (), nil , WithInternalEndpointsEnabled ( true ) )
21422139 Expect (err ).To (BeNil ())
21432140 waitForBackendConfigInit (gateway )
21442141 })
@@ -2410,12 +2407,10 @@ func endpointsToVerify() ([]string, []string, []string) {
24102407 "/pixel/v1/track" ,
24112408 "/pixel/v1/page" ,
24122409 "/v1/webhook" ,
2413- "/v1/job-status/123" ,
2414- "/v1/job-status/123/failed-records" ,
2415- "/v1/warehouse/jobs/status" ,
2410+ "/internal/v1/warehouse/jobs/status" ,
24162411 "/internal/v1/warehouse/fetch-tables" ,
2417- "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/internal/v1 /job-status/123" ,
2418- "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/internal/v1 /job-status/123/failed-records" ,
2412+ "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/internal/v2 /job-status/123" ,
2413+ "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/internal/v2 /job-status/123/failed-records" ,
24192414 }
24202415
24212416 postEndpoints := []string {
@@ -2435,14 +2430,14 @@ func endpointsToVerify() ([]string, []string, []string) {
24352430 "/internal/v1/retl" ,
24362431 "/internal/v1/replay" ,
24372432 "/internal/v1/audiencelist" ,
2438- "/v1/warehouse/pending-events" ,
2439- "/v1/warehouse/trigger-upload" ,
2440- "/v1/warehouse/jobs" ,
2441- // "/internal/v1/batch", will be tested in new unit test
2433+ "/internal/v1/warehouse/pending-events" ,
2434+ "/internal/v1/warehouse/trigger-upload" ,
2435+ "/internal/v1/warehouse/jobs" ,
24422436 }
24432437
24442438 deleteEndpoints := []string {
2445- "/v1/job-status/1234" ,
2439+ "/internal/v2/job-status/1234" ,
2440+ "/internal/v2/job-status/123/failed-records" ,
24462441 }
24472442 return getEndpoints , postEndpoints , deleteEndpoints
24482443}
@@ -2622,7 +2617,7 @@ func createTestGatewayWithLeakyUploader(t *testing.T, endpoint, accessKeyID, sec
26222617 conf .Set ("Gateway.leakyUploader.Storage.DisableSsl" , true )
26232618 conf .Set ("Gateway.leakyUploader.Storage.UseGlue" , true )
26242619 conf .Set ("Gateway.leakyUploader.Storage.S3ForcePathStyle" , true )
2625- err := gw .Setup (context .Background (), conf , logger .NewLogger ().Withn (logger .NewStringField ("component" , "test" )), stats .NOP , mockApp , mockBackendConfig , mockJobsDB , mockRateLimiter , mockVersionHandler , rsources .NewNoOpService (), transformer .NewNoOpService (), sourcedebugger .NewNoOpService (), nil )
2620+ err := gw .Setup (context .Background (), conf , logger .NewLogger ().Withn (logger .NewStringField ("component" , "test" )), stats .NOP , mockApp , mockBackendConfig , mockJobsDB , mockRateLimiter , mockVersionHandler , rsources .NewNoOpService (), transformer .NewNoOpService (), sourcedebugger .NewNoOpService (), nil , WithInternalEndpointsEnabled ( true ) )
26262621 require .NoError (t , err )
26272622 require .Eventually (t , func () bool {
26282623 select {
0 commit comments