@rancher/shell 3.0.12-rc.2 → 3.0.12-rc.3

package/models/__tests__/management.cattle.io.node.ts

@@ -167,11 +167,12 @@ describe('class MgmtNode', () => {
         id: nodeId
       }, {
         ...baseCtx,
-        getters: {
-          all: () => [{
-            mgmtClusterId,
-            nodes
-          }]
+        rootGetters: {
+          ...baseCtx.rootGetters,
+          'management/byId': () => ({
+            id:          mgmtClusterId,
+            provCluster: { nodes }
+          })
         }
       });
 

package/models/__tests__/management.cattle.io.nodepool.ts

@@ -66,14 +66,15 @@ describe('class MgmtNodePool', () => {
       const { spec, nodes } = data;
       const mgmtNode = new MgmtNodePool({
         spec,
-        id: nodeId
+        metadata: {},
+        id:       nodeId
       }, {
         ...baseCtx,
         getters: {
-          all: () => [{
-            mgmtClusterId,
+          byId: () => ({
+            id: mgmtClusterId,
             nodes
-          }]
+          })
         }
       });
 

package/models/__tests__/provisioning.cattle.io.cluster.test.ts

@@ -1,29 +1,36 @@
 import ProvCluster from '@shell/models/provisioning.cattle.io.cluster';
+import MgmtCluster from '@shell/models/management.cattle.io.cluster';
+
 jest.mock('@shell/utils/provider', () => ({
   isHostedProvider: jest.fn().mockImplementation((context, provider) => {
     return ['GKE', 'EKS', 'AKS'].includes(provider);
   })
 }));
+
+jest.mock('@shell/utils/clipboard', () => {
+  return { copyTextToClipboard: jest.fn(() => Promise.resolve({})) };
+});
+
 describe('class ProvCluster', () => {
   const gkeClusterWithPrivateEndpoint = {
     clusterName: 'test',
     provisioner: 'GKE',
     spec:        { },
-    mgmt:        { spec: { gkeConfig: { privateClusterConfig: { enablePrivateEndpoint: true } } } }
+    mgmt:        new MgmtCluster({ spec: { gkeConfig: { privateClusterConfig: { enablePrivateEndpoint: true } } } }),
   };
 
   const eksClusterWithPrivateEndpoint = {
     clusterName: 'test',
     provisioner: 'EKS',
     spec:        { },
-    mgmt:        { spec: { eksConfig: { privateAccess: true } } }
+    mgmt:        new MgmtCluster({ spec: { eksConfig: { privateAccess: true } } }),
   };
 
   const aksClusterWithPrivateEndpoint = {
     clusterName: 'test',
     provisioner: 'AKS',
     spec:        { },
-    mgmt:        { spec: { aksConfig: { privateCluster: true } } }
+    mgmt:        new MgmtCluster({ spec: { aksConfig: { privateCluster: true } } }),
   };
 
   // Related to https://github.com/rancher/dashboard/issues/9402
@@ -41,10 +48,14 @@ describe('class ProvCluster', () => {
     it.each(testCases)('should return the isHostedKubernetesProvider and isPrivateHostedProvider values properly based on the props data', (clusterData: Object, expected: Boolean) => {
       const cluster = new ProvCluster({ spec: clusterData.spec });
 
+      jest.spyOn(clusterData.mgmt, 'provCluster', 'get').mockReturnValue(
+        clusterData
+      );
+
       jest.spyOn(cluster, 'mgmt', 'get').mockReturnValue(
         clusterData.mgmt
       );
-      jest.spyOn(cluster, 'provisioner', 'get').mockReturnValue(
+      jest.spyOn(clusterData.mgmt, 'provisioner', 'get').mockReturnValue(
         clusterData.provisioner
       );
 
@@ -54,6 +65,7 @@ describe('class ProvCluster', () => {
       resetMocks();
     });
   });
+
   describe('isImported', () => {
     const testCases = [
       {
@@ -114,7 +126,8 @@ describe('class ProvCluster', () => {
         clusterData: {
           isLocal:                    false,
           isHostedKubernetesProvider: true,
-          providerConfig:             { imported: true }
+          providerConfig:             { imported: true },
+          mgmt:                       { status: { provider: '', driver: 'EKS' } }
         },
         expected: true
       },
@@ -123,7 +136,8 @@ describe('class ProvCluster', () => {
         clusterData: {
           isLocal:                    false,
           isHostedKubernetesProvider: true,
-          providerConfig:             { imported: false }
+          providerConfig:             { imported: false },
+          mgmt:                       { status: { provider: '', driver: 'EKS' } }
         },
         expected: false
       },
@@ -150,23 +164,27 @@ describe('class ProvCluster', () => {
     };
 
     it.each(testCases)('$description', ({ clusterData, expected }) => {
+      const mgmtCluster = new MgmtCluster(clusterData.mgmt || {});
       const cluster = new ProvCluster({});
 
       // Mock getters
       jest.spyOn(cluster, 'mgmt', 'get').mockReturnValue(
-        clusterData.mgmt
+        mgmtCluster
+      );
+      jest.spyOn(mgmtCluster, 'provCluster', 'get').mockReturnValue(
+        cluster
       );
       if (clusterData.isLocal !== undefined) {
-        jest.spyOn(cluster, 'isLocal', 'get').mockReturnValue(clusterData.isLocal);
+        jest.spyOn(mgmtCluster, 'isLocal', 'get').mockReturnValue(clusterData.isLocal);
       }
       if (clusterData.isHostedKubernetesProvider !== undefined) {
-        jest.spyOn(cluster, 'isHostedKubernetesProvider', 'get').mockReturnValue(clusterData.isHostedKubernetesProvider);
+        jest.spyOn(mgmtCluster, 'isHostedKubernetesProvider', 'get').mockReturnValue(clusterData.isHostedKubernetesProvider);
       }
       if (clusterData.providerConfig !== undefined) {
         jest.spyOn(cluster, 'providerConfig', 'get').mockReturnValue(clusterData.providerConfig);
       }
       if (clusterData.provisioner !== undefined) {
-        jest.spyOn(cluster, 'provisioner', 'get').mockReturnValue(clusterData.provisioner);
+        jest.spyOn(mgmtCluster, 'provisioner', 'get').mockReturnValue(clusterData.provisioner);
       }
 
       expect(cluster.isImported).toBe(expected);
@@ -268,7 +286,10 @@ describe('class ProvCluster', () => {
 
     it.each(testCases)('should return the hasError value properly based on the "status.conditions" props data for testcase %p', (testName: string, conditions: Array, expected: Boolean) => {
       const ctx = { rootGetters: { 'management/byId': jest.fn() } };
-      const cluster = new ProvCluster({ status: { conditions } }, ctx);
+      const mgmtCluster = new MgmtCluster({ status: { conditions } }, ctx);
+      const cluster = new ProvCluster({}, ctx);
+
+      jest.spyOn(cluster, 'mgmt', 'get').mockReturnValue(mgmtCluster);
 
       expect(cluster.hasError).toBe(expected);
       resetMocks();

package/models/base-cluster.x-k8s.io.js

@@ -0,0 +1,26 @@
+import { escapeHtml } from '@shell/utils/string';
+import SteveModel from '@shell/plugins/steve/steve-class';
+import { CAPI } from '@shell/config/types';
+
+export default class CapiMachineRoot extends SteveModel {
+  get cluster() {
+    if ( !this.spec.clusterName ) {
+      return null;
+    }
+
+    // This is used to get the cluster's human name
+    // Ideally we get this via the management cluster. To find it though we have to go via the provisioning cluster. So might as well just use that
+
+    const clusterId = `${ this.metadata.namespace }/${ this.spec.clusterName }`;
+
+    return this.$rootGetters['management/byId'](CAPI.RANCHER_CLUSTER, clusterId);
+  }
+
+  get clusterName() {
+    return this.cluster?.nameDisplay || this.spec.clusterName;
+  }
+
+  get groupByLabel() {
+    return this.$rootGetters['i18n/t']('resourceTable.groupLabel.cluster', { name: escapeHtml(this.clusterName) });
+  }
+}

package/models/cluster.js

@@ -69,6 +69,6 @@ export default class NormanCluster extends NormanModel {
       const id = this.provisioningClusterId;
 
       return id && !!this.$rootGetters['management/byId'](CAPI.RANCHER_CLUSTER, id);
-    }, this.$rootGetters['i18n/t']('cluster.managementTimeout'), timeout, interval);
+    }, this.$rootGetters['i18n/t']('cluster.managementTimeout', { type: CAPI.RANCHER_CLUSTER, name: this.provisioningClusterId }), timeout, interval);
   }
 }

package/models/cluster.x-k8s.io.machine.js

@@ -2,11 +2,10 @@ import { ADDRESSES, CAPI, NODE } from '@shell/config/types';
 import { CAPI as CAPI_LABELS, MACHINE_ROLES } from '@shell/config/labels-annotations';
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import { listNodeRoles } from '@shell/models/cluster/node';
-import { escapeHtml } from '@shell/utils/string';
 import { insertAt, findBy } from '@shell/utils/array';
 import { get } from '@shell/utils/object';
 import { downloadUrl } from '@shell/utils/download';
-import SteveModel from '@shell/plugins/steve/steve-class';
+import CapiMachineRoot from '@shell/models/base-cluster.x-k8s.io';
 
 /**
  * Prevent scaling down control plane or etcd machines to zero
@@ -53,7 +52,8 @@ export function notOnlyOfRole(current, all) {
 
   return false;
 }
-export default class CapiMachine extends SteveModel {
+
+export default class CapiMachine extends CapiMachineRoot {
   get _availableActions() {
     const out = super._availableActions;
 
@@ -144,18 +144,6 @@ export default class CapiMachine extends SteveModel {
     return await this.$dispatch('find', { type: kind, id });
   }
 
-  get cluster() {
-    if ( !this.spec.clusterName ) {
-      return null;
-    }
-
-    const clusterId = `${ this.metadata.namespace }/${ this.spec.clusterName }`;
-
-    const cluster = this.$rootGetters['management/byId'](CAPI.RANCHER_CLUSTER, clusterId);
-
-    return cluster;
-  }
-
   get poolName() {
     return this.metadata?.labels?.[ CAPI_LABELS.DEPLOYMENT_NAME ] || '';
   }
@@ -182,7 +170,7 @@ export default class CapiMachine extends SteveModel {
       return {
         name:   'c-cluster-product-resource-id',
         params: {
-          cluster:  this.cluster.status.clusterName,
+          cluster,
           product:  EXPLORER,
           resource: NODE,
           id:       kubeId
@@ -193,12 +181,6 @@ export default class CapiMachine extends SteveModel {
     return kubeId;
   }
 
-  get groupByLabel() {
-    const name = this.cluster?.nameDisplay || this.spec.clusterName;
-
-    return this.$rootGetters['i18n/t']('resourceTable.groupLabel.cluster', { name: escapeHtml(name) });
-  }
-
   get labels() {
     return this.metadata?.labels || {};
   }

package/models/cluster.x-k8s.io.machinedeployment.js

@@ -1,33 +1,15 @@
 import { CAPI } from '@shell/config/types';
 import { escapeHtml } from '@shell/utils/string';
 import { sortBy } from '@shell/utils/sort';
-import SteveModel from '@shell/plugins/steve/steve-class';
 import { exceptionToErrorsArray } from '@shell/utils/error';
 import { handleConflict } from '@shell/plugins/dashboard-store/normalize';
 import { CAPI as CAPI_ANNOTATIONS, MACHINE_ROLES } from '@shell/config/labels-annotations';
 import { notOnlyOfRole } from '@shell/models/cluster.x-k8s.io.machine';
 import { KIND } from '../config/elemental-types';
 import { KIND as HARVESTER_KIND } from '../config/harvester-manager-types';
+import CapiMachineRoot from '@shell/models/base-cluster.x-k8s.io';
 
-export default class CapiMachineDeployment extends SteveModel {
-  get cluster() {
-    if ( !this.spec.clusterName ) {
-      return null;
-    }
-
-    const clusterId = `${ this.metadata.namespace }/${ this.spec.clusterName }`;
-
-    const cluster = this.$rootGetters['management/byId'](CAPI.RANCHER_CLUSTER, clusterId);
-
-    return cluster;
-  }
-
-  get groupByLabel() {
-    const name = this.cluster?.nameDisplay || this.spec.clusterName;
-
-    return this.$rootGetters['i18n/t']('resourceTable.groupLabel.cluster', { name: escapeHtml(name) });
-  }
-
+export default class CapiMachineDeployment extends CapiMachineRoot {
   get groupByPoolLabel() {
     return `${ this.$rootGetters['i18n/t']('resourceTable.groupLabel.machinePool', { name: escapeHtml(this.nameDisplay) }) }`;
   }

package/models/cluster.x-k8s.io.machineset.js

@@ -1,23 +1,5 @@
-import { CAPI } from '@shell/config/types';
-import { escapeHtml } from '@shell/utils/string';
-import SteveModel from '@shell/plugins/steve/steve-class';
 
-export default class CapiMachineSet extends SteveModel {
-  get cluster() {
-    if ( !this.spec.clusterName ) {
-      return null;
-    }
+import CapiMachineRoot from '@shell/models/base-cluster.x-k8s.io';
 
-    const clusterId = `${ this.metadata.namespace }/${ this.spec.clusterName }`;
-
-    const cluster = this.$rootGetters['management/byId'](CAPI.RANCHER_CLUSTER, clusterId);
-
-    return cluster;
-  }
-
-  get groupByLabel() {
-    const name = this.cluster?.nameDisplay || this.spec.clusterName;
-
-    return this.$rootGetters['i18n/t']('resourceTable.groupLabel.cluster', { name: escapeHtml(name) });
-  }
+export default class CapiMachineSet extends CapiMachineRoot {
 }

package/models/compliance.cattle.io.clusterscan.js

@@ -65,8 +65,29 @@ export default class ClusterScan extends SteveModel {
       total:   1,
     };
 
+    const downloadReportXCCDF = {
+      action:  'downloadLatestReportXCCDF',
+      enabled: this.hasReport,
+      icon:    'icon icon-download',
+      label:   t('compliance.downloadReportXCCDF'),
+      total:   1,
+    };
+
+    const downloadAllReportsXCCDF = {
+      action:  'downloadAllReportsXCCDF',
+      enabled: this.hasReport,
+      icon:    'icon icon-download',
+      label:   t('compliance.downloadAllReportsXCCDF'),
+      total:   1,
+    };
+
     if (this.hasReports) {
       out.unshift({ divider: true });
+      if (this.spec?.scheduledScanConfig?.cronSchedule) {
+        out.unshift(downloadAllReportsXCCDF);
+        downloadReportXCCDF.label = t('compliance.downloadLatestReportXCCDF');
+      }
+      out.unshift(downloadReportXCCDF);
       if (this.spec?.scheduledScanConfig?.cronSchedule) {
         out.unshift(downloadAllReports);
         downloadReport.label = t('compliance.downloadLatestReport');
@@ -121,7 +142,7 @@ export default class ClusterScan extends SteveModel {
 
       downloadFile(`${ labelFor(report) }.csv`, csv, 'application/csv');
     } catch (err) {
-      this.$dispatch('growl/fromError', { title: 'Error downloading file', err }, { root: true });
+      this.$dispatch('growl/fromError', { title: this.t('compliance.scan.errorDownload'), err }, { root: true });
     }
   }
 
@@ -143,7 +164,7 @@ export default class ClusterScan extends SteveModel {
 
         toZip[`${ labelFor(report) }.csv`] = csv;
       } catch (err) {
-        this.$dispatch('growl/fromError', { title: 'Error downloading file', err }, { root: true });
+        this.$dispatch('growl/fromError', { title: this.t('compliance.scan.errorDownload'), err }, { root: true });
       }
     });
     if (!isEmpty(toZip)) {
@@ -153,6 +174,113 @@ export default class ClusterScan extends SteveModel {
     }
   }
 
+  async _resolveBenchmark() {
+    const profileName = this.status?.lastRunScanProfileName;
+
+    if (!profileName) {
+      return null;
+    }
+    const profile = await this.$dispatch('find', { type: COMPLIANCE.CLUSTER_SCAN_PROFILE, id: profileName });
+    const benchmarkId = profile?.spec?.benchmarkVersion;
+
+    if (!benchmarkId) {
+      return null;
+    }
+
+    return this.$dispatch('find', { type: COMPLIANCE.BENCHMARK, id: benchmarkId });
+  }
+
+  async downloadLatestReportXCCDF() {
+    const reports = await this.getReports() || [];
+    const report = sortBy(reports, 'metadata.creationTimestamp', true)[0];
+
+    try {
+      const benchmark = await this._resolveBenchmark();
+      const { generateXCCDFPerNode } = await import(/* webpackChunkName: "xccdf" */'@shell/utils/xccdf');
+
+      const parsed = report.parsedReport || {};
+      const common = {
+        report:           parsed,
+        benchmarkVersion: parsed.version || benchmark?.spec?.benchmarkVersion || '',
+        metadata:         benchmark?.spec?.benchmarkMetadata || {},
+        stigChecks:       benchmark?.spec?.stigChecks || {},
+      };
+
+      const toZip = {};
+
+      if (!Object.entries(parsed.nodes || {}).length) {
+        this.$dispatch('growl/fromError', { title: this.t('compliance.scan.errorNoParsedNodes') }, { root: true });
+      } else {
+        Object.entries(parsed.nodes || {}).forEach(([role, hosts]) => {
+          (hosts || []).forEach((hostname) => {
+            const xml = generateXCCDFPerNode({
+              ...common, hostname, role,
+            });
+
+            toZip[`${ labelFor(report) }--${ hostname }.xml`] = xml;
+          });
+        });
+
+        if (!isEmpty(toZip)) {
+          const zip = await generateZip(toZip);
+
+          downloadFile(`${ labelFor(report) }-per-node.zip`, zip, 'application/zip');
+        }
+      }
+    } catch (err) {
+      this.$dispatch('growl/fromError', { title: this.t('compliance.scan.errorDownload'), err }, { root: true });
+    }
+  }
+
+  async downloadAllReportsXCCDF() {
+    const toZip = {};
+    const reports = await this.getReports() || [];
+
+    try {
+      const benchmark = await this._resolveBenchmark();
+      const { generateXCCDFPerNode } = await import(/* webpackChunkName: "xccdf" */'@shell/utils/xccdf');
+
+      const hasParsedNodes = reports.some((report) => Object.entries(report.parsedReport?.nodes || {}).length);
+
+      if (!hasParsedNodes) {
+        this.$dispatch('growl/fromError', { title: this.t('compliance.scan.errorNoParsedNodes') }, { root: true });
+      } else {
+        reports.forEach((report) => {
+          try {
+            const parsed = report.parsedReport || {};
+            const common = {
+              report:           parsed,
+              benchmarkVersion: parsed.version || benchmark?.spec?.benchmarkVersion || '',
+              metadata:         benchmark?.spec?.benchmarkMetadata || {},
+              stigChecks:       benchmark?.spec?.stigChecks || {},
+            };
+            const folder = labelFor(report);
+
+            Object.entries(parsed.nodes || {}).forEach(([role, hosts]) => {
+              (hosts || []).forEach((hostname) => {
+                const xml = generateXCCDFPerNode({
+                  ...common, hostname, role,
+                });
+
+                toZip[`${ folder }/${ hostname }.xml`] = xml;
+              });
+            });
+          } catch (err) {
+            this.$dispatch('growl/fromError', { title: this.t('compliance.scan.errorDownload'), err }, { root: true });
+          }
+        });
+
+        if (!isEmpty(toZip)) {
+          generateZip(toZip).then((zip) => {
+            downloadFile(`${ this.id }-reports-xccdf-per-node.zip`, zip, 'application/zip');
+          });
+        }
+      }
+    } catch (err) {
+      this.$dispatch('growl/fromError', { title: this.t('compliance.scan.errorDownload'), err }, { root: true });
+    }
+  }
+
   get scanProfileLink() {
     if (this.status?.lastRunScanProfileName) {
       return {

package/models/ext.cattle.io.kubeconfig.ts

@@ -1,4 +1,4 @@
-import { CAPI, MANAGEMENT } from '@shell/config/types';
+import { MANAGEMENT } from '@shell/config/types';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { Location } from 'vue-router';
 
@@ -49,16 +49,13 @@ export default class Kubeconfig extends SteveModel {
    */
   get referencedClusters(): ReferencedCluster[] {
     const clusterIds = this.spec?.clusters || [];
-    const provClusters = this.$rootGetters['management/all'](CAPI.RANCHER_CLUSTER) || [];
-    const mgmtClusters = this.$rootGetters['management/all'](MANAGEMENT.CLUSTER) || [];
 
     return clusterIds.map((id: string) => {
-      const provCluster = provClusters.find((c: any) => c.mgmt?.id === id || c.status?.clusterName === id);
-      const mgmtCluster = mgmtClusters.find((c: any) => c.id === id);
-      const cluster = provCluster || mgmtCluster;
+      const mgmtCluster = this.$rootGetters['management/byId'](MANAGEMENT.CLUSTER, id);
+      const provCluster = mgmtCluster?.provCluster;
 
       return {
-        label:    cluster?.nameDisplay || this.t('"ext.cattle.io.kubeconfig".deleted', { name: id }),
+        label:    mgmtCluster?.nameDisplay || this.t('"ext.cattle.io.kubeconfig".deleted', { name: id }),
         location: provCluster?.detailLocation || mgmtCluster?.detailLocation || null
       };
     });

package/models/fleet-application.js

@@ -7,6 +7,7 @@ import { addObject, addObjects, findBy } from '@shell/utils/array';
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { mapStateToEnum, primaryDisplayStatusFromCount, STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
 import FleetUtils from '@shell/utils/fleet';
+import { HARVESTER_CONTAINER } from '@shell/store/features';
 
 function normalizeStateCounts(data) {
   if (isEmpty(data)) {
@@ -138,7 +139,8 @@ export default class FleetApplication extends SteveModel {
   }
 
   get targetInfo() {
-    const mode = FleetUtils.Application.getTargetMode(this.spec.targets || [], this.metadata.namespace);
+    const areHarvesterHostsVisible = this.$rootGetters['features/get'](HARVESTER_CONTAINER);
+    const mode = FleetUtils.Application.getTargetMode(this.spec.targets || [], this.metadata.namespace, areHarvesterHostsVisible);
 
     return {
       mode,