@rancher/shell 3.0.12-rc.4 → 3.0.12-rc.6

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

@@ -1,6 +1,7 @@
 import { mount } from '@vue/test-utils';
 import { _CREATE, _EDIT, _VIEW } from '@shell/config/query-params';
 import { AUTH_TYPE } from '@shell/config/types';
+import { base64Encode } from '@shell/utils/crypto';
 import GitRepo from '@shell/models/fleet.cattle.io.gitrepo';
 import GitRepoComponent from '@shell/edit/fleet.cattle.io.gitrepo.vue';
 
@@ -327,3 +328,94 @@ describe('view: fleet.cattle.io.gitrepo, GitHub password banner - should', () =>
     expect(githubBanner.exists()).toBe(shouldShowBanner);
   });
 });
+
+describe('view: fleet.cattle.io.gitrepo, GitHub App auth - should', () => {
+  const originalDispatch = mockStore.dispatch;
+
+  afterEach(() => {
+    mockStore.dispatch = originalDispatch;
+  });
+
+  it('create an Opaque secret with the GitHub App data keys on doCreate', async() => {
+    const fakeSecret: any = {
+      metadata: { name: 'gitrepo-auth-abc' },
+      save:     jest.fn().mockResolvedValue(undefined),
+    };
+
+    mockStore.dispatch = jest.fn().mockResolvedValue(fakeSecret);
+
+    const wrapper = mount(GitRepoComponent, initGitRepo({ mode: _CREATE }));
+
+    await (wrapper.vm as any).doCreate('clientSecretName', {
+      selected:                AUTH_TYPE._GITHUB_APP,
+      githubAppId:             'app-id',
+      githubAppInstallationId: 'install-id',
+      githubAppPrivateKey:     'private-key',
+    });
+
+    expect(fakeSecret._type).toBe('Opaque');
+    expect(fakeSecret.data).toStrictEqual({
+      github_app_id:              base64Encode('app-id'),
+      github_app_installation_id: base64Encode('install-id'),
+      github_app_private_key:     base64Encode('private-key'),
+    });
+    expect(fakeSecret.save).toHaveBeenCalledWith();
+  });
+});
+
+describe('view: fleet.cattle.io.gitrepo, beforeNext dryRun validation', () => {
+  it('should call dryRunCreate when leaving stepMetadata in create mode', async() => {
+    const wrapper = mount(GitRepoComponent, initGitRepo({ mode: _CREATE }));
+    const vm = wrapper.vm as any;
+
+    vm.value.dryRunCreate = jest.fn().mockResolvedValue({});
+
+    await vm.beforeNext({ name: 'stepMetadata' });
+
+    expect(vm.value.dryRunCreate).toHaveBeenCalledWith(expect.objectContaining({
+      type:     'fleet.cattle.io.gitrepo',
+      metadata: expect.objectContaining({
+        name:      'test',
+        namespace: 'test',
+      }),
+      spec: expect.objectContaining({ repo: 'https://example.com/placeholder' }),
+    }));
+  });
+
+  it('should not call dryRunCreate for non-metadata steps', async() => {
+    const wrapper = mount(GitRepoComponent, initGitRepo({ mode: _CREATE }));
+    const vm = wrapper.vm as any;
+
+    vm.value.dryRunCreate = jest.fn();
+
+    await vm.beforeNext({ name: 'stepRepo' });
+
+    expect(vm.value.dryRunCreate).not.toHaveBeenCalled();
+  });
+
+  it('should not call dryRunCreate in edit mode', async() => {
+    const wrapper = mount(GitRepoComponent, initGitRepo({ mode: _EDIT }));
+    const vm = wrapper.vm as any;
+
+    vm.value.dryRunCreate = jest.fn();
+
+    await vm.beforeNext({ name: 'stepMetadata' });
+
+    expect(vm.value.dryRunCreate).not.toHaveBeenCalled();
+  });
+
+  it('should reject with API errors when dryRunCreate fails', async() => {
+    const apiError = {
+      _status:    409,
+      message:    'gitrepos.fleet.cattle.io "test" already exists',
+      statusText: 'Conflict',
+    };
+
+    const wrapper = mount(GitRepoComponent, initGitRepo({ mode: _CREATE }));
+    const vm = wrapper.vm as any;
+
+    vm.value.dryRunCreate = jest.fn().mockRejectedValue(apiError);
+
+    await expect(vm.beforeNext({ name: 'stepMetadata' })).rejects.toStrictEqual(apiError);
+  });
+});

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

