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

package/utils/validators/__tests__/monitoring-route.test.ts

@@ -0,0 +1,119 @@
+import { matching, interval } from '@shell/utils/validators/monitoring-route';
+
+const mockGetters = {
+  'i18n/t':      (key: string, args?: object) => (args ? `${ key }:${ JSON.stringify(args) }` : key),
+  'i18n/exists': () => false,
+};
+
+describe('validators/monitoring-route', () => {
+  describe('matching', () => {
+    it('adds error when both match and match_re are empty', () => {
+      const errors: string[] = [];
+
+      matching({ match: {}, match_re: {} }, mockGetters, errors, []);
+
+      expect(errors).toStrictEqual(['validation.monitoring.route.match']);
+    });
+
+    it('adds error when spec is empty object', () => {
+      const errors: string[] = [];
+
+      matching({}, mockGetters, errors, []);
+
+      expect(errors).toStrictEqual(['validation.monitoring.route.match']);
+    });
+
+    it('adds error when spec is null or undefined', () => {
+      const errors: string[] = [];
+
+      matching(null, mockGetters, errors, []);
+
+      expect(errors).toStrictEqual(['validation.monitoring.route.match']);
+    });
+
+    it('adds no error when match has entries', () => {
+      const errors: string[] = [];
+
+      matching({ match: { severity: 'critical' } }, mockGetters, errors, []);
+
+      expect(errors).toStrictEqual([]);
+    });
+
+    it('adds no error when match_re has entries', () => {
+      const errors: string[] = [];
+
+      matching({ match_re: { alertname: '.*' } }, mockGetters, errors, []);
+
+      expect(errors).toStrictEqual([]);
+    });
+
+    it('adds no error when both match and match_re have entries', () => {
+      const errors: string[] = [];
+
+      matching(
+        { match: { severity: 'warning' }, match_re: { alertname: '.*' } },
+        mockGetters,
+        errors,
+        []
+      );
+
+      expect(errors).toStrictEqual([]);
+    });
+  });
+
+  describe('interval', () => {
+    it.each([
+      {
+        desc:  'seconds unit',
+        value: '30s',
+      },
+      {
+        desc:  'minutes unit',
+        value: '5m',
+      },
+      {
+        desc:  'hours unit',
+        value: '2h',
+      },
+      {
+        desc:  'multi-digit seconds',
+        value: '120s',
+      },
+    ])('adds no error for valid interval: $desc', ({ value }) => {
+      const errors: string[] = [];
+
+      interval(value, mockGetters, errors, [], 'Interval');
+
+      expect(errors).toStrictEqual([]);
+    });
+
+    it.each([
+      {
+        desc:  'no unit',
+        value: '30',
+      },
+      {
+        desc:  'unknown unit',
+        value: '5d',
+      },
+      {
+        desc:  'empty string',
+        value: '',
+      },
+      {
+        desc:  'fractional value',
+        value: '1.5s',
+      },
+      {
+        desc:  'letters only',
+        value: 'abc',
+      },
+    ])('adds error for invalid interval: $desc', ({ value }) => {
+      const errors: string[] = [];
+
+      interval(value, mockGetters, errors, [], 'Interval');
+
+      expect(errors).toStrictEqual(['validation.monitoring.route.interval:{"key":"Interval"}']);
+    });
+  });
+});

package/utils/validators/__tests__/private-registry.test.ts

@@ -3,28 +3,22 @@ import { privateRegistryRequired } from '@shell/utils/validators/private-registr
 const makeCtx = (overrides: any = {}) => ({
   t:                      jest.fn((key: string, params?: any) => (params ? `${ key }:${ JSON.stringify(params) }` : key)),
   privateRegistryEnabled: false,
-  normanCluster:          { importedConfig: { privateRegistryURL: null } },
-  isImportedCluster:      true,
+  normanCluster:          { importedConfig: {} },
+  $store:                 { getters: { 'management/byId': () => null } },
   ...overrides,
 });
 
