Skip to content

Commit 0272d22

Browse files
LeopoldthecoderLeopoldthecoder
authored
chore(entities): unify Konnect endpoints (#1295)
1 parent 81e8990 commit 0272d22

File tree

82 files changed

+346
-313
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+346
-313
lines changed

‎.env.development.local.example

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ VITE_KONNECT_PAT=
44
# Konnect Proxy for '^/kong-ui/config'
55
VITE_KONNECT_CONFIG=
66

7-
# Konnect Proxy for '{geo}/kong-api/konnect-api'
7+
# Konnect Proxy for '{geo}/kong-api'
88
VITE_KONNECT_API=
99

1010
# Konnect Proxy for '^/kauth'

‎packages/entities/entities-certificates/sandbox/pages/CACertificateConfigCardPage.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const props = defineProps({
3232
const controlPlaneId = import.meta.env.VITE_KONNECT_CONTROL_PLANE_ID || ''
3333
const konnectConfig = ref<KonnectCertificateEntityConfig>({
3434
app: 'konnect',
35-
apiBaseUrl: '/us/kong-api/konnect-api', // `/{geo}/kong-api`, with leading slash and no trailing slash; Consuming app would pass in something like `https://us.api.konghq.com`
35+
apiBaseUrl: '/us/kong-api', // `/{geo}/kong-api`, with leading slash and no trailing slash; Consuming app would pass in something like `https://us.api.konghq.com`
3636
// Set the root `.env.development.local` variable to a control plane your PAT can access
3737
controlPlaneId,
3838
entityId: props.id,

‎packages/entities/entities-certificates/sandbox/pages/CACertificateFormPage.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const controlPlaneId = import.meta.env.VITE_KONNECT_CONTROL_PLANE_ID || ''
3737
3838
const konnectConfig = ref<KonnectCertificateFormConfig>({
3939
app: 'konnect',
40-
apiBaseUrl: '/us/kong-api/konnect-api', // `/{geo}/kong-api`, with leading slash and no trailing slash; Consuming app would pass in something like `https://us.api.konghq.com`
40+
apiBaseUrl: '/us/kong-api', // `/{geo}/kong-api`, with leading slash and no trailing slash; Consuming app would pass in something like `https://us.api.konghq.com`
4141
// Set the root `.env.development.local` variable to a control plane your PAT can access
4242
controlPlaneId,
4343
cancelRoute: { name: 'ca-certificate-list' },

‎packages/entities/entities-certificates/sandbox/pages/CACertificateListPage.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import SandboxPermissionsControl from '@entities-shared-sandbox/components/Sandb
4646
const controlPlaneId = import.meta.env.VITE_KONNECT_CONTROL_PLANE_ID || ''
4747
const konnectConfig = ref<KonnectCertificateListConfig>({
4848
app: 'konnect',
49-
apiBaseUrl: '/us/kong-api/konnect-api', // `/{geo}/kong-api/konnect-api`, with leading slash and no trailing slash
49+
apiBaseUrl: '/us/kong-api', // `/{geo}/kong-api`, with leading slash and no trailing slash
5050
// Set the root `.env.development.local` variable to a control plane your PAT can access
5151
controlPlaneId,
5252
createRoute: { name: 'create-ca-certificate' },

‎packages/entities/entities-certificates/sandbox/pages/CertificateConfigCardPage.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const props = defineProps({
3232
const controlPlaneId = import.meta.env.VITE_KONNECT_CONTROL_PLANE_ID || ''
3333
const konnectConfig = ref<KonnectCertificateEntityConfig>({
3434
app: 'konnect',
35-
apiBaseUrl: '/us/kong-api/konnect-api', // `/{geo}/kong-api`, with leading slash and no trailing slash; Consuming app would pass in something like `https://us.api.konghq.com`
35+
apiBaseUrl: '/us/kong-api', // `/{geo}/kong-api`, with leading slash and no trailing slash; Consuming app would pass in something like `https://us.api.konghq.com`
3636
// Set the root `.env.development.local` variable to a control plane your PAT can access
3737
controlPlaneId,
3838
entityId: props.id,

‎packages/entities/entities-certificates/sandbox/pages/CertificateFormPage.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const controlPlaneId = import.meta.env.VITE_KONNECT_CONTROL_PLANE_ID || ''
3737
3838
const konnectConfig = ref<KonnectCertificateFormConfig>({
3939
app: 'konnect',
40-
apiBaseUrl: '/us/kong-api/konnect-api', // `/{geo}/kong-api`, with leading slash and no trailing slash; Consuming app would pass in something like `https://us.api.konghq.com`
40+
apiBaseUrl: '/us/kong-api', // `/{geo}/kong-api`, with leading slash and no trailing slash; Consuming app would pass in something like `https://us.api.konghq.com`
4141
// Set the root `.env.development.local` variable to a control plane your PAT can access
4242
controlPlaneId,
4343
cancelRoute: { name: 'certificate-list' },

‎packages/entities/entities-certificates/sandbox/pages/CertificateListPage.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import SandboxPermissionsControl from '@entities-shared-sandbox/components/Sandb
4646
const controlPlaneId = import.meta.env.VITE_KONNECT_CONTROL_PLANE_ID || ''
4747
const konnectConfig = ref<KonnectCertificateListConfig>({
4848
app: 'konnect',
49-
apiBaseUrl: '/us/kong-api/konnect-api', // `/{geo}/kong-api/konnect-api`, with leading slash and no trailing slash
49+
apiBaseUrl: '/us/kong-api', // `/{geo}/kong-api`, with leading slash and no trailing slash
5050
// Set the root `.env.development.local` variable to a control plane your PAT can access
5151
controlPlaneId,
5252
createRoute: { name: 'create-certificate' },

‎packages/entities/entities-certificates/src/ca-certificates-endpoints.ts

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1+
const konnectBaseApiUrl = '/v2/control-planes/{controlPlaneId}/core-entities'
2+
const KMBaseApiUrl = '/{workspace}'
3+
14
export default {
25
list: {
3-
konnect: '/api/runtime_groups/{controlPlaneId}/ca_certificates',
4-
kongManager: '/{workspace}/ca_certificates',
6+
konnect: `${konnectBaseApiUrl}/ca_certificates`,
7+
kongManager: `${KMBaseApiUrl}/ca_certificates`,
58
},
69
form: {
710
konnect: {
8-
create: '/api/runtime_groups/{controlPlaneId}/ca_certificates',
9-
edit: '/api/runtime_groups/{controlPlaneId}/ca_certificates/{id}',
10-
validate: '/api/runtime_groups/{controlPlaneId}/v1/schemas/json/ca-certificate/validate',
11+
create: `${konnectBaseApiUrl}/ca_certificates`,
12+
edit: `${konnectBaseApiUrl}/ca_certificates/{id}`,
13+
validate: `${konnectBaseApiUrl}/v1/schemas/json/ca-certificate/validate`,
1114
},
1215
kongManager: {
13-
create: '/{workspace}/ca_certificates',
14-
edit: '/{workspace}/ca_certificates/{id}',
15-
validate: '/{workspace}/schemas/ca_certificates/validate',
16+
create: `${KMBaseApiUrl}/ca_certificates`,
17+
edit: `${KMBaseApiUrl}/ca_certificates/{id}`,
18+
validate: `${KMBaseApiUrl}/schemas/ca_certificates/validate`,
1619
},
1720
},
1821
}

‎packages/entities/entities-certificates/src/certificates-endpoints.ts

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1+
const konnectBaseApiUrl = '/v2/control-planes/{controlPlaneId}/core-entities'
2+
const KMBaseApiUrl = '/{workspace}'
3+
14
export default {
25
list: {
3-
konnect: '/api/runtime_groups/{controlPlaneId}/certificates',
4-
kongManager: '/{workspace}/certificates',
6+
konnect: `${konnectBaseApiUrl}/certificates`,
7+
kongManager: `${KMBaseApiUrl}/certificates`,
58
},
69
form: {
710
konnect: {
8-
create: '/api/runtime_groups/{controlPlaneId}/certificates',
9-
edit: '/api/runtime_groups/{controlPlaneId}/certificates/{id}',
10-
validate: '/api/runtime_groups/{controlPlaneId}/v1/schemas/json/certificate/validate',
11+
create: `${konnectBaseApiUrl}/certificates`,
12+
edit: `${konnectBaseApiUrl}/certificates/{id}`,
13+
validate: `${konnectBaseApiUrl}/v1/schemas/json/certificate/validate`,
1114
},
1215
kongManager: {
13-
create: '/{workspace}/certificates',
14-
edit: '/{workspace}/certificates/{id}',
15-
validate: '/{workspace}/schemas/certificates/validate',
16+
create: `${KMBaseApiUrl}/certificates`,
17+
edit: `${KMBaseApiUrl}/certificates/{id}`,
18+
validate: `${KMBaseApiUrl}/schemas/certificates/validate`,
1619
},
1720
},
1821
}

‎packages/entities/entities-certificates/src/components/CACertificateForm.cy.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const cancelRoute = { name: 'certificates-list' }
99
const baseConfigKonnect:KonnectCertificateFormConfig = {
1010
app: 'konnect',
1111
controlPlaneId: '1234-abcd-ilove-cats',
12-
apiBaseUrl: '/us/kong-api/konnect-api',
12+
apiBaseUrl: '/us/kong-api',
1313
cancelRoute,
1414
}
1515

@@ -212,7 +212,7 @@ describe('<CACertificateForm />', () => {
212212
cy.intercept(
213213
{
214214
method: 'GET',
215-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/ca_certificates/*`,
215+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/ca_certificates/*`,
216216
},
217217
{
218218
statusCode: 200,
@@ -225,7 +225,7 @@ describe('<CACertificateForm />', () => {
225225
cy.intercept(
226226
{
227227
method: 'POST',
228-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/v1/schemas/json/ca-certificate/validate`,
228+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/v1/schemas/json/ca-certificate/validate`,
229229
},
230230
{
231231
statusCode: status,
@@ -236,7 +236,7 @@ describe('<CACertificateForm />', () => {
236236
cy.intercept(
237237
{
238238
method: 'PUT',
239-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/ca_certificates/*`,
239+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/ca_certificates/*`,
240240
},
241241
{
242242
statusCode: status,
@@ -335,7 +335,7 @@ describe('<CACertificateForm />', () => {
335335
cy.intercept(
336336
{
337337
method: 'GET',
338-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/ca_certificates/*`,
338+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/ca_certificates/*`,
339339
},
340340
{
341341
statusCode: 404,

‎packages/entities/entities-certificates/src/components/CACertificateList.cy.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const baseConfigKM: KongManagerCertificateListConfig = {
3030
const baseConfigKonnect: KonnectCertificateListConfig = {
3131
app: 'konnect',
3232
controlPlaneId: '1234-abcd-ca-certificate',
33-
apiBaseUrl: '/us/kong-api/konnect-api',
33+
apiBaseUrl: '/us/kong-api',
3434
createRoute,
3535
getViewRoute: () => viewRoute,
3636
getEditRoute: () => editRoute,
@@ -59,7 +59,7 @@ describe('<CACertificateList />', () => {
5959
cy.intercept(
6060
{
6161
method: 'GET',
62-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/ca_certificates*`,
62+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/ca_certificates*`,
6363
},
6464
{
6565
statusCode: 200,
@@ -468,7 +468,7 @@ describe('<CACertificateList />', () => {
468468
cy.intercept(
469469
{
470470
method: 'GET',
471-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/ca_certificates*`,
471+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/ca_certificates*`,
472472
},
473473
{
474474
statusCode: 200,
@@ -487,7 +487,7 @@ describe('<CACertificateList />', () => {
487487
cy.intercept(
488488
{
489489
method: 'GET',
490-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/ca_certificates*`,
490+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/ca_certificates*`,
491491
},
492492
(req) => {
493493
const size = req.query.size ? Number(req.query.size) : 30
@@ -546,7 +546,7 @@ describe('<CACertificateList />', () => {
546546
cy.intercept(
547547
{
548548
method: 'GET',
549-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/ca_certificates*`,
549+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/ca_certificates*`,
550550
},
551551
{
552552
statusCode: 500,

‎packages/entities/entities-certificates/src/components/CertificateForm.cy.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const cancelRoute = { name: 'certificates-list' }
1010
const baseConfigKonnect:KonnectCertificateFormConfig = {
1111
app: 'konnect',
1212
controlPlaneId: '1234-abcd-ilove-cats',
13-
apiBaseUrl: '/us/kong-api/konnect-api',
13+
apiBaseUrl: '/us/kong-api',
1414
cancelRoute,
1515
}
1616

@@ -337,7 +337,7 @@ describe('<CertificateForm />', () => {
337337
cy.intercept(
338338
{
339339
method: 'GET',
340-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/certificates/*`,
340+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/certificates/*`,
341341
},
342342
{
343343
statusCode: 200,
@@ -350,7 +350,7 @@ describe('<CertificateForm />', () => {
350350
cy.intercept(
351351
{
352352
method: 'POST',
353-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/v1/schemas/json/certificate/validate`,
353+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/v1/schemas/json/certificate/validate`,
354354
},
355355
handleCertificateCreateUpdate((request) => {
356356
request.reply({
@@ -363,7 +363,7 @@ describe('<CertificateForm />', () => {
363363
cy.intercept(
364364
{
365365
method: 'POST',
366-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/certificates`,
366+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/certificates`,
367367
},
368368
handleCertificateCreateUpdate((request) => {
369369
request.reply({
@@ -376,7 +376,7 @@ describe('<CertificateForm />', () => {
376376
cy.intercept(
377377
{
378378
method: 'PUT',
379-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/certificates/*`,
379+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/certificates/*`,
380380
},
381381
handleCertificateCreateUpdate((request) => {
382382
request.reply({
@@ -481,7 +481,7 @@ describe('<CertificateForm />', () => {
481481
cy.intercept(
482482
{
483483
method: 'GET',
484-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/certificates/*`,
484+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/certificates/*`,
485485
},
486486
{
487487
statusCode: 404,

‎packages/entities/entities-certificates/src/components/CertificateList.cy.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const baseConfigKM: KongManagerCertificateListConfig = {
3030
const baseConfigKonnect: KonnectCertificateListConfig = {
3131
app: 'konnect',
3232
controlPlaneId: '1234-abcd-certificate',
33-
apiBaseUrl: '/us/kong-api/konnect-api',
33+
apiBaseUrl: '/us/kong-api',
3434
createRoute,
3535
getViewRoute: () => viewRoute,
3636
getEditRoute: () => editRoute,
@@ -59,7 +59,7 @@ describe('<CertificateList />', () => {
5959
cy.intercept(
6060
{
6161
method: 'GET',
62-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/certificates*`,
62+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/certificates*`,
6363
},
6464
{
6565
statusCode: 200,
@@ -516,7 +516,7 @@ describe('<CertificateList />', () => {
516516
cy.intercept(
517517
{
518518
method: 'GET',
519-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/certificates*`,
519+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/certificates*`,
520520
},
521521
{
522522
statusCode: 200,
@@ -535,7 +535,7 @@ describe('<CertificateList />', () => {
535535
cy.intercept(
536536
{
537537
method: 'GET',
538-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/certificates*`,
538+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/certificates*`,
539539
},
540540
(req) => {
541541
const size = req.query.size ? Number(req.query.size) : 30
@@ -593,7 +593,7 @@ describe('<CertificateList />', () => {
593593
cy.intercept(
594594
{
595595
method: 'GET',
596-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/certificates*`,
596+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/certificates*`,
597597
},
598598
{
599599
statusCode: 500,

‎packages/entities/entities-consumer-credentials/sandbox/pages/ConsumerCredentialListPage.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const activePlugin = ref<CredentialPlugins>('basic-auth')
5252
5353
const konnectConfig = computed<KonnectConsumerCredentialListConfig>(() => ({
5454
app: 'konnect',
55-
apiBaseUrl: '/us/kong-api/konnect-api', // `/{geo}/kong-api/konnect-api`, with leading slash and no trailing slash; Consuming app would pass in something like `https://us.api.konghq.com`
55+
apiBaseUrl: '/us/kong-api', // `/{geo}/kong-api`, with leading slash and no trailing slash; Consuming app would pass in something like `https://us.api.konghq.com`
5656
// Set the root `.env.development.local` variable to a control plane your PAT can access
5757
controlPlaneId,
5858
// Set the root `.env.development.local` variable to a consumer your PAT can access

‎packages/entities/entities-consumer-credentials/src/components/ConsumerCredentialList.cy.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const createRoute = 'create-route'
2222
const baseConfigKonnect: KonnectConsumerCredentialListConfig = {
2323
app: 'konnect',
2424
controlPlaneId: '1234-abcd-ilove-cats-too',
25-
apiBaseUrl: '/us/kong-api/konnect-api',
25+
apiBaseUrl: '/us/kong-api',
2626
createRoute,
2727
getEditRoute: () => editRoute,
2828
consumerId: '1234-abcd',
@@ -49,7 +49,7 @@ describe('<ConsumerCredentialList />', () => {
4949
cy.intercept(
5050
{
5151
method: 'GET',
52-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/consumers/${baseConfigKonnect.consumerId}/*`,
52+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/consumers/${baseConfigKonnect.consumerId}/*`,
5353
},
5454
{
5555
statusCode: 200,
@@ -539,7 +539,7 @@ describe('<ConsumerCredentialList />', () => {
539539
cy.intercept(
540540
{
541541
method: 'GET',
542-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/consumers/${baseConfigKonnect.consumerId}/*`,
542+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/consumers/${baseConfigKonnect.consumerId}/*`,
543543
},
544544
{
545545
statusCode: 200,
@@ -558,7 +558,7 @@ describe('<ConsumerCredentialList />', () => {
558558
cy.intercept(
559559
{
560560
method: 'GET',
561-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/consumers/${baseConfigKonnect.consumerId}/*`,
561+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/consumers/${baseConfigKonnect.consumerId}/*`,
562562
},
563563
(req) => {
564564
const size = req.query.size ? Number(req.query.size) : 30
@@ -615,7 +615,7 @@ describe('<ConsumerCredentialList />', () => {
615615
cy.intercept(
616616
{
617617
method: 'GET',
618-
url: `${baseConfigKonnect.apiBaseUrl}/api/runtime_groups/${baseConfigKonnect.controlPlaneId}/consumers/${baseConfigKonnect.consumerId}/*`,
618+
url: `${baseConfigKonnect.apiBaseUrl}/v2/control-planes/${baseConfigKonnect.controlPlaneId}/core-entities/consumers/${baseConfigKonnect.consumerId}/*`,
619619
},
620620
{
621621
statusCode: 500,

‎packages/entities/entities-consumer-credentials/src/consumer-credentials-endpoints.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export default {
22
list: {
3-
konnect: '/api/runtime_groups/{controlPlaneId}/consumers/{consumerId}/{plugin}',
3+
konnect: '/v2/control-planes/{controlPlaneId}/core-entities/consumers/{consumerId}/{plugin}',
44
kongManager: '/{workspace}/consumers/{consumerId}/{plugin}',
55
},
66
}

‎packages/entities/entities-consumer-groups/sandbox/pages/ConsumerGroupConfigCardPage.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const props = defineProps({
3232
const controlPlaneId = import.meta.env.VITE_KONNECT_CONTROL_PLANE_ID || ''
3333
const konnectConfig = ref<KonnectConsumerGroupEntityConfig>({
3434
app: 'konnect',
35-
apiBaseUrl: '/us/kong-api/konnect-api', // `/{geo}/kong-api`, with leading slash and no trailing slash; Consuming app would pass in something like `https://us.api.konghq.com`
35+
apiBaseUrl: '/us/kong-api', // `/{geo}/kong-api`, with leading slash and no trailing slash; Consuming app would pass in something like `https://us.api.konghq.com`
3636
// Set the root `.env.development.local` variable to a control plane your PAT can access
3737
controlPlaneId,
3838
entityId: props.id,

‎packages/entities/entities-consumer-groups/sandbox/pages/ConsumerGroupFormPage.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const controlPlaneId = import.meta.env.VITE_KONNECT_CONTROL_PLANE_ID || ''
4242
4343
const konnectConfig = ref<KonnectConsumerGroupFormConfig>({
4444
app: 'konnect',
45-
apiBaseUrl: '/us/kong-api/konnect-api',
45+
apiBaseUrl: '/us/kong-api',
4646
controlPlaneId,
4747
cancelRoute: { name: 'consumer-group-list' },
4848
})

0 commit comments

Comments
 (0)