@rancher/shell 3.0.9-rc.4 → 3.0.9-rc.5

package/dialog/__tests__/ScaleMachineDownDialog.test.ts

@@ -0,0 +1,184 @@
+import { shallowMount } from '@vue/test-utils';
+import ScaleMachineDownDialog from '@shell/dialog/ScaleMachineDownDialog.vue';
+import { CAPI as CAPI_LABELS } from '@shell/config/labels-annotations';
+
+const defaultStubs = { GenericPrompt: true };
+
+const defaultGetters = { 'type-map/labelFor': jest.fn(() => 'Node') };
+
+const defaultMocks = {
+  $store: {
+    dispatch: jest.fn(),
+    getters:  defaultGetters
+  },
+  t: jest.fn((key) => key),
+};
+
+const defaultCluster = {
+  isRke2:   true,
+  machines: [],
+  save:     jest.fn()
+};
+
+const defaultResource = {
+  cluster:       defaultCluster,
+  isWorker:      true,
+  poolName:      'pool1',
+  pool:          { scalePool: jest.fn() },
+  save:          jest.fn(),
+  setAnnotation: jest.fn(),
+  nameDisplay:   'machine-1',
+  namespace:     'default',
+  schema:        'machine'
+};
+
+describe('component: ScaleMachineDownDialog', () => {
+  const createWrapper = (propsData = {}, mocks = {}) => {
+    return shallowMount(ScaleMachineDownDialog, {
+      propsData: {
+        resources: [defaultResource],
+        ...propsData
+      },
+      global: {
+        mocks: {
+          ...defaultMocks,
+          ...mocks
+        },
+        stubs:      defaultStubs,
+        directives: { 'clean-html': true }
+      }
+    });
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render correctly', () => {
+    const wrapper = createWrapper();
+
+    expect(wrapper.exists()).toBe(true);
+  });
+
+  describe('data initialization', () => {
+    it('should identify safe machines to delete (Worker)', () => {
+      const wrapper = createWrapper();
+
+      expect(wrapper.vm.safeMachinesToDelete).toHaveLength(1);
+      expect(wrapper.vm.ignored).toHaveLength(0);
+    });
+
+    it('should ignore deletion if it is the last control plane', () => {
+      const cluster = {
+        isRke2:   true,
+        machines: [{ isControlPlane: true }]
+      };
+      const resource = {
+        ...defaultResource,
+        cluster,
+        isControlPlane: true,
+        isWorker:       false
+      };
+
+      const wrapper = createWrapper({ resources: [resource] });
+
+      expect(wrapper.vm.safeMachinesToDelete).toHaveLength(0);
+      expect(wrapper.vm.ignored).toHaveLength(1);
+    });
+
+    it('should allow deletion if multiple control planes exist', () => {
+      const cluster = {
+        isRke2:   true,
+        machines: [{ isControlPlane: true }, { isControlPlane: true }]
+      };
+      const resource = {
+        ...defaultResource,
+        cluster,
+        isControlPlane: true,
+        isWorker:       false
+      };
+
+      const wrapper = createWrapper({ resources: [resource] });
+
+      expect(wrapper.vm.safeMachinesToDelete).toHaveLength(1);
+      expect(wrapper.vm.ignored).toHaveLength(0);
+    });
+  });
+
+  describe('fetch', () => {
+    it('should fetch machine sets and update loading state', async() => {
+      const wrapper = createWrapper();
+
+      // Mock dispatch to return empty array for findAll
+      (wrapper.vm as any).$store.dispatch.mockResolvedValue([]);
+
+      await ScaleMachineDownDialog.fetch.call(wrapper.vm);
+
+      expect(wrapper.vm.$store.dispatch).toHaveBeenCalledWith('management/findAll', expect.anything());
+      expect(wrapper.vm.loading).toBe(false);
+    });
+  });
+
+  describe('remove', () => {
+    it('should perform RKE2 removal steps', async() => {
+      const wrapper = createWrapper();
+      const resource = (wrapper.vm as any).resources[0];
+
+      await (wrapper.vm as any).remove();
+
+      expect(resource.setAnnotation).toHaveBeenCalledWith(CAPI_LABELS.DELETE_MACHINE, 'true');
+      expect(resource.save).toHaveBeenCalledWith();
+      expect(resource.pool.scalePool).toHaveBeenCalledWith(-1, false);
+      expect(resource.cluster.save).toHaveBeenCalledWith();
+    });
+
+    it('should perform non-RKE2 removal steps', async() => {
+      const normanAction = jest.fn();
+      const resource = {
+        cluster:             { isRke2: false },
+        provisioningCluster: { nodes: [] },
+        norman:              { doAction: normanAction },
+        nameDisplay:         'node-1',
+        schema:              'node'
+      };
+
+      const wrapper = createWrapper({ resources: [resource] });
+
+      await (wrapper.vm as any).remove();
+
+      expect(normanAction).toHaveBeenCalledWith('scaledown');
+    });
+  });
+
+  describe('showScaling', () => {
+    it('should return true if replicas do not match readyReplicas', async() => {
+      const wrapper = createWrapper();
+
+      await wrapper.setData({
+        workerMachineSets: [{
+          data: [{
+            spec:   { replicas: 2 },
+            status: { readyReplicas: 1 }
+          }]
+        }]
+      });
+
+      expect(wrapper.vm.showScaling).toBe(true);
+    });
+
+    it('should return false if replicas match readyReplicas', async() => {
+      const wrapper = createWrapper();
+
+      await wrapper.setData({
+        workerMachineSets: [{
+          data: [{
+            spec:   { replicas: 2 },
+            status: { readyReplicas: 2 }
+          }]
+        }]
+      });
+
+      expect(wrapper.vm.showScaling).toBe(false);
+    });
+  });
+});

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

