-
Notifications
You must be signed in to change notification settings - Fork 11
Release hotfixes #4042
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.
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
Open
michaeljguarino
wants to merge
2
commits into
master
Choose a base branch
from
hotfixes
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Release hotfixes #4042
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 122 additions & 0 deletions
122
assets/src/components/kubernetes/clusterSelection.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| import { describe, expect, it } from 'vitest' | ||
| import { replaceKubernetesClusterId } from '../../routes/kubernetesRoutesConsts' | ||
| import { | ||
| getDefaultKubernetesClusterId, | ||
| isKubernetesClusterMissing, | ||
| withCurrentCluster, | ||
| } from './clusterSelection' | ||
|
|
||
| describe('replaceKubernetesClusterId', () => { | ||
| it('swaps only the kubernetes cluster path segment', () => { | ||
| expect( | ||
| replaceKubernetesClusterId( | ||
| '/kubernetes/cluster-a/workloads/deployments', | ||
| 'cluster-a', | ||
| 'cluster-b' | ||
| ) | ||
| ).toBe('/kubernetes/cluster-b/workloads/deployments') | ||
| }) | ||
|
|
||
| it('does not use a raw substring replace', () => { | ||
| expect( | ||
| replaceKubernetesClusterId( | ||
| '/kubernetes/cluster-a/workloads/cluster-a', | ||
| 'cluster-a', | ||
| 'cluster-b' | ||
| ) | ||
| ).toBe('/kubernetes/cluster-b/workloads/cluster-a') | ||
| }) | ||
|
|
||
| it('leaves unrelated paths unchanged', () => { | ||
| expect( | ||
| replaceKubernetesClusterId( | ||
| '/cd/clusters/cluster-a', | ||
| 'cluster-a', | ||
| 'cluster-b' | ||
| ) | ||
| ).toBe('/cd/clusters/cluster-a') | ||
| }) | ||
| }) | ||
|
|
||
| describe('withCurrentCluster', () => { | ||
| it('prepends the current cluster when it is missing from the page', () => { | ||
| expect( | ||
| withCurrentCluster([{ id: 'a' }, { id: 'b' }], { id: 'current' }) | ||
| ).toEqual([{ id: 'current' }, { id: 'a' }, { id: 'b' }]) | ||
| }) | ||
|
|
||
| it('does not duplicate the current cluster', () => { | ||
| expect(withCurrentCluster([{ id: 'a' }, { id: 'b' }], { id: 'a' })).toEqual( | ||
| [{ id: 'a' }, { id: 'b' }] | ||
| ) | ||
| }) | ||
| }) | ||
|
|
||
| describe('getDefaultKubernetesClusterId', () => { | ||
| const clusters = [ | ||
| { id: 'worker', self: false }, | ||
| { id: 'mgmt', self: true }, | ||
| ] | ||
|
|
||
| it('prefers the last selected cluster when it still exists', () => { | ||
| expect(getDefaultKubernetesClusterId(clusters, 'worker')).toBe('worker') | ||
| }) | ||
|
|
||
| it('falls back to the management cluster', () => { | ||
| expect(getDefaultKubernetesClusterId(clusters, 'gone')).toBe('mgmt') | ||
| }) | ||
|
|
||
| it('returns undefined when there are no clusters', () => { | ||
| expect(getDefaultKubernetesClusterId([], 'worker')).toBeUndefined() | ||
| }) | ||
| }) | ||
|
|
||
| describe('isKubernetesClusterMissing', () => { | ||
| it('does not treat a cluster as missing while the query is in flight', () => { | ||
| expect( | ||
| isKubernetesClusterMissing({ | ||
| clusterId: 'b', | ||
| loading: true, | ||
| hasData: true, | ||
| currentClusterId: 'a', | ||
| clusterIds: ['a'], | ||
| }) | ||
| ).toBe(false) | ||
| }) | ||
|
|
||
| it('does not redirect when the requested cluster is in the page even if cluster(id:) is stale', () => { | ||
| expect( | ||
| isKubernetesClusterMissing({ | ||
| clusterId: 'b', | ||
| loading: false, | ||
| hasData: true, | ||
| currentClusterId: 'a', | ||
| clusterIds: ['a', 'b'], | ||
| }) | ||
| ).toBe(false) | ||
| }) | ||
|
|
||
| it('does not redirect when the requested cluster is only on cluster(id:)', () => { | ||
| expect( | ||
| isKubernetesClusterMissing({ | ||
| clusterId: 'b', | ||
| loading: false, | ||
| hasData: true, | ||
| currentClusterId: 'b', | ||
| clusterIds: ['a'], | ||
| }) | ||
| ).toBe(false) | ||
| }) | ||
|
|
||
| it('flags a settled query whose cluster is neither listed nor returned by id', () => { | ||
| expect( | ||
| isKubernetesClusterMissing({ | ||
| clusterId: 'missing', | ||
| loading: false, | ||
| hasData: true, | ||
| currentClusterId: undefined, | ||
| clusterIds: ['a', 'mgmt'], | ||
| }) | ||
| ).toBe(true) | ||
| }) | ||
| }) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When the selected cluster is absent from the previous bounded cluster page and its new query is still loading, this fallback exposes the previous cluster through
ClusterContexteven though the route already identifies the new cluster. Context consumers then issue resource requests and actions against the old cluster while displaying the new cluster's URL.Knowledge Base Used: