@rancher/shell 3.0.5-rc.6 → 3.0.5-rc.8

package/edit/__tests__/fleet.cattle.io.helmop.test.ts

@@ -0,0 +1,224 @@
+import { mount } from '@vue/test-utils';
+import { _CREATE, _EDIT, _VIEW } from '@shell/config/query-params';
+import HelmOp from '@shell/models/fleet.cattle.io.helmop';
+import HelmOpComponent from '@shell/edit/fleet.cattle.io.helmop.vue';
+
+const mockStore = {
+  dispatch: jest.fn(),
+  commit:   jest.fn(),
+  getters:  {
+    'i18n/t':                  (text: string) => text,
+    'i18n/exists':             jest.fn(),
+    t:                         (text: string) => text,
+    currentStore:              () => 'current_store',
+    'current_store/schemaFor': jest.fn(),
+    'current_store/all':       jest.fn(),
+    workspace:                 'test',
+  },
+  rootGetters: { 'i18n/t': jest.fn() },
+};
+
+const mocks = {
+  $store:      mockStore,
+  $fetchState: { pending: false },
+  $route:      {
+    query: { AS: '' },
+    name:  {
+      endsWith: () => {
+        return false;
+      }
+    }
+  },
+};
+
+const mockComputed = {
+  ...HelmOpComponent.computed,
+  steps: () => [{
+    name:           'advanced',
+    title:          'title',
+    label:          'label',
+    subtext:        'subtext',
+    descriptionKey: 'description',
+    ready:          true,
+    weight:         1,
+  }],
+};
+
+const mockHelmOp = {
+  type:       'fleet.cattle.io.helmop',
+  apiVersion: 'fleet.cattle.io/v1alpha1',
+  kind:       'HelmOp',
+  metadata:   {
+    name:      'test',
+    namespace: 'test1',
+  },
+  spec: {
+    targetNamespace: 'custom-namespace-name',
+    helm:            {},
+    targets:         [
+      { clusterName: `fleet-local` }
+    ],
+  },
+  status:       {},
+  currentRoute: () => {},
+};
+
+const initHelmOp = (props: any, value?: any) => {
+  const initValue = new HelmOp({
+    ...mockHelmOp,
+    ...(value || {})
+  }, {
+    getters:     { schemaFor: () => ({ linkFor: jest.fn() }) },
+    dispatch:    jest.fn(),
+    rootGetters: { 'i18n/t': jest.fn() },
+  });
+
+  return {
+    props: {
+      value: initValue,
+      ...props
+    },
+    computed: mockComputed,
+    global:   { mocks },
+  };
+};
+
+describe('view: fleet.cattle.io.helmop, mode: view', () => {
+  it('should hide advanced options banner', () => {
+    const wrapper = mount(HelmOpComponent, initHelmOp({ mode: _VIEW }));
+
+    const advancedInfoBanner = wrapper.find('[data-testid="helmOp-advanced-info"]');
+
+    expect(advancedInfoBanner.exists()).toBe(false);
+  });
+});
+
+describe.each([
+  _CREATE,
+  _EDIT,
+])('view: fleet.cattle.io.helmop, mode: %p', (mode) => {
+  const wrapper = mount(HelmOpComponent, initHelmOp({ mode }));
+
+  it('should show advanced options banner', () => {
+    const advancedInfoBanner = wrapper.find('[data-testid="helmOp-advanced-info"]');
+
+    expect(advancedInfoBanner.exists()).toBeTruthy();
+  });
+
+  it.each([
+    ['not display', ' OCI registry', 'chart', 'oci://foo', false],
+    ['not display', 'Tarball', 'https://foo', '', false],
+    ['display', 'Repository', 'bar', 'https://foo', true],
+  ])('should %p Polling section if source is %p', (
+    descr1,
+    descr2,
+    chart,
+    repo,
+    visible
+  ) => {
+    const wrapper = mount(HelmOpComponent, initHelmOp({ realMode: mode }, {
+      spec: {
+        pollingInterval: 20,
+        helm:            {
+          chart,
+          repo,
+          version: '1.2.x'
+        }
+      },
+    }));
+
+    const pollingCheckbox = wrapper.findComponent('[data-testid="helmOp-enablePolling-checkbox"]');
+
+    expect(pollingCheckbox.exists()).toBe(visible);
+  });
+
+  it.each([
+    ['disabled', 'not display', '1.2.3', undefined, false, false],
+    ['disabled', 'not display', '1.2.3', null, false, false],
+    ['disabled', 'not display', '1.2.3', 0, false, false],
+    ['disabled', 'not display', '1.2.3', 10, false, false],
+    ['disabled', 'not display', '1.2.3', 30, false, false],
+    ['disabled', 'not display', '', 0, false, false],
+    ['disabled', 'not display', null, 0, false, false],
+    ['enabled', 'display', '1.2.x', 10, true, true],
+    ['enabled', 'not display', '1.2.x', 30, true, false],
+  ])('should show Polling %p and %p min-value warning, with spec.version: %p and spec.disablePolling: %p', (
+    descr1,
+    descr2,
+    version,
+    pollingInterval,
+    enabled,
+    minValueWarnVisible
+  ) => {
+    const wrapper = mount(HelmOpComponent, initHelmOp({ realMode: mode }, {
+      spec: {
+        pollingInterval,
+        helm: {
+          chart: 'foo',
+          repo:  'https://foo',
+          version
+        }
+      },
+    }));
+
+    const pollingCheckbox = wrapper.findComponent('[data-testid="helmOp-enablePolling-checkbox"]') as any;
+    const pollingIntervalInput = wrapper.find('[data-testid="helmOp-pollingInterval-input"]');
+    const pollingIntervalMinimumValueWarning = wrapper.find('[data-testid="helmOp-pollingInterval-minimumValueWarning"]');
+
+    expect(pollingCheckbox.exists()).toBe(true);
+    expect(pollingCheckbox.vm.value).toBe(enabled);
+    expect(pollingCheckbox.element.classList.value.includes('v-popper--has-tooltip')).toBe(!enabled);
+    expect(pollingIntervalInput.exists()).toBe(enabled);
+    expect(pollingIntervalMinimumValueWarning.exists()).toBe(minValueWarnVisible);
+  });
+
+  it('should disable Polling Interval', async() => {
+    const wrapper = mount(HelmOpComponent, initHelmOp({ realMode: mode }, {
+      spec: {
+        pollingInterval: 10,
+        helm:            {
+          chart:   'foo',
+          repo:    'https://foo',
+          version: '1.2.x'
+        }
+      },
+    }));
+
+    wrapper.vm.togglePolling(false);
+
+    await wrapper.vm.$nextTick();
+
+    const pollingIntervalInput = wrapper.find('[data-testid="helmOp-pollingInterval-input"]');
+
+    expect(pollingIntervalInput.exists()).toBe(false);
+  });
+
+  it.each([
+    ['15', null],
+    ['15', 0],
+    ['30', 30],
+  ])('should set minimum Polling Interval to %p when input value is %p', async(
+    displayValue,
+    inputValue
+  ) => {
+    const wrapper = mount(HelmOpComponent, initHelmOp({ realMode: mode }, {
+      spec: {
+        pollingInterval: 10,
+        helm:            {
+          chart:   'foo',
+          repo:    'https://foo',
+          version: '1.2.x'
+        }
+      },
+    }));
+
+    wrapper.vm.pollingInterval = inputValue;
+    wrapper.vm.updatePollingInterval(inputValue);
+
+    await wrapper.vm.$nextTick();
+
+    const pollingIntervalInput = wrapper.find('[data-testid="helmOp-pollingInterval-input"]').element as HTMLInputElement;
+
+    expect(pollingIntervalInput.value).toBe(displayValue);
+  });
+});

