@rancher/shell 3.0.12-rc.3 → 3.0.12-rc.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/styles/global/_button.scss +1 -1
- package/assets/styles/global/_layout.scss +4 -0
- package/assets/translations/en-us.yaml +183 -51
- package/assets/translations/zh-hans.yaml +1 -7
- package/chart/monitoring/ClusterSelector.vue +0 -21
- package/chart/monitoring/prometheus/index.vue +6 -3
- package/components/ActionDropdownShell.vue +5 -3
- package/components/ButtonGroup.vue +26 -1
- package/components/CruResource.vue +212 -16
- package/components/ExplorerMembers.vue +8 -4
- package/components/ExplorerProjectsNamespaces.vue +10 -6
- package/components/GrowlManager.vue +4 -0
- package/components/MgmtNodeList.vue +184 -0
- package/components/PromptRestore.vue +93 -32
- package/components/Questions/index.vue +1 -0
- package/components/Resource/Detail/Card/StateCard/__tests__/composables.test.ts +90 -1
- package/components/Resource/Detail/Card/StateCard/composables.ts +57 -87
- package/components/Resource/Detail/Card/StatusCard/__tests__/StatusCard.test.ts +61 -0
- package/components/Resource/Detail/Card/StatusCard/index.vue +61 -15
- package/components/Resource/Detail/Metadata/IdentifyingInformation/index.vue +2 -0
- package/components/Resource/Detail/Metadata/KeyValue.vue +5 -2
- package/components/Resource/Detail/Metadata/KeyValueRow.vue +2 -6
- package/components/ResourceDetail/index.vue +1 -1
- package/components/ResourceList/Masthead.vue +7 -1
- package/components/ResourceList/index.vue +82 -1
- package/components/ResourceTable.vue +1 -0
- package/components/RichTranslation.vue +5 -2
- package/components/Setting.vue +1 -0
- package/components/SortableTable/index.vue +4 -3
- package/components/SubtleLink.vue +31 -6
- package/components/Tabbed/Tab.vue +29 -3
- package/components/Tabbed/index.vue +25 -3
- package/components/TableOfContents/TableOfContents.vue +109 -0
- package/components/TableOfContents/composables.ts +258 -0
- package/components/Window/ContainerShell.vue +21 -11
- package/components/Window/__tests__/ContainerShell.test.ts +107 -37
- package/components/Wizard.vue +23 -5
- package/components/__tests__/ButtonGroup.test.ts +56 -0
- package/components/__tests__/PromptRestore.test.ts +169 -19
- package/components/fleet/AppCoChartGrid.vue +401 -0
- package/components/fleet/AppCoEmptyState.vue +127 -0
- package/components/fleet/AppCoPageHeader.vue +119 -0
- package/components/fleet/AppCoVersionSelect.vue +70 -0
- package/components/fleet/FleetClusterTargets/ClusterSelectionFields.vue +217 -0
- package/components/fleet/FleetClusterTargets/TargetsList.vue +123 -35
- package/components/fleet/FleetClusterTargets/index.vue +189 -146
- package/components/fleet/FleetIntro.vue +7 -3
- package/components/fleet/FleetNoWorkspaces.vue +7 -3
- package/components/fleet/FleetSecretSelector.vue +5 -3
- package/components/fleet/FleetValuesFrom.vue +8 -2
- package/components/fleet/GitRepoAdvancedTab.vue +1 -0
- package/components/fleet/GitRepoMetadataTab.vue +5 -0
- package/components/fleet/GitRepoTargetTab.vue +0 -2
- package/components/fleet/HelmOpAdvancedTab.vue +19 -53
- package/components/fleet/HelmOpAppCoConfigTab.vue +597 -0
- package/components/fleet/HelmOpAppCoResourcesSection.vue +162 -0
- package/components/fleet/HelmOpMetadataTab.vue +5 -0
- package/components/fleet/HelmOpResourcesSection.vue +82 -0
- package/components/fleet/HelmOpTargetOptionsSection.vue +89 -0
- package/components/fleet/HelmOpTargetTab.vue +64 -60
- package/components/fleet/HelmOpValuesTab.vue +129 -105
- package/components/fleet/__tests__/AppCoEmptyState.test.ts +71 -0
- package/components/fleet/__tests__/AppCoVersionSelect.test.ts +36 -0
- package/components/fleet/__tests__/ClusterSelectionFields.test.ts +62 -0
- package/components/fleet/__tests__/FleetClusterTargets.test.ts +253 -0
- package/components/fleet/__tests__/FleetSecretSelector.test.ts +16 -0
- package/components/fleet/__tests__/FleetValuesFrom.test.ts +44 -0
- package/components/fleet/__tests__/HelmOpAppCoConfigTab.test.ts +59 -0
- package/components/fleet/__tests__/HelmOpAppCoResourcesSection.test.ts +62 -0
- package/components/fleet/__tests__/HelmOpResourcesSection.test.ts +43 -0
- package/components/fleet/__tests__/HelmOpTargetOptionsSection.test.ts +34 -0
- package/components/fleet/__tests__/HelmOpValuesTab.test.ts +39 -0
- package/components/fleet/__tests__/__snapshots__/AppCoEmptyState.test.ts.snap +97 -0
- package/components/fleet/__tests__/__snapshots__/AppCoVersionSelect.test.ts.snap +30 -0
- package/components/fleet/__tests__/__snapshots__/ClusterSelectionFields.test.ts.snap +209 -0
- package/components/fleet/__tests__/__snapshots__/HelmOpTargetOptionsSection.test.ts.snap +140 -0
- package/components/fleet/dashboard/Empty.vue +8 -4
- package/components/fleet/dashboard/ResourceCard.vue +28 -0
- package/components/fleet/dashboard/ResourceDetails.vue +28 -0
- package/components/fleet/dashboard/__tests__/ResourceCard.test.ts +87 -0
- package/components/form/ArrayList.vue +61 -4
- package/components/form/FileSelector.vue +39 -1
- package/components/form/KeyValue.vue +23 -2
- package/components/form/LabeledSelect.vue +39 -1
- package/components/form/Labels.vue +22 -3
- package/components/form/NameNsDescription.vue +13 -5
- package/components/form/PrivateRegistry.constants.ts +7 -0
- package/components/form/PrivateRegistry.vue +253 -18
- package/components/form/ResourceTabs/index.vue +1 -0
- package/components/form/SelectOrCreateAuthSecret.vue +140 -17
- package/components/form/__tests__/FileSelector.test.ts +23 -0
- package/components/form/__tests__/NameNsDescription.test.ts +75 -0
- package/components/form/__tests__/PrivateRegistry.test.ts +463 -73
- package/components/form/__tests__/SelectOrCreateAuthSecret.test.ts +122 -0
- package/components/formatter/EtcdSnapshotName.vue +73 -0
- package/components/formatter/InternalExternalIP.vue +10 -4
- package/components/formatter/ServiceTargets.vue +26 -7
- package/components/formatter/__tests__/InternalExternalIP.test.ts +132 -0
- package/components/formatter/__tests__/ServiceTargets.test.ts +412 -0
- package/components/nav/Header.vue +12 -1
- package/components/nav/TopLevelMenu.vue +7 -2
- package/components/nav/__tests__/Header.test.ts +15 -0
- package/components/nav/__tests__/TopLevelMenu.test.ts +120 -2
- package/components/templates/default.vue +16 -4
- package/components/templates/home.vue +9 -4
- package/components/templates/plain.vue +9 -4
- package/composables/useHelmOpResources.test.ts +56 -0
- package/composables/useHelmOpResources.ts +32 -0
- package/composables/useStateColor.test.ts +325 -0
- package/composables/useStateColor.ts +128 -0
- package/config/features.js +1 -0
- package/config/home-links.js +1 -1
- package/config/labels-annotations.js +3 -0
- package/config/product/explorer.js +17 -4
- package/config/product/manager.js +8 -0
- package/config/router/index.js +16 -0
- package/config/router/navigation-guards/__tests__/authentication.test.ts +130 -0
- package/config/router/navigation-guards/authentication.js +10 -4
- package/config/router/routes.js +20 -6
- package/config/secret.ts +10 -0
- package/config/settings.ts +6 -4
- package/config/table-headers.js +3 -4
- package/config/types.js +16 -0
- package/core/plugin-products-base.ts +3 -3
- package/core/plugin-types.ts +83 -30
- package/core/plugin.ts +3 -0
- package/core/types-provisioning.ts +34 -1
- package/core/types.ts +15 -2
- package/detail/__tests__/provisioning.cattle.io.cluster.test.ts +114 -0
- package/detail/__tests__/workload.test.ts +3 -152
- package/detail/catalog.cattle.io.clusterrepo.vue +1 -1
- package/detail/provisioning.cattle.io.cluster.vue +109 -7
- package/detail/workload/index.vue +12 -55
- package/dialog/RotateEncryptionKeyDialog.vue +33 -9
- package/dialog/__tests__/RotateEncryptionKeyDialog.test.ts +78 -0
- package/edit/__tests__/catalog.cattle.io.clusterrepo.test.ts +248 -0
- package/edit/__tests__/fleet.cattle.io.gitrepo.test.ts +92 -0
- package/edit/__tests__/fleet.cattle.io.helmop.test.ts +206 -0
- package/edit/__tests__/management.cattle.io.setting.test.ts +2 -1
- package/edit/auditlog.cattle.io.auditpolicy/__tests__/__snapshots__/General.test.ts.snap +6 -0
- package/edit/auditlog.cattle.io.auditpolicy/__tests__/__snapshots__/index.test.ts.snap +1 -0
- package/edit/auth/__tests__/azuread.test.ts +34 -9
- package/edit/auth/__tests__/github.test.ts +234 -0
- package/edit/auth/__tests__/oidc.test.ts +26 -6
- package/edit/auth/__tests__/saml.test.ts +196 -0
- package/edit/auth/azuread.vue +128 -95
- package/edit/auth/github.vue +72 -13
- package/edit/auth/ldap/__tests__/index.test.ts +206 -0
- package/edit/auth/ldap/config.vue +8 -0
- package/edit/auth/ldap/index.vue +75 -1
- package/edit/auth/oidc.vue +119 -73
- package/edit/auth/saml.vue +76 -12
- package/edit/catalog.cattle.io.clusterrepo.vue +140 -32
- package/edit/compliance.cattle.io.clusterscanprofile.vue +39 -41
- package/edit/fleet.cattle.io.gitrepo.vue +70 -16
- package/edit/fleet.cattle.io.helmop.vue +542 -141
- package/edit/helm.cattle.io.projecthelmchart.vue +1 -0
- package/edit/{management.cattle.io.setting.vue → management.cattle.io.setting/index.vue} +32 -9
- package/edit/management.cattle.io.setting/system-default-registry-pull-secrets.vue +81 -0
- package/edit/management.cattle.io.user.vue +5 -2
- package/edit/provisioning.cattle.io.cluster/SelectCredential.vue +3 -12
- package/edit/provisioning.cattle.io.cluster/__tests__/rke2.test.ts +18 -0
- package/edit/provisioning.cattle.io.cluster/rke2.vue +89 -11
- package/edit/provisioning.cattle.io.cluster/tabs/MachinePool.vue +11 -0
- package/edit/provisioning.cattle.io.cluster/tabs/etcd/index.vue +0 -1
- package/edit/provisioning.cattle.io.cluster/tabs/registries/index.vue +14 -55
- package/list/group.principal.vue +5 -4
- package/list/harvesterhci.io.management.cluster.vue +8 -9
- package/list/management.cattle.io.user.vue +12 -9
- package/list/provisioning.cattle.io.cluster.vue +16 -10
- package/mixins/__tests__/auth-config.test.ts +90 -0
- package/mixins/__tests__/chart.test.ts +94 -0
- package/mixins/__tests__/resource-fetch-api-pagination.test.ts +48 -0
- package/mixins/auth-config.js +7 -0
- package/mixins/chart.js +11 -2
- package/mixins/child-hook.js +12 -6
- package/mixins/create-edit-view/impl.js +5 -3
- package/mixins/resource-fetch-api-pagination.js +21 -1
- package/models/__tests__/catalog.cattle.io.clusterrepo.test.ts +57 -0
- package/models/__tests__/compliance.cattle.io.clusterscan.test.ts +144 -0
- package/models/__tests__/fleet-application.test.ts +175 -0
- package/models/__tests__/fleet.cattle.io.bundle.test.ts +169 -0
- package/models/__tests__/fleet.cattle.io.helmop.test.ts +84 -0
- package/models/__tests__/management.cattle.io.node.ts +22 -0
- package/models/__tests__/namespace.test.ts +36 -0
- package/models/__tests__/provisioning.cattle.io.cluster.test.ts +205 -0
- package/models/__tests__/secret.test.ts +68 -1
- package/models/__tests__/workload.test.ts +401 -26
- package/models/catalog.cattle.io.clusterrepo.js +28 -4
- package/models/compliance.cattle.io.clusterscan.js +39 -4
- package/models/fleet-application.js +4 -0
- package/models/fleet.cattle.io.helmop.js +20 -1
- package/models/management.cattle.io.cluster.js +39 -5
- package/models/management.cattle.io.node.js +44 -3
- package/models/namespace.js +1 -1
- package/models/pod.js +46 -3
- package/models/provisioning.cattle.io.cluster.js +64 -14
- package/models/rke.cattle.io.etcdsnapshot.js +17 -9
- package/models/secret.js +19 -0
- package/models/workload.js +120 -20
- package/models/workload.service.js +5 -0
- package/package.json +14 -13
- package/pages/about.vue +5 -6
- package/pages/auth/login.vue +0 -35
- package/pages/auth/setup.vue +11 -0
- package/pages/c/_cluster/apps/charts/AppChartCardFooter.vue +2 -2
- package/pages/c/_cluster/apps/charts/AppChartCardSubHeader.vue +10 -1
- package/pages/c/_cluster/apps/charts/__tests__/index.test.ts +93 -0
- package/pages/c/_cluster/apps/charts/__tests__/install.test.ts +485 -107
- package/pages/c/_cluster/apps/charts/chart.vue +2 -1
- package/pages/c/_cluster/apps/charts/index.vue +48 -10
- package/pages/c/_cluster/apps/charts/install.vue +236 -144
- package/pages/c/_cluster/auth/roles/index.vue +5 -4
- package/pages/c/_cluster/explorer/workload-dashboard/ByNamespaceSection.vue +31 -0
- package/pages/c/_cluster/explorer/workload-dashboard/ByStateSection.vue +138 -0
- package/pages/c/_cluster/explorer/workload-dashboard/ByTypeSection.vue +30 -0
- package/pages/c/_cluster/explorer/workload-dashboard/WorkloadCard.vue +155 -0
- package/pages/c/_cluster/explorer/workload-dashboard/WorkloadNamespaceCard.vue +142 -0
- package/pages/c/_cluster/explorer/workload-dashboard/WorkloadTypeCard.vue +159 -0
- package/pages/c/_cluster/explorer/workload-dashboard/__tests__/composable.test.ts +561 -0
- package/pages/c/_cluster/explorer/workload-dashboard/composable.ts +440 -0
- package/pages/c/_cluster/explorer/workload-dashboard/index.vue +187 -0
- package/pages/c/_cluster/explorer/workload-dashboard/types.ts +80 -0
- package/pages/c/_cluster/fleet/application/create.vue +187 -136
- package/pages/c/_cluster/fleet/application/index.vue +5 -3
- package/pages/c/_cluster/fleet/application/suse-app-collection/ChartDetailBody.vue +338 -0
- package/pages/c/_cluster/fleet/application/suse-app-collection/ChartDetailHeader.vue +121 -0
- package/pages/c/_cluster/fleet/application/suse-app-collection/chart.vue +369 -0
- package/pages/c/_cluster/fleet/application/suse-app-collection/charts.vue +248 -0
- package/pages/c/_cluster/fleet/application/suse-app-collection/credentials.vue +310 -0
- package/pages/c/_cluster/fleet/index.vue +2 -2
- package/pages/c/_cluster/uiplugins/__tests__/index.test.ts +96 -0
- package/pages/c/_cluster/uiplugins/index.vue +15 -0
- package/pages/fail-whale.vue +16 -11
- package/pages/home.vue +16 -46
- package/pkg/require-asset.lib.js +25 -0
- package/pkg/vue.config.js +7 -0
- package/plugins/clean-html.d.ts +9 -0
- package/plugins/dashboard-store/__tests__/resource-class.test.ts +177 -0
- package/plugins/dashboard-store/getters.js +0 -1
- package/plugins/dashboard-store/resource-class.js +114 -19
- package/plugins/steve/__tests__/actions.test.ts +212 -0
- package/plugins/steve/actions.js +96 -0
- package/plugins/steve/steve-pagination-utils.ts +1 -1
- package/rancher-components/Accordion/Accordion.vue +53 -9
- package/rancher-components/Form/Checkbox/Checkbox.vue +14 -0
- package/rancher-components/Form/Radio/RadioButton.vue +17 -1
- package/rancher-components/Form/Radio/RadioGroup.vue +10 -0
- package/rancher-components/Form/TextArea/TextAreaAutoGrow.vue +30 -0
- package/rancher-components/Form/TextArea/__tests__/TextAreaAutoGrow.test.ts +95 -0
- package/rancher-components/Pill/RcTag/RcTag.vue +3 -2
- package/rancher-components/RcButton/RcButton.test.ts +103 -0
- package/rancher-components/RcButton/RcButton.vue +94 -15
- package/rancher-components/RcButton/index.ts +1 -1
- package/rancher-components/RcButton/types.ts +3 -0
- package/rancher-components/RcDropdown/RcDropdownTrigger.vue +6 -1
- package/rancher-components/RcItemCard/RcItemCard.test.ts +18 -0
- package/rancher-components/RcItemCard/RcItemCard.vue +2 -2
- package/rancher-components/RcSection/RcSection.vue +28 -3
- package/scripts/extension/helm/package/Dockerfile +1 -1
- package/scripts/test-plugins-build.sh +2 -1
- package/store/__tests__/features.test.ts +131 -0
- package/store/__tests__/growl.test.ts +374 -0
- package/store/__tests__/modal.test.ts +131 -0
- package/store/__tests__/notifications.test.ts +434 -0
- package/store/__tests__/slideInPanel.test.ts +88 -0
- package/store/__tests__/type-map.utils.test.ts +433 -0
- package/store/catalog.js +57 -0
- package/store/features.js +4 -0
- package/store/plugins.js +7 -4
- package/types/components/buttonGroup.ts +5 -0
- package/types/shell/index.d.ts +166 -70
- package/utils/__tests__/auth.test.ts +273 -0
- package/utils/__tests__/computed.test.ts +193 -0
- package/utils/__tests__/cspAdaptor.test.ts +163 -0
- package/utils/__tests__/dom.test.ts +81 -0
- package/utils/__tests__/duration.test.ts +37 -1
- package/utils/__tests__/dynamic-importer.test.ts +102 -0
- package/utils/__tests__/fleet-appco.test.ts +312 -0
- package/utils/__tests__/monitoring.test.ts +130 -0
- package/utils/__tests__/object.test.ts +22 -0
- package/utils/__tests__/operation-cr.test.ts +34 -0
- package/utils/__tests__/platform.test.ts +91 -0
- package/utils/__tests__/position.test.ts +237 -0
- package/utils/__tests__/provider.test.ts +51 -1
- package/utils/__tests__/queue.test.ts +232 -0
- package/utils/__tests__/release-notes.test.ts +221 -0
- package/utils/__tests__/router.test.js +254 -1
- package/utils/__tests__/select.test.ts +208 -0
- package/utils/__tests__/time.test.ts +265 -1
- package/utils/__tests__/title.test.ts +47 -0
- package/utils/__tests__/width.test.ts +53 -0
- package/utils/__tests__/window.test.ts +158 -0
- package/utils/__tests__/xccdf.test.ts +126 -6
- package/utils/crypto/__tests__/browserHashUtils.test.ts +98 -0
- package/utils/crypto/__tests__/index.test.ts +144 -0
- package/utils/duration.ts +104 -0
- package/utils/dynamic-content/__tests__/notification-handler.test.ts +196 -0
- package/utils/dynamic-content/info.ts +2 -1
- package/utils/error.js +13 -0
- package/utils/fleet-appco.ts +323 -0
- package/utils/object.js +22 -2
- package/utils/operation-cr.js +19 -0
- package/utils/provider.ts +12 -0
- package/utils/require-asset.ts +7 -0
- package/utils/validators/__tests__/container-images.test.ts +104 -0
- package/utils/validators/__tests__/flow-output.test.ts +91 -0
- package/utils/validators/__tests__/logging-outputs.test.ts +58 -0
- package/utils/validators/__tests__/monitoring-route.test.ts +119 -0
- package/utils/validators/__tests__/private-registry.test.ts +27 -15
- package/utils/validators/private-registry.ts +15 -4
- package/utils/xccdf.ts +39 -42
- package/vue.config.js +1 -1
- package/pages/support/index.vue +0 -264
- package/utils/duration.js +0 -43
|
@@ -1,9 +1,19 @@
|
|
|
1
1
|
import ProvCluster from '@shell/models/provisioning.cattle.io.cluster';
|
|
2
2
|
import MgmtCluster from '@shell/models/management.cattle.io.cluster';
|
|
3
|
+
import { IMPORTED_DAY_2_OPS } from '@shell/config/features';
|
|
4
|
+
import { OPERATION_ANNOTATIONS } from '@shell/config/labels-annotations';
|
|
5
|
+
import { SETTING } from '@shell/config/settings';
|
|
6
|
+
import { MANAGEMENT, OPERATION } from '@shell/config/types';
|
|
7
|
+
import { createOperationCR } from '@shell/utils/operation-cr';
|
|
8
|
+
|
|
9
|
+
jest.mock('@shell/utils/operation-cr', () => ({ createOperationCR: jest.fn() }));
|
|
3
10
|
|
|
4
11
|
jest.mock('@shell/utils/provider', () => ({
|
|
5
12
|
isHostedProvider: jest.fn().mockImplementation((context, provider) => {
|
|
6
13
|
return ['GKE', 'EKS', 'AKS'].includes(provider);
|
|
14
|
+
}),
|
|
15
|
+
isCAPIProvider: jest.fn().mockImplementation((context, provider) => {
|
|
16
|
+
return ['capa', 'capv'].includes(provider.toLowerCase());
|
|
7
17
|
})
|
|
8
18
|
}));
|
|
9
19
|
|
|
@@ -392,4 +402,199 @@ describe('class ProvCluster', () => {
|
|
|
392
402
|
jest.clearAllMocks();
|
|
393
403
|
});
|
|
394
404
|
});
|
|
405
|
+
|
|
406
|
+
describe('isCapiWithoutExtension', () => {
|
|
407
|
+
const testCases = [
|
|
408
|
+
{
|
|
409
|
+
description: 'should return undefined when mgmt is undefined',
|
|
410
|
+
isCapiHybrid: undefined,
|
|
411
|
+
isCAPIProvider: undefined,
|
|
412
|
+
expected: undefined,
|
|
413
|
+
},
|
|
414
|
+
{
|
|
415
|
+
description: 'should return false when not a CAPI cluster',
|
|
416
|
+
isCapiHybrid: false,
|
|
417
|
+
isCAPIProvider: false,
|
|
418
|
+
expected: false,
|
|
419
|
+
},
|
|
420
|
+
{
|
|
421
|
+
description: 'should return false when CAPI cluster and a registered CAPI provider extension exists',
|
|
422
|
+
isCapiHybrid: true,
|
|
423
|
+
isCAPIProvider: true,
|
|
424
|
+
expected: false,
|
|
425
|
+
},
|
|
426
|
+
{
|
|
427
|
+
description: 'should return true when CAPI cluster but no registered CAPI provider extension',
|
|
428
|
+
isCapiHybrid: true,
|
|
429
|
+
isCAPIProvider: false,
|
|
430
|
+
expected: true,
|
|
431
|
+
},
|
|
432
|
+
];
|
|
433
|
+
|
|
434
|
+
it.each(testCases)('$description', ({ isCapiHybrid, isCAPIProvider, expected }) => {
|
|
435
|
+
const cluster = new ProvCluster({});
|
|
436
|
+
|
|
437
|
+
if (isCapiHybrid === undefined) {
|
|
438
|
+
jest.spyOn(cluster, 'mgmt', 'get').mockReturnValue(undefined);
|
|
439
|
+
} else {
|
|
440
|
+
const mgmtCluster = new MgmtCluster({});
|
|
441
|
+
|
|
442
|
+
jest.spyOn(mgmtCluster, 'isCapiHybrid', 'get').mockReturnValue(isCapiHybrid);
|
|
443
|
+
jest.spyOn(mgmtCluster, 'isCAPIProvider', 'get').mockReturnValue(isCAPIProvider);
|
|
444
|
+
jest.spyOn(cluster, 'mgmt', 'get').mockReturnValue(mgmtCluster);
|
|
445
|
+
}
|
|
446
|
+
|
|
447
|
+
expect(cluster.isCapiWithoutExtension).toStrictEqual(expected);
|
|
448
|
+
jest.clearAllMocks();
|
|
449
|
+
});
|
|
450
|
+
});
|
|
451
|
+
describe('day 2 operations', () => {
|
|
452
|
+
const createContext = ({
|
|
453
|
+
byId = jest.fn(),
|
|
454
|
+
all = jest.fn(() => []),
|
|
455
|
+
schemaFor = jest.fn(() => ({})),
|
|
456
|
+
} = {}) => {
|
|
457
|
+
return {
|
|
458
|
+
getters: { schemaFor },
|
|
459
|
+
rootGetters: {
|
|
460
|
+
'management/byId': byId,
|
|
461
|
+
'management/all': all,
|
|
462
|
+
}
|
|
463
|
+
};
|
|
464
|
+
};
|
|
465
|
+
|
|
466
|
+
it('should return true when the day 2 operations feature is enabled', () => {
|
|
467
|
+
const byId = jest.fn().mockImplementation((type, id) => {
|
|
468
|
+
if (type === MANAGEMENT.FEATURE && id === IMPORTED_DAY_2_OPS) {
|
|
469
|
+
return { enabled: true };
|
|
470
|
+
}
|
|
471
|
+
|
|
472
|
+
return undefined;
|
|
473
|
+
});
|
|
474
|
+
const cluster = new ProvCluster({}, createContext({ byId }));
|
|
475
|
+
|
|
476
|
+
expect(cluster.isDayTwoOpsFeatureEnabled).toBe(true);
|
|
477
|
+
});
|
|
478
|
+
|
|
479
|
+
it('should return true for imported RKE2 day 2 operations when the annotation is enabled', () => {
|
|
480
|
+
const byId = jest.fn().mockImplementation((type, id) => {
|
|
481
|
+
if (type === MANAGEMENT.FEATURE && id === IMPORTED_DAY_2_OPS) {
|
|
482
|
+
return { enabled: true };
|
|
483
|
+
}
|
|
484
|
+
|
|
485
|
+
return undefined;
|
|
486
|
+
});
|
|
487
|
+
const cluster = new ProvCluster({}, createContext({ byId }));
|
|
488
|
+
|
|
489
|
+
jest.spyOn(cluster, 'mgmt', 'get').mockReturnValue({ metadata: { annotations: { [OPERATION_ANNOTATIONS.ENABLED]: 'true' } } });
|
|
490
|
+
jest.spyOn(cluster, 'isImportedRke2K3s', 'get').mockReturnValue(true);
|
|
491
|
+
|
|
492
|
+
expect(cluster.isImportedWithDayTwoOps).toBe(true);
|
|
493
|
+
});
|
|
494
|
+
|
|
495
|
+
it('should return true for imported RKE2 day 2 operations when the global setting is enabled', () => {
|
|
496
|
+
const byId = jest.fn().mockImplementation((type, id) => {
|
|
497
|
+
if (type === MANAGEMENT.FEATURE && id === IMPORTED_DAY_2_OPS) {
|
|
498
|
+
return { enabled: true };
|
|
499
|
+
}
|
|
500
|
+
|
|
501
|
+
if (type === MANAGEMENT.SETTING && id === SETTING.IMPORTED_CLUSTER_DAY2_OPS_DEFAULT) {
|
|
502
|
+
return { value: 'true' };
|
|
503
|
+
}
|
|
504
|
+
|
|
505
|
+
return undefined;
|
|
506
|
+
});
|
|
507
|
+
const cluster = new ProvCluster({}, createContext({ byId }));
|
|
508
|
+
|
|
509
|
+
jest.spyOn(cluster, 'mgmt', 'get').mockReturnValue({ metadata: { annotations: {} } });
|
|
510
|
+
jest.spyOn(cluster, 'isImportedRke2K3s', 'get').mockReturnValue(true);
|
|
511
|
+
|
|
512
|
+
expect(cluster.isImportedWithDayTwoOps).toBe(true);
|
|
513
|
+
});
|
|
514
|
+
|
|
515
|
+
it('should return false for imported RKE2 day 2 operations when the feature is disabled', () => {
|
|
516
|
+
const byId = jest.fn().mockImplementation((type, id) => {
|
|
517
|
+
if (type === MANAGEMENT.SETTING && id === SETTING.IMPORTED_CLUSTER_DAY2_OPS_DEFAULT) {
|
|
518
|
+
return { value: 'true' };
|
|
519
|
+
}
|
|
520
|
+
|
|
521
|
+
return undefined;
|
|
522
|
+
});
|
|
523
|
+
const cluster = new ProvCluster({}, createContext({ byId }));
|
|
524
|
+
|
|
525
|
+
jest.spyOn(cluster, 'mgmt', 'get').mockReturnValue({ metadata: { annotations: { [OPERATION_ANNOTATIONS.ENABLED]: 'true' } } });
|
|
526
|
+
jest.spyOn(cluster, 'isImportedRke2K3s', 'get').mockReturnValue(true);
|
|
527
|
+
|
|
528
|
+
expect(cluster.isImportedWithDayTwoOps).toBeFalsy();
|
|
529
|
+
});
|
|
530
|
+
|
|
531
|
+
it('should return false for imported RKE2 day 2 operations when operation schema is missing', () => {
|
|
532
|
+
const byId = jest.fn().mockImplementation((type, id) => {
|
|
533
|
+
if (type === MANAGEMENT.FEATURE && id === IMPORTED_DAY_2_OPS) {
|
|
534
|
+
return { enabled: true };
|
|
535
|
+
}
|
|
536
|
+
|
|
537
|
+
if (type === MANAGEMENT.SETTING && id === SETTING.IMPORTED_CLUSTER_DAY2_OPS_DEFAULT) {
|
|
538
|
+
return { value: 'true' };
|
|
539
|
+
}
|
|
540
|
+
|
|
541
|
+
return undefined;
|
|
542
|
+
});
|
|
543
|
+
const schemaFor = jest.fn().mockReturnValue(undefined);
|
|
544
|
+
const cluster = new ProvCluster({}, createContext({ byId, schemaFor }));
|
|
545
|
+
|
|
546
|
+
jest.spyOn(cluster, 'mgmt', 'get').mockReturnValue({ metadata: { annotations: { [OPERATION_ANNOTATIONS.ENABLED]: 'true' } } });
|
|
547
|
+
jest.spyOn(cluster, 'isImportedRke2K3s', 'get').mockReturnValue(true);
|
|
548
|
+
|
|
549
|
+
expect(cluster.isImportedWithDayTwoOps).toBeFalsy();
|
|
550
|
+
});
|
|
551
|
+
|
|
552
|
+
it('should filter etcd snapshots by management cluster fields for imported day 2 operations clusters', () => {
|
|
553
|
+
const snapshots = [
|
|
554
|
+
{
|
|
555
|
+
metadata: { namespace: 'c-m-1' },
|
|
556
|
+
spec: { clusterName: 'imported-cluster' }
|
|
557
|
+
},
|
|
558
|
+
{
|
|
559
|
+
metadata: { namespace: 'c-m-1' },
|
|
560
|
+
spec: { clusterName: 'other-cluster' }
|
|
561
|
+
},
|
|
562
|
+
{
|
|
563
|
+
metadata: { namespace: 'c-m-2' },
|
|
564
|
+
spec: { clusterName: 'imported-cluster' }
|
|
565
|
+
}
|
|
566
|
+
];
|
|
567
|
+
const all = jest.fn().mockReturnValue(snapshots);
|
|
568
|
+
const cluster = new ProvCluster({}, createContext({ all }));
|
|
569
|
+
|
|
570
|
+
jest.spyOn(cluster, 'isImportedWithDayTwoOps', 'get').mockReturnValue(true);
|
|
571
|
+
jest.spyOn(cluster, 'mgmt', 'get').mockReturnValue({ id: 'c-m-1', metadata: { name: 'imported-cluster' } });
|
|
572
|
+
|
|
573
|
+
expect(cluster.etcdSnapshots).toStrictEqual([snapshots[0]]);
|
|
574
|
+
});
|
|
575
|
+
|
|
576
|
+
it('should create an operation CR when taking a snapshot on an imported RKE2 or K3s cluster', () => {
|
|
577
|
+
const cluster = new ProvCluster({}, createContext());
|
|
578
|
+
|
|
579
|
+
(createOperationCR as jest.Mock).mockResolvedValue(undefined);
|
|
580
|
+
|
|
581
|
+
jest.spyOn(cluster, 'isRke1', 'get').mockReturnValue(false);
|
|
582
|
+
jest.spyOn(cluster, 'isImportedWithDayTwoOps', 'get').mockReturnValue(true);
|
|
583
|
+
jest.spyOn(cluster, 'mgmt', 'get').mockReturnValue({ id: 'c-m-1', metadata: { name: 'imported-cluster' } });
|
|
584
|
+
|
|
585
|
+
cluster.takeSnapshot();
|
|
586
|
+
|
|
587
|
+
expect(createOperationCR).toHaveBeenCalledTimes(1);
|
|
588
|
+
expect((createOperationCR as jest.Mock).mock.calls[0][1]).toBe(OPERATION.ETCD_SNAPSHOT);
|
|
589
|
+
expect((createOperationCR as jest.Mock).mock.calls[0][2]).toStrictEqual({
|
|
590
|
+
clusterRef: {
|
|
591
|
+
apiVersion: 'management.cattle.io/v3',
|
|
592
|
+
kind: 'Cluster',
|
|
593
|
+
name: 'c-m-1',
|
|
594
|
+
}
|
|
595
|
+
});
|
|
596
|
+
expect((createOperationCR as jest.Mock).mock.calls[0][3]).toBe('c-m-1');
|
|
597
|
+
expect((createOperationCR as jest.Mock).mock.calls[0][4]).toBe('imported-cluster');
|
|
598
|
+
});
|
|
599
|
+
});
|
|
395
600
|
});
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import Secret from '@shell/models/secret';
|
|
2
|
-
import { SECRET_TYPES as TYPES } from '@shell/config/secret';
|
|
2
|
+
import { SECRET_TYPES as TYPES, GITHUB_APP_SECRET_KEYS } from '@shell/config/secret';
|
|
3
3
|
import { VIRTUAL_TYPES } from '@shell/config/types';
|
|
4
4
|
import { UI_PROJECT_SECRET } from '@shell/config/labels-annotations';
|
|
5
|
+
import { base64Encode } from '@shell/utils/crypto';
|
|
5
6
|
|
|
6
7
|
describe('class Secret', () => {
|
|
7
8
|
describe('detailLocation', () => {
|
|
@@ -132,4 +133,70 @@ ${ part }`;
|
|
|
132
133
|
expect(result).toBe(supported);
|
|
133
134
|
});
|
|
134
135
|
});
|
|
136
|
+
|
|
137
|
+
describe('isGithubApp', () => {
|
|
138
|
+
const githubAppData = {
|
|
139
|
+
github_app_id: 'MTI=',
|
|
140
|
+
github_app_installation_id: 'MzQ=',
|
|
141
|
+
github_app_private_key: 'a2V5',
|
|
142
|
+
};
|
|
143
|
+
|
|
144
|
+
it.each([
|
|
145
|
+
[
|
|
146
|
+
false,
|
|
147
|
+
'type is not Opaque',
|
|
148
|
+
TYPES.SSH,
|
|
149
|
+
githubAppData,
|
|
150
|
+
],
|
|
151
|
+
[
|
|
152
|
+
false,
|
|
153
|
+
'data is null',
|
|
154
|
+
TYPES.OPAQUE,
|
|
155
|
+
null,
|
|
156
|
+
],
|
|
157
|
+
[
|
|
158
|
+
false,
|
|
159
|
+
'Opaque but missing a GitHub App key',
|
|
160
|
+
TYPES.OPAQUE,
|
|
161
|
+
{ github_app_id: 'MTI=', github_app_installation_id: 'MzQ=' },
|
|
162
|
+
],
|
|
163
|
+
[
|
|
164
|
+
true,
|
|
165
|
+
'Opaque with all GitHub App keys',
|
|
166
|
+
TYPES.OPAQUE,
|
|
167
|
+
githubAppData,
|
|
168
|
+
],
|
|
169
|
+
])('is %p if %p', (
|
|
170
|
+
expected,
|
|
171
|
+
descr,
|
|
172
|
+
_type,
|
|
173
|
+
data
|
|
174
|
+
) => {
|
|
175
|
+
const secret = new Secret({ _type, data });
|
|
176
|
+
|
|
177
|
+
expect(secret.isGithubApp).toBe(expected);
|
|
178
|
+
});
|
|
179
|
+
});
|
|
180
|
+
|
|
181
|
+
describe('GitHub App display', () => {
|
|
182
|
+
const githubAppData = {
|
|
183
|
+
[GITHUB_APP_SECRET_KEYS.APP_ID]: base64Encode('12345'),
|
|
184
|
+
[GITHUB_APP_SECRET_KEYS.INSTALLATION_ID]: base64Encode('67890'),
|
|
185
|
+
[GITHUB_APP_SECRET_KEYS.PRIVATE_KEY]: base64Encode('a-private-key'),
|
|
186
|
+
};
|
|
187
|
+
|
|
188
|
+
const ctx = { rootGetters: { 'i18n/withFallback': (_key: string, _args: any, fallback: string) => fallback } };
|
|
189
|
+
|
|
190
|
+
it('dataPreview should show the decoded App ID and Installation ID', () => {
|
|
191
|
+
const secret = new Secret({ _type: TYPES.OPAQUE, data: githubAppData }, ctx);
|
|
192
|
+
|
|
193
|
+
expect(secret.dataPreview).toBe('12345 / 67890');
|
|
194
|
+
});
|
|
195
|
+
|
|
196
|
+
it('subTypeDisplay should resolve to the GitHub App label', () => {
|
|
197
|
+
const secret = new Secret({ _type: TYPES.OPAQUE, data: githubAppData }, ctx);
|
|
198
|
+
|
|
199
|
+
expect(secret.subTypeDisplay).toBe('GitHub App');
|
|
200
|
+
});
|
|
201
|
+
});
|
|
135
202
|
});
|