@rancher/shell 2.0.1 → 2.0.2

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/initialize/entry-helpers.js

@@ -3,7 +3,6 @@ import { updatePageTitle } from '@shell/utils/title';
 import { getVendor } from '@shell/config/private-label';
 import middleware from '@shell/config/middleware.js';
 import { withQuery } from 'ufo';
-import dynamicPluginLoader from '@shell/pkg/dynamic-plugin-loader';
 
 // Global variable used on mount, updated on route change and used in the render function
 let app;
@@ -191,30 +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) {
-    // Handle the loading of dynamic plugins (Harvester) because we only want to attempt to load those plugins and routes if we first couldn't find a page.
-    // We should probably get rid of this concept entirely and just load plugins at the start.
-    await app.context.store.dispatch('loadManagement');
-    const newLocation = await dynamicPluginLoader.check({ route: { path: window.location.pathname }, store: app.context.store });
-
-    // If we have a new location, double check that it's actually valid
-    const resolvedRoute = newLocation?.path ? app.context.store.app.router.resolve({ path: newLocation.path.replace(/^\/{0,1}dashboard/, '') }) : 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(resolvedRoute.resolved.path);
-    }
-
-    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/provisioning.cattle.io.cluster.vue

@@ -10,10 +10,11 @@ import { mapFeature, HARVESTER as HARVESTER_FEATURE } from '@shell/store/feature
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
 import ResourceFetch from '@shell/mixins/resource-fetch';
 import { BadgeState } from '@components/BadgeState';
+import CloudCredExpired from '@shell/components/formatter/CloudCredExpired';
 
 export default {
   components: {
-    Banner, ResourceTable, Masthead, BadgeState
+    Banner, ResourceTable, Masthead, BadgeState, CloudCredExpired
   },
   mixins: [ResourceFetch],
   props:  {
@@ -41,6 +42,8 @@ export default {
       mgmtClusters:    this.$fetchType(MANAGEMENT.CLUSTER),
     };
 
+    this.$store.dispatch('rancher/findAll', { type: NORMAN.CLOUD_CREDENTIAL });
+
     if ( this.$store.getters['management/canList'](SNAPSHOT) ) {
       hash.etcdSnapshots = this.$fetchType(SNAPSHOT);
     }
@@ -141,6 +144,29 @@ export default {
       // This will be used when there's clusters from extension based provisioners
       // We should re-visit this for scaling reasons
       return this.filteredRows.some((c) => c.metadata.namespace !== 'fleet-local' && c.metadata.namespace !== 'fleet-default');
+    },
+
+    tokenExpiredData() {
+      const counts = this.rows.reduce((res, provCluster) => {
+        const expireData = provCluster.cloudCredential?.expireData;
+
+        if (expireData?.expiring) {
+          res.expiring++;
+        }
+        if (expireData?.expired) {
+          res.expired++;
+        }
+
+        return res;
+      }, {
+        expiring: 0,
+        expired:  0
+      });
+
+      return {
+        expiring: counts.expiring ? this.t('cluster.cloudCredentials.banners.expiring', { count: counts.expiring }) : '',
+        expired:  counts.expired ? this.t('cluster.cloudCredentials.banners.expired', { count: counts.expired }) : '',
+      };
     }
   },
 
@@ -186,6 +212,17 @@ export default {
       </template>
     </Masthead>
 
+    <Banner
+      v-if="tokenExpiredData.expiring"
+      color="warning"
+      :label="tokenExpiredData.expiring"
+    />
+    <Banner
+      v-if="tokenExpiredData.expired"
+      color="error"
+      :label="tokenExpiredData.expired"
+    />
+
     <ResourceTable
       :schema="schema"
       :rows="filteredRows"
@@ -194,6 +231,7 @@ export default {
       :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
       :data-testid="'cluster-list'"
       :force-update-live-and-delayed="forceUpdateLiveAndDelayed"
+      :sub-rows="true"
     >
       <!-- Why are state column and subrow overwritten here? -->
       <!-- for rke1 clusters, where they try to use the mgmt cluster stateObj instead of prov cluster stateObj,  -->
@@ -207,19 +245,32 @@ export default {
       </template>
       <template #sub-row="{fullColspan, row, keyField, componentTestid, i, onRowMouseEnter, onRowMouseLeave}">
         <tr
-          v-if="row.stateDescription"
           :key="row[keyField] + '-description'"
           :data-testid="componentTestid + '-' + i + '-row-description'"
           class="state-description sub-row"
           @mouseenter="onRowMouseEnter"
           @mouseleave="onRowMouseLeave"
         >
-          <td>&nbsp;</td>
+          <td v-if="row.cloudCredentialWarning || row.stateDescription">
+&nbsp;
+          </td>
           <td
+            v-if="row.cloudCredentialWarning || row.stateDescription"
             :colspan="fullColspan - 1"
-            :class="{ 'text-error' : row.stateObj.error }"
           >
-            {{ row.stateDescription }}
+            <CloudCredExpired
+              v-if="row.cloudCredentialWarning"
+              :value="row.cloudCredential.expires"
+              :row="row.cloudCredential"
+              :verbose="true"
+              :class="{'mb-10': row.stateDescription}"
+            />
+            <div
+              v-if="row.stateDescription"
+              :class="{ 'text-error' : row.stateObj.error }"
+            >
+              {{ row.stateDescription }}
+            </div>
           </td>
         </tr>
       </template>

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/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.
@@ -275,6 +291,8 @@ export default {
             id:   `${ this.query.appNamespace }/${ this.query.appName }`,
           });
 
+          await this.existing?.fetchValues(true);
+
           this.mode = _EDIT;
         } catch (e) {
           this.mode = _CREATE;
@@ -434,10 +452,12 @@ export default {
               }
             }
             if (existingCRDApp) {
+              await existingCRDApp.fetchValues(true);
+
               // spec.values are any non-default values the user configured
               // the installation form should show these, as well as any default values from the chart
-              const existingValues = clone(existingCRDApp.spec?.values || {});
-              const defaultValues = clone(existingCRDApp.spec?.chart?.values || {});
+              const existingValues = clone(existingCRDApp.values || {});
+              const defaultValues = clone(existingCRDApp.chartValues || {});
 
               crdVersionInfo.existingValues = existingValues;
               crdVersionInfo.allValues = merge(defaultValues, existingValues);

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) {