@@ -1,5 +1,6 @@
 import { mount } from '@vue/test-utils';
 import { _CREATE, _EDIT, _VIEW } from '@shell/config/query-params';
+import { AUTH_TYPE } from '@shell/config/types';
 import GitRepo from '@shell/models/fleet.cattle.io.gitrepo';
 import GitRepoComponent from '@shell/edit/fleet.cattle.io.gitrepo.vue';
 
@@ -237,3 +238,91 @@ describe.each([
 
   it.todo('test paths and subpaths');
 });
+
+describe('view: fleet.cattle.io.gitrepo, GitHub password banner - should', () => {
+  it('show GitHub password banner when GitHub.com repository and basic auth is selected', async() => {
+    const wrapper = mount(GitRepoComponent, initGitRepo({ mode: _CREATE }, { spec: { repo: 'https://github.com/rancher/fleet-examples' } }));
+
+    // Check computed properties
+    expect(wrapper.vm.isGitHubDotComRepository).toBeTruthy();
+
+    // Set basic auth selection in tempCachedValues
+    await wrapper.setData({ tempCachedValues: { clientSecretName: { selected: AUTH_TYPE._BASIC } } });
+
+    // Check computed property after setting data
+    expect(wrapper.vm.isBasicAuthSelected).toBeTruthy();
+
+    await wrapper.vm.$nextTick();
+
+    const githubBanner = wrapper.find('[data-testid="gitrepo-githubdotcom-password-warning"]');
+
+    expect(githubBanner.exists()).toBeTruthy();
+
+    // Check the banner element
+    const bannerElement = wrapper.find('.banner.warning');
+
+    expect(bannerElement.exists()).toBeTruthy();
+  });
+
+  it('show GitHub password banner in edit mode when conditions are met', async() => {
+    const wrapper = mount(GitRepoComponent, initGitRepo({ mode: _EDIT }, { spec: { repo: 'https://github.com/rancher/fleet-examples' } }));
+
+    await wrapper.setData({ tempCachedValues: { clientSecretName: { selected: AUTH_TYPE._BASIC } } });
+
+    const githubBanner = wrapper.find('[data-testid="gitrepo-githubdotcom-password-warning"]');
+
+    expect(githubBanner.exists()).toBeTruthy();
+  });
+
+  it('hide GitHub password banner when not using GitHub.com repository', async() => {
+    const wrapper = mount(GitRepoComponent, initGitRepo({ mode: _CREATE }, { spec: { repo: 'https://gitlab.com/user/repo' } }));
+
+    await wrapper.setData({ tempCachedValues: { clientSecretName: { selected: AUTH_TYPE._SSH } } });
+
+    const githubBanner = wrapper.find('[data-testid="gitrepo-githubdotcom-password-warning"]');
+
+    expect(githubBanner.exists()).toBeFalsy();
+  });
+
+  it('hide GitHub password banner when not using basic auth', async() => {
+    const wrapper = mount(GitRepoComponent, initGitRepo({ mode: _CREATE }, { spec: { repo: 'https://github.com/rancher/fleet-examples' } }));
+
+    await wrapper.setData({ tempCachedValues: { clientSecretName: { selected: AUTH_TYPE._SSH } } });
+
+    const githubBanner = wrapper.find('[data-testid="gitrepo-githubdotcom-password-warning"]');
+
+    expect(githubBanner.exists()).toBeFalsy();
+  });
+
+  it('hide GitHub password banner when no auth is selected', async() => {
+    const wrapper = mount(GitRepoComponent, initGitRepo({ mode: _CREATE }, { spec: { repo: 'https://github.com/rancher/fleet-examples' } }));
+
+    await wrapper.setData({ tempCachedValues: { clientSecretName: { selected: AUTH_TYPE._NONE } } });
+
+    const githubBanner = wrapper.find('[data-testid="gitrepo-githubdotcom-password-warning"]');
+
+    expect(githubBanner.exists()).toBeFalsy();
+  });
+
+  it.each([
+    ['https://github.com/user/repo', true],
+    ['https://GitHub.com/user/repo', true],
+    ['HTTPS://GITHUB.COM/user/repo', true],
+    ['https://api.github.com/user/repo', false], // subdomain doesn't match
+    ['https://raw.github.com/user/repo', false], // subdomain doesn't match
+    ['https://company-github.com/user/repo', false], // doesn't contain exact 'https://github.com'
+    ['https://github.company.com/user/repo', true], // contains exact 'https://github.com' at start
+    ['https://gitlab.com/user/repo', false],
+    ['https://bitbucket.org/user/repo', false],
+    ['http://github.com/user/repo', false], // not https
+    ['git@github.com:user/repo.git', false], // not https
+  ])('correctly detect GitHub.com repository for URL: %s (expected: %s)', async(repoUrl, shouldShowBanner) => {
+    const wrapper = mount(GitRepoComponent, initGitRepo({ mode: _CREATE }, { spec: { repo: repoUrl } }));
+
+    await wrapper.setData({ tempCachedValues: { clientSecretName: { selected: AUTH_TYPE._BASIC } } });
+
+    const githubBanner = wrapper.find('[data-testid="gitrepo-githubdotcom-password-warning"]');
+
+    expect(githubBanner.exists()).toBe(shouldShowBanner);
+  });
+});

