From 6127544493be07df2330108b041cac2757d0817f Mon Sep 17 00:00:00 2001 From: HerbertJulio Date: Tue, 14 Jan 2025 13:56:00 -0300 Subject: [PATCH 1/7] fix: update real-time events and metrics service URLs to use v4 API version --- cypress/e2mock/activity-history.cy.js | 2 +- .../real-time-events-service/make-real-time-events-service.js | 2 +- .../real-time-metrics-services/make-beholder-base-url.js | 2 +- .../activity-history/list-activity-history.test.js | 2 +- .../activity-history/load-activity-history.test.js | 2 +- .../data-stream/list-data-stream.test.js | 2 +- .../data-stream/load-data-stream.test.js | 2 +- .../real-time-events-service/edge-dns/list-edge-dns.test.js | 2 +- .../real-time-events-service/edge-dns/load-edge-dns.test.js | 2 +- .../edge-functions-console/list-edge-functions-console.test.js | 2 +- .../edge-functions-console/load-edge-functions-console.test.js | 2 +- .../edge-functions/list-edge-functions.test.js | 2 +- .../edge-functions/load-edge-functions.test.js | 2 +- .../http-request/list-http-request.test.js | 2 +- .../http-request/load-http-request.test.js | 2 +- .../image-processor/list-image-processor.test.js | 2 +- .../image-processor/load-image-processor.test.js | 2 +- .../tiered-cache/list-tiered-cache.test.js | 2 +- .../tiered-cache/load-tiered-cache.test.js | 2 +- .../load-real-time-metrics-data.test.js | 2 +- .../real-time-metrics-services/make-beholder-base-url.test.js | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/cypress/e2mock/activity-history.cy.js b/cypress/e2mock/activity-history.cy.js index 3bb4ba0c52..f383a61bab 100644 --- a/cypress/e2mock/activity-history.cy.js +++ b/cypress/e2mock/activity-history.cy.js @@ -4,7 +4,7 @@ import selectors from '../support/selectors' describe('Activity History Spec', { tags: ['@dev2'] }, () => { beforeEach(() => { cy.login() - cy.intercept('POST', '/api/v3/events/graphql', { fixture: 'activity-history.json' }).as('activityHistoryApi') + cy.intercept('POST', '/api/v4/events/graphql', { fixture: 'activity-history.json' }).as('activityHistoryApi') cy.openProduct('Activity History') }) diff --git a/src/services/real-time-events-service/make-real-time-events-service.js b/src/services/real-time-events-service/make-real-time-events-service.js index 7312c7a78c..5198b5a3db 100644 --- a/src/services/real-time-events-service/make-real-time-events-service.js +++ b/src/services/real-time-events-service/make-real-time-events-service.js @@ -1,3 +1,3 @@ export const makeRealTimeEventsBaseUrl = () => { - return 'v3/events/graphql' + return 'v4/events/graphql' } diff --git a/src/services/real-time-metrics-services/make-beholder-base-url.js b/src/services/real-time-metrics-services/make-beholder-base-url.js index f79e749b72..5e2606d3d2 100644 --- a/src/services/real-time-metrics-services/make-beholder-base-url.js +++ b/src/services/real-time-metrics-services/make-beholder-base-url.js @@ -1,4 +1,4 @@ export const makeBeholderBaseUrl = () => { - const version = 'v3' + const version = 'v4' return `${version}/metrics/graphql` } diff --git a/src/tests/services/real-time-events-service/activity-history/list-activity-history.test.js b/src/tests/services/real-time-events-service/activity-history/list-activity-history.test.js index ab37990c68..af6d990046 100644 --- a/src/tests/services/real-time-events-service/activity-history/list-activity-history.test.js +++ b/src/tests/services/real-time-events-service/activity-history/list-activity-history.test.js @@ -64,7 +64,7 @@ describe('ActivityHistoryServices', () => { ].join('\n') expect(requestSpy).toHaveBeenCalledWith({ - url: 'v3/events/graphql', + url: 'v4/events/graphql', method: 'POST', signal: undefined, body: { diff --git a/src/tests/services/real-time-events-service/activity-history/load-activity-history.test.js b/src/tests/services/real-time-events-service/activity-history/load-activity-history.test.js index 6959333892..aadbaf5eeb 100644 --- a/src/tests/services/real-time-events-service/activity-history/load-activity-history.test.js +++ b/src/tests/services/real-time-events-service/activity-history/load-activity-history.test.js @@ -42,7 +42,7 @@ describe('ActivityHistoryServices', () => { await sut(fixtures.filter) expect(requestSpy).toHaveBeenCalledWith({ - url: 'v3/events/graphql', + url: 'v4/events/graphql', method: 'POST', signal: undefined, body: { diff --git a/src/tests/services/real-time-events-service/data-stream/list-data-stream.test.js b/src/tests/services/real-time-events-service/data-stream/list-data-stream.test.js index 0672100b0b..b0f0226466 100644 --- a/src/tests/services/real-time-events-service/data-stream/list-data-stream.test.js +++ b/src/tests/services/real-time-events-service/data-stream/list-data-stream.test.js @@ -70,7 +70,7 @@ describe('DataStreamingServices', () => { ].join('\n') expect(requestSpy).toHaveBeenCalledWith({ - url: 'v3/events/graphql', + url: 'v4/events/graphql', method: 'POST', signal: undefined, body: { diff --git a/src/tests/services/real-time-events-service/data-stream/load-data-stream.test.js b/src/tests/services/real-time-events-service/data-stream/load-data-stream.test.js index 2ecae4334c..7570f9cef9 100644 --- a/src/tests/services/real-time-events-service/data-stream/load-data-stream.test.js +++ b/src/tests/services/real-time-events-service/data-stream/load-data-stream.test.js @@ -42,7 +42,7 @@ describe('DataStreamingServices', () => { await sut(fixtures.filter) expect(requestSpy).toHaveBeenCalledWith({ - url: 'v3/events/graphql', + url: 'v4/events/graphql', method: 'POST', signal: undefined, body: { diff --git a/src/tests/services/real-time-events-service/edge-dns/list-edge-dns.test.js b/src/tests/services/real-time-events-service/edge-dns/list-edge-dns.test.js index f34e757454..b9f7ff70ad 100644 --- a/src/tests/services/real-time-events-service/edge-dns/list-edge-dns.test.js +++ b/src/tests/services/real-time-events-service/edge-dns/list-edge-dns.test.js @@ -65,7 +65,7 @@ describe('edgeDns', () => { ].join('\n') expect(requestSpy).toHaveBeenCalledWith({ - url: 'v3/events/graphql', + url: 'v4/events/graphql', method: 'POST', signal: undefined, body: { diff --git a/src/tests/services/real-time-events-service/edge-dns/load-edge-dns.test.js b/src/tests/services/real-time-events-service/edge-dns/load-edge-dns.test.js index 768f946720..eb10598569 100644 --- a/src/tests/services/real-time-events-service/edge-dns/load-edge-dns.test.js +++ b/src/tests/services/real-time-events-service/edge-dns/load-edge-dns.test.js @@ -42,7 +42,7 @@ describe('ImageProcessorServices', () => { await sut(fixtures.filter) expect(requestSpy).toHaveBeenCalledWith({ - url: 'v3/events/graphql', + url: 'v4/events/graphql', method: 'POST', signal: undefined, body: { diff --git a/src/tests/services/real-time-events-service/edge-functions-console/list-edge-functions-console.test.js b/src/tests/services/real-time-events-service/edge-functions-console/list-edge-functions-console.test.js index 4a85fc049b..85c7254c7b 100644 --- a/src/tests/services/real-time-events-service/edge-functions-console/list-edge-functions-console.test.js +++ b/src/tests/services/real-time-events-service/edge-functions-console/list-edge-functions-console.test.js @@ -64,7 +64,7 @@ describe('EdgeFunctionsConsoleServices', () => { ].join('\n') expect(requestSpy).toHaveBeenCalledWith({ - url: 'v3/events/graphql', + url: 'v4/events/graphql', method: 'POST', signal: undefined, body: { diff --git a/src/tests/services/real-time-events-service/edge-functions-console/load-edge-functions-console.test.js b/src/tests/services/real-time-events-service/edge-functions-console/load-edge-functions-console.test.js index 80ec61389d..196daf87ce 100644 --- a/src/tests/services/real-time-events-service/edge-functions-console/load-edge-functions-console.test.js +++ b/src/tests/services/real-time-events-service/edge-functions-console/load-edge-functions-console.test.js @@ -42,7 +42,7 @@ describe('EdgeFunctionsConsoleServices', () => { await sut(fixtures.filter) expect(requestSpy).toHaveBeenCalledWith({ - url: 'v3/events/graphql', + url: 'v4/events/graphql', method: 'POST', signal: undefined, body: { diff --git a/src/tests/services/real-time-events-service/edge-functions/list-edge-functions.test.js b/src/tests/services/real-time-events-service/edge-functions/list-edge-functions.test.js index 8d0af41ca5..a9fd500087 100644 --- a/src/tests/services/real-time-events-service/edge-functions/list-edge-functions.test.js +++ b/src/tests/services/real-time-events-service/edge-functions/list-edge-functions.test.js @@ -61,7 +61,7 @@ describe('EdgeFunctionsServices', () => { ].join('\n') expect(requestSpy).toHaveBeenCalledWith({ - url: 'v3/events/graphql', + url: 'v4/events/graphql', method: 'POST', signal: undefined, body: { diff --git a/src/tests/services/real-time-events-service/edge-functions/load-edge-functions.test.js b/src/tests/services/real-time-events-service/edge-functions/load-edge-functions.test.js index 286a5400ce..6a844bf02c 100644 --- a/src/tests/services/real-time-events-service/edge-functions/load-edge-functions.test.js +++ b/src/tests/services/real-time-events-service/edge-functions/load-edge-functions.test.js @@ -43,7 +43,7 @@ describe('DataStreamingServices', () => { await sut(fixtures.filter) expect(requestSpy).toHaveBeenCalledWith({ - url: 'v3/events/graphql', + url: 'v4/events/graphql', method: 'POST', signal: undefined, body: { diff --git a/src/tests/services/real-time-events-service/http-request/list-http-request.test.js b/src/tests/services/real-time-events-service/http-request/list-http-request.test.js index e53fc61d15..ccc476b356 100644 --- a/src/tests/services/real-time-events-service/http-request/list-http-request.test.js +++ b/src/tests/services/real-time-events-service/http-request/list-http-request.test.js @@ -63,7 +63,7 @@ describe('HttpRequestServices', () => { ].join('\n') expect(requestSpy).toHaveBeenCalledWith({ - url: 'v3/events/graphql', + url: 'v4/events/graphql', method: 'POST', signal: undefined, body: { diff --git a/src/tests/services/real-time-events-service/http-request/load-http-request.test.js b/src/tests/services/real-time-events-service/http-request/load-http-request.test.js index 38ee14ecf5..3e30e9a741 100644 --- a/src/tests/services/real-time-events-service/http-request/load-http-request.test.js +++ b/src/tests/services/real-time-events-service/http-request/load-http-request.test.js @@ -69,7 +69,7 @@ describe('HttpRequestServices', () => { await sut(fixtures.filter) expect(requestSpy).toHaveBeenCalledWith({ - url: 'v3/events/graphql', + url: 'v4/events/graphql', method: 'POST', signal: undefined, body: { diff --git a/src/tests/services/real-time-events-service/image-processor/list-image-processor.test.js b/src/tests/services/real-time-events-service/image-processor/list-image-processor.test.js index 3fcaf0ff5c..fd8a2beb29 100644 --- a/src/tests/services/real-time-events-service/image-processor/list-image-processor.test.js +++ b/src/tests/services/real-time-events-service/image-processor/list-image-processor.test.js @@ -66,7 +66,7 @@ describe('ImageProcessorServices', () => { ].join('\n') expect(requestSpy).toHaveBeenCalledWith({ - url: 'v3/events/graphql', + url: 'v4/events/graphql', method: 'POST', signal: undefined, body: { diff --git a/src/tests/services/real-time-events-service/image-processor/load-image-processor.test.js b/src/tests/services/real-time-events-service/image-processor/load-image-processor.test.js index 15d6c88705..da83201582 100644 --- a/src/tests/services/real-time-events-service/image-processor/load-image-processor.test.js +++ b/src/tests/services/real-time-events-service/image-processor/load-image-processor.test.js @@ -58,7 +58,7 @@ describe('ImageProcessorServices', () => { await sut(fixtures.filter) expect(requestSpy).toHaveBeenCalledWith({ - url: 'v3/events/graphql', + url: 'v4/events/graphql', method: 'POST', signal: undefined, body: { diff --git a/src/tests/services/real-time-events-service/tiered-cache/list-tiered-cache.test.js b/src/tests/services/real-time-events-service/tiered-cache/list-tiered-cache.test.js index b776787425..db352e4e7a 100644 --- a/src/tests/services/real-time-events-service/tiered-cache/list-tiered-cache.test.js +++ b/src/tests/services/real-time-events-service/tiered-cache/list-tiered-cache.test.js @@ -65,7 +65,7 @@ describe('tieredCacheServices', () => { ].join('\n') expect(requestSpy).toHaveBeenCalledWith({ - url: 'v3/events/graphql', + url: 'v4/events/graphql', method: 'POST', signal: undefined, body: { diff --git a/src/tests/services/real-time-events-service/tiered-cache/load-tiered-cache.test.js b/src/tests/services/real-time-events-service/tiered-cache/load-tiered-cache.test.js index 5fe961b7c4..1362a3d644 100644 --- a/src/tests/services/real-time-events-service/tiered-cache/load-tiered-cache.test.js +++ b/src/tests/services/real-time-events-service/tiered-cache/load-tiered-cache.test.js @@ -64,7 +64,7 @@ describe('tieredCacheServices', () => { await sut(fixtures.filter) expect(requestSpy).toHaveBeenCalledWith({ - url: 'v3/events/graphql', + url: 'v4/events/graphql', method: 'POST', signal: undefined, body: { diff --git a/src/tests/services/real-time-metrics-services/load-real-time-metrics-data.test.js b/src/tests/services/real-time-metrics-services/load-real-time-metrics-data.test.js index 3bf16a0015..efaf3784b2 100644 --- a/src/tests/services/real-time-metrics-services/load-real-time-metrics-data.test.js +++ b/src/tests/services/real-time-metrics-services/load-real-time-metrics-data.test.js @@ -27,7 +27,7 @@ describe('RealTimeMetricsServices', () => { }) const { sut } = makeSut() - const version = 'v3' + const version = 'v4' await sut({ query: fixtures.query, signal: fixtures.signal }) diff --git a/src/tests/services/real-time-metrics-services/make-beholder-base-url.test.js b/src/tests/services/real-time-metrics-services/make-beholder-base-url.test.js index 332effd18f..f7971c5bf8 100644 --- a/src/tests/services/real-time-metrics-services/make-beholder-base-url.test.js +++ b/src/tests/services/real-time-metrics-services/make-beholder-base-url.test.js @@ -12,7 +12,7 @@ const makeSut = () => { describe('RealTimeMetricsServices', () => { it('should return the API base url to beholder service', () => { const { sut } = makeSut() - const version = 'v3' + const version = 'v4' const beholderUrl = `${version}/metrics/graphql` const baseUrl = sut() From ca0dfd575074f0871b3ced530a8252bbc17e0eda Mon Sep 17 00:00:00 2001 From: HerbertJulio Date: Tue, 14 Jan 2025 14:00:23 -0300 Subject: [PATCH 2/7] fix: update origin names in azion.config.cjs and vite.config.js --- azion.config.cjs | 4 ++-- vite.config.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/azion.config.cjs b/azion.config.cjs index b2a0f89d11..fa67d0a135 100644 --- a/azion.config.cjs +++ b/azion.config.cjs @@ -237,7 +237,7 @@ const backRules = [ behavior: { forwardCookies: true, setOrigin: { - name: 'origin-manager', + name: 'origin-api', type: 'single_origin' }, rewrite: '/billing/graphql' @@ -250,7 +250,7 @@ const backRules = [ behavior: { forwardCookies: true, setOrigin: { - name: 'origin-manager', + name: 'origin-api', type: 'single_origin' }, rewrite: '/accounting/graphql' diff --git a/vite.config.js b/vite.config.js index f87c7e7eff..c0d6ab39d9 100644 --- a/vite.config.js +++ b/vite.config.js @@ -50,7 +50,7 @@ const getConfig = () => { rewrite: (path) => path.replace(/^\/graphql\/cities/, '/graphql') }, '/graphql/billing': { - target: `${URLStartPrefix}manager.azion.com`, + target: `${URLStartPrefix}api.azion.com`, changeOrigin: true, rewrite: (path) => path.replace(/^\/graphql\/billing/, '/billing/graphql') }, @@ -85,7 +85,7 @@ const getConfig = () => { rewrite: (path) => path.replace(/^\/ai/, '') }, '/graphql/accounting': { - target: `${URLStartPrefix}manager.azion.com`, + target: `${URLStartPrefix}api.azion.com`, changeOrigin: true, rewrite: (path) => path.replace(/^\/graphql\/accounting/, '/accounting/graphql') }, From dacdecee8b30b1d78aabb413a425e7b5c5ddff37 Mon Sep 17 00:00:00 2001 From: HerbertJulio Date: Wed, 15 Jan 2025 18:50:26 -0300 Subject: [PATCH 3/7] fix: update real-time events and metrics service URLs to use v4 API version --- src/services/axios/makeEventsApi.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/axios/makeEventsApi.js b/src/services/axios/makeEventsApi.js index 12fffc4704..ccc8406e15 100644 --- a/src/services/axios/makeEventsApi.js +++ b/src/services/axios/makeEventsApi.js @@ -2,7 +2,7 @@ import axios from 'axios' const api = (personalToken) => { delete axios.defaults.headers.common['Authorization'] - const version = 'v3' + const version = 'v4' const baseURL = `api/${version}/events` axios.defaults.headers.common['Accept'] = 'application/json' From 635dd98a49779612cb5df22aa39070271996babb Mon Sep 17 00:00:00 2001 From: HerbertJulio Date: Mon, 20 Jan 2025 16:23:36 -0300 Subject: [PATCH 4/7] fix: update URLs for real-time events and metrics services to use v4 API version --- src/helpers/get-static-urls-by-environment.js | 8 ++++---- src/tests/helpers/events-playground-opener.test.js | 4 ++-- src/tests/helpers/get-static-urls-by-environment.test.js | 6 +++--- src/tests/helpers/metrics-playground-opener.test.js | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/helpers/get-static-urls-by-environment.js b/src/helpers/get-static-urls-by-environment.js index 14265e16d8..fe6dd57a77 100644 --- a/src/helpers/get-static-urls-by-environment.js +++ b/src/helpers/get-static-urls-by-environment.js @@ -10,12 +10,12 @@ const urls = { production: 'https://manager.azion.com/billing-subscriptions' }, playgroundMetrics: { - stage: 'https://stage-manager.azion.com/metrics/graphql', - production: 'https://manager.azion.com/metrics/graphql' + stage: 'https://stage-api.azion.com/v4/metrics/graphql', + production: 'https://api.azion.com/v4/metrics/graphql' }, playgroundEvents: { - stage: 'https://stage-manager.azion.com/events/graphql', - production: 'https://manager.azion.com/events/graphql' + stage: 'https://stage-api.azion.com/v4/events/graphql', + production: 'https://api.azion.com/v4/events/graphql' }, helpCenter: { stage: 'https://storage.googleapis.com/gcs-docs-help-center-stage/console/', diff --git a/src/tests/helpers/events-playground-opener.test.js b/src/tests/helpers/events-playground-opener.test.js index 01ed03006a..119351fd0a 100644 --- a/src/tests/helpers/events-playground-opener.test.js +++ b/src/tests/helpers/events-playground-opener.test.js @@ -10,12 +10,12 @@ const scenarios = [ { label: 'should open a new window for the events playground in the prod environment', href: 'https://azion.com', - expected: 'https://manager.azion.com/events/graphql#query=undefined&variables=undefined' + expected: 'https://api.azion.com/v4/events/graphql#query=undefined&variables=undefined' }, { label: 'should open a new window for the events playground in the stage environment', href: 'http://localhost', - expected: 'https://manager.azion.com/events/graphql#query=undefined&variables=undefined' + expected: 'https://api.azion.com/v4/events/graphql#query=undefined&variables=undefined' } ] diff --git a/src/tests/helpers/get-static-urls-by-environment.test.js b/src/tests/helpers/get-static-urls-by-environment.test.js index 77c24b84dc..0244cf8546 100644 --- a/src/tests/helpers/get-static-urls-by-environment.test.js +++ b/src/tests/helpers/get-static-urls-by-environment.test.js @@ -38,17 +38,17 @@ const scenarios = [ { section: 'playgroundMetrics', env: 'development', - expected: 'https://stage-manager.azion.com/metrics/graphql' + expected: 'https://stage-api.azion.com/v4/metrics/graphql' }, { section: 'playgroundMetrics', env: 'stage', - expected: 'https://stage-manager.azion.com/metrics/graphql' + expected: 'https://stage-api.azion.com/v4/metrics/graphql' }, { section: 'playgroundMetrics', env: 'production', - expected: 'https://manager.azion.com/metrics/graphql' + expected: 'https://api.azion.com/v4/metrics/graphql' }, { section: 'helpCenter', diff --git a/src/tests/helpers/metrics-playground-opener.test.js b/src/tests/helpers/metrics-playground-opener.test.js index bf128f07e6..1b863a5166 100644 --- a/src/tests/helpers/metrics-playground-opener.test.js +++ b/src/tests/helpers/metrics-playground-opener.test.js @@ -13,12 +13,12 @@ const scenarios = [ { label: 'should open a new window to metrics playground in prod env', href: 'https://azion.com', - expected: 'https://manager.azion.com/metrics/graphql' + expected: 'https://api.azion.com/metrics/graphql' }, { label: 'should open a new window to metrics playground in stage env', href: 'http://localhost', - expected: 'https://stage-manager.azion.com/metrics/graphql' + expected: 'https://stage-api.azion.com/v4/metrics/graphql' } ] From 57ca170831da8a889fb53d18607bbc639177c675 Mon Sep 17 00:00:00 2001 From: HerbertJulio Date: Mon, 27 Jan 2025 18:06:07 -0300 Subject: [PATCH 5/7] fix: update URLs for real-time events and metrics services to use v4 API version --- azion.config.cjs | 23 ++++--------------- src/services/axios/AxiosHttpClientAdapter.js | 5 ++-- .../axios/AxiosHttpClientSignalDecorator.js | 5 ++-- src/services/axios/makeEventsApi.js | 3 +-- .../list-payment-history-service.js | 15 +++++------- ...and-products-changes-accounting-service.js | 15 +++++------- .../list-service-and-products-changes.js | 15 +++++------- .../load-current-invoice-service.js | 15 +++++------- .../load-invoice-data-service.js | 15 +++++------- .../load-invoice-last-updated-service.js | 15 +++++------- .../load-your-service-plan-service.js | 17 ++++++-------- .../make-accounting-base-url.js | 2 +- .../billing-services/make-billing-base-url.js | 2 +- .../activity-history/list-activity-history.js | 1 + .../activity-history/load-activity-history.js | 1 + .../data-stream/list-data-stream.js | 1 + .../data-stream/load-data-stream.js | 1 + .../edge-dns/list-edge-dns.js | 1 + .../edge-dns/load-edge-dns.js | 1 + .../list-edge-functions-console.js | 1 + .../load-edge-functions-console.js | 1 + .../edge-functions/list-edge-functions.js | 1 + .../edge-functions/load-edge-functions.js | 1 + .../http-request/list-http-request.js | 1 + .../http-request/load-http-request.js | 1 + .../image-processor/list-image-processor.js | 1 + .../image-processor/load-image-processor.js | 1 + .../load-fields-real-time-events-data.js | 1 + .../tiered-cache/list-tiered-cache.js | 1 + .../tiered-cache/load-tiered-cache.js | 1 + .../load-real-time-metrics-data.js | 1 + .../make-beholder-base-url.js | 3 +-- .../list-payment-history-service.test.js | 19 +++++++-------- .../load-your-service-plan-service.test.js | 15 +++++------- .../make-billing-base-url.test.js | 2 +- .../list-activity-history.test.js | 1 + .../load-activity-history.test.js | 1 + .../data-stream/list-data-stream.test.js | 1 + .../data-stream/load-data-stream.test.js | 1 + .../edge-dns/list-edge-dns.test.js | 1 + .../edge-dns/load-edge-dns.test.js | 1 + .../list-edge-functions-console.test.js | 1 + .../load-edge-functions-console.test.js | 1 + .../list-edge-functions.test.js | 1 + .../load-edge-functions.test.js | 1 + .../http-request/list-http-request.test.js | 1 + .../http-request/load-http-request.test.js | 1 + .../list-image-processor.test.js | 1 + .../load-image-processor.test.js | 1 + .../tiered-cache/list-tiered-cache.test.js | 1 + .../tiered-cache/load-tiered-cache.test.js | 1 + .../load-real-time-metrics-data.test.js | 1 + vite.config.js | 16 ++++--------- 53 files changed, 112 insertions(+), 125 deletions(-) diff --git a/azion.config.cjs b/azion.config.cjs index fa67d0a135..9f5872d23e 100644 --- a/azion.config.cjs +++ b/azion.config.cjs @@ -231,29 +231,14 @@ const backRules = [ } }, { - name: 'Route GraphQL Billing Queries to Manager Origin', - description: 'Routes GraphQL Billing queries to the Manager, updating the URI accordingly', - match: '^/graphql/billing', + name: 'API Version 4 Routing', + description: 'Directs API version 4 requests to the designated API origin for handling.', + match: '^/v4', behavior: { - forwardCookies: true, - setOrigin: { - name: 'origin-api', - type: 'single_origin' - }, - rewrite: '/billing/graphql' - } - }, - { - name: 'Route GraphQL Accounting Queries to Manager Origin', - description: 'Routes GraphQL Accounting queries to the Manager, updating the URI accordingly', - match: '^/graphql/accounting', - behavior: { - forwardCookies: true, setOrigin: { name: 'origin-api', type: 'single_origin' - }, - rewrite: '/accounting/graphql' + } } }, { diff --git a/src/services/axios/AxiosHttpClientAdapter.js b/src/services/axios/AxiosHttpClientAdapter.js index 3d8720a24f..0b8403957f 100644 --- a/src/services/axios/AxiosHttpClientAdapter.js +++ b/src/services/axios/AxiosHttpClientAdapter.js @@ -39,7 +39,7 @@ export const parseHttpResponse = (httpResponse) => { export class AxiosHttpClientAdapter { static async request( - { url, method, headers, body, signal }, + { url, method, headers, body, signal, baseURL }, axios = defaultApi(import.meta.env.VITE_PERSONAL_TOKEN) ) { let axiosResponse @@ -50,7 +50,8 @@ export class AxiosHttpClientAdapter { method: method, headers: headers, data: body, - signal + signal, + ...(baseURL && { baseURL: baseURL }) }) } catch (error) { const axiosError = error diff --git a/src/services/axios/AxiosHttpClientSignalDecorator.js b/src/services/axios/AxiosHttpClientSignalDecorator.js index 2f57c42050..cb1f29a306 100644 --- a/src/services/axios/AxiosHttpClientSignalDecorator.js +++ b/src/services/axios/AxiosHttpClientSignalDecorator.js @@ -5,13 +5,14 @@ export class AxiosHttpClientSignalDecorator { this.signal = signal } - async request({ url, method, headers, body }) { + async request({ url, method, headers, body, baseURL }) { return await AxiosHttpClientAdapter.request({ url, method, headers, body, - signal: this.signal + signal: this.signal, + baseURL }) } } diff --git a/src/services/axios/makeEventsApi.js b/src/services/axios/makeEventsApi.js index ccc8406e15..7a79c10219 100644 --- a/src/services/axios/makeEventsApi.js +++ b/src/services/axios/makeEventsApi.js @@ -2,8 +2,7 @@ import axios from 'axios' const api = (personalToken) => { delete axios.defaults.headers.common['Authorization'] - const version = 'v4' - const baseURL = `api/${version}/events` + const baseURL = `v4/events` axios.defaults.headers.common['Accept'] = 'application/json' diff --git a/src/services/billing-services/list-payment-history-service.js b/src/services/billing-services/list-payment-history-service.js index df02b7d5da..96b5253747 100644 --- a/src/services/billing-services/list-payment-history-service.js +++ b/src/services/billing-services/list-payment-history-service.js @@ -3,7 +3,6 @@ import { makePaymentBaseUrl } from './make-payment-base-url' import { makeAccountingBaseUrl } from './make-accounting-base-url' import { formatDateToUS, getStaticUrlsByEnvironment } from '@/helpers' import { useAccountStore } from '@/stores/account' -import graphQLApi from '../axios/makeGraphQl' import { getLastDayMonth } from '@/helpers/payment-history' const PAGE_SIZE = 200 @@ -67,14 +66,12 @@ const listPaymentHistoryForRegularAccounts = async () => { }` } - let httpResponse = await AxiosHttpClientAdapter.request( - { - url: `${makeAccountingBaseUrl()}`, - method: 'POST', - body: payload - }, - graphQLApi - ) + let httpResponse = await AxiosHttpClientAdapter.request({ + baseURL: '/', + url: `${makeAccountingBaseUrl()}`, + method: 'POST', + body: payload + }) return adaptPaymentHistoryForRegularAccounts(httpResponse) } diff --git a/src/services/billing-services/list-service-and-products-changes-accounting-service.js b/src/services/billing-services/list-service-and-products-changes-accounting-service.js index a5c42df5d5..7dd643278f 100644 --- a/src/services/billing-services/list-service-and-products-changes-accounting-service.js +++ b/src/services/billing-services/list-service-and-products-changes-accounting-service.js @@ -1,6 +1,5 @@ import { formatUnitValue } from '@/helpers' import { AxiosHttpClientAdapter, parseHttpResponse } from '../axios/AxiosHttpClientAdapter' -import graphQLApi from '../axios/makeGraphQl' import { makeAccountingBaseUrl } from './make-accounting-base-url' export const listServiceAndProductsChangesAccountingService = async (billID) => { @@ -27,14 +26,12 @@ export const listServiceAndProductsChangesAccountingService = async (billID) => query: BILL_DETAIL_QUERY } - let httpResponse = await AxiosHttpClientAdapter.request( - { - url: `${makeAccountingBaseUrl()}`, - method: 'POST', - body: graphQLPayload - }, - graphQLApi - ) + let httpResponse = await AxiosHttpClientAdapter.request({ + baseURL: '/', + url: `${makeAccountingBaseUrl()}`, + method: 'POST', + body: graphQLPayload + }) httpResponse = adapt(httpResponse) diff --git a/src/services/billing-services/list-service-and-products-changes.js b/src/services/billing-services/list-service-and-products-changes.js index 5b2d62233e..efb7a24d7d 100644 --- a/src/services/billing-services/list-service-and-products-changes.js +++ b/src/services/billing-services/list-service-and-products-changes.js @@ -1,6 +1,5 @@ import { formatCurrencyString, formatUnitValue } from '@/helpers' import { AxiosHttpClientAdapter, parseHttpResponse } from '../axios/AxiosHttpClientAdapter' -import graphQLApi from '../axios/makeGraphQl' import { makeBillingBaseUrl } from './make-billing-base-url' export const listServiceAndProductsChangesService = async (billID) => { @@ -98,14 +97,12 @@ export const listServiceAndProductsChangesService = async (billID) => { } } - let httpResponse = await AxiosHttpClientAdapter.request( - { - url: `${makeBillingBaseUrl()}`, - method: 'POST', - body: graphQLPayload - }, - graphQLApi - ) + let httpResponse = await AxiosHttpClientAdapter.request({ + baseURL: '/', + url: `${makeBillingBaseUrl()}`, + method: 'POST', + body: graphQLPayload + }) httpResponse = adapt(httpResponse) diff --git a/src/services/billing-services/load-current-invoice-service.js b/src/services/billing-services/load-current-invoice-service.js index 3ee2e16710..4789c19571 100644 --- a/src/services/billing-services/load-current-invoice-service.js +++ b/src/services/billing-services/load-current-invoice-service.js @@ -1,5 +1,4 @@ import { AxiosHttpClientAdapter, parseHttpResponse } from '../axios/AxiosHttpClientAdapter' -import graphQLApi from '../axios/makeGraphQl' import { makeBillingBaseUrl } from './make-billing-base-url' import { makeAccountingBaseUrl } from './make-accounting-base-url' import { formatDateToUSBilling } from '@/helpers/convert-date' @@ -10,14 +9,12 @@ export const loadCurrentInvoiceService = async () => { const payload = getQueryByAccountType(accountIsNotRegular) const url = accountIsNotRegular ? `${makeBillingBaseUrl()}` : `${makeAccountingBaseUrl()}` - let httpResponse = await AxiosHttpClientAdapter.request( - { - url, - method: 'POST', - body: payload - }, - graphQLApi - ) + let httpResponse = await AxiosHttpClientAdapter.request({ + baseURL: '/', + url, + method: 'POST', + body: payload + }) httpResponse = adapt(httpResponse, accountIsNotRegular) diff --git a/src/services/billing-services/load-invoice-data-service.js b/src/services/billing-services/load-invoice-data-service.js index 02ddb8e2c6..2346b3d506 100644 --- a/src/services/billing-services/load-invoice-data-service.js +++ b/src/services/billing-services/load-invoice-data-service.js @@ -1,5 +1,4 @@ import { AxiosHttpClientAdapter, parseHttpResponse } from '../axios/AxiosHttpClientAdapter' -import graphQLApi from '../axios/makeGraphQl' import { makeBillingBaseUrl } from './make-billing-base-url' import { formatDateToUSBilling } from '@/helpers/convert-date' import { makeAccountingBaseUrl } from './make-accounting-base-url' @@ -10,14 +9,12 @@ export const loadInvoiceDataService = async (invoiceId) => { const payload = getQueryByAccountType(accountIsNotRegular, invoiceId) const url = accountIsNotRegular ? `${makeBillingBaseUrl()}` : `${makeAccountingBaseUrl()}` - let httpResponse = await AxiosHttpClientAdapter.request( - { - url, - method: 'POST', - body: payload - }, - graphQLApi - ) + let httpResponse = await AxiosHttpClientAdapter.request({ + baseURL: '/', + url, + method: 'POST', + body: payload + }) httpResponse = adapt(httpResponse, accountIsNotRegular) diff --git a/src/services/billing-services/load-invoice-last-updated-service.js b/src/services/billing-services/load-invoice-last-updated-service.js index bf23dd1365..c16e5e8e58 100644 --- a/src/services/billing-services/load-invoice-last-updated-service.js +++ b/src/services/billing-services/load-invoice-last-updated-service.js @@ -1,5 +1,4 @@ import { AxiosHttpClientAdapter, parseHttpResponse } from '../axios/AxiosHttpClientAdapter' -import graphQLApi from '../axios/makeGraphQl' import { makeBillingBaseUrl } from './make-billing-base-url' import { formatDateToUSBilling } from '@/helpers/convert-date' @@ -17,14 +16,12 @@ export const loadInvoiceLastUpdatedService = async () => { }` } - let httpResponse = await AxiosHttpClientAdapter.request( - { - url: `${makeBillingBaseUrl()}`, - method: 'POST', - body: payload - }, - graphQLApi - ) + let httpResponse = await AxiosHttpClientAdapter.request({ + baseURL: '/', + url: `${makeBillingBaseUrl()}`, + method: 'POST', + body: payload + }) httpResponse = adapt(httpResponse) diff --git a/src/services/billing-services/load-your-service-plan-service.js b/src/services/billing-services/load-your-service-plan-service.js index f4a12e4d5c..dbebc567ee 100644 --- a/src/services/billing-services/load-your-service-plan-service.js +++ b/src/services/billing-services/load-your-service-plan-service.js @@ -1,7 +1,6 @@ import { AxiosHttpClientAdapter, parseHttpResponse } from '../axios/AxiosHttpClientAdapter' -import graphQLApi from '../axios/makeGraphQl' import { formatDateToUSBilling } from '@/helpers/convert-date' - +import { makeBillingBaseUrl } from './make-billing-base-url' export const loadYourServicePlanService = async (disclaimer = '') => { const { lastDayOfMonth, firstDayOfMonth } = getFirstDayCurrentDate() @@ -25,14 +24,12 @@ export const loadYourServicePlanService = async (disclaimer = '') => { }` } - let httpResponse = await AxiosHttpClientAdapter.request( - { - url: `/billing`, - method: 'POST', - body: payload - }, - graphQLApi - ) + let httpResponse = await AxiosHttpClientAdapter.request({ + baseURL: '/', + url: makeBillingBaseUrl(), + method: 'POST', + body: payload + }) httpResponse = adapt(httpResponse, disclaimer) diff --git a/src/services/billing-services/make-accounting-base-url.js b/src/services/billing-services/make-accounting-base-url.js index 20ef389ff9..816093604b 100644 --- a/src/services/billing-services/make-accounting-base-url.js +++ b/src/services/billing-services/make-accounting-base-url.js @@ -1,3 +1,3 @@ export const makeAccountingBaseUrl = () => { - return 'accounting' + return 'v4/accounting/graphql' } diff --git a/src/services/billing-services/make-billing-base-url.js b/src/services/billing-services/make-billing-base-url.js index a523b4772d..a97fdad166 100644 --- a/src/services/billing-services/make-billing-base-url.js +++ b/src/services/billing-services/make-billing-base-url.js @@ -1,3 +1,3 @@ export const makeBillingBaseUrl = () => { - return 'billing' + return 'v4/billing/graphql' } diff --git a/src/services/real-time-events-service/activity-history/list-activity-history.js b/src/services/real-time-events-service/activity-history/list-activity-history.js index 5a7433b988..e756d6ca6f 100644 --- a/src/services/real-time-events-service/activity-history/list-activity-history.js +++ b/src/services/real-time-events-service/activity-history/list-activity-history.js @@ -15,6 +15,7 @@ export const listActivityHistory = async (filter) => { const decorator = new AxiosHttpClientSignalDecorator() const response = await decorator.request({ + baseURL: '/', url: makeRealTimeEventsBaseUrl(), method: 'POST', body: payload diff --git a/src/services/real-time-events-service/activity-history/load-activity-history.js b/src/services/real-time-events-service/activity-history/load-activity-history.js index 03a612f33f..67c71eae3b 100644 --- a/src/services/real-time-events-service/activity-history/load-activity-history.js +++ b/src/services/real-time-events-service/activity-history/load-activity-history.js @@ -10,6 +10,7 @@ export const loadActivityHistory = async (filter) => { const decorator = new AxiosHttpClientSignalDecorator() const response = await decorator.request({ + baseURL: '/', url: makeRealTimeEventsBaseUrl(), method: 'POST', body: payload diff --git a/src/services/real-time-events-service/data-stream/list-data-stream.js b/src/services/real-time-events-service/data-stream/list-data-stream.js index 018b7910d9..9e4561399e 100644 --- a/src/services/real-time-events-service/data-stream/list-data-stream.js +++ b/src/services/real-time-events-service/data-stream/list-data-stream.js @@ -15,6 +15,7 @@ export const listDataStream = async (filter) => { const decorator = new AxiosHttpClientSignalDecorator() const response = await decorator.request({ + baseURL: '/', url: makeRealTimeEventsBaseUrl(), method: 'POST', body: payload diff --git a/src/services/real-time-events-service/data-stream/load-data-stream.js b/src/services/real-time-events-service/data-stream/load-data-stream.js index e2b5c91592..7d0d46a3c6 100644 --- a/src/services/real-time-events-service/data-stream/load-data-stream.js +++ b/src/services/real-time-events-service/data-stream/load-data-stream.js @@ -9,6 +9,7 @@ export const loadDataStream = async (filter) => { const decorator = new AxiosHttpClientSignalDecorator() const response = await decorator.request({ + baseURL: '/', url: makeRealTimeEventsBaseUrl(), method: 'POST', body: payload diff --git a/src/services/real-time-events-service/edge-dns/list-edge-dns.js b/src/services/real-time-events-service/edge-dns/list-edge-dns.js index aa62f1a9a7..3534816ac1 100644 --- a/src/services/real-time-events-service/edge-dns/list-edge-dns.js +++ b/src/services/real-time-events-service/edge-dns/list-edge-dns.js @@ -15,6 +15,7 @@ export const listEdgeDNS = async (filter) => { const decorator = new AxiosHttpClientSignalDecorator() const response = await decorator.request({ + baseURL: '/', url: makeRealTimeEventsBaseUrl(), method: 'POST', body: payload diff --git a/src/services/real-time-events-service/edge-dns/load-edge-dns.js b/src/services/real-time-events-service/edge-dns/load-edge-dns.js index 9764ffb36f..e114e3e5e6 100644 --- a/src/services/real-time-events-service/edge-dns/load-edge-dns.js +++ b/src/services/real-time-events-service/edge-dns/load-edge-dns.js @@ -8,6 +8,7 @@ export const loadEdgeDNS = async (filter) => { const decorator = new AxiosHttpClientSignalDecorator() const response = await decorator.request({ + baseURL: '/', url: makeRealTimeEventsBaseUrl(), method: 'POST', body: payload diff --git a/src/services/real-time-events-service/edge-functions-console/list-edge-functions-console.js b/src/services/real-time-events-service/edge-functions-console/list-edge-functions-console.js index 84f414a013..4bd8096bed 100644 --- a/src/services/real-time-events-service/edge-functions-console/list-edge-functions-console.js +++ b/src/services/real-time-events-service/edge-functions-console/list-edge-functions-console.js @@ -16,6 +16,7 @@ export const listEdgeFunctionsConsole = async (filter) => { const decorator = new AxiosHttpClientSignalDecorator() const response = await decorator.request({ + baseURL: '/', url: makeRealTimeEventsBaseUrl(), method: 'POST', body: payload diff --git a/src/services/real-time-events-service/edge-functions-console/load-edge-functions-console.js b/src/services/real-time-events-service/edge-functions-console/load-edge-functions-console.js index f4a9088c9c..fed5873613 100644 --- a/src/services/real-time-events-service/edge-functions-console/load-edge-functions-console.js +++ b/src/services/real-time-events-service/edge-functions-console/load-edge-functions-console.js @@ -9,6 +9,7 @@ export const loadEdgeFunctionsConsole = async (filter) => { const decorator = new AxiosHttpClientSignalDecorator() const response = await decorator.request({ + baseURL: '/', url: makeRealTimeEventsBaseUrl(), method: 'POST', body: payload diff --git a/src/services/real-time-events-service/edge-functions/list-edge-functions.js b/src/services/real-time-events-service/edge-functions/list-edge-functions.js index d10e5d2c2b..29dfc7a2bc 100644 --- a/src/services/real-time-events-service/edge-functions/list-edge-functions.js +++ b/src/services/real-time-events-service/edge-functions/list-edge-functions.js @@ -15,6 +15,7 @@ export const listEdgeFunctions = async (filter) => { const decorator = new AxiosHttpClientSignalDecorator() const response = await decorator.request({ + baseURL: '/', url: makeRealTimeEventsBaseUrl(), method: 'POST', body: payload diff --git a/src/services/real-time-events-service/edge-functions/load-edge-functions.js b/src/services/real-time-events-service/edge-functions/load-edge-functions.js index 56d904bf57..48f85281e8 100644 --- a/src/services/real-time-events-service/edge-functions/load-edge-functions.js +++ b/src/services/real-time-events-service/edge-functions/load-edge-functions.js @@ -10,6 +10,7 @@ export const loadEdgeFunctions = async (filter) => { const decorator = new AxiosHttpClientSignalDecorator() const response = await decorator.request({ + baseURL: '/', url: makeRealTimeEventsBaseUrl(), method: 'POST', body: payload diff --git a/src/services/real-time-events-service/http-request/list-http-request.js b/src/services/real-time-events-service/http-request/list-http-request.js index 4b76e16af4..92b1a05445 100644 --- a/src/services/real-time-events-service/http-request/list-http-request.js +++ b/src/services/real-time-events-service/http-request/list-http-request.js @@ -15,6 +15,7 @@ export const listHttpRequest = async (filter) => { const decorator = new AxiosHttpClientSignalDecorator() const httpResponse = await decorator.request({ + baseURL: '/', url: makeRealTimeEventsBaseUrl(), method: 'POST', body: payload diff --git a/src/services/real-time-events-service/http-request/load-http-request.js b/src/services/real-time-events-service/http-request/load-http-request.js index d7152471e5..4b2eac286a 100644 --- a/src/services/real-time-events-service/http-request/load-http-request.js +++ b/src/services/real-time-events-service/http-request/load-http-request.js @@ -9,6 +9,7 @@ export const loadHttpRequest = async (filter) => { const decorator = new AxiosHttpClientSignalDecorator() const httpResponse = await decorator.request({ + baseURL: '/', url: makeRealTimeEventsBaseUrl(), method: 'POST', body: payload diff --git a/src/services/real-time-events-service/image-processor/list-image-processor.js b/src/services/real-time-events-service/image-processor/list-image-processor.js index 0427f17b5a..c0cadb7960 100644 --- a/src/services/real-time-events-service/image-processor/list-image-processor.js +++ b/src/services/real-time-events-service/image-processor/list-image-processor.js @@ -15,6 +15,7 @@ export const listImageProcessor = async (filter) => { const decorator = new AxiosHttpClientSignalDecorator() const response = await decorator.request({ + baseURL: '/', url: makeRealTimeEventsBaseUrl(), method: 'POST', body: payload diff --git a/src/services/real-time-events-service/image-processor/load-image-processor.js b/src/services/real-time-events-service/image-processor/load-image-processor.js index 3611f2ffed..ea2795a047 100644 --- a/src/services/real-time-events-service/image-processor/load-image-processor.js +++ b/src/services/real-time-events-service/image-processor/load-image-processor.js @@ -9,6 +9,7 @@ export const loadImageProcessor = async (filter) => { const decorator = new AxiosHttpClientSignalDecorator() const response = await decorator.request({ + baseURL: '/', url: makeRealTimeEventsBaseUrl(), method: 'POST', body: payload diff --git a/src/services/real-time-events-service/load-fields-real-time-events-data.js b/src/services/real-time-events-service/load-fields-real-time-events-data.js index 15facceb86..a7bdf7f746 100644 --- a/src/services/real-time-events-service/load-fields-real-time-events-data.js +++ b/src/services/real-time-events-service/load-fields-real-time-events-data.js @@ -10,6 +10,7 @@ import { AxiosHttpClientAdapter } from '../axios/AxiosHttpClientAdapter' */ export async function loadFieldsEventsData({ query, signal }) { const response = await AxiosHttpClientAdapter.request({ + baseURL: '/', url: makeRealTimeEventsBaseUrl(), method: 'POST', body: { diff --git a/src/services/real-time-events-service/tiered-cache/list-tiered-cache.js b/src/services/real-time-events-service/tiered-cache/list-tiered-cache.js index 418f2ddb4a..576ff003e8 100644 --- a/src/services/real-time-events-service/tiered-cache/list-tiered-cache.js +++ b/src/services/real-time-events-service/tiered-cache/list-tiered-cache.js @@ -15,6 +15,7 @@ export const listTieredCache = async (filter) => { const decorator = new AxiosHttpClientSignalDecorator() const response = await decorator.request({ + baseURL: '/', url: makeRealTimeEventsBaseUrl(), method: 'POST', body: payload diff --git a/src/services/real-time-events-service/tiered-cache/load-tiered-cache.js b/src/services/real-time-events-service/tiered-cache/load-tiered-cache.js index 80bc457890..8222656635 100644 --- a/src/services/real-time-events-service/tiered-cache/load-tiered-cache.js +++ b/src/services/real-time-events-service/tiered-cache/load-tiered-cache.js @@ -9,6 +9,7 @@ export const loadTieredCache = async (filter) => { const decorator = new AxiosHttpClientSignalDecorator() const response = await decorator.request({ + baseURL: '/', url: makeRealTimeEventsBaseUrl(), method: 'POST', body: payload diff --git a/src/services/real-time-metrics-services/load-real-time-metrics-data.js b/src/services/real-time-metrics-services/load-real-time-metrics-data.js index a0320fc37c..1ec1c09e4a 100644 --- a/src/services/real-time-metrics-services/load-real-time-metrics-data.js +++ b/src/services/real-time-metrics-services/load-real-time-metrics-data.js @@ -10,6 +10,7 @@ import { AxiosHttpClientAdapter } from '../axios/AxiosHttpClientAdapter' */ export async function loadRealTimeMetricsData({ query, signal }) { const response = await AxiosHttpClientAdapter.request({ + baseURL: '/', url: makeBeholderBaseUrl(), method: 'POST', body: adapt(query), diff --git a/src/services/real-time-metrics-services/make-beholder-base-url.js b/src/services/real-time-metrics-services/make-beholder-base-url.js index 5e2606d3d2..244915f8a4 100644 --- a/src/services/real-time-metrics-services/make-beholder-base-url.js +++ b/src/services/real-time-metrics-services/make-beholder-base-url.js @@ -1,4 +1,3 @@ export const makeBeholderBaseUrl = () => { - const version = 'v4' - return `${version}/metrics/graphql` + return `v4/metrics/graphql` } diff --git a/src/tests/services/billing-services/list-payment-history-service.test.js b/src/tests/services/billing-services/list-payment-history-service.test.js index 772b9cd5f9..2ead99ad53 100644 --- a/src/tests/services/billing-services/list-payment-history-service.test.js +++ b/src/tests/services/billing-services/list-payment-history-service.test.js @@ -4,7 +4,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' import { localeMock } from '@/tests/utils/localeMock' import { getStaticUrlsByEnvironment } from '@/helpers' import { useAccountStore } from '@/stores/account' -import graphQLApi from '@/services/axios/makeGraphQl' import { getLastDayMonth } from '@/helpers/payment-history' const fixtures = { @@ -128,12 +127,12 @@ describe('BillingServices', () => { const { sut } = makeSut() await sut() - expect(requestSpy).toHaveBeenCalledWith( - { - url: 'accounting', - method: 'POST', - body: { - query: ` + expect(requestSpy).toHaveBeenCalledWith({ + url: 'v4/accounting/graphql', + method: 'POST', + baseURL: '/', + body: { + query: ` query { accountingDetail ( filter: { @@ -152,10 +151,8 @@ describe('BillingServices', () => { metricSlug } }` - } - }, - graphQLApi - ) + } + }) }) it('should parse correctly payment history for regular accounts', async () => { diff --git a/src/tests/services/billing-services/load-your-service-plan-service.test.js b/src/tests/services/billing-services/load-your-service-plan-service.test.js index fa7dc2cf67..f00640987f 100644 --- a/src/tests/services/billing-services/load-your-service-plan-service.test.js +++ b/src/tests/services/billing-services/load-your-service-plan-service.test.js @@ -1,7 +1,6 @@ import { AxiosHttpClientAdapter } from '@/services/axios/AxiosHttpClientAdapter' import { loadYourServicePlanService } from '@/services/billing-services' import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest' -import graphQLApi from '@/services/axios/makeGraphQl' const fixtures = { paymentMock: { @@ -66,14 +65,12 @@ describe('BillingService', () => { } }` } - expect(requestSpy).toHaveBeenCalledWith( - { - url: '/billing', - method: 'POST', - body: payload - }, - graphQLApi - ) + expect(requestSpy).toHaveBeenCalledWith({ + url: 'v4/billing/graphql', + method: 'POST', + baseURL: '/', + body: payload + }) }) it('should return correct credit amount in the disclaimer message', async () => { vi.spyOn(AxiosHttpClientAdapter, 'request').mockResolvedValueOnce({ diff --git a/src/tests/services/billing-services/make-billing-base-url.test.js b/src/tests/services/billing-services/make-billing-base-url.test.js index ad09fe64ad..1854757318 100644 --- a/src/tests/services/billing-services/make-billing-base-url.test.js +++ b/src/tests/services/billing-services/make-billing-base-url.test.js @@ -12,7 +12,7 @@ const makeSut = () => { describe('BillingServices', () => { it('should return the API base url to billing service', () => { const { sut } = makeSut() - const correctApiUrl = 'billing' + const correctApiUrl = 'v4/billing/graphql' const baseUrl = sut() diff --git a/src/tests/services/real-time-events-service/activity-history/list-activity-history.test.js b/src/tests/services/real-time-events-service/activity-history/list-activity-history.test.js index af6d990046..1a5d18d257 100644 --- a/src/tests/services/real-time-events-service/activity-history/list-activity-history.test.js +++ b/src/tests/services/real-time-events-service/activity-history/list-activity-history.test.js @@ -67,6 +67,7 @@ describe('ActivityHistoryServices', () => { url: 'v4/events/graphql', method: 'POST', signal: undefined, + baseURL: '/', body: { query, variables: { diff --git a/src/tests/services/real-time-events-service/activity-history/load-activity-history.test.js b/src/tests/services/real-time-events-service/activity-history/load-activity-history.test.js index aadbaf5eeb..3ffb1fca0a 100644 --- a/src/tests/services/real-time-events-service/activity-history/load-activity-history.test.js +++ b/src/tests/services/real-time-events-service/activity-history/load-activity-history.test.js @@ -45,6 +45,7 @@ describe('ActivityHistoryServices', () => { url: 'v4/events/graphql', method: 'POST', signal: undefined, + baseURL: '/', body: { query: expect.any(String), variables: { diff --git a/src/tests/services/real-time-events-service/data-stream/list-data-stream.test.js b/src/tests/services/real-time-events-service/data-stream/list-data-stream.test.js index b0f0226466..1ca4d67c53 100644 --- a/src/tests/services/real-time-events-service/data-stream/list-data-stream.test.js +++ b/src/tests/services/real-time-events-service/data-stream/list-data-stream.test.js @@ -73,6 +73,7 @@ describe('DataStreamingServices', () => { url: 'v4/events/graphql', method: 'POST', signal: undefined, + baseURL: '/', body: { query, variables: { diff --git a/src/tests/services/real-time-events-service/data-stream/load-data-stream.test.js b/src/tests/services/real-time-events-service/data-stream/load-data-stream.test.js index 7570f9cef9..93346cd180 100644 --- a/src/tests/services/real-time-events-service/data-stream/load-data-stream.test.js +++ b/src/tests/services/real-time-events-service/data-stream/load-data-stream.test.js @@ -45,6 +45,7 @@ describe('DataStreamingServices', () => { url: 'v4/events/graphql', method: 'POST', signal: undefined, + baseURL: '/', body: { query: expect.any(String), variables: { diff --git a/src/tests/services/real-time-events-service/edge-dns/list-edge-dns.test.js b/src/tests/services/real-time-events-service/edge-dns/list-edge-dns.test.js index b9f7ff70ad..22b342efd7 100644 --- a/src/tests/services/real-time-events-service/edge-dns/list-edge-dns.test.js +++ b/src/tests/services/real-time-events-service/edge-dns/list-edge-dns.test.js @@ -68,6 +68,7 @@ describe('edgeDns', () => { url: 'v4/events/graphql', method: 'POST', signal: undefined, + baseURL: '/', body: { query, variables: { diff --git a/src/tests/services/real-time-events-service/edge-dns/load-edge-dns.test.js b/src/tests/services/real-time-events-service/edge-dns/load-edge-dns.test.js index eb10598569..90077e42ce 100644 --- a/src/tests/services/real-time-events-service/edge-dns/load-edge-dns.test.js +++ b/src/tests/services/real-time-events-service/edge-dns/load-edge-dns.test.js @@ -45,6 +45,7 @@ describe('ImageProcessorServices', () => { url: 'v4/events/graphql', method: 'POST', signal: undefined, + baseURL: '/', body: { query: expect.any(String), variables: { diff --git a/src/tests/services/real-time-events-service/edge-functions-console/list-edge-functions-console.test.js b/src/tests/services/real-time-events-service/edge-functions-console/list-edge-functions-console.test.js index 85c7254c7b..1c68328950 100644 --- a/src/tests/services/real-time-events-service/edge-functions-console/list-edge-functions-console.test.js +++ b/src/tests/services/real-time-events-service/edge-functions-console/list-edge-functions-console.test.js @@ -67,6 +67,7 @@ describe('EdgeFunctionsConsoleServices', () => { url: 'v4/events/graphql', method: 'POST', signal: undefined, + baseURL: '/', body: { query, variables: { diff --git a/src/tests/services/real-time-events-service/edge-functions-console/load-edge-functions-console.test.js b/src/tests/services/real-time-events-service/edge-functions-console/load-edge-functions-console.test.js index 196daf87ce..c65a7946cd 100644 --- a/src/tests/services/real-time-events-service/edge-functions-console/load-edge-functions-console.test.js +++ b/src/tests/services/real-time-events-service/edge-functions-console/load-edge-functions-console.test.js @@ -45,6 +45,7 @@ describe('EdgeFunctionsConsoleServices', () => { url: 'v4/events/graphql', method: 'POST', signal: undefined, + baseURL: '/', body: { query: expect.any(String), variables: { diff --git a/src/tests/services/real-time-events-service/edge-functions/list-edge-functions.test.js b/src/tests/services/real-time-events-service/edge-functions/list-edge-functions.test.js index a9fd500087..dcc1942df7 100644 --- a/src/tests/services/real-time-events-service/edge-functions/list-edge-functions.test.js +++ b/src/tests/services/real-time-events-service/edge-functions/list-edge-functions.test.js @@ -64,6 +64,7 @@ describe('EdgeFunctionsServices', () => { url: 'v4/events/graphql', method: 'POST', signal: undefined, + baseURL: '/', body: { query, variables: { diff --git a/src/tests/services/real-time-events-service/edge-functions/load-edge-functions.test.js b/src/tests/services/real-time-events-service/edge-functions/load-edge-functions.test.js index 6a844bf02c..d790a2c796 100644 --- a/src/tests/services/real-time-events-service/edge-functions/load-edge-functions.test.js +++ b/src/tests/services/real-time-events-service/edge-functions/load-edge-functions.test.js @@ -46,6 +46,7 @@ describe('DataStreamingServices', () => { url: 'v4/events/graphql', method: 'POST', signal: undefined, + baseURL: '/', body: { query: expect.any(String), variables: { diff --git a/src/tests/services/real-time-events-service/http-request/list-http-request.test.js b/src/tests/services/real-time-events-service/http-request/list-http-request.test.js index ccc476b356..5346e1680c 100644 --- a/src/tests/services/real-time-events-service/http-request/list-http-request.test.js +++ b/src/tests/services/real-time-events-service/http-request/list-http-request.test.js @@ -66,6 +66,7 @@ describe('HttpRequestServices', () => { url: 'v4/events/graphql', method: 'POST', signal: undefined, + baseURL: '/', body: { query, variables: { diff --git a/src/tests/services/real-time-events-service/http-request/load-http-request.test.js b/src/tests/services/real-time-events-service/http-request/load-http-request.test.js index 3e30e9a741..65c2bebf59 100644 --- a/src/tests/services/real-time-events-service/http-request/load-http-request.test.js +++ b/src/tests/services/real-time-events-service/http-request/load-http-request.test.js @@ -72,6 +72,7 @@ describe('HttpRequestServices', () => { url: 'v4/events/graphql', method: 'POST', signal: undefined, + baseURL: '/', body: { query: expect.any(String), variables: { diff --git a/src/tests/services/real-time-events-service/image-processor/list-image-processor.test.js b/src/tests/services/real-time-events-service/image-processor/list-image-processor.test.js index fd8a2beb29..baf67e547b 100644 --- a/src/tests/services/real-time-events-service/image-processor/list-image-processor.test.js +++ b/src/tests/services/real-time-events-service/image-processor/list-image-processor.test.js @@ -69,6 +69,7 @@ describe('ImageProcessorServices', () => { url: 'v4/events/graphql', method: 'POST', signal: undefined, + baseURL: '/', body: { query, variables: { diff --git a/src/tests/services/real-time-events-service/image-processor/load-image-processor.test.js b/src/tests/services/real-time-events-service/image-processor/load-image-processor.test.js index da83201582..5bfd6b9189 100644 --- a/src/tests/services/real-time-events-service/image-processor/load-image-processor.test.js +++ b/src/tests/services/real-time-events-service/image-processor/load-image-processor.test.js @@ -61,6 +61,7 @@ describe('ImageProcessorServices', () => { url: 'v4/events/graphql', method: 'POST', signal: undefined, + baseURL: '/', body: { query: expect.any(String), variables: { diff --git a/src/tests/services/real-time-events-service/tiered-cache/list-tiered-cache.test.js b/src/tests/services/real-time-events-service/tiered-cache/list-tiered-cache.test.js index db352e4e7a..958dace3d2 100644 --- a/src/tests/services/real-time-events-service/tiered-cache/list-tiered-cache.test.js +++ b/src/tests/services/real-time-events-service/tiered-cache/list-tiered-cache.test.js @@ -68,6 +68,7 @@ describe('tieredCacheServices', () => { url: 'v4/events/graphql', method: 'POST', signal: undefined, + baseURL: '/', body: { query, variables: { diff --git a/src/tests/services/real-time-events-service/tiered-cache/load-tiered-cache.test.js b/src/tests/services/real-time-events-service/tiered-cache/load-tiered-cache.test.js index 1362a3d644..2fcb13e806 100644 --- a/src/tests/services/real-time-events-service/tiered-cache/load-tiered-cache.test.js +++ b/src/tests/services/real-time-events-service/tiered-cache/load-tiered-cache.test.js @@ -67,6 +67,7 @@ describe('tieredCacheServices', () => { url: 'v4/events/graphql', method: 'POST', signal: undefined, + baseURL: '/', body: { query: expect.any(String), variables: { diff --git a/src/tests/services/real-time-metrics-services/load-real-time-metrics-data.test.js b/src/tests/services/real-time-metrics-services/load-real-time-metrics-data.test.js index efaf3784b2..9673c274ab 100644 --- a/src/tests/services/real-time-metrics-services/load-real-time-metrics-data.test.js +++ b/src/tests/services/real-time-metrics-services/load-real-time-metrics-data.test.js @@ -34,6 +34,7 @@ describe('RealTimeMetricsServices', () => { expect(requestSpy).toHaveBeenCalledWith({ url: `${version}/metrics/graphql`, method: 'POST', + baseURL: '/', body: fixtures.formattedQuery, signal: fixtures.signal }) diff --git a/vite.config.js b/vite.config.js index c0d6ab39d9..89c56046e6 100644 --- a/vite.config.js +++ b/vite.config.js @@ -49,11 +49,6 @@ const getConfig = () => { changeOrigin: true, rewrite: (path) => path.replace(/^\/graphql\/cities/, '/graphql') }, - '/graphql/billing': { - target: `${URLStartPrefix}api.azion.com`, - changeOrigin: true, - rewrite: (path) => path.replace(/^\/graphql\/billing/, '/billing/graphql') - }, '/api/webhook/console_feedback': { target: `https://automate.azion.net/`, changeOrigin: true, @@ -69,6 +64,10 @@ const getConfig = () => { changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '') }, + '/v4': { + target: `${URLStartPrefix}api.azion.com`, + changeOrigin: true + }, '/webpagetest': { target: `https://www.azion.com/api/webpagetest`, changeOrigin: true, @@ -83,12 +82,7 @@ const getConfig = () => { target: `${URLStartPrefix}ai.azion.com/copilot/chat/completions`, changeOrigin: true, rewrite: (path) => path.replace(/^\/ai/, '') - }, - '/graphql/accounting': { - target: `${URLStartPrefix}api.azion.com`, - changeOrigin: true, - rewrite: (path) => path.replace(/^\/graphql\/accounting/, '/accounting/graphql') - }, + } } } } From 1bdabf4f459f595ca46a0587062e66c6ea8cbb2f Mon Sep 17 00:00:00 2001 From: HerbertJulio Date: Tue, 28 Jan 2025 10:39:35 -0300 Subject: [PATCH 6/7] test: update url to activy history for e2mock --- cypress/e2mock/activity-history.cy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/e2mock/activity-history.cy.js b/cypress/e2mock/activity-history.cy.js index f383a61bab..71feaecf44 100644 --- a/cypress/e2mock/activity-history.cy.js +++ b/cypress/e2mock/activity-history.cy.js @@ -4,7 +4,7 @@ import selectors from '../support/selectors' describe('Activity History Spec', { tags: ['@dev2'] }, () => { beforeEach(() => { cy.login() - cy.intercept('POST', '/api/v4/events/graphql', { fixture: 'activity-history.json' }).as('activityHistoryApi') + cy.intercept('POST', 'v4/events/graphql', { fixture: 'activity-history.json' }).as('activityHistoryApi') cy.openProduct('Activity History') }) From 6de0d6e83939b23e6047b4ceea892170f6ae05f5 Mon Sep 17 00:00:00 2001 From: HerbertJulio Date: Tue, 4 Feb 2025 11:27:52 -0300 Subject: [PATCH 7/7] test: update metrics playground opener tests for environment handling --- .../helpers/metrics-playground-opener.test.js | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/tests/helpers/metrics-playground-opener.test.js b/src/tests/helpers/metrics-playground-opener.test.js index 1b863a5166..30e669ee3b 100644 --- a/src/tests/helpers/metrics-playground-opener.test.js +++ b/src/tests/helpers/metrics-playground-opener.test.js @@ -12,34 +12,29 @@ const makeSut = () => { const scenarios = [ { label: 'should open a new window to metrics playground in prod env', - href: 'https://azion.com', - expected: 'https://api.azion.com/metrics/graphql' + environment: 'production', + expected: 'https://api.azion.com/v4/metrics/graphql' }, { label: 'should open a new window to metrics playground in stage env', - href: 'http://localhost', + environment: 'stage', expected: 'https://stage-api.azion.com/v4/metrics/graphql' } ] describe('metricsPlaygroundOpener', () => { afterAll(() => { - vi.unstubAllGlobals() + vi.restoreAllMocks() }) - - it.each(scenarios)('$label', ({ href, expected }) => () => { - vi.stubGlobal('window', { - open: (url) => url, - location: { - href - } - }) - - const openWindowSpy = vi.spyOn(window, 'open') + it.each(scenarios)('$label', async ({ environment, expected }) => { + vi.stubEnv('VITE_ENVIRONMENT', environment) + const mockWindowOpen = vi.fn() + vi.stubGlobal('window', { open: mockWindowOpen }) const { sut } = makeSut() - sut() + await sut() - expect(openWindowSpy).toHaveBeenCalledWith(expected, '_blank') + expect(mockWindowOpen).toHaveBeenCalledTimes(1) + expect(mockWindowOpen).toHaveBeenCalledWith(expected, '_blank') }) })