@rancher/shell 0.3.13 → 0.3.15

package/rancher-components/components/StringList/StringList.test.ts

@@ -1,18 +1,19 @@
+/* eslint-disable jest/no-hooks */
 import { mount, Wrapper } from '@vue/test-utils';
 import { StringList } from './index';
 
-describe('StringList.vue', () => {
+describe('stringList.vue', () => {
   let wrapper: Wrapper<InstanceType<typeof StringList>>;
 
   beforeEach(() => {
     wrapper = mount(StringList, { propsData: { items: [] } });
   });
 
-  describe('List box', () => {
+  describe('list box', () => {
     it('is empty', () => {
       const box = wrapper.find('[data-testid="div-string-list-box"]').element as HTMLElement;
 
-      expect(box.children.length).toBe(0);
+      expect(box.children).toHaveLength(0);
     });
 
     it('show multiple items', async() => {
@@ -22,7 +23,7 @@ describe('StringList.vue', () => {
 
       const elements = wrapper.findAll('[data-testid^="div-item"]');
 
-      expect(elements.length).toBe(10);
+      expect(elements).toHaveLength(10);
     });
 
     it('double click triggers inline edit mode', async() => {
@@ -130,7 +131,7 @@ describe('StringList.vue', () => {
     });
   });
 
-  describe('Buttons', () => {
+  describe('buttons', () => {
     it('are visible by default', () => {
       const actionButtons = wrapper.find('[data-testid="div-action-buttons"]');
 
@@ -144,7 +145,7 @@ describe('StringList.vue', () => {
       expect(actionButtons.element).toBeUndefined();
     });
 
-    describe('Add button', () => {
+    describe('add button', () => {
       it('is enabled by default', () => {
         const addButton = wrapper.find('[data-testid="button-add"]')?.element as HTMLButtonElement;
 
@@ -176,7 +177,7 @@ describe('StringList.vue', () => {
       });
     });
 
-    describe('Remove button', () => {
+    describe('remove button', () => {
       it('is disabled by default', () => {
         const removeButton = wrapper.find('[data-testid="button-remove"]');
         const buttonElem = removeButton.element as HTMLButtonElement;
@@ -279,7 +280,7 @@ describe('StringList.vue', () => {
     });
   });
 
-  describe('List edit', () => {
+  describe('list edit', () => {
     const validItem = '    item name   ';
     const emptyItem = '  ';
 
@@ -397,7 +398,7 @@ describe('StringList.vue', () => {
     });
   });
 
-  describe('Errors handling', () => {
+  describe('errors handling', () => {
     it('show duplicate warning icon when errorMessages is defined', async() => {
       const items = ['test'];
 

package/rancher-components/components/StringList/StringList.vue

@@ -30,9 +30,9 @@ const CLASS = {
  * Manage a list of strings
  */
 export default Vue.extend({
-  components: { LabeledInput },
 
-  name: 'StringList',
+  name:       'StringList',
+  components: { LabeledInput },
 
   props: {
     /**
@@ -100,8 +100,8 @@ export default Vue.extend({
      */
     errorMessagesArray(): string[] {
       return (Object.keys(this.errors) as Error[])
-        .filter(f => this.errors[f] && this.errorMessages[f])
-        .map(k => this.errorMessages[k]);
+        .filter((f) => this.errors[f] && this.errorMessages[f])
+        .map((k) => this.errorMessages[k]);
     },
   },
 
@@ -364,7 +364,7 @@ export default Vue.extend({
      * Remove an item from items list
      */
     deleteItem(item?: string) {
-      const items = this.items.filter(f => f !== item);
+      const items = this.items.filter((f) => f !== item);
 
       this.updateItems(items);
     },

package/scripts/extension/helm/charts/ui-plugin-server/Chart.yaml

@@ -1,6 +1,6 @@
 annotations:
   catalog.cattle.io/certified: rancher # Any application we are adding as a helm chart
-  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.26.0-0'
+  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.28.0-0'
   catalog.cattle.io/namespace: cattle-ui-plugin-system # Must prefix with cattle- and suffix with -system=
   catalog.cattle.io/os: linux
   catalog.cattle.io/permits-os: linux, windows

package/store/action-menu.js

@@ -22,10 +22,10 @@ export const state = function() {
 };
 
 export const getters = {
-  showing:   state => state.show,
-  elem:      state => state.elem,
-  event:     state => state.event,
-  resources: state => state.resources,
+  showing:   (state) => state.show,
+  elem:      (state) => state.elem,
+  event:     (state) => state.event,
+  resources: (state) => state.resources,
 
   options(state) {
     let selected = state.resources;

package/store/auth.js

@@ -160,7 +160,10 @@ export const actions = {
     return findBy(authConfigs, 'id', id);
   },
 
-  setNonce({ dispatch }, opt) {
+  /**
+   * Create the basic json object used for the nonce (this includes the random nonce/state)
+   */
+  createNonce(ctx, opt) {
     const out = { nonce: randomStr(16), to: 'vue' };
 
     if ( opt.test ) {
@@ -171,7 +174,15 @@ export const actions = {
       out.provider = opt.provider;
     }
 
-    const strung = JSON.stringify(out);
+    return out;
+  },
+
+  /**
+   * Save nonce details. Information it contains will be used to validate auth requests/responses
+   * Note - this may be structurally different than the nonce we encode and send
+   */
+  saveNonce(ctx, opt) {
+    const strung = JSON.stringify(opt);
 
     this.$cookies.set(KEY, strung, {
       path:     '/',
@@ -182,6 +193,15 @@ export const actions = {
     return strung;
   },
 
+  /**
+   * Convert the nonce into something we can send
+   */
+  encodeNonce(ctx, nonce) {
+    const stringify = JSON.stringify(nonce);
+
+    return base64Encode(stringify, 'url');
+  },
+
   async redirectTo({ state, commit, dispatch }, opt = {}) {
     const provider = opt.provider;
     let redirectUrl = opt.redirectUrl;
@@ -200,10 +220,16 @@ export const actions = {
       returnToUrl = `${ window.location.origin }/verify-auth-azure`;
     }
 
-    const nonce = await dispatch('setNonce', opt);
+    // The base nonce that will be sent server way
+    const baseNonce = opt.nonce || await dispatch('createNonce', opt);
+
+    // Save a possibly expanded nonce
+    await dispatch('saveNonce', opt.persistNonce || baseNonce);
+    // Convert the base nonce in to something we can transmit
+    const encodedNonce = await dispatch('encodeNonce', baseNonce);
 
     const fromQuery = unescape(parseUrl(redirectUrl).query?.[GITHUB_SCOPE] || '');
-    const scopes = fromQuery.split(/[, ]+/).filter(x => !!x);
+    const scopes = fromQuery.split(/[, ]+/).filter((x) => !!x);
 
     if (BASE_SCOPES[provider]) {
       addObjects(scopes, BASE_SCOPES[provider]);
@@ -216,8 +242,8 @@ export const actions = {
     let url = removeParam(redirectUrl, GITHUB_SCOPE);
 
     const params = {
-      [GITHUB_SCOPE]: scopes.join(','),
-      [GITHUB_NONCE]: base64Encode(nonce, 'url')
+      [GITHUB_SCOPE]: scopes.join(opt.scopesJoinChar || ','), // Some providers won't accept comma separated scopes
+      [GITHUB_NONCE]: encodedNonce
     };
 
     if (!url.includes(GITHUB_REDIRECT)) {
@@ -249,9 +275,16 @@ export const actions = {
       return ERR_NONCE;
     }
 
+    const body = { code };
+
+    // If the request came with a pkce code ensure we also sent that in the verify
+    if (parsed.pkceCodeVerifier) {
+      body.code_verifier = parsed.pkceCodeVerifier;
+    }
+
     return dispatch('login', {
       provider,
-      body: { code }
+      body
     });
   },
 

package/store/aws.js

@@ -190,7 +190,7 @@ export const actions = {
       const res = await client[cmd](opt);
 
       if ( !key ) {
-        key = Object.keys(res).find(x => isArray(res[x]));
+        key = Object.keys(res).find((x) => isArray(res[x]));
       }
 
       addObjects(out, res[key]);

package/store/catalog.js

@@ -75,7 +75,7 @@ export const getters = {
   },
 
   charts(state, getters, rootState, rootGetters) {
-    const repoKeys = getters.repos.map(x => x._key);
+    const repoKeys = getters.repos.map((x) => x._key);
     let cluster = rootGetters['currentCluster'];
 
     if ( rootGetters['currentProduct']?.inStore === 'management' ) {
@@ -120,7 +120,7 @@ export const getters = {
       });
 
       if ( includeHidden === false ) {
-        matching = matching.filter(x => !x.hidden);
+        matching = matching.filter((x) => !x.hidden);
       }
 
       if ( !matching.length ) {
@@ -176,7 +176,7 @@ export const getters = {
       name = name.toLowerCase().trim();
       chartVersion = normalizeVersion(chartVersion);
 
-      const matching = getters.charts.filter(chart => chart.chartName.toLowerCase().trim() === name);
+      const matching = getters.charts.filter((chart) => chart.chartName.toLowerCase().trim() === name);
 
       if ( !matching.length ) {
         return;
@@ -192,9 +192,9 @@ export const getters = {
       if ( wantVersion === 'latest' ) {
         version = chart.versions[0];
       } else if ( wantVersion === 'match' || wantVersion === 'matching' ) {
-        version = chart.versions.find(v => normalizeVersion(v.version) === chartVersion);
+        version = chart.versions.find((v) => normalizeVersion(v.version) === chartVersion);
       } else {
-        version = chart.versions.find(v => normalizeVersion(v.version) === wantVersion);
+        version = chart.versions.find((v) => normalizeVersion(v.version) === wantVersion);
       }
 
       if ( version ) {
@@ -205,7 +205,7 @@ export const getters = {
 
   versionProviding(state, getters) {
     return ({ repoType, repoName, gvr }) => {
-      const matching = getters.charts.filter(chart => chart.provides.includes(gvr) );
+      const matching = getters.charts.filter((chart) => chart.provides.includes(gvr) );
 
       if ( !matching.length ) {
         return;
@@ -215,7 +215,7 @@ export const getters = {
         preferSameRepo(matching, repoType, repoName);
       }
 
-      const version = matching[0].versions.find(version => version.annotations?.[CATALOG_ANNOTATIONS.PROVIDES] === gvr);
+      const version = matching[0].versions.find((version) => version.annotations?.[CATALOG_ANNOTATIONS.PROVIDES] === gvr);
 
       if ( version ) {
         return clone(version);
@@ -274,7 +274,7 @@ export const getters = {
       const allPaths = require.context('@shell/chart', true, /\.vue$/).keys();
 
       allPaths
-        .filter(path => path.startsWith(stepsPath))
+        .filter((path) => path.startsWith(stepsPath))
         .forEach((path) => {
           try {
             steps.push({
@@ -354,6 +354,7 @@ export const actions = {
 
     // As per comment above, when there are no clusters this will be management. Store it such that it can be used for those cases
     commit('setInStore', inStore);
+    hash.cluster = hash.cluster.filter((repo) => !(repo?.metadata?.annotations?.[CATALOG_ANNOTATIONS.HIDDEN_REPO] === 'true'));
 
     commit('setRepos', hash);
 
@@ -399,7 +400,7 @@ export const actions = {
   },
 
   async refresh({ getters, commit, dispatch }) {
-    const promises = getters.repos.map(x => x.refresh());
+    const promises = getters.repos.map((x) => x.refresh());
 
     // @TODO wait for repo state to indicate they're done once the API has that
 
@@ -567,7 +568,7 @@ function normalizeVersion(v) {
 }
 
 function filterCategories(categories) {
-  categories = (categories || []).map(x => normalizeCategory(x));
+  categories = (categories || []).map((x) => normalizeCategory(x));
 
   const out = [];
 
@@ -650,7 +651,7 @@ export function filterAndArrangeCharts(charts, {
 
     if ( searchQuery ) {
       // The search filter doesn't match
-      const searchTokens = searchQuery.split(/\s*[, ]\s*/).map(x => ensureRegex(x, false));
+      const searchTokens = searchQuery.split(/\s*[, ]\s*/).map((x) => ensureRegex(x, false));
 
       for ( const token of searchTokens ) {
         const chartDescription = c.chartDescription || '';

package/store/digitalocean.js

@@ -39,7 +39,7 @@ export const mutations = {
 };
 
 export const getters = {
-  fromCache: state => ({ credentialId, key }) => {
+  fromCache: (state) => ({ credentialId, key }) => {
     return state.cache[credentialId]?.[key];
   },
 };
@@ -64,8 +64,8 @@ export const actions = {
     const regions = await dispatch('cachedCommand', { credentialId, command: 'regions' });
     const sizes = await dispatch('cachedCommand', { credentialId, command: 'sizes' });
 
-    const regionInfo = regions.regions.find(x => x.slug === region);
-    const available = sizes.sizes.filter(size => regionInfo.sizes.includes(size.slug)).map((size) => {
+    const regionInfo = regions.regions.find((x) => x.slug === region);
+    const available = sizes.sizes.filter((size) => regionInfo.sizes.includes(size.slug)).map((size) => {
       const match = size.slug.match(/^(so|gd|g|c|m|s).*-/);
       const plan = match ? match[1] : (size.slug.includes('-') ? 'standard' : 'other');
 
@@ -81,7 +81,7 @@ export const actions = {
       out.label = rootGetters['i18n/t']('cluster.machineConfig.digitalocean.sizeLabel', out);
 
       return out;
-    }).filter(size => size.plan !== 'other');
+    }).filter((size) => size.plan !== 'other');
 
     return sortBy(available, ['planSort', 'memoryGb', 'vcpus', 'disk']);
   },

package/store/features.js

@@ -30,6 +30,7 @@ export const RKE2 = create('rke2', true);
 export const UNSUPPORTED_STORAGE_DRIVERS = create('unsupported-storage-drivers', false);
 export const FLEET = create('continuous-delivery', true);
 export const HARVESTER = create('harvester', true);
+export const HARVESTER_CONTAINER = create('harvester-baremetal-container-workload', false);
 
 // Not currently used.. no point defining ones we don't use
 // export const EMBEDDED_CLUSTER_API = create('embedded-cluster-api', true);