package/edit/__tests__/management.cattle.io.project.test.js

@@ -1,4 +1,5 @@
 import { shallowMount } from '@vue/test-utils';
+import CruResource from '@shell/components/CruResource';
 import ManagementCattleIoProject from '@shell/edit/management.cattle.io.project.vue';
 import { _EDIT } from '@shell/config/query-params';
 
@@ -15,7 +16,13 @@ const mockStore = {
 };
 
 const defaultMountOptions = {
-  props:  { mode: _EDIT },
+  props: {
+    mode:  _EDIT,
+    value: {
+      spec:     { containerDefaultResourceLimit: {} },
+      metadata: { namespace: 'test-ns', annotations: {} },
+    }
+  },
   global: { mocks: { $store: mockStore } }
 };
 
@@ -134,4 +141,52 @@ describe('component: ManagementCattleIoProject', () => {
     expect(wrapper.vm.value.spec.namespaceDefaultResourceQuota.limit.extended.test1).toBeUndefined();
     expect(wrapper.vm.value.spec.namespaceDefaultResourceQuota.limit.extended.test2).toBe('4');
   });
+
+  it('should update isQuotasValid when validateQuotas is called', () => {
+    const wrapper = shallowMount(ManagementCattleIoProject, defaultMountOptions);
+
+    wrapper.vm.validateQuotas(false);
+    expect(wrapper.vm.isQuotasValid).toStrictEqual(false);
+
+    wrapper.vm.validateQuotas(true);
+    expect(wrapper.vm.isQuotasValid).toStrictEqual(true);
+  });
+
+  it('cruResource validation-passed should be false if isQuotasValid is false', async() => {
+    const wrapper = shallowMount(ManagementCattleIoProject, defaultMountOptions);
+
+    await wrapper.setData({ isQuotasValid: false });
+
+    const cruResource = wrapper.findComponent(CruResource);
+
+    expect(cruResource.props('validationPassed')).toStrictEqual(false);
+  });
+
+  it('should remove an extended resource quota correctly with fixed startsWith', async() => {
+    const value = {
+      spec: {
+        resourceQuota:                 { limit: { extended: { test2: '1' } } },
+        namespaceDefaultResourceQuota: { limit: { extended: { test2: '2' } } }
+      },
+      metadata:     { namespace: 'test-ns', annotations: {} },
+      save:         jest.fn(),
+      listLocation: { name: 'list' }
+    };
+
+    const wrapper = shallowMount(
+      ManagementCattleIoProject,
+      {
+        ...defaultMountOptions,
+        props: {
+          ...defaultMountOptions.props,
+          value,
+        },
+      }
+    );
+
+    wrapper.vm.removeQuota('extended.test2');
+
+    expect(wrapper.vm.value.spec.resourceQuota.limit.extended).toBeUndefined();
+    expect(wrapper.vm.value.spec.namespaceDefaultResourceQuota.limit.extended).toBeUndefined();
+  });
 });

