From e91edbc09710d679674980704257b03a0f1243c3 Mon Sep 17 00:00:00 2001 From: Patrick Ear Date: Tue, 27 Aug 2024 16:44:47 +0200 Subject: [PATCH] save --- src/js/managementClient.ts | 2 +- .../locations/__tests__/LocationList.test.tsx | 28 +++++++++++++++++++ src/react/utils/testUtil.tsx | 4 +-- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/js/managementClient.ts b/src/js/managementClient.ts index a9d5bbbb4..95369bd42 100644 --- a/src/js/managementClient.ts +++ b/src/js/managementClient.ts @@ -8,7 +8,7 @@ export class UiFacingApiWrapper extends UiFacingApi { public baseUrl: string, public fetchFn: typeof window.fetch, ) { - super(configuration); + super(configuration, baseUrl, fetchFn); } setToken(token: string) { diff --git a/src/react/locations/__tests__/LocationList.test.tsx b/src/react/locations/__tests__/LocationList.test.tsx index a10e10cd5..4ed48ffc7 100644 --- a/src/react/locations/__tests__/LocationList.test.tsx +++ b/src/react/locations/__tests__/LocationList.test.tsx @@ -7,6 +7,7 @@ import { import { setupServer } from 'msw/node'; import { rest } from 'msw'; import { + ACCOUNT_ID, getConfigOverlay, getStorageConsumptionMetricsHandlers, } from '../../../js/mock/managementClientMSWHandlers'; @@ -18,6 +19,7 @@ import { } from '../../utils/testUtil'; import { INSTANCE_ID } from '../../actions/__tests__/utils/testUtil'; import { LocationsList } from '../LocationsList'; +import { debug } from 'jest-preview'; const server = setupServer( getConfigOverlay(TEST_API_BASE_URL, INSTANCE_ID), @@ -29,6 +31,32 @@ const server = setupServer( `${TEST_API_BASE_URL}/api/v1/instance/${INSTANCE_ID}/status`, (req, res, ctx) => res(ctx.json({})), ), + rest.post(`${TEST_API_BASE_URL}/`, (req, res, ctx) => { + const params = new URLSearchParams(req.body); + console.log(req.body); + + if (params.get('Action') === 'GetRolesForWebIdentity') { + const TEST_ACCOUNT = 'Test Account'; + const TEST_ACCOUNT_CREATION_DATE = '2022-03-18T12:51:44Z'; + return res( + ctx.json({ + IsTruncated: false, + Accounts: [ + { + Name: TEST_ACCOUNT, + CreationDate: TEST_ACCOUNT_CREATION_DATE, + Roles: [ + { + Name: 'storage-manager-role', + Arn: `arn:aws:iam::${ACCOUNT_ID}:role/scality-internal/storage-manager-role`, + }, + ], + }, + ], + }), + ); + } + }), ); describe('LocationList', () => { diff --git a/src/react/utils/testUtil.tsx b/src/react/utils/testUtil.tsx index bacc4ef7f..6495b6772 100644 --- a/src/react/utils/testUtil.tsx +++ b/src/react/utils/testUtil.tsx @@ -22,7 +22,7 @@ import userEvent from '@testing-library/user-event'; import { applyMiddleware, compose, createStore } from 'redux'; import ZenkoClient from '../../js/ZenkoClient'; import { VEEAM_FEATURE, XDM_FEATURE } from '../../js/config'; -import { UiFacingApi } from '../../js/managementClient/api'; +import { UiFacingApiWrapper } from '../../js/managementClient'; import { Configuration } from '../../js/managementClient/configuration'; import { _DataServiceRoleContext } from '../DataServiceRoleProvider'; import { _ManagementContext } from '../ManagementProvider'; @@ -143,7 +143,7 @@ const params = { }; const iamClient = new IAMClient(TEST_API_BASE_URL); iamClient.login(params); -export const TEST_MANAGEMENT_CLIENT = new UiFacingApi( +export const TEST_MANAGEMENT_CLIENT = new UiFacingApiWrapper( new Configuration({ apiKey: 'token', basePath: `${TEST_API_BASE_URL}/api/v1`,