@rancher/shell 2.0.0 → 2.0.2-rc.1

package/edit/provisioning.cattle.io.cluster/tabs/DirectoryConfig.vue

@@ -1,16 +1,12 @@
 
 <script>
-import { Checkbox } from '@components/Form/Checkbox';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import { _CREATE } from '@shell/config/query-params';
 
 export default {
   name:       'DirectoryConfig',
-  components: {
-    Checkbox,
-    LabeledInput,
-  },
-  props: {
+  components: { LabeledInput },
+  props:      {
     mode: {
       type:     String,
       required: true,
@@ -21,50 +17,11 @@ export default {
       required: true,
     },
   },
-  data() {
-    let atLeastOneDirWithAnIdentifier = false;
-    let allDirsWithSameIdentifier = false;
-
-    if (this.value.systemAgent.length || this.value.provisioning.length || this.value.k8sDistro.length) {
-      atLeastOneDirWithAnIdentifier = true;
-      if (this.value.systemAgent === this.value.provisioning && this.value.provisioning === this.value.k8sDistro &&
-      this.value.systemAgent === this.value.k8sDistro) {
-        allDirsWithSameIdentifier = true;
-      }
-    }
-
-    return {
-      isSettingCommonConfig: !(atLeastOneDirWithAnIdentifier && !allDirsWithSameIdentifier),
-      commonConfig:          allDirsWithSameIdentifier ? this.value.systemAgent : '',
-    };
-  },
-  watch: {
-    commonConfig(neu) {
-      if (neu && neu.length && this.isSettingCommonConfig) {
-        this.value.systemAgent = neu;
-        this.value.provisioning = neu;
-        this.value.k8sDistro = neu;
-      }
-    }
-  },
   computed: {
     disableEditInput() {
       return this.mode !== _CREATE;
     }
-  },
-  methods: {
-    handleCommonConfig(val) {
-      this.isSettingCommonConfig = val;
-
-      if (val) {
-        this.value.systemAgent = '';
-        this.value.provisioning = '';
-        this.value.k8sDistro = '';
-      } else {
-        this.commonConfig = '';
-      }
-    }
-  },
+  }
 };
 </script>
 
@@ -74,54 +31,33 @@ export default {
       <h3 class="mb-20">
         {{ t('cluster.directoryConfig.title') }}
       </h3>
-      <Checkbox
-        class="mb-10"
-        :value="isSettingCommonConfig"
+      <LabeledInput
+        v-model="value.systemAgent"
+        class="mb-20"
+        :mode="mode"
+        :label="t('cluster.directoryConfig.systemAgent.label')"
+        :tooltip="t('cluster.directoryConfig.systemAgent.tooltip')"
+        :disabled="disableEditInput"
+        data-testid="rke2-directory-config-systemAgent-data-dir"
+      />
+      <LabeledInput
+        v-model="value.provisioning"
+        class="mb-20"
         :mode="mode"
-        :label="t('cluster.directoryConfig.checkboxText')"
+        :label="t('cluster.directoryConfig.provisioning.label')"
+        :tooltip="t('cluster.directoryConfig.provisioning.tooltip')"
         :disabled="disableEditInput"
-        data-testid="rke2-directory-config-individual-config-checkbox"
-        @input="handleCommonConfig"
+        data-testid="rke2-directory-config-provisioning-data-dir"
       />
       <LabeledInput
-        v-if="isSettingCommonConfig"
-        v-model="commonConfig"
+        v-model="value.k8sDistro"
         class="mb-20"
         :mode="mode"
-        :label="t('cluster.directoryConfig.common.label')"
-        :tooltip="t('cluster.directoryConfig.common.tooltip')"
+        :label="t('cluster.directoryConfig.k8sDistro.label')"
+        :tooltip="t('cluster.directoryConfig.k8sDistro.tooltip')"
         :disabled="disableEditInput"
-        data-testid="rke2-directory-config-common-data-dir"
+        data-testid="rke2-directory-config-k8sDistro-data-dir"
       />
-      <div v-if="!isSettingCommonConfig">
-        <LabeledInput
-          v-model="value.systemAgent"
-          class="mb-20"
-          :mode="mode"
-          :label="t('cluster.directoryConfig.systemAgent.label')"
-          :tooltip="t('cluster.directoryConfig.systemAgent.tooltip')"
-          :disabled="disableEditInput"
-          data-testid="rke2-directory-config-systemAgent-data-dir"
-        />
-        <LabeledInput
-          v-model="value.provisioning"
-          class="mb-20"
-          :mode="mode"
-          :label="t('cluster.directoryConfig.provisioning.label')"
-          :tooltip="t('cluster.directoryConfig.provisioning.tooltip')"
-          :disabled="disableEditInput"
-          data-testid="rke2-directory-config-provisioning-data-dir"
-        />
-        <LabeledInput
-          v-model="value.k8sDistro"
-          class="mb-20"
-          :mode="mode"
-          :label="t('cluster.directoryConfig.k8sDistro.label')"
-          :tooltip="t('cluster.directoryConfig.k8sDistro.tooltip')"
-          :disabled="disableEditInput"
-          data-testid="rke2-directory-config-k8sDistro-data-dir"
-        />
-      </div>
       <div class="mb-40" />
     </div>
   </div>

package/edit/provisioning.cattle.io.cluster/tabs/registries/RegistryConfigs.vue

@@ -7,6 +7,7 @@ import SelectOrCreateAuthSecret from '@shell/components/form/SelectOrCreateAuthS
 import CreateEditView from '@shell/mixins/create-edit-view';
 import SecretSelector from '@shell/components/form/SecretSelector';
 import { SECRET_TYPES as TYPES } from '@shell/config/secret';
+import { base64Decode, base64Encode } from '@shell/utils/crypto';
 
 export default {
   components: {
@@ -55,7 +56,7 @@ export default {
       if (configMap[hostname]) {
         configMap[hostname].insecureSkipVerify = configMap[hostname].insecureSkipVerify ?? defaultAddValue.insecureSkipVerify;
         configMap[hostname].authConfigSecretName = configMap[hostname].authConfigSecretName ?? defaultAddValue.authConfigSecretName;
-        configMap[hostname].caBundle = configMap[hostname].caBundle ?? defaultAddValue.caBundle;
+        configMap[hostname].caBundle = base64Decode(configMap[hostname].caBundle ?? defaultAddValue.caBundle);
         configMap[hostname].tlsSecretName = configMap[hostname].tlsSecretName ?? defaultAddValue.tlsSecretName;
       }
       entries.push({
@@ -94,7 +95,11 @@ export default {
           continue;
         }
 
-        configs[h] = { ...entry };
+        configs[h] = {
+          ...entry,
+          caBundle: base64Encode(entry.caBundle)
+        };
+
         delete configs[h].hostname;
       }
 
@@ -177,6 +182,7 @@ export default {
 
             <LabeledInput
               v-model="row.value.caBundle"
+              :data-testid="`registry-caBundle-${i}`"
               class="mt-20"
               type="multiline"
               label="CA Cert Bundle"

package/edit/provisioning.cattle.io.cluster/tabs/registries/__tests__/RegistryConfigs.test.ts

@@ -0,0 +1,61 @@
+import { mount, Wrapper } from '@vue/test-utils';
+import { clone } from '@shell/utils/object';
+import { _EDIT } from '@shell/config/query-params';
+import { PROV_CLUSTER } from '@shell/edit/provisioning.cattle.io.cluster/__tests__/utils/cluster';
+import RegistryConfigs from '@shell/edit/provisioning.cattle.io.cluster/tabs/registries/RegistryConfigs.vue';
+
+describe('component: RegistryConfigs', () => {
+  let wrapper: Wrapper<InstanceType<typeof RegistryConfigs> & { [key: string]: any }>;
+
+  const mountOptions = {
+    propsData: {
+      value:                     {},
+      mode:                      _EDIT,
+      clusterRegisterBeforeHook: () => {}
+    },
+    stubs: {
+      SelectOrCreateAuthSecret: true,
+      SecretSelector:           true,
+    },
+    mocks: { $store: { getters: { 'i18n/t': jest.fn() } } }
+  };
+
+  describe('key CA Cert Bundle', () => {
+    it('should display default key', () => {
+      const value = clone(PROV_CLUSTER);
+
+      value.spec.rkeConfig.registries.configs = { foo: { caBundle: 'Zm9vYmFy' } };
+
+      mountOptions.propsData.value = value;
+
+      wrapper = mount(
+        RegistryConfigs,
+        mountOptions
+      );
+
+      const registry = wrapper.find('[data-testid^="registry-caBundle"]').element as HTMLTextAreaElement;
+
+      expect(registry.value).toBe('foobar');
+    });
+
+    it('should update key in base64 format', async() => {
+      const value = clone(PROV_CLUSTER);
+
+      value.spec.rkeConfig.registries.configs = { foo: { caBundle: 'Zm9vYmFy' } };
+
+      mountOptions.propsData.value = value;
+
+      wrapper = mount(
+        RegistryConfigs,
+        mountOptions
+      );
+
+      const registry = wrapper.find('[data-testid^="registry-caBundle"]');
+
+      await registry.setValue('ssh key');
+      wrapper.vm.update();
+
+      expect(wrapper.emitted('updateConfigs')![0][0]['foo']['caBundle']).toBe('c3NoIGtleQ==');
+    });
+  });
+});

package/edit/token.vue

@@ -13,6 +13,7 @@ import Select from '@shell/components/form/Select';
 import CreateEditView from '@shell/mixins/create-edit-view';
 import { diffFrom } from '@shell/utils/time';
 import { filterHiddenLocalCluster, filterOnlyKubernetesClusters } from '@shell/utils/cluster';
+import { SETTING } from '@shell/config/settings';
 
 export default {
   components: {
@@ -29,7 +30,7 @@ export default {
 
   data() {
     // Get the setting that defines the max token TTL allowed (in minutes)
-    const maxTTLSetting = this.$store.getters['management/byId'](MANAGEMENT.SETTING, 'auth-token-max-ttl-minutes');
+    const maxTTLSetting = this.$store.getters['management/byId'](MANAGEMENT.SETTING, SETTING.AUTH_TOKEN_MAX_TTL_MINUTES);
     let maxTTL = 0;
 
     try {

package/initialize/entry-helpers.js

@@ -190,34 +190,14 @@ async function render(to, from, next) {
     next:  _next.bind(this)
   });
 
+  if (this.$loading.start && !this.$loading.manual) {
+    this.$loading.start();
+  }
+
   // Get route's matched components
   const matches = [];
   const Components = getMatchedComponents(to, matches);
 
-  // If no Components matched, generate 404
-  if (!Components.length) {
-    // Call the authenticated middleware. This used to attempt to load the error layout but because it was missing it would:
-    // 1. load the default layout instead
-    // 2. then call the authenticated middleware
-    // 3. Authenticated middleware would then load plugins and check to see if there was a valid route and navigate to that if it existed
-    // 4. This would allow harvester cluster pages to load on page reload
-    // We should really make authenticated middleware do less...
-    await callMiddleware.call(this, [{ options: { middleware: ['authenticated'] } }], app.context);
-
-    // We used to have i18n middleware which was called each time we called middleware. This is also needed to support harvester because of the way harvester loads as outlined in the comment above
-    await this.$store.dispatch('i18n/init');
-
-    if (nextCalled) {
-      return;
-    }
-
-    // Show error page
-    // this.error({ statusCode: 404, message: 'This page could not be found' });
-    errorRedirect(this, new Error('404: This page could not be found'));
-
-    return next();
-  }
-
   try {
     // Call middleware
     await callMiddleware.call(this, Components, app.context);

package/list/management.cattle.io.feature.vue

@@ -163,14 +163,16 @@ export default {
           const response = await this.$axios.get(url, { timeout: 5000 });
 
           if (response?.status === 200) {
-            this.rows = await this.$store.dispatch('management/findAll', { type: this.resource, opt: { force: true } });
+            await this.$store.dispatch('management/findAll', { type: this.resource, opt: { force: true } });
             btnCB(true);
             this.close();
             this.waiting = false;
           }
         } catch (e) {}
 
-        this.waitForBackend(btnCB, id);
+        if (this.waiting) {
+          this.waitForBackend(btnCB, id);
+        }
       }, 5000);
     },
 

package/middleware/authenticated.js

@@ -2,7 +2,6 @@ import { DEFAULT_WORKSPACE } from '@shell/config/types';
 import { applyProducts } from '@shell/store/type-map';
 import { ClusterNotFoundError, RedirectToError } from '@shell/utils/error';
 import { get } from '@shell/utils/object';
-import dynamicPluginLoader from '@shell/pkg/dynamic-plugin-loader';
 import { AFTER_LOGIN_ROUTE, WORKSPACE } from '@shell/store/prefs';
 import { BACK_TO } from '@shell/config/local-storage';
 import { NAME as FLEET_NAME } from '@shell/config/product/fleet.js';
@@ -107,24 +106,6 @@ export default async function({
       });
     }
 
-    if (!route.matched?.length) {
-      // If there are no matching routes we could be trying to nav to a page belonging to a dynamic plugin which needs loading
-      await Promise.all([
-        ...always,
-      ]);
-
-      // If a plugin claims the route and is loaded correctly we'll get a route back
-      const newLocation = await dynamicPluginLoader.check({ route, store });
-
-      // If we have a new location, double check that it's actually valid
-      const resolvedRoute = newLocation ? store.app.router.resolve(newLocation) : null;
-
-      if (resolvedRoute?.route.matched.length) {
-        // Note - don't use `redirect` or `store.app.route` (breaks feature by failing to run middleware in default layout)
-        return next(newLocation);
-      }
-    }
-
     // Ensure that the activeNamespaceCache is updated given the change of context either from or to a place where it uses workspaces
     // When fleet moves to it's own package this should be moved to pkg onEnter/onLeave
     if ((oldProduct === FLEET_NAME || product === FLEET_NAME) && oldProduct !== product) {

package/mixins/__tests__/chart.test.ts

@@ -24,8 +24,9 @@ describe('chartMixin', () => {
   localVue.mixin(ChartMixin);
 
   it.each(testCases.opa)(
-    'should add OPA deprecation warning properly', (chartId, expected) => {
+    'should add OPA deprecation warning properly', async(chartId, expected) => {
       const store = new Vuex.Store({
+        actions: { 'catalog/load': () => {} },
         getters: {
           currentCluster: () => {},
           isRancher:      () => true,
@@ -44,6 +45,8 @@ describe('chartMixin', () => {
 
       instance.$route = { query: { chart: 'chart_name' } };
 
+      await instance.fetchChart();
+
       const warnings = instance.warnings;
 
       expect(warnings).toHaveLength(expected);

package/mixins/auth-config.js

@@ -273,7 +273,7 @@ export default {
 
         // KeyCloakOIDCConfig --> OIDCConfig
         set(this.model, 'rancherUrl', `${ serverUrl }/verify-auth`);
-        set(this.model, 'scope', BASE_SCOPES.oidc[0]);
+        set(this.model, 'scope', this.model.id === 'keycloakoidc' ? BASE_SCOPES.keycloakoidc[0] : BASE_SCOPES.genericoidc[0]);
         break;
       }
 

package/mixins/chart.js

@@ -27,6 +27,8 @@ export default {
       existing:         null,
 
       ignoreWarning: false,
+
+      chart: null,
     };
   },
 
@@ -35,20 +37,6 @@ export default {
 
     showPreRelease: mapPref(SHOW_PRE_RELEASE),
 
-    chart() {
-      if ( this.repo && this.query.chartName ) {
-        return this.$store.getters['catalog/chart']({
-          repoType:       this.query.repoType,
-          repoName:       this.query.repoName,
-          chartName:      this.query.chartName,
-          includeHidden:  true,
-          showDeprecated: this.showDeprecated
-        });
-      }
-
-      return null;
-    },
-
     repo() {
       return this.$store.getters['catalog/repo']({
         repoType: this.query.repoType,
@@ -258,11 +246,39 @@ export default {
   },
 
   methods: {
+    /**
+     * Populate `this.chart`
+     *
+     * `chart` used to be a computed property pointing at getter catalog/chart
+     *
+     * this however stopped recalculating given changes to the store
+     *
+     * (the store would populate a charts collection, which the getter uses to find the chart,
+     * however this did not kick off the computed property, so this.charts was not populated)
+     *
+     * Now we find and cache the chart
+     */
+    fetchStoreChart() {
+      if (!this.chart && this.repo && this.query.chartName) {
+        this.chart = this.$store.getters['catalog/chart']({
+          repoType:       this.query.repoType,
+          repoName:       this.query.repoName,
+          chartName:      this.query.chartName,
+          includeHidden:  true,
+          showDeprecated: this.showDeprecated
+        });
+      }
+
+      return this.chart;
+    },
+
     async fetchChart() {
       this.versionInfoError = null;
 
       await this.$store.dispatch('catalog/load'); // not the problem
 
+      this.fetchStoreChart();
+
       if ( this.query.appNamespace && this.query.appName ) {
         // First check the URL query for an app name and namespace.
         // Use those values to check for a catalog app resource.

package/models/__tests__/apps.deployment.test.ts

@@ -0,0 +1,93 @@
+import Deployment from '@shell/models/apps.deployment';
+import { WORKLOAD_TYPES } from '@shell/config/types';
+
+describe('class Deployment', () => {
+  describe('replicaSetId', () => {
+    it.each([{
+      relationships: [],
+      expected:      undefined,
+    }, {
+      relationships: [{
+        rel:    'owner',
+        toType: WORKLOAD_TYPES.REPLICA_SET,
+        toId:   'rel-id'
+      }],
+      expected: 'rel-id',
+    }, {
+      relationships: [{
+        rel:     'owner',
+        toType:  WORKLOAD_TYPES.REPLICA_SET,
+        toId:    'rel-id-1',
+        message: 'ReplicaSet is available. Replicas: 1'
+      }],
+      expected: 'rel-id-1',
+    }, {
+      relationships: [{
+        rel:     'owner',
+        toType:  WORKLOAD_TYPES.REPLICA_SET,
+        toId:    'rel-id-1',
+        message: 'ReplicaSet is available. Replicas: 0'
+      }, {
+        rel:     'owner',
+        toType:  WORKLOAD_TYPES.REPLICA_SET,
+        toId:    'rel-id-2',
+        message: 'ReplicaSet is available. Replicas: 1'
+      }],
+      expected: 'rel-id-2',
+    }, {
+      relationships: [{
+        rel:     'owner',
+        toType:  WORKLOAD_TYPES.REPLICA_SET,
+        toId:    'rel-id-1',
+        message: 'Message without replicas count'
+      }, {
+        rel:     'owner',
+        toType:  WORKLOAD_TYPES.REPLICA_SET,
+        toId:    'rel-id-2',
+        message: 'Another message without replicas count'
+      }],
+      expected: 'rel-id-1',
+    }, {
+      relationships: [{
+        rel:     'owner',
+        toType:  WORKLOAD_TYPES.REPLICA_SET,
+        toId:    'rel-id-1',
+        message: 'ReplicaSet is available. Replicas: 0'
+      }, {
+        rel:     'owner',
+        toType:  WORKLOAD_TYPES.REPLICA_SET,
+        toId:    'rel-id-2',
+        message: 'ReplicaSet is available. Replicas: 0'
+      }],
+      expected: 'rel-id-1',
+    }, {
+      relationships: [{
+        rel:     'owner',
+        toType:  WORKLOAD_TYPES.REPLICA_SET,
+        toId:    'rel-id-1',
+        message: 'Message without replicas count'
+      }, {
+        rel:     'owner',
+        toType:  WORKLOAD_TYPES.REPLICA_SET,
+        toId:    'rel-id-2',
+        message: 'ReplicaSet is available. Replicas: 0'
+      }],
+      expected: 'rel-id-1',
+    }])('replicaSetId', ({ relationships, expected }) => {
+      const deploymentData = {
+        id:       'any-id',
+        type:     WORKLOAD_TYPES.DEPLOYMENT,
+        metadata: {
+          name:      'any-name',
+          namespace: 'any-namespace',
+          uid:       'any-uid',
+          relationships,
+        },
+      };
+
+      const deployment = new Deployment(deploymentData);
+
+      expect(deployment.replicaSetId).toStrictEqual(expected);
+    });
+  });
+});

package/models/apps.deployment.js

@@ -10,14 +10,28 @@ const IGNORED_ANNOTATIONS = [
   'deprecated.deployment.rollback.to',
 ];
 
+const replicasRegEx = /Replicas: (\d+)/;
+
 export default class Deployment extends Workload {
   get replicaSetId() {
-    const set = this.metadata?.relationships?.find((relationship) => {
-      return relationship.rel === 'owner' &&
-            relationship.toType === WORKLOAD_TYPES.REPLICA_SET;
+    const relationships = this.metadata?.relationships || [];
+
+    // Find all relevant ReplicaSet relationships
+    const replicaSetRelationships = relationships.filter((relationship) => relationship.rel === 'owner' && relationship.toType === WORKLOAD_TYPES.REPLICA_SET
+    );
+
+    // Filter the ReplicaSets based on replicas > 0
+    const activeReplicaSet = replicaSetRelationships.find((relationship) => {
+      const replicasMatch = relationship.message?.match(replicasRegEx);
+      const replicas = replicasMatch ? parseInt(replicasMatch[1], 10) : 0;
+
+      return replicas > 0;
     });
 
-    return set?.toId?.replace(`${ this.namespace }/`, '');
+    // If no active ReplicaSet is found, fall back to the first one from the list
+    const selectedReplicaSet = activeReplicaSet || replicaSetRelationships[0];
+
+    return selectedReplicaSet?.toId?.replace(`${ this.namespace }/`, '');
   }
 
   async rollBack(cluster, deployment, revision) {

package/models/driver.js

@@ -1,6 +1,7 @@
 import { DESCRIPTION } from '@shell/config/labels-annotations';
 import NormanModel from '@shell/plugins/steve/norman-class';
 import { KONTAINER_TO_DRIVER } from './management.cattle.io.kontainerdriver';
+import capitalize from 'lodash/capitalize';
 
 export default class Driver extends NormanModel {
   get canViewYaml() {
@@ -20,12 +21,12 @@ export default class Driver extends NormanModel {
       }
     }
 
-    return KONTAINER_TO_DRIVER[this.id] || this.id;
+    return KONTAINER_TO_DRIVER[this.id] || this.name || this.id;
   }
 
   get nameDisplay() {
     const path = `cluster.provider.${ this.driverName }`;
-    const label = this.driverName || this.name || this.id;
+    const label = capitalize(this.driverName);
 
     return this.$rootGetters['i18n/withFallback'](path, label);
   }

package/models/kontainerdriver.js

@@ -8,19 +8,21 @@ export default class KontainerDriver extends Driver {
   get _availableActions() {
     const out = [
       {
-        action:   'activate',
-        label:    'Activate',
-        icon:     'icon icon-play',
-        bulkable: true,
-        enabled:  !!this.links.update && !this.active
+        action:     'activate',
+        label:      this.t('action.activate'),
+        icon:       'icon icon-play',
+        bulkable:   true,
+        bulkAction: 'activateBulk',
+        enabled:    !!this.links.update && !this.active
       },
       {
-        action:   'deactivate',
-        label:    'Deactivate',
-        icon:     'icon icon-pause',
-        bulkable: true,
-        enabled:  !!this.links.update && !!this.active,
-        weight:   -1
+        action:     'deactivate',
+        label:      this.t('action.deactivate'),
+        icon:       'icon icon-pause',
+        bulkable:   true,
+        bulkAction: 'deactivateBulk',
+        enabled:    !!this.links.update && !!this.active,
+        weight:     -1
       },
       { divider: true },
       {
@@ -52,9 +54,16 @@ export default class KontainerDriver extends Driver {
     return out;
   }
 
-  deactivate() {
+  deactivate(resources = [this]) {
+    this.$dispatch('promptModal', {
+      componentProps: { drivers: resources, driverType: 'kontainerDrivers' },
+      component:      'DeactivateDriverDialog'
+    });
+  }
+
+  deactivateBulk(resources) {
     this.$dispatch('promptModal', {
-      componentProps: { url: `v3/kontainerDrivers/${ escape(this.id) }?action=deactivate`, name: this.nameDisplay },
+      componentProps: { drivers: resources, driverType: 'kontainerDrivers' },
       component:      'DeactivateDriverDialog'
     });
   }
@@ -65,4 +74,12 @@ export default class KontainerDriver extends Driver {
       method: 'post',
     }, { root: true });
   }
+
+  async activateBulk(resources) {
+    await Promise.all(resources.map((resource) => this.$dispatch('rancher/request', {
+      url:    `v3/kontainerDrivers/${ escape(resource.id) }?action=activate`,
+      method: 'post',
+    }, { root: true }
+    )));
+  }
 }