package/edit/auditlog.cattle.io.auditpolicy/AdditionalRedactions.vue

@@ -0,0 +1,114 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+import Tab from '@shell/components/Tabbed/Tab.vue';
+import Tabbed from '@shell/components/Tabbed/index.vue';
+import ArrayList from '@shell/components/form/ArrayList.vue';
+import { AuditPolicy } from '@shell/edit/auditlog.cattle.io.auditpolicy/types';
+
+// Component Props & Emits
+const props = defineProps({
+  value: {
+    type:    Object,
+    default: () => ({})
+  },
+  mode: {
+    type:    String,
+    default: 'create'
+  },
+});
+
+const emit = defineEmits<{
+  'update:value': [value: AuditPolicy];
+}>();
+
+// Default Values & Reactive Spec
+const defaults: AuditPolicy = { additionalRedactions: [] };
+const spec = ref<AuditPolicy>({ ...defaults, ...props.value });
+
+// Methods
+function addRedaction() {
+  const valueToEmit = { ...props.value, ...spec.value };
+
+  valueToEmit.additionalRedactions?.push({
+    headers: [],
+    paths:   [],
+  });
+  emit('update:value', valueToEmit);
+}
+
+function removeRedaction(tab: number) {
+  const valueToEmit = { ...props.value, ...spec.value };
+
+  valueToEmit.additionalRedactions?.splice(tab, 1);
+  emit('update:value', valueToEmit);
+}
+
+const redactionLabel = computed(() => {
+  return (i: number) => `Rule ${ i + 1 }`;
+});
+</script>
+
+<template>
+  <div>
+    <div class="row mb-40">
+      <div class="col span-12">
+        <Tabbed
+          :side-tabs="true"
+          :show-tabs-add-remove="mode !== 'view'"
+          :use-hash="true"
+          @addTab="addRedaction"
+          @removeTab="removeRedaction"
+        >
+          <Tab
+            v-for="(redaction, idx) in spec.additionalRedactions"
+            :key="idx"
+            :name="`rule-${idx}`"
+            :label="redactionLabel(idx)"
+            :show-header="false"
+            class="container-group"
+          >
+            <fieldset>
+              <h2>{{ t("auditPolicy.additionalRedactions.headers.title") }}</h2>
+              <div class="row">
+                <div class="col span-12">
+                  <ArrayList
+                    key="headers"
+                    v-model:value="redaction.headers"
+                    :value-placeholder="t('auditPolicy.additionalRedactions.headers.placeholder')"
+                    :add-label="t('auditPolicy.additionalRedactions.headers.add')"
+                    :mode="mode"
+                    :protip="false"
+                  />
+                </div>
+              </div>
+            </fieldset>
+            <div class="spacer" />
+            <fieldset>
+              <h2>
+                {{ t("auditPolicy.additionalRedactions.paths.title") }}                  <i
+                  v-clean-tooltip="{content: t('auditPolicy.additionalRedactions.paths.tooltip'), triggers: ['hover', 'touch', 'focus'] }"
+                  v-stripped-aria-label="t('auditPolicy.additionalRedactions.paths.tooltip')"
+                  class="icon icon-info"
+                  tabindex="0"
+                  role="tooltip"
+                />
+              </h2>
+              <div class="row">
+                <div class="col span-12">
+                  <ArrayList
+                    key="paths"
+                    v-model:value="redaction.paths"
+                    :value-placeholder="t('auditPolicy.additionalRedactions.paths.placeholder')"
+                    :add-label="t('auditPolicy.additionalRedactions.paths.add')"
+                    :mode="mode"
+                    :protip="false"
+                  />
+                </div>
+              </div>
+            </fieldset>
+          </Tab>
+        </Tabbed>
+      </div>
+    </div>
+  </div>
+</template>