@@ -421,6 +421,12 @@ describe.each([
     expect(wrapper.vm.value.spec.downstreamResources).toStrictEqual([{ name: 'configMap2', kind: 'ConfigMap' }, { name: 'configMap3', kind: 'ConfigMap' }]);
   });
 
+  it('should have a beforeNext method', () => {
+    const wrapper = mount(HelmOpComponent, initHelmOp({ mode }));
+
+    expect(typeof wrapper.vm.beforeNext).toBe('function');
+  });
+
   if (mode === _CREATE) {
     it('should set created-by-user-id label when updateBeforeSave is called in CREATE mode', () => {
       const mockCurrentUser = { id: 'user-123' };
@@ -475,3 +481,98 @@ describe.each([
     });
   }
 });
+
+describe('view: fleet.cattle.io.helmop, beforeNext dryRun validation', () => {
+  const initHelmOpWithMetadata = (props: any) => {
+    const value = new HelmOp({
+      ...mockHelmOp,
+      metadata: {
+        name:      'test-helmop',
+        namespace: 'fleet-default',
+      },
+    }, {
+      getters:     { schemaFor: () => ({ linkFor: jest.fn() }) },
+      dispatch:    jest.fn(),
+      rootGetters: { 'i18n/t': jest.fn() },
+    });
+
+    value.applyDefaults = () => {};
+
+    return {
+      props: {
+        value,
+        ...props
+      },
+      provide: {
+        store: createStore({
+          getters: {
+            currentStore:                   () => 'current_store',
+            'management/paginationEnabled': () => () => false
+          }
+        })
+      },
+      computed: mockComputed,
+      global:   { mocks },
+    };
+  };
+
+  it('should call dryRunCreate when leaving basics step in create mode', async() => {
+    const wrapper = mount(HelmOpComponent, initHelmOpWithMetadata({ mode: _CREATE }));
+    const vm = wrapper.vm as any;
+
+    vm.value.dryRunCreate = jest.fn().mockResolvedValue({});
+
+    await vm.beforeNext({ name: 'basics' });
+
+    expect(vm.value.dryRunCreate).toHaveBeenCalledWith(expect.objectContaining({
+      type:     'fleet.cattle.io.helmop',
+      metadata: expect.objectContaining({
+        name:      'test-helmop',
+        namespace: 'fleet-default',
+      }),
+      spec: expect.objectContaining({
+        helm: expect.objectContaining({
+          chart: 'placeholder',
+          repo:  'https://example.com',
+        }),
+      }),
+    }));
+  });
+
+  it('should not call dryRunCreate for non-basics steps', async() => {
+    const wrapper = mount(HelmOpComponent, initHelmOpWithMetadata({ mode: _CREATE }));
+    const vm = wrapper.vm as any;
+
+    vm.value.dryRunCreate = jest.fn();
+
+    await vm.beforeNext({ name: 'chart' });
+
+    expect(vm.value.dryRunCreate).not.toHaveBeenCalled();
+  });
+
+  it('should not call dryRunCreate in edit mode', async() => {
+    const wrapper = mount(HelmOpComponent, initHelmOpWithMetadata({ mode: _EDIT }));
+    const vm = wrapper.vm as any;
+
+    vm.value.dryRunCreate = jest.fn();
+
+    await vm.beforeNext({ name: 'basics' });
+
+    expect(vm.value.dryRunCreate).not.toHaveBeenCalled();
+  });
+
+  it('should reject with API errors when dryRunCreate fails', async() => {
+    const apiError = {
+      _status:    409,
+      message:    'helmops.fleet.cattle.io "test-helmop" already exists',
+      statusText: 'Conflict',
+    };
+
+    const wrapper = mount(HelmOpComponent, initHelmOpWithMetadata({ mode: _CREATE }));
+    const vm = wrapper.vm as any;
+
+    vm.value.dryRunCreate = jest.fn().mockRejectedValue(apiError);
+
+    await expect(vm.beforeNext({ name: 'basics' })).rejects.toStrictEqual(apiError);
+  });
+});