-describe('privateRegistryRequired', () => {
-  it('should return undefined when the cluster is not imported', () => {
-    const ctx = makeCtx({ isImportedCluster: false, privateRegistryEnabled: true });
-    const rule = privateRegistryRequired(ctx);
-
-    expect(rule()).toBeUndefined();
-  });
+const storeWithGlobalRegistry = { getters: { 'management/byId': () => ({ value: 'registry.global.io' }) } };
 
-  it('should default isImportedCluster to true when the property is absent from the context', () => {
-    const ctx: any = {
-      t:                      jest.fn((key: string, params?: any) => (params ? `${ key }:${ JSON.stringify(params) }` : key)),
+describe('privateRegistryRequired', () => {
+  it('should return undefined when a global default registry is configured', () => {
+    const ctx = makeCtx({
       privateRegistryEnabled: true,
-      normanCluster:          { importedConfig: { privateRegistryURL: null } },
-    };
+      $store:                 storeWithGlobalRegistry,
+    });
     const rule = privateRegistryRequired(ctx);
 
-    expect(rule()).toStrictEqual('validation.required:{"key":"cluster.privateRegistry.label"}');
+    expect(rule()).toBeUndefined();
   });
 
   it('should return undefined when the registry toggle is off', () => {
@@ -73,4 +67,22 @@ describe('privateRegistryRequired', () => {
 
     expect(rule()).toBeUndefined();
   });
+
+  it('should handle $store getter throwing gracefully', () => {
+    const ctx = makeCtx({
+      privateRegistryEnabled: true,
+      normanCluster:          { importedConfig: {} },
+      $store:                 {
+        getters: {
+          get 'management/byId'() {
+            throw new Error('no store');
+          }
+        }
+      },
+    });
+    const rule = privateRegistryRequired(ctx);
+
+    // Falls through to validation since no global default detected
+    expect(rule()).toStrictEqual('validation.required:{"key":"cluster.privateRegistry.label"}');
+  });
 });

package/utils/validators/private-registry.ts

@@ -1,19 +1,30 @@
+import { VuexStore } from 'types/store/vuex';
 import { Translation } from '@shell/types/t';
 import formRulesGenerator from '@shell/utils/validators/formRules';
+import { SETTING } from '@shell/config/settings';
+import { MANAGEMENT } from '@shell/config/types';
 
 interface PrivateRegistryRuleContext {
   t: Translation;
   privateRegistryEnabled: boolean;
   normanCluster: { importedConfig?: { privateRegistryURL?: string | null } } | null;
-  isImportedCluster?: boolean;
+  $store: VuexStore
 }
 
 export function privateRegistryRequired(ctx: PrivateRegistryRuleContext) {
   return () => {
-    // Check existence using `in` rather than direct access to avoid Vue's render-time warning
-    const isImported = 'isImportedCluster' in ctx ? !!ctx.isImportedCluster : true;
+    let hasGlobalDefault = false;
 
-    if (!isImported || !ctx.privateRegistryEnabled) {
+    try {
+      // settings are loaded when the dashboard loads so using a synchronous getter is reliable here
+      const globalRegistrySetting = ctx.$store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.SYSTEM_DEFAULT_REGISTRY);
+
+      hasGlobalDefault = !!globalRegistrySetting?.value;
+    } catch {
+      // if no setting proceed like there's no global default
+    }
+
+    if (!ctx.privateRegistryEnabled || hasGlobalDefault) {
       return undefined;
     }
     const url = ctx.normanCluster?.importedConfig?.privateRegistryURL;

package/utils/xccdf.ts

@@ -61,16 +61,17 @@ export interface BenchmarkMetadata {
   source?: string;
 }
 
-export interface StigCheckMetadata {
+export interface CheckDecoration {
   ruleId?: string;
   version?: string;
   severity?: string;
   fixId?: string;
   checkId?: string;
-  cci?: string[];
+  /** Generic XCCDF idents — STIG populates with CCIs, CIS with control IDs, etc. */
+  idents?: { system: string; value: string }[];
 }
 
-export type StigChecks = Record<string, StigCheckMetadata>;
+export type CheckDecorations = Record<string, CheckDecoration>;
 
 export interface XccdfTargetFact {
   name: string;
@@ -82,7 +83,7 @@ export interface GenerateXccdfArgs {
   report: XccdfReport;
   benchmarkVersion: string;
   metadata?: BenchmarkMetadata;
-  stigChecks?: StigChecks;
+  decorations?: CheckDecorations;
   targetAddresses?: string[];
   targetFacts?: XccdfTargetFact[];
   /** Override the cluster name used for the <target> element. Falls back to metadata.clusterName, then derived node names. */
@@ -101,32 +102,27 @@ const fixIdFor = (checkId: string): string => `${ ruleIdFor(checkId) }_fix`;
 
 const profileIdFor = (benchmarkVersion: string): string => `${ ID_PREFIX }_profile_${ safeId(benchmarkVersion) }`;
 
-const stigGroupId = (checkId: string): string => {
-  const parts = checkId.split('-');
-
-  if (parts.length >= 2) {
-    return `${ parts[0] }-${ parts[1] }`;
+const effectiveRuleId = (decoration: CheckDecoration, groupId: string, checkId: string, hitGroupKey: boolean): string => {
+  if (!decoration.ruleId) {
+    return ruleIdFor(checkId);
   }
+  if (!hitGroupKey) {
+    return decoration.ruleId;
+  }
+  const suffix = checkId.startsWith(`${ groupId }-`) ? checkId.slice(groupId.length + 1) : checkId;
 
-  return checkId;
+  return `${ decoration.ruleId }_${ suffix }`;
 };
 
-const effectiveRuleId = (stig: StigCheckMetadata, checkId: string): string => {
-  if (!stig.ruleId) {
-    return ruleIdFor(checkId);
+const lookupDecoration = (decorations: CheckDecorations, groupId: string, checkId: string): { decoration: CheckDecoration; hitGroupKey: boolean } => {
+  if (decorations[checkId]) {
+    return { decoration: decorations[checkId], hitGroupKey: false };
   }
-  const gid = stigGroupId(checkId);
-
-  if (checkId === gid) {
-    return stig.ruleId;
+  if (decorations[groupId]) {
+    return { decoration: decorations[groupId], hitGroupKey: true };
   }
-  const suffix = checkId.startsWith(`${ gid }-`) ? checkId.slice(gid.length + 1) : checkId;
-
-  return `${ stig.ruleId }_${ suffix }`;
-};
 
-const lookupStig = (stigChecks: StigChecks, checkId: string): StigCheckMetadata => {
-  return stigChecks[stigGroupId(checkId)] || {};
+  return { decoration: {}, hitGroupKey: false };
 };
 
 const mapResult = (state?: string): string => {
@@ -142,18 +138,18 @@ const mapResult = (state?: string): string => {
 
 const severityFor = (scored?: boolean): string => (scored ? 'medium' : 'low');
 
-const stigSeverity = (stigSev: string | undefined, scored?: boolean): string => stigSev || severityFor(scored);
+const decorationSeverity = (sev: string | undefined, scored?: boolean): string => sev || severityFor(scored);
 
 const ruleWeight = (scored?: boolean): string => (scored ? '10' : '0');
 
 const ruleRole = (scored?: boolean): string => (scored ? 'full' : 'unscored');
 
-const stigIdents = (ccis?: string[]): { system: string; value: string }[] => {
-  if (!ccis || ccis.length === 0) {
+const decorationIdents = (idents?: { system: string; value: string }[]): { system: string; value: string }[] => {
+  if (!idents || idents.length === 0) {
     return [{ system: NA, value: NA }];
   }
 
-  return ccis.map((cci) => ({ system: 'http://cyber.mil/cci', value: cci }));
+  return idents;
 };
 
 const collectTargets = (report: XccdfReport): string[] => {
@@ -187,7 +183,7 @@ export function generateXCCDF({
   report,
   benchmarkVersion,
   metadata = {},
-  stigChecks = {},
+  decorations = {},
   targetAddresses,
   targetFacts,
   clusterName,
@@ -239,7 +235,7 @@ export function generateXCCDF({
   profile.ele('title').txt(benchmarkTitle);
   profile.ele('description').txt(na(metadata.description));
 
-  const ruleResults: { check: XccdfReportCheck; effectiveId: string; stig: StigCheckMetadata }[] = [];
+  const ruleResults: { check: XccdfReportCheck; effectiveId: string; decoration: CheckDecoration }[] = [];
   const groups = report.results || [];
 
   groups.forEach((group) => {
@@ -250,10 +246,11 @@ export function generateXCCDF({
 
     (group.checks || []).forEach((check) => {
       const checkId = check.id || '';
-      const stig = lookupStig(stigChecks, checkId);
-      const effectiveId = effectiveRuleId(stig, checkId);
-      const ruleFixId = stig.fixId || fixIdFor(checkId);
-      const ruleCheckSystem = stig.checkId || CHECK_SYSTEM;
+      const groupId = group.id || '';
+      const { decoration, hitGroupKey } = lookupDecoration(decorations, groupId, checkId);
+      const effectiveId = effectiveRuleId(decoration, groupId, checkId, hitGroupKey);
+      const ruleFixId = decoration.fixId || fixIdFor(checkId);
+      const ruleCheckSystem = decoration.checkId || CHECK_SYSTEM;
       const checkHref = na(metadata.checkHref);
       const checkName = na(metadata.checkName);
 
@@ -262,10 +259,10 @@ export function generateXCCDF({
         selected: 'true',
         weight:   ruleWeight(check.scored),
         role:     ruleRole(check.scored),
-        severity: stigSeverity(stig.severity, check.scored),
+        severity: decorationSeverity(decoration.severity, check.scored),
       });
 
-      rule.ele('version').txt(na(stig.version));
+      rule.ele('version').txt(na(decoration.version));
       rule.ele('title').txt(na(`${ checkId } ${ check.description || '' }`));
       rule.ele('description').txt(na(check.description));
 
@@ -277,7 +274,7 @@ export function generateXCCDF({
       ruleRef.ele('type').txt(na(metadata.referenceType));
       ruleRef.ele('identifier').txt(na(metadata.referenceIdentifier));
 
-      stigIdents(stig.cci).forEach((ident) => {
+      decorationIdents(decoration.idents).forEach((ident) => {
         rule.ele('ident', { system: ident.system }).txt(ident.value);
       });
 
@@ -290,7 +287,7 @@ export function generateXCCDF({
       ruleCheck.ele('check-content').txt(na(check.audit));
 
       ruleResults.push({
-        check, effectiveId, stig
+        check, effectiveId, decoration
       });
     });
   });
@@ -348,8 +345,8 @@ export function generateXCCDF({
     rrCheck.ele('check-content-ref', { name: NA, href: NA });
     rrCheck.ele('check-content').txt(NA);
   } else {
-    ruleResults.forEach(({ check, effectiveId, stig }) => {
-      const ruleCheckSystem = stig.checkId || CHECK_SYSTEM;
+    ruleResults.forEach(({ check, effectiveId, decoration }) => {
+      const ruleCheckSystem = decoration.checkId || CHECK_SYSTEM;
       const checkHref = na(metadata.checkHref);
       const checkName = na(metadata.checkName);
 
@@ -357,12 +354,12 @@ export function generateXCCDF({
         idref:    effectiveId,
         role:     ruleRole(check.scored),
         time:     timeStr,
-        severity: stigSeverity(stig.severity, check.scored),
-        version:  na(stig.version),
+        severity: decorationSeverity(decoration.severity, check.scored),
+        version:  na(decoration.version),
         weight:   ruleWeight(check.scored),
       });
 
-      stigIdents(stig.cci).forEach((ident) => {
+      decorationIdents(decoration.idents).forEach((ident) => {
         rr.ele('ident', { system: ident.system }).txt(ident.value);
       });
       rr.ele('result').txt(mapResult(check.state));

package/vue.config.js

@@ -520,7 +520,7 @@ module.exports = function(dir, appConfig = {}) {
             @import "~shell/assets/styles/base/_variables.scss";
             @import "~shell/assets/styles/base/_functions.scss";
             @import "~shell/assets/styles/base/_mixins.scss";
-            @import 'node_modules/xterm/css/xterm.css';
+            @import 'node_modules/@xterm/xterm/css/xterm.css';
           `
         }
       }

package/pages/support/index.vue

@@ -1,264 +0,0 @@
-<script>
-import BannerGraphic from '@shell/components/BannerGraphic';
-import IndentedPanel from '@shell/components/IndentedPanel';
-import CommunityLinks from '@shell/components/CommunityLinks';
-import { MANAGEMENT } from '@shell/config/types';
-import { getVendor } from '@shell/config/private-label';
-import { SETTING } from '@shell/config/settings';
-import { addParam } from '@shell/utils/url';
-import { isRancherPrime } from '@shell/config/version';
-import TabTitle from '@shell/components/TabTitle';
-import CspAdapterUtils from '@shell/utils/cspAdaptor';
-
-export default {
-
-  components: {
-    BannerGraphic,
-    IndentedPanel,
-    CommunityLinks,
-    TabTitle
-  },
-
-  async fetch() {
-    const fetchOrCreateSetting = async(id, val) => {
-      let setting;
-
-      try {
-        setting = await this.$store.dispatch('management/find', { type: MANAGEMENT.SETTING, id });
-      } catch {
-        const schema = this.$store.getters['management/schemaFor'](MANAGEMENT.SETTING);
-        const url = schema.linkFor('collection');
-
-        setting = await this.$store.dispatch('management/create', {
-          type:     MANAGEMENT.SETTING,
-          metadata: { name: id },
-          value:    val,
-          default:  val || ''
-        });
-
-        setting.save({ url });
-      }
-
-      return setting;
-    };
-
-    this.apps = await CspAdapterUtils.fetchCspAdaptorApp(this.$store);
-    this.brandSetting = await fetchOrCreateSetting(SETTING.BRAND, '');
-    this.serverUrlSetting = await fetchOrCreateSetting(SETTING.SERVER_URL, '');
-    this.uiIssuesSetting = await this.$store.dispatch('management/find', { type: MANAGEMENT.SETTING, id: SETTING.ISSUES });
-    this.settings = await this.$store.dispatch('management/findAll', { type: MANAGEMENT.SETTING });
-  },
-
-  data() {
-    return {
-      apps:            [],
-      vendor:          getVendor(),
-      supportKey:      '',
-      brandSetting:    null,
-      uiIssuesSetting: null,
-      serverSetting:   null,
-      settings:        null,
-      // i18n-uses support.promos.one.*
-      // i18n-uses support.promos.two.*
-      // i18n-uses support.promos.three.*
-      // i18n-uses support.promos.four.*
-      promos:          [
-        'support.promos.one',
-        'support.promos.two',
-        'support.promos.three',
-        'support.promos.four',
-      ]
-    };
-  },
-
-  computed: {
-    cspAdapter() {
-      return CspAdapterUtils.hasCspAdapter({ $store: this.$store, apps: this.apps });
-    },
-
-    hasSupport() {
-      return this.hasAWSSupport || isRancherPrime();
-    },
-
-    hasAWSSupport() {
-      return !!this.cspAdapter;
-    },
-
-    serverUrl() {
-      // Client-side rendered: use the current window location
-      return window.location.origin;
-    },
-
-    supportConfigLink() {
-      const adapter = this.cspAdapter;
-
-      if (!adapter) {
-        return false;
-      }
-
-      if (adapter.metadata.name === 'rancher-csp-billing-adapter') {
-        return `${ this.serverUrl }/v1/generateSUSERancherSupportConfig?usePAYG=true`;
-      } else {
-        return `${ this.serverUrl }/v1/generateSUSERancherSupportConfig`;
-      }
-    },
-
-    title() {
-      return this.hasSupport ? 'support.suse.title' : 'support.community.title';
-    },
-
-    sccLink() {
-      return this.hasAWSSupport ? addParam('https://scc.suse.com', 'from_marketplace', '1') : 'https://scc.suse.com';
-    }
-  },
-
-};
-</script>
-<template>
-  <div>
-    <BannerGraphic
-      :title="t(title, {}, true)"
-      :alt="t('support.bannerImage')"
-    />
-
-    <IndentedPanel>
-      <div class="content mt-20">
-        <div class="promo col main-panel">
-          <div class="box mb-20 box-primary">
-            <h2>
-              <TabTitle breadcrumb="vendor-only">
-                {{ t('support.suse.access.title') }}
-              </TabTitle>
-            </h2>
-            <div
-              v-if="!hasSupport"
-              class="external support-links mt-20"
-            >
-              <div class="support-link">
-                <a
-                  class="support-link"
-                  href="https://www.rancher.com/support"
-                  target="_blank"
-                  rel="noopener noreferrer nofollow"
-                >{{ t('support.community.learnMore') }}</a>
-              </div>
-              <div class="support-link">
-                <a
-                  class="support-link"
-                  href="https://rancher.com/pricing"
-                  target="_blank"
-                  rel="noopener noreferrer nofollow"
-                >{{ t('support.community.pricing') }}</a>
-              </div>
-            </div>
-            <div v-else>
-              <p class="pb-10">
-                {{ hasAWSSupport ? t("support.suse.access.aws.text") : t("support.suse.access.text") }}
-              </p>
-              <a
-                v-if="hasAWSSupport"
-                class="mr-5 btn role-secondary btn-sm"
-                :href="supportConfigLink"
-              >
-                {{ t('support.suse.access.aws.generateConfig') }}
-              </a>
-              <a
-                :href="sccLink"
-                target="_blank"
-                rel="noopener noreferrer nofollow"
-              >
-                {{ t('support.suse.access.action') }} <i class="icon icon-external-link" />
-              </a>
-            </div>
-          </div>
-          <div class="boxes">
-            <div
-              v-for="(key, i) in promos"
-              :key="i"
-              class="box"
-            >
-              <h2>{{ t(`${key}.title`) }}</h2>
-              <div>{{ t(`${key}.text`) }}</div>
-            </div>
-          </div>
-        </div>
-        <CommunityLinks
-          :is-support-page="true"
-          class="community col side-panel span-3"
-        />
-      </div>
-    </IndentedPanel>
-  </div>
-</template>
-<style lang="scss" scoped>
-.content {
-
-    display: flex;
-    align-items: stretch;
-    .col {
-      margin: 0
-    }
-    .main-panel {
-      flex: auto;
-    }
-
-    .side-panel {
-      margin-left: 1.75%;
-    }
-  }
-
-.toggle-support {
-    height: 100%;
-
-    &.card-container {
-      box-shadow: none;
-    }
-
-    &:deep() .card-actions {
-      display: flex;
-      justify-content: space-between;
-    }
-}
-
-.support-link:not(:first-child) {
-  margin: 15px 0 0 0;
-}
-
-.register {
-  display: flex;
-  align-items: center;
-  margin-top: 20px;
-  font-size: 16px;
-}
-.remove-link {
-  cursor: pointer;
-  font-size: 14px;
-}
-.boxes {
-  display: grid;
-  grid-column-gap: 20px;
-  grid-row-gap: 20px;
-  grid-template-columns: 50% 50%;
-  margin-right: 20px;
-}
-
-.box {
-  padding: 20px;
-  border: 1px solid var(--border);
-
-  &.box-primary {
-    border-color: var(--primary);
-  }
-
-  > h2 {
-    font-size: 20px;
-    font-weight: 300;
-  }
-
-  > div {
-    font-weight: 300;
-    line-height: 18px;
-    opacity: 0.8;
-  }
-}
-</style>