Skip to content

fix: remove excessive slash for requests via tenant node #1537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 25, 2024
Merged

fix: remove excessive slash for requests via tenant node #1537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/BasicNodeViewer/BasicNodeViewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ export const BasicNodeViewer = ({node, additionalNodesProps, className}: BasicNo
let nodeHref: string | undefined;

if (additionalNodesProps?.getNodeRef) {
nodeHref = additionalNodesProps.getNodeRef(node) + 'internal';
nodeHref = additionalNodesProps.getNodeRef(node) + '/internal';
} else if (node.NodeId) {
nodeHref = createDeveloperUILinkWithNodeId(node.NodeId) + 'internal';
nodeHref = createDeveloperUILinkWithNodeId(node.NodeId) + '/internal';
}

return (
Expand Down
4 changes: 2 additions & 2 deletions src/components/NodeHostWrapper/NodeHostWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ export const NodeHostWrapper = ({node, getNodeRef, database}: NodeHostWrapperPro

let nodeHref: string | undefined;
if (getNodeRef) {
nodeHref = getNodeRef(node) + 'internal';
nodeHref = getNodeRef(node) + '/internal';
} else if (node.NodeId) {
nodeHref = createDeveloperUILinkWithNodeId(node.NodeId) + 'internal';
nodeHref = createDeveloperUILinkWithNodeId(node.NodeId) + '/internal';
}

const nodePath = isNodeAvailable
Expand Down
2 changes: 1 addition & 1 deletion src/utils/__test__/prepareBackend.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ describe('getBackendFromRawNodeData', () => {
},
],
};
const result = 'https://viewer.ydb.ru:443/ydb-dev02-000.search.net:8765/';
const result = 'https://viewer.ydb.ru:443/ydb-dev02-000.search.net:8765';

expect(getBackendFromRawNodeData(node, balancer)).toBe(result);
});
Expand Down
8 changes: 4 additions & 4 deletions src/utils/developerUI/__test__/developerUI.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@ import {
describe('Developer UI links generators', () => {
describe('createDeveloperUILinkWithNodeId', () => {
it('should create relative link with no host', () => {
expect(createDeveloperUILinkWithNodeId(1)).toBe('/node/1/');
expect(createDeveloperUILinkWithNodeId(1)).toBe('/node/1');
});
it('should create relative link with existing relative path with nodeId', () => {
expect(createDeveloperUILinkWithNodeId(1, '/node/3/')).toBe('/node/1/');
expect(createDeveloperUILinkWithNodeId(1, '/node/3/')).toBe('/node/1');
});
it('should create full link with host', () => {
expect(
createDeveloperUILinkWithNodeId(
1,
'http://ydb-vla-dev02-001.search.yandex.net:8765',
),
).toBe('http://ydb-vla-dev02-001.search.yandex.net:8765/node/1/');
).toBe('http://ydb-vla-dev02-001.search.yandex.net:8765/node/1');
});
it('should create full link with host with existing node path with nodeId', () => {
expect(
createDeveloperUILinkWithNodeId(
1,
'http://ydb-vla-dev02-001.search.yandex.net:8765/node/3',
),
).toBe('http://ydb-vla-dev02-001.search.yandex.net:8765/node/1/');
).toBe('http://ydb-vla-dev02-001.search.yandex.net:8765/node/1');
});
});
describe('createPDiskDeveloperUILink', () => {
Expand Down
8 changes: 4 additions & 4 deletions src/utils/developerUI/developerUI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ export const createDeveloperUILinkWithNodeId = (nodeId: number | string, host =
// In case current backend is already relative node path ({host}/node/{nodeId})
// We replace existing nodeId path with new nodeId path
if (nodePathRegexp.test(String(host))) {
return String(host).replace(nodePathRegexp, `/node/${nodeId}/`);
return String(host).replace(nodePathRegexp, `/node/${nodeId}`);
}

return `${host ?? ''}/node/${nodeId}/`;
return `${host ?? ''}/node/${nodeId}`;
};

interface PDiskDeveloperUILinkParams {
Expand All @@ -21,7 +21,7 @@ interface PDiskDeveloperUILinkParams {
}

export const createPDiskDeveloperUILink = ({nodeId, pDiskId, host}: PDiskDeveloperUILinkParams) => {
const pdiskPath = 'actors/pdisks/pdisk' + pad9(pDiskId);
const pdiskPath = '/actors/pdisks/pdisk' + pad9(pDiskId);

return createDeveloperUILinkWithNodeId(nodeId, host) + pdiskPath;
};
Expand All @@ -36,7 +36,7 @@ export const createVDiskDeveloperUILink = ({
vDiskSlotId,
host,
}: VDiskDeveloperUILinkParams) => {
const vdiskPath = 'actors/vdisks/vdisk' + pad9(pDiskId) + '_' + pad9(vDiskSlotId);
const vdiskPath = '/actors/vdisks/vdisk' + pad9(pDiskId) + '_' + pad9(vDiskSlotId);

return createDeveloperUILinkWithNodeId(nodeId, host) + vdiskPath;
};
Expand Down
4 changes: 2 additions & 2 deletions src/utils/prepareBackend.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const getBackendFromRawNodeData = (

if (useBalancerAsBackend && NodeId) {
const preparedBalancer = removeViewerPathname(balancer);
return `${preparedBalancer}/node/${NodeId}/`;
return `${preparedBalancer}/node/${NodeId}`;
}

if (Host && Endpoints) {
Expand All @@ -43,7 +43,7 @@ export const getBackendFromRawNodeData = (

// Currently this func is used to get link to developerUI for specific node
// It's expected with / at the end (code in embedded version)
return getBackendFromNodeHost(hostWithPort, balancer) + '/';
return getBackendFromNodeHost(hostWithPort, balancer);
}

return null;
Expand Down
Loading