package/edit/auditlog.cattle.io.auditpolicy/Filters.vue

@@ -0,0 +1,119 @@
+<script setup lang="ts">
+import { ref } from 'vue';
+import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
+import LabeledSelect from '@shell/components/form/LabeledSelect.vue';
+import ArrayList from '@shell/components/form/ArrayList.vue';
+import { AuditPolicy, FilterRule } from '@shell/edit/auditlog.cattle.io.auditpolicy/types';
+
+// Component Props & Emits
+const props = defineProps({
+  value: {
+    type:    Object,
+    default: () => ({})
+  },
+  mode: {
+    type:    String,
+    default: 'create'
+  },
+});
+
+const emit = defineEmits<{
+  'update:value': [value: AuditPolicy];
+}>();
+
+// Default Values & Reactive Spec
+const defaults: AuditPolicy = { filters: [] };
+const spec = ref<AuditPolicy>({ ...defaults, ...props.value });
+const defaultAddValue: FilterRule = {
+  action:     'allow',
+  requestURI: '',
+};
+
+// Methods
+function addRow(key: 'action' | 'requestURI', filters: FilterRule[]) {
+  const valueToEmit = { ...props.value, ...spec.value };
+
+  valueToEmit.filters = filters;
+
+  emit('update:value', valueToEmit);
+}
+
+function updateRow(key: 'action' | 'requestURI', index: number, value: string) {
+  const valueToEmit = { ...props.value, ...spec.value };
+
+  if (!valueToEmit.filters) {
+    valueToEmit.filters = [];
+  }
+
+  // Ensure the filter exists at the given index
+  if (!valueToEmit.filters[index]) {
+    valueToEmit.filters[index] = { action: '', requestURI: '' };
+  }
+
+  valueToEmit.filters[index][key] = value;
+  emit('update:value', valueToEmit);
+}
+</script>
+
+<template>
+  <div>
+    <div class="row mb-40">
+      <div class="col span-12">
+        <ArrayList
+          key="headers"
+          v-model:value="spec.filters"
+          :value-placeholder="t('auditPolicy.filters.placeholder')"
+          :add-label="t('auditPolicy.filters.add')"
+          :mode="mode"
+          :protip="false"
+          :defaultAddValue="defaultAddValue"
+          :show-header="true"
+          @update:value="addRow('action', $event)"
+        >
+          <template v-slot:column-headers>
+            <div class="filters-heading mb-10">
+              <div
+                class="row"
+              >
+                <div class="col span-6">
+                  <span class="text-label">{{ t('auditPolicy.filters.action.title') }}</span>
+                </div>
+                <div class="col span-6 send-to">
+                  <span class="text-label">{{ t('auditPolicy.filters.requestURI.title') }}</span>
+                </div>
+              </div>
+            </div>
+          </template>
+          <template v-slot:columns="scope">
+            <div class="row">
+              <div class="col span-6">
+                <LabeledSelect
+                  v-model:value="scope.row.value.action"
+                  :options="[{ value: 'allow', label: t('auditPolicy.filters.action.allow')},{ value: 'deny', label: t('auditPolicy.filters.action.deny') }]"
+                  :mode="mode"
+                  :placeholder="t('auditPolicy.filters.action.placeholder')"
+                  @update:value="updateRow('action', scope.i, $event)"
+                />
+              </div>
+              <div class="col span-6">
+                <LabeledInput
+                  v-model:value="scope.row.value.requestURI"
+                  :mode="mode"
+                  :placeholder="t('auditPolicy.filters.requestURI.placeholder')"
+                  @update:value="updateRow('requestURI', scope.i, $event, )"
+                />
+              </div>
+            </div>
+          </template>
+        </ArrayList>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style lang="scss" scoped>
+  .filters-heading {
+    display: grid;
+    grid-template-columns: auto $array-list-remove-margin;
+  }
+</style>