package/edit/__tests__/management.cattle.io.setting.test.ts

@@ -1,5 +1,5 @@
 import { mount } from '@vue/test-utils';
-import Settings from '@shell/edit/management.cattle.io.setting.vue';
+import Settings from '@shell/edit/management.cattle.io.setting/index.vue';
 import { SETTING } from '@shell/config/settings';
 
 const requiredSetup = () => ({
@@ -18,6 +18,7 @@ const requiredSetup = () => ({
       },
       $route:  { query: { AS: '' } },
       $router: { applyQuery: jest.fn() },
+      t:       (key: string) => key,
     }
   }
 });

package/edit/auth/AuthProviderWarningBanners.vue

@@ -1,12 +1,17 @@
 <script lang="ts">
 import { defineComponent } from 'vue';
 import { Banner } from '@components/Banner';
+import { HIDE_LOCAL_AUTH_PROVIDER } from '@shell/store/features';
 
 export default defineComponent({
   name: 'AuthProviderWarningBanners',
 
   components: { Banner },
 
+  data() {
+    return { disableLocalAuth: this.$store.getters['features/get'](HIDE_LOCAL_AUTH_PROVIDER) };
+  },
+
   props: {
     tArgs: {
       type:     Object,
@@ -24,6 +29,13 @@ export default defineComponent({
       color="warning"
       data-testid="auth-provider-disabled-warning-banner"
     />
+    <Banner
+      v-if="disableLocalAuth"
+      color="warning"
+      data-testid="auth-provider-disable-local-auth-banner"
+    >
+      <span v-clean-html="t('authConfig.bannerEnableAuthProvider', {}, true)" />
+    </Banner>
     <Banner
       color="warning"
       data-testid="auth-provider-admin-permissions-warning-banner"

package/edit/auth/__tests__/AuthProviderWarningBanners.test.ts

@@ -4,7 +4,16 @@ import { mount } from '@vue/test-utils';
 describe('component: AuthProviderWarningBanners.vue', () => {
   const wrapper = mount(AuthProviderWarningBanners, {
     props:  { tArgs: { provider: 'Any Provider', username: 'username' } },
-    global: { mocks: { $store: { getters: { 'i18n/t': (text: string) => text } } } }
+    global: {
+      mocks: {
+        $store: {
+          getters: {
+            'i18n/t':       (text: string) => text,
+            'features/get': () => false,
+          }
+        }
+      }
+    }
   });
 
   it('should render properly', () => {

package/edit/auth/__tests__/azuread.test.ts

@@ -52,6 +52,7 @@ const requiredSetup = (modelOverrides = {}) => ({
           'current_store/all':       jest.fn(),
           'i18n/t':                  (val: string) => val,
           'i18n/exists':             jest.fn(),
+          'features/get':            () => false,
         },
         dispatch: jest.fn()
       },

package/edit/auth/__tests__/github.test.ts

@@ -56,6 +56,7 @@ const requiredSetup = (modelOverrides = {}, dataOverrides = {}) => ({
           'current_store/all':       jest.fn(),
           'i18n/t':                  (val: string) => val,
           'i18n/exists':             jest.fn(),
+          'features/get':            () => false,
         },
         dispatch: jest.fn(),
       },

package/edit/auth/__tests__/oidc.test.ts

@@ -69,6 +69,7 @@ describe('oidc.vue', () => {
               'current_store/all':       jest.fn(),
               'i18n/t':                  (val: string) => val,
               'i18n/exists':             jest.fn(),
+              'features/get':            () => false,
             },
             dispatch: jest.fn()
           },

package/edit/auth/__tests__/saml.test.ts

@@ -63,6 +63,7 @@ const mountOptions = (model: object) => ({
           'current_store/all':       jest.fn(),
           'i18n/t':                  (val: string) => val,
           'i18n/exists':             jest.fn(),
+          'features/get':            () => false,
         },
         dispatch: jest.fn(),
       },

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

@@ -59,6 +59,7 @@ const buildSetup = (type = 'openldap', modelOverride = {}, localDataOverride = {
           'current_store/all':       jest.fn(),
           'i18n/t':                  (val: string) => val,
           'i18n/exists':             jest.fn(),
+          'features/get':            () => false,
         },
         dispatch: jest.fn()
       },

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

@@ -103,48 +103,46 @@ export default {
 </script>
 
 <template>
-  <div>
-    <CruResource
-      :validation-passed="!!name && !!value.spec.benchmarkVersion"
-      :done-route="doneRoute"
-      :resource="value"
-      :mode="mode"
-      :errors="errors"
-      @finish="save"
-      @error="e=>errors = e"
-    >
-      <div class="spacer" />
-      <div class="row">
-        <div class="col span-12">
-          <NameNsDescription
-            :mode="mode"
-            :value="value"
-            :namespaced="false"
-            @change="name=value.metadata.name"
-          />
-        </div>
+  <CruResource
+    :validation-passed="!!name && !!value.spec.benchmarkVersion"
+    :done-route="doneRoute"
+    :resource="value"
+    :mode="mode"
+    :errors="errors"
+    @finish="save"
+    @error="e=>errors = e"
+  >
+    <div class="spacer" />
+    <div class="row">
+      <div class="col span-12">
+        <NameNsDescription
+          :mode="mode"
+          :value="value"
+          :namespaced="false"
+          @change="name=value.metadata.name"
+        />
       </div>
-      <div class="row">
-        <div class="col span-6">
-          <LabeledSelect
-            v-model:value="value.spec.benchmarkVersion"
-            :mode="mode"
-            :label="t('compliance.benchmarkVersion')"
-            :options="compatibleBenchmarkNames"
-          />
-        </div>
+    </div>
+    <div class="row">
+      <div class="col span-6">
+        <LabeledSelect
+          v-model:value="value.spec.benchmarkVersion"
+          :mode="mode"
+          :label="t('compliance.benchmarkVersion')"
+          :options="compatibleBenchmarkNames"
+        />
       </div>
-      <div class="spacer" />
-      <div class="row">
-        <div class="col span-6">
-          <ArrayList
-            v-model:value="value.spec.skipTests"
-            :title="t('compliance.testsToSkip')"
-            :value-placeholder="t('compliance.testID')"
-            :mode="mode"
-          />
-        </div>
+    </div>
+    <div class="spacer" />
+    <div class="row">
+      <div class="col span-6">
+        <ArrayList
+          v-model:value="value.spec.skipTests"
+          :title="t('compliance.testsToSkip')"
+          :value-placeholder="t('compliance.testID')"
+          :mode="mode"
+        />
       </div>
-    </CruResource>
-  </div>
+    </div>
+  </CruResource>
 </template>

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

@@ -8,7 +8,7 @@ import Loading from '@shell/components/Loading';
 import { base64Decode, base64Encode } from '@shell/utils/crypto';
 import { _CREATE, _EDIT, _VIEW } from '@shell/config/query-params';
 import { CATALOG, FLEET as FLEET_LABELS } from '@shell/config/labels-annotations';
-import { SECRET_TYPES } from '@shell/config/secret';
+import { SECRET_TYPES, GITHUB_APP_SECRET_KEYS } from '@shell/config/secret';
 import FormValidation from '@shell/mixins/form-validation';
 import { toSeconds } from '@shell/utils/duration';
 import Tab from '@shell/components/Tabbed/Tab.vue';
@@ -97,10 +97,19 @@ export default {
       refValue,
       displayHelmRepoUrlRegex: false,
       targetsCreated:          '',
-      fvFormRuleSets:          [{
-        path:  'spec.repo',
-        rules: ['urlRepository'],
-      }],
+      fvFormRuleSets:          [
+        {
+          step:           'stepMetadata',
+          path:           'metadata.name',
+          rules:          ['subDomain'],
+          translationKey: 'nameNsDescription.name.label'
+        },
+        {
+          step:  'stepRepo',
+          path:  'spec.repo',
+          rules: ['urlRepository'],
+        },
+      ],
       touched: null,
     };
   },
@@ -129,7 +138,7 @@ export default {
           label:          this.t('fleet.gitRepo.add.steps.metadata.label'),
           subtext:        this.t('fleet.gitRepo.add.steps.metadata.subtext'),
           descriptionKey: 'fleet.gitRepo.add.steps.metadata.description',
-          ready:          this.isView || !!this.value.metadata.name,
+          ready:          this.isView || (!!this.value.metadata.name && this.stepPathErrors('stepMetadata').length === 0),
           weight:         1
         },
         {
@@ -206,6 +215,15 @@ export default {
   },
 
   methods: {
+    stepPathErrors(stepName) {
+      // Helper is used to check which validations is for each step
+      const paths = this.fvFormRuleSets
+        .filter((rule) => rule.step === stepName)
+        .map((rule) => rule.path);
+
+      return this.fvGetPathErrors(paths);
+    },
+
     updatePaths(value) {
       const { paths, bundles } = value;
 
@@ -283,10 +301,13 @@ export default {
         selected,
         publicKey,
         privateKey,
-        sshKnownHosts
+        sshKnownHosts,
+        githubAppId,
+        githubAppInstallationId,
+        githubAppPrivateKey,
       } = credentials;
 
-      if ( ![AUTH_TYPE._SSH, AUTH_TYPE._BASIC, AUTH_TYPE._S3].includes(selected) ) {
+      if ( ![AUTH_TYPE._SSH, AUTH_TYPE._BASIC, AUTH_TYPE._S3, AUTH_TYPE._GITHUB_APP].includes(selected) ) {
         return;
       }
 
@@ -323,19 +344,31 @@ export default {
           publicField = 'username';
           privateField = 'password';
           break;
+        case AUTH_TYPE._GITHUB_APP:
+          type = SECRET_TYPES.OPAQUE;
+          break;
         default:
           throw new Error('Unknown type');
         }
 
         secret._type = type;
-        secret.data = {
-          [publicField]:  base64Encode(publicKey),
-          [privateField]: base64Encode(privateKey),
-        };
-
-        // Add ssh known hosts
-        if (selected === AUTH_TYPE._SSH && sshKnownHosts) {
-          secret.data.known_hosts = base64Encode(sshKnownHosts);
+
+        if (selected === AUTH_TYPE._GITHUB_APP) {
+          secret.data = {
+            [GITHUB_APP_SECRET_KEYS.APP_ID]:          base64Encode(githubAppId),
+            [GITHUB_APP_SECRET_KEYS.INSTALLATION_ID]: base64Encode(githubAppInstallationId),
+            [GITHUB_APP_SECRET_KEYS.PRIVATE_KEY]:     base64Encode(githubAppPrivateKey),
+          };
+        } else {
+          secret.data = {
+            [publicField]:  base64Encode(publicKey),
+            [privateField]: base64Encode(privateKey),
+          };
+
+          // Add ssh known hosts
+          if (selected === AUTH_TYPE._SSH && sshKnownHosts) {
+            secret.data.known_hosts = base64Encode(sshKnownHosts);
+          }
         }
       }
 
@@ -413,6 +446,25 @@ export default {
       }
     },
 
+    async beforeNext(activeStep) {
+      if (activeStep.name !== 'stepMetadata' || !this.isCreate) {
+        return;
+      }
+
+      await this.value.dryRunCreate({
+        type:     this.value.type,
+        metadata: {
+          name:      this.value.metadata.name,
+          namespace: this.value.metadata.namespace,
+        },
+        spec: {
+          repo:   'https://example.com/placeholder',
+          branch: 'master',
+          paths:  [],
+        }
+      });
+    },
+
     durationSeconds(value) {
       return `${ value }s`;
     }
@@ -432,6 +484,7 @@ export default {
     :errors="errors"
     :steps="!isView ? steps : undefined"
     :finish-mode="'finish'"
+    :before-next="beforeNext"
     class="wizard"
     @cancel="done"
     @error="e=>errors = e"
@@ -442,6 +495,7 @@ export default {
         :value="value"
         :mode="mode"
         :is-view="isView"
+        :name-rules="fvGetAndReportPathRules('metadata.name')"
         @input="$emit('input', $event)"
       />
     </template>