From 3a551b3bfb2b4bc53afb30d8e508e377af7b639e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bonnet?= Date: Tue, 8 Oct 2024 14:29:16 +0200 Subject: [PATCH] fix(registry): add project_id field for scaleway (#1709) * fix(container-registry): add project_id field for scaleway * fix: add helm-repository update --- .../container-registry-create-edit-modal.tsx | 1 + .../container-registry-form.spec.tsx | 2 +- .../container-registry-form.tsx | 16 ++++++++++++++++ .../helm-repository-create-edit-modal.spec.tsx | 2 +- .../helm-repository-create-edit-modal.tsx | 17 +++++++++++++++++ .../src/lib/domains-services-data-access.ts | 6 ++---- package.json | 2 +- yarn.lock | 10 +++++----- 8 files changed, 44 insertions(+), 12 deletions(-) diff --git a/libs/domains/organizations/feature/src/lib/container-registry-create-edit-modal/container-registry-create-edit-modal.tsx b/libs/domains/organizations/feature/src/lib/container-registry-create-edit-modal/container-registry-create-edit-modal.tsx index 52cd4c6b9d4..35c6ae8e1c6 100644 --- a/libs/domains/organizations/feature/src/lib/container-registry-create-edit-modal/container-registry-create-edit-modal.tsx +++ b/libs/domains/organizations/feature/src/lib/container-registry-create-edit-modal/container-registry-create-edit-modal.tsx @@ -32,6 +32,7 @@ export function ContainerRegistryCreateEditModal({ region: registry?.config?.region, access_key_id: registry?.config?.access_key_id, secret_access_key: undefined, + scaleway_project_id: registry?.config?.scaleway_project_id, scaleway_access_key: registry?.config?.scaleway_access_key, scaleway_secret_key: undefined, json_credentials: undefined, diff --git a/libs/domains/organizations/feature/src/lib/container-registry-form/container-registry-form.spec.tsx b/libs/domains/organizations/feature/src/lib/container-registry-form/container-registry-form.spec.tsx index 83b35cd3621..4154e4190f0 100644 --- a/libs/domains/organizations/feature/src/lib/container-registry-form/container-registry-form.spec.tsx +++ b/libs/domains/organizations/feature/src/lib/container-registry-form/container-registry-form.spec.tsx @@ -32,7 +32,7 @@ describe('ContainerRegistryForm', () => { }, { kind: 'SCALEWAY_CR', - required_config: ['region', 'scaleway_access_key', 'scaleway_secret_key'], + required_config: ['region', 'scaleway_access_key', 'scaleway_project_id', 'scaleway_secret_key'], is_mandatory: true, }, { diff --git a/libs/domains/organizations/feature/src/lib/container-registry-form/container-registry-form.tsx b/libs/domains/organizations/feature/src/lib/container-registry-form/container-registry-form.tsx index 2c300cae51b..0381afae0c5 100644 --- a/libs/domains/organizations/feature/src/lib/container-registry-form/container-registry-form.tsx +++ b/libs/domains/organizations/feature/src/lib/container-registry-form/container-registry-form.tsx @@ -374,6 +374,22 @@ export function ContainerRegistryForm({ )} {watchKind === ContainerRegistryKindEnum.SCALEWAY_CR && ( <> + ( + + )} + /> { }, { kind: 'OCI_SCALEWAY_CR', - required_config: ['region', 'scaleway_access_key', 'scaleway_secret_key'], + required_config: ['region', 'scaleway_project_id', 'scaleway_access_key', 'scaleway_secret_key'], is_mandatory: true, }, { diff --git a/libs/domains/organizations/feature/src/lib/helm-repository-create-edit-modal/helm-repository-create-edit-modal.tsx b/libs/domains/organizations/feature/src/lib/helm-repository-create-edit-modal/helm-repository-create-edit-modal.tsx index dbd9b84e78e..2a117ff0c5c 100644 --- a/libs/domains/organizations/feature/src/lib/helm-repository-create-edit-modal/helm-repository-create-edit-modal.tsx +++ b/libs/domains/organizations/feature/src/lib/helm-repository-create-edit-modal/helm-repository-create-edit-modal.tsx @@ -63,6 +63,7 @@ export function HelmRepositoryCreateEditModal({ password: undefined, region: repository?.config?.region, access_key_id: repository?.config?.access_key_id, + scaleway_project_id: repository?.config?.scaleway_project_id, scaleway_access_key: repository?.config?.scaleway_access_key, scaleway_secret_key: undefined, secret_access_key: undefined, @@ -355,6 +356,22 @@ export function HelmRepositoryCreateEditModal({ /> )} /> + ( + + )} + /> ({ - query: customDomainApi.checkContainerCustomDomain.bind(customDomainApi), + query: customDomainContainerApi.checkContainerCustomDomain.bind(customDomainContainerApi), serviceType, })) .with('HELM', (serviceType) => ({ - query: customDomainApi.checkHelmCustomDomain.bind(customDomainApi), + query: customDomainHelmApi.checkHelmCustomDomain.bind(customDomainHelmApi), serviceType, })) .exhaustive() diff --git a/package.json b/package.json index ab1ef4ddd75..a0fddbd7520 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "jwt-decode": "^4.0.0", "monaco-editor": "^0.44.0", "posthog-js": "^1.131.4", - "qovery-typescript-axios": "^1.1.483", + "qovery-typescript-axios": "^1.1.487", "react": "18.3.1", "react-country-flag": "^3.0.2", "react-datepicker": "^4.12.0", diff --git a/yarn.lock b/yarn.lock index 273985d14a3..c58263f8317 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4124,7 +4124,7 @@ __metadata: prettier: ^3.2.5 prettier-plugin-tailwindcss: ^0.5.14 pretty-quick: ^4.0.0 - qovery-typescript-axios: ^1.1.483 + qovery-typescript-axios: ^1.1.487 qovery-ws-typescript-axios: ^0.1.153 react: 18.3.1 react-country-flag: ^3.0.2 @@ -19426,12 +19426,12 @@ __metadata: languageName: node linkType: hard -"qovery-typescript-axios@npm:^1.1.483": - version: 1.1.483 - resolution: "qovery-typescript-axios@npm:1.1.483" +"qovery-typescript-axios@npm:^1.1.487": + version: 1.1.487 + resolution: "qovery-typescript-axios@npm:1.1.487" dependencies: axios: ^0.27.2 - checksum: f8503bb282e1de17bd86f6d5b5d7bf0b82ecefa1a3d8a66bb0b57c5f8d262e887d7abb7f59596e09bf036c1227f7233a00b32c2f8fdec87f13a653d76239f274 + checksum: c3c8a5a38e81664e68fe4638f9104a97b6b751946a4fd1c99267df829d7c2a0adfc9b999dafc828d0b770145ed8ce39452a60acb31bf507cb96f642afe99bc20 languageName: node linkType: hard