package/edit/auth/ldap/__tests__/config.test.ts

@@ -41,4 +41,18 @@ describe('lDAP config', () => {
     expect(userLoginFilter.element.value).toBe(expectedValue);
     expect(wrapper.vm.model.userLoginFilter).toBeUndefined();
   });
+
+  it.each([
+    'openldap', 'freeipa'
+  ])('should display searchUsingServiceAccount checkbox if type %p', (type) => {
+    const wrapper = mount(LDAPConfig, {
+      propsData: {
+        value: {},
+        type,
+      }
+    });
+    const checkbox = wrapper.find('[data-testid="searchUsingServiceAccount"]');
+
+    expect(checkbox).toBeDefined();
+  });
 });

package/edit/auth/ldap/config.vue

@@ -11,6 +11,8 @@ const DEFAULT_TLS_PORT = 636;
 
 export const SHIBBOLETH = 'shibboleth';
 export const OKTA = 'okta';
+export const OPEN_LDAP = 'openldap';
+export const FREE_IPA = 'freeipa';
 
 export default {
   emits: ['update:value'],
@@ -64,6 +66,11 @@ export default {
     // Does the auth provider support LDAP for search in addition to SAML?
     isSamlProvider() {
       return this.type === SHIBBOLETH || this.type === OKTA;
+    },
+
+    // Allow to enable user search just for these providers
+    isSearchAllowed() {
+      return this.type === OPEN_LDAP || this.type === FREE_IPA;
     }
   },
 
@@ -226,6 +233,23 @@ export default {
         />
       </div>
     </div>
+
+    <div
+      v-if="isSearchAllowed"
+      class="row mb-20"
+    >
+      <div class="col">
+        <Checkbox
+          v-model:value="model.searchUsingServiceAccount"
+          :mode="mode"
+          data-testid="searchUsingServiceAccount"
+          class="full-height"
+          :label="t('authConfig.ldap.searchUsingServiceAccount.label')"
+          :tooltip="t('authConfig.ldap.searchUsingServiceAccount.tip')"
+        />
+      </div>
+    </div>
+
     <div class="row mb-20">
       <div class="col span-6">
         <LabeledInput

package/edit/compliance.cattle.io.clusterscan.vue

@@ -79,7 +79,7 @@ export default {
     });
 
     try {
-      this.defaultConfigMap = await this.$store.dispatch('cluster/find', { type: CONFIG_MAP, id: 'rancher-compliance-system/default-clusterscanprofiles' });
+      this.defaultConfigMap = await this.$store.dispatch('cluster/find', { type: CONFIG_MAP, id: 'compliance-operator-system/default-clusterscanprofiles' });
     } catch {}
 
     this.allProfiles = hash.profiles;

package/edit/configmap.vue

@@ -1,4 +1,5 @@
 <script>
+import jsyaml from 'js-yaml';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import CruResource from '@shell/components/CruResource';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
@@ -66,7 +67,9 @@ export default {
       const yaml = await this.$refs.cru.createResourceYaml(this.yamlModifiers);
 
       try {
-        await this.value.saveYaml(yaml);
+        const initialYaml = jsyaml.dump(this.initialValue);
+
+        await this.value.saveYaml(yaml, initialYaml);
         this.done();
       } catch (err) {
         this.errors.push(err);

package/edit/fleet.cattle.io.gitrepo.vue

@@ -23,7 +23,9 @@ import FleetClusterTargets from '@shell/components/fleet/FleetClusterTargets/ind
 import { toSeconds } from '@shell/utils/duration';
 import FleetGitRepoPaths from '@shell/components/fleet/FleetGitRepoPaths.vue';
 import FleetOCIStorageSecret from '@shell/components/fleet/FleetOCIStorageSecret.vue';
-import { DEFAULT_POLLING_INTERVAL, MINIMUM_POLLING_INTERVAL } from '@shell/models/fleet-application';
+
+const MINIMUM_POLLING_INTERVAL = 15;
+const DEFAULT_POLLING_INTERVAL = 60;
 
 const _VERIFY = 'verify';
 const _SKIP = 'skip';
@@ -105,10 +107,7 @@ export default {
       targetsCreated:          '',
       fvFormRuleSets:          [{
         path:  'spec.repo',
-        rules: [
-          'required',
-          'urlRepository'
-        ],
+        rules: ['urlRepository'],
       }],
       touched: null,
     };
@@ -636,7 +635,7 @@ export default {
             <Banner
               v-if="showPollingIntervalWarning"
               color="warning"
-              label-key="fleet.gitRepo.polling.pollingInterval.minimumValuewarning"
+              label-key="fleet.gitRepo.polling.pollingInterval.minimumValueWarning"
               data-testid="gitRepo-pollingInterval-minimumValueWarning"
             />
             <Banner

package/edit/fleet.cattle.io.helmop.vue

@@ -1,10 +1,11 @@
 <script>
 import { clone, set } from '@shell/utils/object';
+import semver from 'semver';
 import jsyaml from 'js-yaml';
 import { saferDump } from '@shell/utils/create-yaml';
 import { mapGetters } from 'vuex';
 import { base64Encode } from '@shell/utils/crypto';
-import { _CREATE, _EDIT, _VIEW } from '@shell/config/query-params';
+import { _CREATE, _EDIT } from '@shell/config/query-params';
 import { checkSchemasForFindAllHash } from '@shell/utils/auth';
 import { AUTH_TYPE, CONFIG_MAP, NORMAN, SECRET } from '@shell/config/types';
 import { CATALOG, FLEET as FLEET_LABELS } from '@shell/config/labels-annotations';
@@ -27,9 +28,10 @@ import { SECRET_TYPES } from '@shell/config/secret';
 import UnitInput from '@shell/components/form/UnitInput';
 import FleetClusterTargets from '@shell/components/fleet/FleetClusterTargets/index.vue';
 import { toSeconds } from '@shell/utils/duration';
-import { DEFAULT_POLLING_INTERVAL, MINIMUM_POLLING_INTERVAL } from '@shell/models/fleet-application';
 import FleetValuesFrom from '@shell/components/fleet/FleetValuesFrom.vue';
 
+const MINIMUM_POLLING_INTERVAL = 15;
+
 const VALUES_STATE = {
   YAML: 'YAML',
   DIFF: 'DIFF'
@@ -77,17 +79,6 @@ export default {
   },
 
   data() {
-    let pollingInterval = toSeconds(this.value.spec.pollingInterval) || this.value.spec.pollingInterval;
-
-    if (!pollingInterval) {
-      if (this.realMode === _CREATE) {
-        pollingInterval = DEFAULT_POLLING_INTERVAL;
-        this.value.spec.pollingInterval = this.durationSeconds(pollingInterval);
-      } else if (this.realMode === _EDIT || this.realMode === _VIEW) {
-        pollingInterval = MINIMUM_POLLING_INTERVAL;
-      }
-    }
-
     const correctDriftEnabled = this.value.spec?.correctDrift?.enabled || false;
 
     const chartValues = saferDump(clone(this.value.spec.helm.values));
@@ -96,7 +87,7 @@ export default {
       VALUES_STATE,
       SOURCE_TYPE,
       allWorkspaces:    [],
-      pollingInterval,
+      pollingInterval:  toSeconds(this.value.spec.pollingInterval) || this.value.spec.pollingInterval,
       sourceTypeInit:   this.value.sourceType,
       sourceType:       this.value.sourceType || SOURCE_TYPE.REPO,
       helmSpecInit:     clone(this.value.spec.helm),
@@ -221,9 +212,25 @@ export default {
       return EDITOR_MODES.EDIT_CODE;
     },
 
-    showPollingIntervalWarning() {
-      return !this.isView && this.value.isPollingEnabled && this.pollingInterval < MINIMUM_POLLING_INTERVAL;
+    isNullOrStaticVersion() {
+      return !this.value.spec.helm.version || semver.valid(this.value.spec.helm.version) !== null;
+    },
+
+    isPollingEnabled() {
+      return !this.isNullOrStaticVersion && !!this.value.spec.pollingInterval;
+    },
+
+    showPollingIntervalMinValueWarning() {
+      return !this.isView && this.isPollingEnabled && this.pollingInterval < MINIMUM_POLLING_INTERVAL;
     },
+
+    enablePollingTooltip() {
+      if (this.isNullOrStaticVersion) {
+        return this.t('fleet.helmOp.polling.pollingInterval.versionTooltip', { version: this.value.spec.helm.version || '' }, true);
+      }
+
+      return null;
+    }
   },
 
   watch: {
@@ -255,22 +262,21 @@ export default {
       this.value.spec.targets = value;
     },
 
-    enablePolling(value) {
+    togglePolling(value) {
       if (value) {
-        delete this.value.spec.disablePolling;
+        this.pollingInterval = this.pollingInterval ?? MINIMUM_POLLING_INTERVAL;
+        this.value.spec.pollingInterval = this.value.spec.pollingInterval ?? this.durationSeconds(MINIMUM_POLLING_INTERVAL);
       } else {
-        this.value.spec.disablePolling = true;
+        delete this.value.spec.pollingInterval;
       }
     },
 
     updatePollingInterval(value) {
-      if (!value) {
-        this.pollingInterval = DEFAULT_POLLING_INTERVAL;
-        this.value.spec.pollingInterval = this.durationSeconds(DEFAULT_POLLING_INTERVAL);
-      } else if (value === MINIMUM_POLLING_INTERVAL) {
-        delete this.value.spec.pollingInterval;
-      } else {
+      if (value) {
         this.value.spec.pollingInterval = this.durationSeconds(value);
+      } else {
+        this.pollingInterval = MINIMUM_POLLING_INTERVAL;
+        this.value.spec.pollingInterval = this.durationSeconds(MINIMUM_POLLING_INTERVAL);
       }
     },
 
@@ -398,22 +404,28 @@ export default {
       case SOURCE_TYPE.REPO:
         this.fvFormRuleSets = [{
           path:  'spec.helm.repo',
-          rules: ['required', 'urlRepository'],
+          rules: ['urlRepository'],
         }, {
           path:  'spec.helm.chart',
           rules: ['required'],
+        }, {
+          path:  'spec.helm.version',
+          rules: ['semanticVersion'],
         }];
         break;
       case SOURCE_TYPE.OCI:
         this.fvFormRuleSets = [{
           path:  'spec.helm.repo',
-          rules: ['required', 'ociRegistry'],
+          rules: ['ociRegistry'],
+        }, {
+          path:  'spec.helm.version',
+          rules: ['semanticVersion'],
         }];
         break;
       case SOURCE_TYPE.TARBALL:
         this.fvFormRuleSets = [{
           path:  'spec.helm.chart',
-          rules: ['required', 'urlRepository'],
+          rules: ['urlRepository'],
         }];
         break;
       }
@@ -535,6 +547,7 @@ export default {
               :mode="mode"
               label-key="fleet.helmOp.source.version.label"
               :placeholder="t('fleet.helmOp.source.version.placeholder', null, true)"
+              :rules="fvGetAndReportPathRules('spec.helm.version')"
             />
           </div>
         </div>
@@ -558,6 +571,7 @@ export default {
               :mode="mode"
               label-key="fleet.helmOp.source.version.label"
               :placeholder="t('fleet.helmOp.source.version.placeholder', null, true)"
+              :rules="fvGetAndReportPathRules('spec.helm.version')"
             />
           </div>
         </div>
@@ -663,6 +677,7 @@ export default {
         v-if="!isView"
         color="info"
         label-key="fleet.helmOp.add.steps.advanced.info"
+        data-testid="helmOp-advanced-info"
       />
 
       <h2 v-t="'fleet.helmOp.auth.title'" />
@@ -713,38 +728,45 @@ export default {
         />
       </div>
 
-      <h2 v-t="'fleet.helmOp.polling.label'" />
-      <div class="row polling">
-        <div class="col span-6">
-          <Checkbox
-            :value="value.isPollingEnabled"
-            type="checkbox"
-            label-key="fleet.helmOp.polling.enable"
-            :mode="mode"
-            @update:value="enablePolling"
-          />
-        </div>
-        <template v-if="value.isPollingEnabled">
-          <div class="col">
-            <Banner
-              v-if="showPollingIntervalWarning"
-              color="warning"
-              label-key="fleet.helmOp.polling.pollingInterval.minimumValuewarning"
-            />
-          </div>
+      <template v-if="sourceType === SOURCE_TYPE.REPO">
+        <h2 v-t="'fleet.helmOp.polling.label'" />
+        <div class="row polling">
           <div class="col span-6">
-            <UnitInput
-              v-model:value="pollingInterval"
-              min="1"
-              :suffix="t('suffix.seconds', { count: pollingInterval })"
-              :label="t('fleet.helmOp.polling.pollingInterval.label')"
+            <Checkbox
+              :value="isPollingEnabled"
+              type="checkbox"
+              label-key="fleet.helmOp.polling.enable"
+              data-testid="helmOp-enablePolling-checkbox"
+              :tooltip="enablePollingTooltip"
               :mode="mode"
-              tooltip-key="fleet.helmOp.polling.pollingInterval.tooltip"
-              @blur.capture="updatePollingInterval(pollingInterval)"
+              :disabled="isNullOrStaticVersion"
+              @update:value="togglePolling"
             />
           </div>
-        </template>
-      </div>
+          <template v-if="isPollingEnabled">
+            <div class="col">
+              <Banner
+                v-if="showPollingIntervalMinValueWarning"
+                color="warning"
+                label-key="fleet.helmOp.polling.pollingInterval.minimumValueWarning"
+                data-testid="helmOp-pollingInterval-minimumValueWarning"
+              />
+            </div>
+            <div class="col span-6">
+              <UnitInput
+                v-model:value="pollingInterval"
+                min="1"
+                data-testid="helmOp-pollingInterval-input"
+                :suffix="t('suffix.seconds', { count: pollingInterval })"
+                :label="t('fleet.helmOp.polling.pollingInterval.label')"
+                :mode="mode"
+                tooltip-key="fleet.helmOp.polling.pollingInterval.tooltip"
+                @blur.capture="updatePollingInterval(pollingInterval)"
+              />
+            </div>
+          </template>
+        </div>
+      </template>
     </template>
   </CruResource>
 </template>

package/edit/logging.banzaicloud.io.output/index.vue

@@ -21,7 +21,7 @@ import YamlEditor, { EDITOR_MODES } from '@shell/components/YamlEditor';
 export default {
   components: {
     Banner, CruResource, Labels, LabeledSelect, NameNsDescription, Tab, Tabbed, YamlEditor, Loading
-  }, //
+  },
 
   mixins: [CreateEditView],
 

package/edit/logging.banzaicloud.io.output/providers/awsElasticsearch.vue

@@ -36,11 +36,11 @@ export default {
     </div>
     <div class="row">
       <div class="col span-6">
-        <LabeledInput
-          v-model:value="value.endpoint.url"
-          :mode="mode"
-          :disabled="disabled"
-          :label="t('logging.awsElasticsearch.url')"
+        <LabeledInput
+          v-model:value="value.endpoint.url"
+          :mode="mode"
+          :disabled="disabled"
+          :label="t('logging.awsElasticsearch.url')"
         />
       </div>
     </div>
@@ -51,7 +51,6 @@ export default {
       </div>
     </div>
     <div class="row mb-10">
-      {{ value.namespace }}
       <div class="col span-6">
         <SecretSelector
           v-model:value="value.endpoint.access_key_id"