diff --git a/packages/entities/entities-certificates/src/ca-certificates-endpoints.ts b/packages/entities/entities-certificates/src/ca-certificates-endpoints.ts index c26e0b10fa..1e482ff90c 100644 --- a/packages/entities/entities-certificates/src/ca-certificates-endpoints.ts +++ b/packages/entities/entities-certificates/src/ca-certificates-endpoints.ts @@ -1,13 +1,13 @@ export default { list: { - konnect: '/api/runtime_groups/{controlPlaneId}/ca_certificates', + konnect: '/api/control_planes/{controlPlaneId}/ca_certificates', kongManager: '/{workspace}/ca_certificates', }, form: { konnect: { - create: '/api/runtime_groups/{controlPlaneId}/ca_certificates', - edit: '/api/runtime_groups/{controlPlaneId}/ca_certificates/{id}', - validate: '/api/runtime_groups/{controlPlaneId}/v1/schemas/json/ca-certificate/validate', + create: '/api/control_planes/{controlPlaneId}/ca_certificates', + edit: '/api/control_planes/{controlPlaneId}/ca_certificates/{id}', + validate: '/api/control_planes/{controlPlaneId}/v1/schemas/json/ca-certificate/validate', }, kongManager: { create: '/{workspace}/ca_certificates', diff --git a/packages/entities/entities-certificates/src/certificates-endpoints.ts b/packages/entities/entities-certificates/src/certificates-endpoints.ts index 36a0e0e9a7..3ec1aaf045 100644 --- a/packages/entities/entities-certificates/src/certificates-endpoints.ts +++ b/packages/entities/entities-certificates/src/certificates-endpoints.ts @@ -1,13 +1,13 @@ export default { list: { - konnect: '/api/runtime_groups/{controlPlaneId}/certificates', + konnect: '/api/control_planes/{controlPlaneId}/certificates', kongManager: '/{workspace}/certificates', }, form: { konnect: { - create: '/api/runtime_groups/{controlPlaneId}/certificates', - edit: '/api/runtime_groups/{controlPlaneId}/certificates/{id}', - validate: '/api/runtime_groups/{controlPlaneId}/v1/schemas/json/certificate/validate', + create: '/api/control_planes/{controlPlaneId}/certificates', + edit: '/api/control_planes/{controlPlaneId}/certificates/{id}', + validate: '/api/control_planes/{controlPlaneId}/v1/schemas/json/certificate/validate', }, kongManager: { create: '/{workspace}/certificates', diff --git a/packages/entities/entities-certificates/src/components/CACertificateForm.cy.ts b/packages/entities/entities-certificates/src/components/CACertificateForm.cy.ts index fad8223c51..ff42fbefc2 100644 --- a/packages/entities/entities-certificates/src/components/CACertificateForm.cy.ts +++ b/packages/entities/entities-certificates/src/components/CACertificateForm.cy.ts @@ -212,7 +212,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/ca_certificates/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/ca_certificates/*`, }, { statusCode: 200, @@ -225,7 +225,7 @@ describe('', () => { cy.intercept( { method: 'POST', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/v1/schemas/json/ca-certificate/validate`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/v1/schemas/json/ca-certificate/validate`, }, { statusCode: status, @@ -236,7 +236,7 @@ describe('', () => { cy.intercept( { method: 'PUT', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/ca_certificates/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/ca_certificates/*`, }, { statusCode: status, @@ -335,7 +335,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/ca_certificates/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/ca_certificates/*`, }, { statusCode: 404, diff --git a/packages/entities/entities-certificates/src/components/CACertificateList.cy.ts b/packages/entities/entities-certificates/src/components/CACertificateList.cy.ts index 2349e2850a..cf9d127587 100644 --- a/packages/entities/entities-certificates/src/components/CACertificateList.cy.ts +++ b/packages/entities/entities-certificates/src/components/CACertificateList.cy.ts @@ -59,7 +59,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/ca_certificates*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/ca_certificates*`, }, { statusCode: 200, @@ -472,7 +472,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/ca_certificates*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/ca_certificates*`, }, { statusCode: 200, @@ -491,7 +491,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/ca_certificates*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/ca_certificates*`, }, (req) => { const size = req.query.size ? Number(req.query.size) : 30 @@ -549,7 +549,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/ca_certificates*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/ca_certificates*`, }, { statusCode: 500, diff --git a/packages/entities/entities-certificates/src/components/CertificateForm.cy.ts b/packages/entities/entities-certificates/src/components/CertificateForm.cy.ts index 44b377b68c..6005f98d4a 100644 --- a/packages/entities/entities-certificates/src/components/CertificateForm.cy.ts +++ b/packages/entities/entities-certificates/src/components/CertificateForm.cy.ts @@ -216,7 +216,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/certificates/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/certificates/*`, }, { statusCode: 200, @@ -229,7 +229,7 @@ describe('', () => { cy.intercept( { method: 'POST', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/v1/schemas/json/certificate/validate`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/v1/schemas/json/certificate/validate`, }, { statusCode: status, @@ -240,7 +240,7 @@ describe('', () => { cy.intercept( { method: 'PUT', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/certificates/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/certificates/*`, }, { statusCode: status, @@ -343,7 +343,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/certificates/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/certificates/*`, }, { statusCode: 404, diff --git a/packages/entities/entities-certificates/src/components/CertificateList.cy.ts b/packages/entities/entities-certificates/src/components/CertificateList.cy.ts index 6e9db50641..06b37cb07d 100644 --- a/packages/entities/entities-certificates/src/components/CertificateList.cy.ts +++ b/packages/entities/entities-certificates/src/components/CertificateList.cy.ts @@ -59,7 +59,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/certificates*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/certificates*`, }, { statusCode: 200, @@ -520,7 +520,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/certificates*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/certificates*`, }, { statusCode: 200, @@ -539,7 +539,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/certificates*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/certificates*`, }, (req) => { const size = req.query.size ? Number(req.query.size) : 30 @@ -596,7 +596,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/certificates*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/certificates*`, }, { statusCode: 500, diff --git a/packages/entities/entities-consumer-credentials/src/components/ConsumerCredentialList.cy.ts b/packages/entities/entities-consumer-credentials/src/components/ConsumerCredentialList.cy.ts index 3a7bf0fb29..3ea37b90dc 100644 --- a/packages/entities/entities-consumer-credentials/src/components/ConsumerCredentialList.cy.ts +++ b/packages/entities/entities-consumer-credentials/src/components/ConsumerCredentialList.cy.ts @@ -49,7 +49,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/consumers/${baseConfigKonnect.consumerId}/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/consumers/${baseConfigKonnect.consumerId}/*`, }, { statusCode: 200, @@ -543,7 +543,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/consumers/${baseConfigKonnect.consumerId}/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/consumers/${baseConfigKonnect.consumerId}/*`, }, { statusCode: 200, @@ -562,7 +562,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/consumers/${baseConfigKonnect.consumerId}/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/consumers/${baseConfigKonnect.consumerId}/*`, }, (req) => { const size = req.query.size ? Number(req.query.size) : 30 @@ -618,7 +618,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/consumers/${baseConfigKonnect.consumerId}/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/consumers/${baseConfigKonnect.consumerId}/*`, }, { statusCode: 500, diff --git a/packages/entities/entities-consumer-credentials/src/consumer-credentials-endpoints.ts b/packages/entities/entities-consumer-credentials/src/consumer-credentials-endpoints.ts index beaa1a9a31..1cde6ac15f 100644 --- a/packages/entities/entities-consumer-credentials/src/consumer-credentials-endpoints.ts +++ b/packages/entities/entities-consumer-credentials/src/consumer-credentials-endpoints.ts @@ -1,6 +1,6 @@ export default { list: { - konnect: '/api/runtime_groups/{controlPlaneId}/consumers/{consumerId}/{plugin}', + konnect: '/api/control_planes/{controlPlaneId}/consumers/{consumerId}/{plugin}', kongManager: '/{workspace}/consumers/{consumerId}/{plugin}', }, } diff --git a/packages/entities/entities-consumer-groups/src/components/AddToGroupModal.cy.ts b/packages/entities/entities-consumer-groups/src/components/AddToGroupModal.cy.ts index ec61f6d0e3..b3f5289c99 100644 --- a/packages/entities/entities-consumer-groups/src/components/AddToGroupModal.cy.ts +++ b/packages/entities/entities-consumer-groups/src/components/AddToGroupModal.cy.ts @@ -24,7 +24,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${configGroupKonnect.apiBaseUrl}/api/runtime_groups/${configGroupKonnect.controlPlaneId}/consumer_groups*`, + url: `${configGroupKonnect.apiBaseUrl}/api/control_planes/${configGroupKonnect.controlPlaneId}/consumer_groups*`, }, { statusCode: 200, @@ -40,7 +40,7 @@ describe('', () => { cy.intercept( { method: 'POST', - url: `${configGroupKonnect.apiBaseUrl}/api/runtime_groups/${configGroupKonnect.controlPlaneId}/consumers/${configGroupKonnect.consumerId}/consumer_groups`, + url: `${configGroupKonnect.apiBaseUrl}/api/control_planes/${configGroupKonnect.controlPlaneId}/consumers/${configGroupKonnect.consumerId}/consumer_groups`, }, { statusCode: status, diff --git a/packages/entities/entities-consumer-groups/src/components/ConsumerGroupForm.cy.ts b/packages/entities/entities-consumer-groups/src/components/ConsumerGroupForm.cy.ts index 2b30a4e942..9038f130af 100644 --- a/packages/entities/entities-consumer-groups/src/components/ConsumerGroupForm.cy.ts +++ b/packages/entities/entities-consumer-groups/src/components/ConsumerGroupForm.cy.ts @@ -31,7 +31,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/consumers*`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/consumers*`, }, { statusCode: status, @@ -43,7 +43,7 @@ describe('', () => { cy.intercept( { method: 'POST', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/consumer_groups`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/consumer_groups`, }, { statusCode: status, @@ -55,7 +55,7 @@ describe('', () => { cy.intercept( { method: 'PUT', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/consumer_groups/*`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/consumer_groups/*`, }, { statusCode: status, @@ -67,7 +67,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/consumer_groups/*`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/consumer_groups/*`, }, { statusCode: status, @@ -79,7 +79,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/consumer_groups/*/consumers`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/consumer_groups/*/consumers`, }, { statusCode: status, @@ -91,7 +91,7 @@ describe('', () => { cy.intercept( { method: 'POST', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/consumer_groups/*/consumers`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/consumer_groups/*/consumers`, }, { statusCode: status, @@ -103,7 +103,7 @@ describe('', () => { cy.intercept( { method: 'DELETE', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/consumer_groups/*/consumers/*`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/consumer_groups/*/consumers/*`, }, { statusCode: status, diff --git a/packages/entities/entities-consumer-groups/src/components/ConsumerGroupList.cy.ts b/packages/entities/entities-consumer-groups/src/components/ConsumerGroupList.cy.ts index fec582882b..7a33f2982f 100644 --- a/packages/entities/entities-consumer-groups/src/components/ConsumerGroupList.cy.ts +++ b/packages/entities/entities-consumer-groups/src/components/ConsumerGroupList.cy.ts @@ -672,7 +672,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/consumer_groups*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/consumer_groups*`, }, { statusCode: 200, @@ -690,7 +690,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${configConsumerKonnect.apiBaseUrl}/api/runtime_groups/${configConsumerKonnect.controlPlaneId}/consumers/${configConsumerKonnect.consumerId}/consumer_groups*`, + url: `${configConsumerKonnect.apiBaseUrl}/api/control_planes/${configConsumerKonnect.controlPlaneId}/consumers/${configConsumerKonnect.consumerId}/consumer_groups*`, }, { statusCode: 200, @@ -708,7 +708,7 @@ describe('', () => { cy.intercept( { method: 'DELETE', - url: `${configConsumerKonnect.apiBaseUrl}/api/runtime_groups/${configConsumerKonnect.controlPlaneId}/consumers/${configConsumerKonnect.consumerId}/consumer_groups/*`, + url: `${configConsumerKonnect.apiBaseUrl}/api/control_planes/${configConsumerKonnect.controlPlaneId}/consumers/${configConsumerKonnect.consumerId}/consumer_groups/*`, }, { statusCode: params?.status || 200, @@ -724,7 +724,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/consumer_groups*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/consumer_groups*`, }, (req) => { const size = req.query.size ? Number(req.query.size) : 30 @@ -786,7 +786,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/consumer_groups*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/consumer_groups*`, }, { statusCode: 500, diff --git a/packages/entities/entities-consumer-groups/src/consumer-groups-endpoints.ts b/packages/entities/entities-consumer-groups/src/consumer-groups-endpoints.ts index 48aa5f3e0a..70c2b38a3c 100644 --- a/packages/entities/entities-consumer-groups/src/consumer-groups-endpoints.ts +++ b/packages/entities/entities-consumer-groups/src/consumer-groups-endpoints.ts @@ -1,4 +1,4 @@ -const konnectBaseApiUrl = '/api/runtime_groups/{controlPlaneId}' +const konnectBaseApiUrl = '/api/control_planes/{controlPlaneId}' const KMBaseApiUrl = '/{workspace}' export default { diff --git a/packages/entities/entities-consumers/src/components/AddConsumerModal.cy.ts b/packages/entities/entities-consumers/src/components/AddConsumerModal.cy.ts index af01076c0b..a9b1e8554c 100644 --- a/packages/entities/entities-consumers/src/components/AddConsumerModal.cy.ts +++ b/packages/entities/entities-consumers/src/components/AddConsumerModal.cy.ts @@ -24,7 +24,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${configGroupKonnect.apiBaseUrl}/api/runtime_groups/${configGroupKonnect.controlPlaneId}/consumers*`, + url: `${configGroupKonnect.apiBaseUrl}/api/control_planes/${configGroupKonnect.controlPlaneId}/consumers*`, }, { statusCode: 200, @@ -40,7 +40,7 @@ describe('', () => { cy.intercept( { method: 'POST', - url: `${configGroupKonnect.apiBaseUrl}/api/runtime_groups/${configGroupKonnect.controlPlaneId}/consumer_groups/${configGroupKonnect.consumerGroupId}/consumers`, + url: `${configGroupKonnect.apiBaseUrl}/api/control_planes/${configGroupKonnect.controlPlaneId}/consumer_groups/${configGroupKonnect.consumerGroupId}/consumers`, }, { statusCode: status, diff --git a/packages/entities/entities-consumers/src/components/ConsumerForm.cy.ts b/packages/entities/entities-consumers/src/components/ConsumerForm.cy.ts index 035999a5c5..455753e316 100644 --- a/packages/entities/entities-consumers/src/components/ConsumerForm.cy.ts +++ b/packages/entities/entities-consumers/src/components/ConsumerForm.cy.ts @@ -139,7 +139,7 @@ describe('', () => { cy.intercept( { method: 'POST', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/v1/schemas/json/consumer/validate`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/v1/schemas/json/consumer/validate`, }, { statusCode: status, @@ -152,7 +152,7 @@ describe('', () => { cy.intercept( { method: 'POST', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/consumers`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/consumers`, }, { statusCode: status, @@ -165,7 +165,7 @@ describe('', () => { cy.intercept( { method: 'PUT', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/consumers/*`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/consumers/*`, }, { statusCode: status, @@ -178,7 +178,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/consumers/*`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/consumers/*`, }, { statusCode: 200, diff --git a/packages/entities/entities-consumers/src/components/ConsumerList.cy.ts b/packages/entities/entities-consumers/src/components/ConsumerList.cy.ts index 92493a1b6f..1fe36675ab 100644 --- a/packages/entities/entities-consumers/src/components/ConsumerList.cy.ts +++ b/packages/entities/entities-consumers/src/components/ConsumerList.cy.ts @@ -672,7 +672,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/consumers*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/consumers*`, }, { statusCode: 200, @@ -690,7 +690,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${configGroupKonnect.apiBaseUrl}/api/runtime_groups/${configGroupKonnect.controlPlaneId}/consumer_groups/${configGroupKonnect.consumerGroupId}/consumers*`, + url: `${configGroupKonnect.apiBaseUrl}/api/control_planes/${configGroupKonnect.controlPlaneId}/consumer_groups/${configGroupKonnect.consumerGroupId}/consumers*`, }, { statusCode: 200, @@ -708,7 +708,7 @@ describe('', () => { cy.intercept( { method: 'DELETE', - url: `${configGroupKonnect.apiBaseUrl}/api/runtime_groups/${configGroupKonnect.controlPlaneId}/consumer_groups/${configGroupKonnect.consumerGroupId}/consumers/*`, + url: `${configGroupKonnect.apiBaseUrl}/api/control_planes/${configGroupKonnect.controlPlaneId}/consumer_groups/${configGroupKonnect.consumerGroupId}/consumers/*`, }, { statusCode: params?.status || 200, @@ -724,7 +724,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/consumers*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/consumers*`, }, (req) => { const size = req.query.size ? Number(req.query.size) : 30 @@ -786,7 +786,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/consumers*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/consumers*`, }, { statusCode: 500, diff --git a/packages/entities/entities-consumers/src/consumers-endpoints.ts b/packages/entities/entities-consumers/src/consumers-endpoints.ts index 7253062a38..6b4ef18d87 100644 --- a/packages/entities/entities-consumers/src/consumers-endpoints.ts +++ b/packages/entities/entities-consumers/src/consumers-endpoints.ts @@ -1,4 +1,4 @@ -const konnectBaseApiUrl = '/api/runtime_groups/{controlPlaneId}' +const konnectBaseApiUrl = '/api/control_planes/{controlPlaneId}' const KMBaseApiUrl = '/{workspace}' export default { diff --git a/packages/entities/entities-gateway-services/src/components/GatewayServiceForm.cy.ts b/packages/entities/entities-gateway-services/src/components/GatewayServiceForm.cy.ts index c9b0b0f556..3d0db79406 100644 --- a/packages/entities/entities-gateway-services/src/components/GatewayServiceForm.cy.ts +++ b/packages/entities/entities-gateway-services/src/components/GatewayServiceForm.cy.ts @@ -29,7 +29,7 @@ describe('', { viewportHeight: 800, viewportWidth: 700 }, cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/services/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/services/*`, }, { statusCode: 200, @@ -42,7 +42,7 @@ describe('', { viewportHeight: 800, viewportWidth: 700 }, cy.intercept( { method: 'POST', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/v1/schemas/json/service/validate`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/v1/schemas/json/service/validate`, }, { statusCode: status, @@ -53,7 +53,7 @@ describe('', { viewportHeight: 800, viewportWidth: 700 }, cy.intercept( { method: 'PUT', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/services/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/services/*`, }, { statusCode: status, @@ -245,7 +245,7 @@ describe('', { viewportHeight: 800, viewportWidth: 700 }, cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/services/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/services/*`, }, { statusCode: 404, diff --git a/packages/entities/entities-gateway-services/src/components/GatewayServiceList.cy.ts b/packages/entities/entities-gateway-services/src/components/GatewayServiceList.cy.ts index fd21f8a77e..c8847bab76 100644 --- a/packages/entities/entities-gateway-services/src/components/GatewayServiceList.cy.ts +++ b/packages/entities/entities-gateway-services/src/components/GatewayServiceList.cy.ts @@ -59,7 +59,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/services*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/services*`, }, { statusCode: 200, @@ -488,7 +488,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/services*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/services*`, }, { statusCode: 200, @@ -507,7 +507,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/services*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/services*`, }, (req) => { const size = req.query.size ? Number(req.query.size) : 30 @@ -565,7 +565,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/services*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/services*`, }, { statusCode: 500, diff --git a/packages/entities/entities-gateway-services/src/gateway-services-endpoints.ts b/packages/entities/entities-gateway-services/src/gateway-services-endpoints.ts index 8a5edef1b8..be1a14178c 100644 --- a/packages/entities/entities-gateway-services/src/gateway-services-endpoints.ts +++ b/packages/entities/entities-gateway-services/src/gateway-services-endpoints.ts @@ -1,7 +1,7 @@ export default { list: { konnect: { - all: '/api/runtime_groups/{controlPlaneId}/services', + all: '/api/control_planes/{controlPlaneId}/services', }, kongManager: { all: '/{workspace}/services', @@ -9,9 +9,9 @@ export default { }, form: { konnect: { - create: '/api/runtime_groups/{controlPlaneId}/services', - validate: '/api/runtime_groups/{controlPlaneId}/v1/schemas/json/service/validate', - edit: '/api/runtime_groups/{controlPlaneId}/services/{id}', + create: '/api/control_planes/{controlPlaneId}/services', + validate: '/api/control_planes/{controlPlaneId}/v1/schemas/json/service/validate', + edit: '/api/control_planes/{controlPlaneId}/services/{id}', }, kongManager: { create: '/{workspace}/services', diff --git a/packages/entities/entities-key-sets/src/components/KeySetForm.cy.ts b/packages/entities/entities-key-sets/src/components/KeySetForm.cy.ts index e6bb056171..44672805e2 100644 --- a/packages/entities/entities-key-sets/src/components/KeySetForm.cy.ts +++ b/packages/entities/entities-key-sets/src/components/KeySetForm.cy.ts @@ -206,7 +206,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/key-sets/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/key-sets/*`, }, { statusCode: 200, @@ -219,7 +219,7 @@ describe('', () => { cy.intercept( { method: 'PUT', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/key-sets/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/key-sets/*`, }, { statusCode: status, @@ -324,7 +324,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/key-sets/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/key-sets/*`, }, { statusCode: 404, diff --git a/packages/entities/entities-key-sets/src/components/KeySetList.cy.ts b/packages/entities/entities-key-sets/src/components/KeySetList.cy.ts index 296c94694e..9d2cbbd8a0 100644 --- a/packages/entities/entities-key-sets/src/components/KeySetList.cy.ts +++ b/packages/entities/entities-key-sets/src/components/KeySetList.cy.ts @@ -59,7 +59,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/key-sets*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/key-sets*`, }, { statusCode: 200, @@ -472,7 +472,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/key-sets*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/key-sets*`, }, { statusCode: 200, @@ -491,7 +491,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/key-sets*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/key-sets*`, }, (req) => { const size = req.query.size ? Number(req.query.size) : 30 @@ -549,7 +549,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/key-sets*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/key-sets*`, }, { statusCode: 500, diff --git a/packages/entities/entities-key-sets/src/key-sets-endpoints.ts b/packages/entities/entities-key-sets/src/key-sets-endpoints.ts index c51cec626b..e3fd976394 100644 --- a/packages/entities/entities-key-sets/src/key-sets-endpoints.ts +++ b/packages/entities/entities-key-sets/src/key-sets-endpoints.ts @@ -1,12 +1,12 @@ export default { list: { - konnect: '/api/runtime_groups/{controlPlaneId}/key-sets', + konnect: '/api/control_planes/{controlPlaneId}/key-sets', kongManager: '/{workspace}/key-sets', }, form: { konnect: { - create: '/api/runtime_groups/{controlPlaneId}/key-sets', - edit: '/api/runtime_groups/{controlPlaneId}/key-sets/{id}', + create: '/api/control_planes/{controlPlaneId}/key-sets', + edit: '/api/control_planes/{controlPlaneId}/key-sets/{id}', }, kongManager: { create: '/{workspace}/key-sets', diff --git a/packages/entities/entities-keys/src/components/KeyForm.cy.ts b/packages/entities/entities-keys/src/components/KeyForm.cy.ts index 46b4d631c8..01d0b75c75 100644 --- a/packages/entities/entities-keys/src/components/KeyForm.cy.ts +++ b/packages/entities/entities-keys/src/components/KeyForm.cy.ts @@ -448,7 +448,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/key-sets*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/key-sets*`, }, { statusCode: 200, @@ -461,7 +461,7 @@ describe('', () => { cy.intercept( { method: 'PUT', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/keys/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/keys/*`, }, { statusCode: status, @@ -477,7 +477,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/keys/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/keys/*`, }, { statusCode: 200, @@ -765,7 +765,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/keys/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/keys/*`, }, { statusCode: 404, @@ -795,7 +795,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/key-sets*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/key-sets*`, }, { statusCode: 500, diff --git a/packages/entities/entities-keys/src/components/KeyList.cy.ts b/packages/entities/entities-keys/src/components/KeyList.cy.ts index c594ebb335..d7263293df 100644 --- a/packages/entities/entities-keys/src/components/KeyList.cy.ts +++ b/packages/entities/entities-keys/src/components/KeyList.cy.ts @@ -59,7 +59,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/keys*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/keys*`, }, { statusCode: 200, @@ -472,7 +472,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/keys*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/keys*`, }, { statusCode: 200, @@ -491,7 +491,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/keys*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/keys*`, }, (req) => { const size = req.query.size ? Number(req.query.size) : 30 @@ -549,7 +549,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/keys*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/keys*`, }, { statusCode: 500, diff --git a/packages/entities/entities-keys/src/keys-endpoints.ts b/packages/entities/entities-keys/src/keys-endpoints.ts index c40d5ae140..3024580c75 100644 --- a/packages/entities/entities-keys/src/keys-endpoints.ts +++ b/packages/entities/entities-keys/src/keys-endpoints.ts @@ -1,8 +1,8 @@ export default { list: { konnect: { - all: '/api/runtime_groups/{controlPlaneId}/keys', - forKeySet: '/api/runtime_groups/{controlPlaneId}/key-sets/{keySetId}/keys', + all: '/api/control_planes/{controlPlaneId}/keys', + forKeySet: '/api/control_planes/{controlPlaneId}/key-sets/{keySetId}/keys', }, kongManager: { all: '/{workspace}/keys', @@ -11,10 +11,10 @@ export default { }, form: { konnect: { - create: '/api/runtime_groups/{controlPlaneId}/keys', - edit: '/api/runtime_groups/{controlPlaneId}/keys/{id}', - keySets: '/api/runtime_groups/{controlPlaneId}/key-sets', - getKeySet: '/api/runtime_groups/{controlPlaneId}/key-sets/{keySetId}', + create: '/api/control_planes/{controlPlaneId}/keys', + edit: '/api/control_planes/{controlPlaneId}/keys/{id}', + keySets: '/api/control_planes/{controlPlaneId}/key-sets', + getKeySet: '/api/control_planes/{controlPlaneId}/key-sets/{keySetId}', }, kongManager: { create: '/{workspace}/keys', diff --git a/packages/entities/entities-plugins/src/components/PluginList.cy.ts b/packages/entities/entities-plugins/src/components/PluginList.cy.ts index 6726ca9ccf..a871633fc2 100644 --- a/packages/entities/entities-plugins/src/components/PluginList.cy.ts +++ b/packages/entities/entities-plugins/src/components/PluginList.cy.ts @@ -67,7 +67,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/plugins*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/plugins*`, }, { statusCode: 200, @@ -721,7 +721,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/plugins*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/plugins*`, }, { statusCode: 200, @@ -740,7 +740,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/plugins*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/plugins*`, }, (req) => { const size = req.query.size ? Number(req.query.size) : 30 @@ -798,7 +798,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/plugins*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/plugins*`, }, { statusCode: 500, diff --git a/packages/entities/entities-plugins/src/plugins-endpoints.ts b/packages/entities/entities-plugins/src/plugins-endpoints.ts index 432723bf26..75b7a804b2 100644 --- a/packages/entities/entities-plugins/src/plugins-endpoints.ts +++ b/packages/entities/entities-plugins/src/plugins-endpoints.ts @@ -1,8 +1,8 @@ export default { list: { konnect: { - all: '/api/runtime_groups/{controlPlaneId}/plugins', - forEntity: '/api/runtime_groups/{controlPlaneId}/{entityType}/{entityId}/plugins', + all: '/api/control_planes/{controlPlaneId}/plugins', + forEntity: '/api/control_planes/{controlPlaneId}/{entityType}/{entityId}/plugins', }, kongManager: { all: '/{workspace}/plugins', @@ -11,8 +11,8 @@ export default { }, form: { konnect: { - edit: '/api/runtime_groups/{controlPlaneId}/plugins/{id}', - pluginSchema: '/api/runtime_groups/{controlPlaneId}/schemas/plugins/{plugin}', + edit: '/api/control_planes/{controlPlaneId}/plugins/{id}', + pluginSchema: '/api/control_planes/{controlPlaneId}/schemas/plugins/{plugin}', }, kongManager: { edit: '/{workspace}/plugins/{id}', @@ -21,8 +21,8 @@ export default { }, item: { konnect: { - all: '/api/runtime_groups/{controlPlaneId}/plugins/{id}', - forEntity: '/api/runtime_groups/{controlPlaneId}/{entityType}/{entityId}/plugins/{id}', + all: '/api/control_planes/{controlPlaneId}/plugins/{id}', + forEntity: '/api/control_planes/{controlPlaneId}/{entityType}/{entityId}/plugins/{id}', }, kongManager: { all: '/{workspace}/plugins/{id}', diff --git a/packages/entities/entities-routes/src/components/RouteForm.cy.ts b/packages/entities/entities-routes/src/components/RouteForm.cy.ts index 7ea329c89d..7c8246d23c 100644 --- a/packages/entities/entities-routes/src/components/RouteForm.cy.ts +++ b/packages/entities/entities-routes/src/components/RouteForm.cy.ts @@ -511,7 +511,7 @@ describe('', { viewportHeight: 700, viewportWidth: 700 }, () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/routes/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/routes/*`, }, { statusCode: 200, @@ -527,7 +527,7 @@ describe('', { viewportHeight: 700, viewportWidth: 700 }, () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/services*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/services*`, }, { statusCode: 200, @@ -540,7 +540,7 @@ describe('', { viewportHeight: 700, viewportWidth: 700 }, () => { cy.intercept( { method: 'PUT', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/routes/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/routes/*`, }, { statusCode: status, @@ -825,7 +825,7 @@ describe('', { viewportHeight: 700, viewportWidth: 700 }, () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/routes/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/routes/*`, }, { statusCode: 404, @@ -880,7 +880,7 @@ describe('', { viewportHeight: 700, viewportWidth: 700 }, () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/services*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/services*`, }, { statusCode: 500, diff --git a/packages/entities/entities-routes/src/components/RouteList.cy.ts b/packages/entities/entities-routes/src/components/RouteList.cy.ts index f642228d6b..2f8c5aced9 100644 --- a/packages/entities/entities-routes/src/components/RouteList.cy.ts +++ b/packages/entities/entities-routes/src/components/RouteList.cy.ts @@ -59,7 +59,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/routes*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/routes*`, }, { statusCode: 200, @@ -472,7 +472,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/routes*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/routes*`, }, { statusCode: 200, @@ -491,7 +491,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/routes*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/routes*`, }, (req) => { const size = req.query.size ? Number(req.query.size) : 30 @@ -549,7 +549,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/routes*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/routes*`, }, { statusCode: 500, diff --git a/packages/entities/entities-routes/src/routes-endpoints.ts b/packages/entities/entities-routes/src/routes-endpoints.ts index 712c685f6f..99e09af29f 100644 --- a/packages/entities/entities-routes/src/routes-endpoints.ts +++ b/packages/entities/entities-routes/src/routes-endpoints.ts @@ -1,8 +1,8 @@ export default { list: { konnect: { - all: '/api/runtime_groups/{controlPlaneId}/routes', - forGatewayService: '/api/runtime_groups/{controlPlaneId}/services/{serviceId}/routes', + all: '/api/control_planes/{controlPlaneId}/routes', + forGatewayService: '/api/control_planes/{controlPlaneId}/services/{serviceId}/routes', }, kongManager: { all: '/{workspace}/routes', @@ -11,18 +11,18 @@ export default { }, form: { konnect: { - services: '/api/runtime_groups/{controlPlaneId}/services', + services: '/api/control_planes/{controlPlaneId}/services', create: { - all: '/api/runtime_groups/{controlPlaneId}/routes', - forGatewayService: '/api/runtime_groups/{controlPlaneId}/services/{serviceId}/routes', + all: '/api/control_planes/{controlPlaneId}/routes', + forGatewayService: '/api/control_planes/{controlPlaneId}/services/{serviceId}/routes', }, fetch: { - all: '/api/runtime_groups/{controlPlaneId}/routes/{id}', - forGatewayService: '/api/runtime_groups/{controlPlaneId}/services/{serviceId}/routes/{id}', + all: '/api/control_planes/{controlPlaneId}/routes/{id}', + forGatewayService: '/api/control_planes/{controlPlaneId}/services/{serviceId}/routes/{id}', }, edit: { - all: '/api/runtime_groups/{controlPlaneId}/routes/{id}', - forGatewayService: '/api/runtime_groups/{controlPlaneId}/services/{serviceId}/routes/{id}', + all: '/api/control_planes/{controlPlaneId}/routes/{id}', + forGatewayService: '/api/control_planes/{controlPlaneId}/services/{serviceId}/routes/{id}', }, }, kongManager: { @@ -43,9 +43,9 @@ export default { }, item: { konnect: { - getService: '/api/runtime_groups/{controlPlaneId}/services/{serviceId}', - all: '/api/runtime_groups/{controlPlaneId}/routes/{id}', - forGatewayService: '/api/runtime_groups/{controlPlaneId}/services/{serviceId}/routes/{id}', + getService: '/api/control_planes/{controlPlaneId}/services/{serviceId}', + all: '/api/control_planes/{controlPlaneId}/routes/{id}', + forGatewayService: '/api/control_planes/{controlPlaneId}/services/{serviceId}/routes/{id}', }, kongManager: { getService: '/{workspace}/services/{serviceId}', diff --git a/packages/entities/entities-shared/docs/entity-base-config-card.md b/packages/entities/entities-shared/docs/entity-base-config-card.md index e6c6edaee8..a7bbb07ae8 100644 --- a/packages/entities/entities-shared/docs/entity-base-config-card.md +++ b/packages/entities/entities-shared/docs/entity-base-config-card.md @@ -85,7 +85,7 @@ The base konnect or kongManger config. Fetch url for the entity to display record data for. We will handle the replacement of {controlPlaneId}, {workspace}, and {id}. Value should NOT contain config.apiBaseUrl, as we auto include this. Typically this will just an entry from the endpoints file. -ex. `/api/runtime_groups/{controlPlaneId}/services/{id}` +ex. `/api/control_planes/{controlPlaneId}/services/{id}` #### `dataKey` diff --git a/packages/entities/entities-shared/docs/entity-base-form.md b/packages/entities/entities-shared/docs/entity-base-form.md index db435f7c8e..f8b3127573 100644 --- a/packages/entities/entities-shared/docs/entity-base-form.md +++ b/packages/entities/entities-shared/docs/entity-base-form.md @@ -88,7 +88,7 @@ Required if `editId` is specified. Fetch url for the entity to edit. We will handle the replacement of {controlPlaneId}, {workspace}, and {id}. Value should NOT contain config.apiBaseUrl, as we auto include this. Typically this will just an entry from the endpoints file. -ex. `/api/runtime_groups/{controlPlaneId}/snis/{id}` +ex. `/api/control_planes/{controlPlaneId}/snis/{id}` #### `isReadonly` diff --git a/packages/entities/entities-shared/sandbox/pages/EntityBaseConfigCardPage.vue b/packages/entities/entities-shared/sandbox/pages/EntityBaseConfigCardPage.vue index 68b247ceaf..56c9360282 100644 --- a/packages/entities/entities-shared/sandbox/pages/EntityBaseConfigCardPage.vue +++ b/packages/entities/entities-shared/sandbox/pages/EntityBaseConfigCardPage.vue @@ -58,7 +58,7 @@ import composables from '../../src/composables' const controlPlaneId = import.meta.env.VITE_KONNECT_CONTROL_PLANE_ID || '' // replace with your own endpoint -const konnectFetchUrl = ref('/api/runtime_groups/{controlPlaneId}/upstreams/{id}') +const konnectFetchUrl = ref('/api/control_planes/{controlPlaneId}/upstreams/{id}') const kmFetchUrl = ref('/{workspace}/upstreams/{id}') // replace with you own ID const entityId = 'ce83dd74-6455-40a9-b944-0f393c7ee22c' diff --git a/packages/entities/entities-shared/src/components/entity-base-config-card/EntityBaseConfigCard.cy.ts b/packages/entities/entities-shared/src/components/entity-base-config-card/EntityBaseConfigCard.cy.ts index f82039283a..045c365a32 100644 --- a/packages/entities/entities-shared/src/components/entity-base-config-card/EntityBaseConfigCard.cy.ts +++ b/packages/entities/entities-shared/src/components/entity-base-config-card/EntityBaseConfigCard.cy.ts @@ -16,8 +16,8 @@ const config: KonnectBaseEntityConfig = { controlPlaneId, entityId, } -const fetchUrl = `/api/runtime_groups/${config.controlPlaneId}/services/{id}` -const pluginsFetchUrl = `/api/runtime_groups/${config.controlPlaneId}/plugins/{id}` +const fetchUrl = `/api/control_planes/${config.controlPlaneId}/services/{id}` +const pluginsFetchUrl = `/api/control_planes/${config.controlPlaneId}/plugins/{id}` const pluginConfigKey = 'config' const customizedKey = 'ca_certificates' @@ -92,7 +92,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${config.apiBaseUrl}/api/runtime_groups/${config.controlPlaneId}/services/${entityId}`, + url: `${config.apiBaseUrl}/api/control_planes/${config.controlPlaneId}/services/${entityId}`, }, { statusCode: status, @@ -105,7 +105,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${config.apiBaseUrl}/api/runtime_groups/${config.controlPlaneId}/plugins/${entityId}`, + url: `${config.apiBaseUrl}/api/control_planes/${config.controlPlaneId}/plugins/${entityId}`, }, { statusCode: status, @@ -223,7 +223,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${config.apiBaseUrl}/api/runtime_groups/${config.controlPlaneId}/services/${entityId}`, + url: `${config.apiBaseUrl}/api/control_planes/${config.controlPlaneId}/services/${entityId}`, }, { statusCode: 200, @@ -396,7 +396,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${config.apiBaseUrl}/api/runtime_groups/${config.controlPlaneId}/services/${entityId}`, + url: `${config.apiBaseUrl}/api/control_planes/${config.controlPlaneId}/services/${entityId}`, }, { statusCode: 500, diff --git a/packages/entities/entities-shared/src/components/entity-base-config-card/EntityBaseConfigCard.vue b/packages/entities/entities-shared/src/components/entity-base-config-card/EntityBaseConfigCard.vue index 46cf142b33..d58160ce1e 100644 --- a/packages/entities/entities-shared/src/components/entity-base-config-card/EntityBaseConfigCard.vue +++ b/packages/entities/entities-shared/src/components/entity-base-config-card/EntityBaseConfigCard.vue @@ -154,7 +154,7 @@ const props = defineProps({ * Value should NOT contain config.apiBaseUrl, as we auto include this. Typically this will just an entry from * the endpoints file. * - * ex. `/api/runtime_groups/{controlPlaneId}/snis/{id}` + * ex. `/api/control_planes/{controlPlaneId}/snis/{id}` */ fetchUrl: { type: String, diff --git a/packages/entities/entities-shared/src/components/entity-base-form/EntityBaseForm.cy.ts b/packages/entities/entities-shared/src/components/entity-base-form/EntityBaseForm.cy.ts index 1be361c29a..bd358d87e5 100644 --- a/packages/entities/entities-shared/src/components/entity-base-form/EntityBaseForm.cy.ts +++ b/packages/entities/entities-shared/src/components/entity-base-form/EntityBaseForm.cy.ts @@ -13,7 +13,7 @@ describe('', () => { cancelRoute: { name: '/' }, } const editId = '1234-ideclare-athumb-war' - const fetchUrl = `/api/runtime_groups/${config.controlPlaneId}/routes/{id}` + const fetchUrl = `/api/control_planes/${config.controlPlaneId}/routes/{id}` it('disables save button when canSubmit is false', () => { cy.mount(EntityBaseForm, { @@ -64,7 +64,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${config.apiBaseUrl}/api/runtime_groups/${config.controlPlaneId}/routes/${editId}`, + url: `${config.apiBaseUrl}/api/control_planes/${config.controlPlaneId}/routes/${editId}`, }, { statusCode: 200, @@ -93,7 +93,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${config.apiBaseUrl}/api/runtime_groups/${config.controlPlaneId}/routes/${editId}`, + url: `${config.apiBaseUrl}/api/control_planes/${config.controlPlaneId}/routes/${editId}`, }, { statusCode: 500, diff --git a/packages/entities/entities-shared/src/components/entity-base-form/EntityBaseForm.vue b/packages/entities/entities-shared/src/components/entity-base-form/EntityBaseForm.vue index 0c757dc016..0150f97cf0 100644 --- a/packages/entities/entities-shared/src/components/entity-base-form/EntityBaseForm.vue +++ b/packages/entities/entities-shared/src/components/entity-base-form/EntityBaseForm.vue @@ -107,7 +107,7 @@ const props = defineProps({ * the endpoints file. * Required if `editId` is specified. * - * ex. `/api/runtime_groups/{controlPlaneId}/snis/{id}` + * ex. `/api/control_planes/{controlPlaneId}/snis/{id}` */ fetchUrl: { type: String, diff --git a/packages/entities/entities-snis/src/components/SniForm.cy.ts b/packages/entities/entities-snis/src/components/SniForm.cy.ts index 1f25a7ce7a..83a111725c 100644 --- a/packages/entities/entities-snis/src/components/SniForm.cy.ts +++ b/packages/entities/entities-snis/src/components/SniForm.cy.ts @@ -355,7 +355,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/certificates*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/certificates*`, }, { statusCode: 200, @@ -371,7 +371,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/snis/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/snis/*`, }, { statusCode: 200, @@ -384,7 +384,7 @@ describe('', () => { cy.intercept( { method: 'POST', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/v1/schemas/json/sni/validate`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/v1/schemas/json/sni/validate`, }, { statusCode: status, @@ -395,7 +395,7 @@ describe('', () => { cy.intercept( { method: 'PUT', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/snis/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/snis/*`, }, { statusCode: status, @@ -578,7 +578,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/snis/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/snis/*`, }, { statusCode: 404, @@ -608,7 +608,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/certificates*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/certificates*`, }, { statusCode: 500, diff --git a/packages/entities/entities-snis/src/components/SniList.cy.ts b/packages/entities/entities-snis/src/components/SniList.cy.ts index 857102b2cb..a5f40e3495 100644 --- a/packages/entities/entities-snis/src/components/SniList.cy.ts +++ b/packages/entities/entities-snis/src/components/SniList.cy.ts @@ -45,7 +45,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/snis*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/snis*`, }, { statusCode: 200, @@ -428,7 +428,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/snis*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/snis*`, }, { statusCode: 200, @@ -447,7 +447,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/snis*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/snis*`, }, (req) => { const size = req.query.size ? Number(req.query.size) : 30 @@ -505,7 +505,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/snis*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/snis*`, }, { statusCode: 500, diff --git a/packages/entities/entities-snis/src/snis-endpoints.ts b/packages/entities/entities-snis/src/snis-endpoints.ts index 415d1cfb39..3a14e63ef3 100644 --- a/packages/entities/entities-snis/src/snis-endpoints.ts +++ b/packages/entities/entities-snis/src/snis-endpoints.ts @@ -1,7 +1,7 @@ export default { list: { konnect: { - all: '/api/runtime_groups/{controlPlaneId}/snis', + all: '/api/control_planes/{controlPlaneId}/snis', }, kongManager: { all: '/{workspace}/snis', @@ -9,10 +9,10 @@ export default { }, form: { konnect: { - create: '/api/runtime_groups/{controlPlaneId}/snis', - edit: '/api/runtime_groups/{controlPlaneId}/snis/{id}', - validate: '/api/runtime_groups/{controlPlaneId}/v1/schemas/json/sni/validate', - certificates: '/api/runtime_groups/{controlPlaneId}/certificates', + create: '/api/control_planes/{controlPlaneId}/snis', + edit: '/api/control_planes/{controlPlaneId}/snis/{id}', + validate: '/api/control_planes/{controlPlaneId}/v1/schemas/json/sni/validate', + certificates: '/api/control_planes/{controlPlaneId}/certificates', }, kongManager: { create: '/{workspace}/snis', diff --git a/packages/entities/entities-upstreams-targets/src/components/TargetForm.cy.ts b/packages/entities/entities-upstreams-targets/src/components/TargetForm.cy.ts index 599adc8edb..008536c2f9 100644 --- a/packages/entities/entities-upstreams-targets/src/components/TargetForm.cy.ts +++ b/packages/entities/entities-upstreams-targets/src/components/TargetForm.cy.ts @@ -193,7 +193,7 @@ describe('', { viewportHeight: 700, viewportWidth: 700 }, () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/upstreams/${upstreamId}/targets/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/upstreams/${upstreamId}/targets/*`, }, { statusCode: 200, @@ -306,7 +306,7 @@ describe('', { viewportHeight: 700, viewportWidth: 700 }, () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/upstreams/${upstreamId}/targets/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/upstreams/${upstreamId}/targets/*`, }, { statusCode: 404, diff --git a/packages/entities/entities-upstreams-targets/src/components/TargetsList.cy.ts b/packages/entities/entities-upstreams-targets/src/components/TargetsList.cy.ts index 2922467ccc..c2d2d8303e 100644 --- a/packages/entities/entities-upstreams-targets/src/components/TargetsList.cy.ts +++ b/packages/entities/entities-upstreams-targets/src/components/TargetsList.cy.ts @@ -45,7 +45,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/upstreams/${baseConfigKonnect.upstreamId}/targets*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/upstreams/${baseConfigKonnect.upstreamId}/targets*`, }, { statusCode: 200, @@ -125,7 +125,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/upstreams/${baseConfigKonnect.upstreamId}/targets*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/upstreams/${baseConfigKonnect.upstreamId}/targets*`, }, { statusCode: 200, @@ -540,7 +540,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/upstreams/${baseConfigKonnect.upstreamId}/targets*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/upstreams/${baseConfigKonnect.upstreamId}/targets*`, }, { statusCode: 200, @@ -559,7 +559,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/upstreams/${baseConfigKonnect.upstreamId}/targets*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/upstreams/${baseConfigKonnect.upstreamId}/targets*`, }, (req) => { const size = req.query.size ? Number(req.query.size) : 30 @@ -617,7 +617,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/upstreams/${baseConfigKonnect.upstreamId}/targets*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/upstreams/${baseConfigKonnect.upstreamId}/targets*`, }, { statusCode: 500, diff --git a/packages/entities/entities-upstreams-targets/src/components/UpstreamsConfigCard.cy.ts b/packages/entities/entities-upstreams-targets/src/components/UpstreamsConfigCard.cy.ts index b980c202a2..ad05bdf274 100644 --- a/packages/entities/entities-upstreams-targets/src/components/UpstreamsConfigCard.cy.ts +++ b/packages/entities/entities-upstreams-targets/src/components/UpstreamsConfigCard.cy.ts @@ -9,7 +9,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${konnectCardConfig.apiBaseUrl}/api/runtime_groups/${konnectCardConfig.controlPlaneId}/upstreams/*`, + url: `${konnectCardConfig.apiBaseUrl}/api/control_planes/${konnectCardConfig.controlPlaneId}/upstreams/*`, }, { statusCode: status, diff --git a/packages/entities/entities-upstreams-targets/src/components/UpstreamsForm.cy.ts b/packages/entities/entities-upstreams-targets/src/components/UpstreamsForm.cy.ts index c931c19688..441979031a 100644 --- a/packages/entities/entities-upstreams-targets/src/components/UpstreamsForm.cy.ts +++ b/packages/entities/entities-upstreams-targets/src/components/UpstreamsForm.cy.ts @@ -15,7 +15,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/services*`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/services*`, }, { statusCode: status, @@ -27,7 +27,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/certificates*`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/certificates*`, }, { statusCode: status, @@ -39,7 +39,7 @@ describe('', () => { cy.intercept( { method: 'POST', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/upstreams`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/upstreams`, }, { statusCode: status, @@ -51,7 +51,7 @@ describe('', () => { cy.intercept( { method: 'PUT', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/upstreams/*`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/upstreams/*`, }, { statusCode: status, @@ -63,7 +63,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/upstreams/*`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/upstreams/*`, }, { statusCode: status, @@ -75,7 +75,7 @@ describe('', () => { cy.intercept( { method: 'POST', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/v1/schemas/json/upstream/validate`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/v1/schemas/json/upstream/validate`, }, { statusCode: status, diff --git a/packages/entities/entities-upstreams-targets/src/components/UpstreamsFormGeneralInfo.cy.ts b/packages/entities/entities-upstreams-targets/src/components/UpstreamsFormGeneralInfo.cy.ts index 47a747531b..7aa821aa20 100644 --- a/packages/entities/entities-upstreams-targets/src/components/UpstreamsFormGeneralInfo.cy.ts +++ b/packages/entities/entities-upstreams-targets/src/components/UpstreamsFormGeneralInfo.cy.ts @@ -7,7 +7,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/services*`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/services*`, }, { statusCode: status, @@ -19,7 +19,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${konnectConfig.apiBaseUrl}/api/runtime_groups/${konnectConfig.controlPlaneId}/certificates*`, + url: `${konnectConfig.apiBaseUrl}/api/control_planes/${konnectConfig.controlPlaneId}/certificates*`, }, { statusCode: status, diff --git a/packages/entities/entities-upstreams-targets/src/components/UpstreamsList.cy.ts b/packages/entities/entities-upstreams-targets/src/components/UpstreamsList.cy.ts index a721cd6777..e630fb95e1 100644 --- a/packages/entities/entities-upstreams-targets/src/components/UpstreamsList.cy.ts +++ b/packages/entities/entities-upstreams-targets/src/components/UpstreamsList.cy.ts @@ -62,7 +62,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/upstreams*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/upstreams*`, }, { statusCode: 200, @@ -475,7 +475,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/upstreams*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/upstreams*`, }, { statusCode: 200, @@ -494,7 +494,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/upstreams*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/upstreams*`, }, (req) => { const size = req.query.size ? Number(req.query.size) : 30 @@ -552,7 +552,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/upstreams*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/upstreams*`, }, { statusCode: 500, diff --git a/packages/entities/entities-upstreams-targets/src/targets-endpoints.ts b/packages/entities/entities-upstreams-targets/src/targets-endpoints.ts index e8b2705c86..169bfa605f 100644 --- a/packages/entities/entities-upstreams-targets/src/targets-endpoints.ts +++ b/packages/entities/entities-upstreams-targets/src/targets-endpoints.ts @@ -1,13 +1,13 @@ export default { list: { - konnect: '/api/runtime_groups/{controlPlaneId}/upstreams/{upstreamId}/targets', + konnect: '/api/control_planes/{controlPlaneId}/upstreams/{upstreamId}/targets', kongManager: '/{workspace}/upstreams/{upstreamId}/targets', }, form: { konnect: { - create: '/api/runtime_groups/{controlPlaneId}/upstreams/{upstreamId}/targets', - edit: '/api/runtime_groups/{controlPlaneId}/upstreams/{upstreamId}/targets/{id}', - validate: '/api/runtime_groups/{controlPlaneId}/v1/schemas/json/target/validate', + create: '/api/control_planes/{controlPlaneId}/upstreams/{upstreamId}/targets', + edit: '/api/control_planes/{controlPlaneId}/upstreams/{upstreamId}/targets/{id}', + validate: '/api/control_planes/{controlPlaneId}/v1/schemas/json/target/validate', }, kongManager: { create: '/{workspace}/upstreams/{upstreamId}/targets', diff --git a/packages/entities/entities-upstreams-targets/src/upstreams-endpoints.ts b/packages/entities/entities-upstreams-targets/src/upstreams-endpoints.ts index 3475065b20..f1753c95eb 100644 --- a/packages/entities/entities-upstreams-targets/src/upstreams-endpoints.ts +++ b/packages/entities/entities-upstreams-targets/src/upstreams-endpoints.ts @@ -1,4 +1,4 @@ -const konnectBaseApiUrl = '/api/runtime_groups/{controlPlaneId}' +const konnectBaseApiUrl = '/api/control_planes/{controlPlaneId}' const KMBaseApiUrl = '/{workspace}' export default { list: { diff --git a/packages/entities/entities-vaults/src/components/VaultConfigCard.cy.ts b/packages/entities/entities-vaults/src/components/VaultConfigCard.cy.ts index 0b6db6c45d..63b9878aad 100644 --- a/packages/entities/entities-vaults/src/components/VaultConfigCard.cy.ts +++ b/packages/entities/entities-vaults/src/components/VaultConfigCard.cy.ts @@ -8,7 +8,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${konnectCardConfig.apiBaseUrl}/api/runtime_groups/${konnectCardConfig.controlPlaneId}/vaults/*`, + url: `${konnectCardConfig.apiBaseUrl}/api/control_planes/${konnectCardConfig.controlPlaneId}/vaults/*`, }, { statusCode: status, diff --git a/packages/entities/entities-vaults/src/components/VaultForm.cy.ts b/packages/entities/entities-vaults/src/components/VaultForm.cy.ts index 35dcb14771..c6ed1cf22b 100644 --- a/packages/entities/entities-vaults/src/components/VaultForm.cy.ts +++ b/packages/entities/entities-vaults/src/components/VaultForm.cy.ts @@ -430,7 +430,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/vaults/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/vaults/*`, }, { statusCode: 200, @@ -443,7 +443,7 @@ describe('', () => { cy.intercept( { method: 'PUT', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/vaults/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/vaults/*`, }, { statusCode: status, @@ -736,7 +736,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/vaults/*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/vaults/*`, }, { statusCode: 404, diff --git a/packages/entities/entities-vaults/src/components/VaultList.cy.ts b/packages/entities/entities-vaults/src/components/VaultList.cy.ts index 3041434a38..bfaaf95242 100644 --- a/packages/entities/entities-vaults/src/components/VaultList.cy.ts +++ b/packages/entities/entities-vaults/src/components/VaultList.cy.ts @@ -55,7 +55,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/vaults*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/vaults*`, }, { statusCode: 200, @@ -468,7 +468,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/vaults*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/vaults*`, }, { statusCode: 200, @@ -487,7 +487,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/vaults*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/vaults*`, }, (req) => { const size = req.query.size ? Number(req.query.size) : 30 @@ -545,7 +545,7 @@ describe('', () => { cy.intercept( { method: 'GET', - url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/vaults*`, + url: `${baseConfigKonnect.apiBaseUrl}/api/control_planes/${baseConfigKonnect.controlPlaneId}/vaults*`, }, { statusCode: 500, diff --git a/packages/entities/entities-vaults/src/vaults-endpoints.ts b/packages/entities/entities-vaults/src/vaults-endpoints.ts index 0e858638ee..2e8f0674e9 100644 --- a/packages/entities/entities-vaults/src/vaults-endpoints.ts +++ b/packages/entities/entities-vaults/src/vaults-endpoints.ts @@ -1,12 +1,12 @@ export default { list: { - konnect: '/api/runtime_groups/{controlPlaneId}/vaults', + konnect: '/api/control_planes/{controlPlaneId}/vaults', kongManager: '/{workspace}/vaults', }, form: { konnect: { - create: '/api/runtime_groups/{controlPlaneId}/vaults', - edit: '/api/runtime_groups/{controlPlaneId}/vaults/{id}', + create: '/api/control_planes/{controlPlaneId}/vaults', + edit: '/api/control_planes/{controlPlaneId}/vaults/{id}', }, kongManager: { create: '/{workspace}/vaults',