@rancher/shell 0.3.0 → 0.3.2

package/store/index.js

@@ -81,7 +81,13 @@ const getActiveNamespaces = (state, getters) => {
     return out;
   }
 
-  const namespaces = getters[`${ inStore }/all`](NAMESPACE);
+  let namespaces = [];
+
+  if (Array.isArray(state.allNamespaces) && state.allNamespaces.length > 0) {
+    namespaces = state.allNamespaces;
+  } else {
+    namespaces = getters[`${ inStore }/all`](NAMESPACE);
+  }
 
   const filters = state.namespaceFilters.filter(x => !!x && !`${ x }`.startsWith(NAMESPACED_PREFIX));
   const includeAll = getters.isAllNamespaces;
@@ -169,6 +175,7 @@ export const state = () => {
     serverVersion:           null,
     systemNamespaces:        [],
     isSingleProduct:         undefined,
+    namespaceFilterMode:     null,
   };
 };
 
@@ -205,6 +212,15 @@ export const getters = {
     return state.systemNamespaces;
   },
 
+  /**
+   * Namespace Filter Mode supplies a resource type to the NamespaceFilter.
+   *
+   * Only one of the resource type is allowed to be selected
+   */
+  namespaceFilterMode(state) {
+    return state.namespaceFilterMode;
+  },
+
   currentCluster(state, getters) {
     return getters['management/byId'](MANAGEMENT.CLUSTER, state.clusterId);
   },
@@ -284,6 +300,34 @@ export const getters = {
     return state.namespaceFilters.filter(x => !`${ x }`.startsWith(NAMESPACED_PREFIX)).length === 0;
   },
 
+  isSingleNamespace(state, getters) {
+    const product = getters['currentProduct'];
+
+    if ( !product ) {
+      return false;
+    }
+
+    if ( product.showWorkspaceSwitcher ) {
+      return false;
+    }
+
+    if ( getters.isAllNamespaces ) {
+      return false;
+    }
+
+    const filters = state.namespaceFilters;
+
+    if ( filters.length !== 1 ) {
+      return false;
+    }
+
+    if (filters[0].startsWith('ns://')) {
+      return filters[0];
+    }
+
+    return false;
+  },
+
   isMultipleNamespaces(state, getters) {
     const product = getters['currentProduct'];
 
@@ -485,6 +529,10 @@ export const mutations = {
     getActiveNamespaces(state, getters);
   },
 
+  setNamespaceFilterMode(state, mode) {
+    state.namespaceFilterMode = mode;
+  },
+
   pageActions(state, pageActions) {
     state.pageActions = pageActions;
   },
@@ -808,7 +856,6 @@ export const actions = {
     commit('updateNamespaces', {
       filters: filters || [ALL_USER],
       all:     res.namespaces,
-      ...getters
     });
 
     commit('clusterReady', true);
@@ -826,7 +873,11 @@ export const actions = {
         [key]: ids
       }
     });
-    commit('updateNamespaces', { filters: ids, ...getters });
+    commit('updateNamespaces', { filters: ids });
+  },
+
+  setNamespaceFilterMode({ commit }, mode) {
+    commit('setNamespaceFilterMode', mode);
   },
 
   async cleanNamespaces({ getters, dispatch }) {

package/store/plugins.js

@@ -125,14 +125,6 @@ export const state = function() {
 };
 
 export const getters = {
-  credentialDrivers() {
-    const ctx = require.context('@shell/cloud-credential', true, /.*/);
-
-    const drivers = ctx.keys().filter(path => !path.match(/\.(vue|js)$/)).map(path => path.substr(2));
-
-    return drivers;
-  },
-
   credentialOptions() {
     return (name) => {
       name = (name || '').toLowerCase();
@@ -157,15 +149,6 @@ export const getters = {
     };
   },
 
-  machineDrivers() {
-    // The subset of drivers supported by Vue components
-    const ctx = require.context('@shell/machine-config', true, /.*/);
-
-    const drivers = ctx.keys().filter(path => !path.match(/\.(vue|js)$/)).map(path => path.substr(2));
-
-    return drivers;
-  },
-
   clusterDrivers() {
     // The subset of drivers supported by Vue components
     return [];

package/store/pnap.js

@@ -0,0 +1,128 @@
+import { base64Encode } from '@shell/utils/crypto';
+import { addParam, addParams } from '@shell/utils/url';
+
+const ENDPOINT = 'api.phoenixnap.com';
+
+export const state = () => {
+  return { cache: {} };
+};
+
+export const mutations = {
+  setCache(state, { credentialId, key, value }) {
+    let cache = state.cache[credentialId];
+
+    if ( !cache ) {
+      cache = {};
+      state.cache[credentialId] = cache;
+    }
+
+    cache[key] = value;
+  },
+};
+
+export const getters = {
+  fromCache: state => ({ credentialId, key }) => {
+    return state.cache[credentialId]?.[key];
+  },
+};
+
+export const actions = {
+  async osChoices({ dispatch }, { credentialId }) {
+    const osList = await dispatch('cachedCommand', { credentialId, command: 'rancher-node-driver/options' });
+
+    const oses = osList.operatingSystems;
+    const result = [];
+
+    if (Array.isArray(oses)) {
+      const map = new Map();
+
+      for (const os of oses) {
+        if (!map.has(os)) {
+          map.set(os, true);
+          result.push({ value: os, label: os });
+        }
+      }
+    } else {
+      result.push({ value: osList.message });
+    }
+
+    return result;
+  },
+
+  async allProducts({ dispatch }, { credentialId }) {
+    const out = await dispatch('cachedCommand', { credentialId, command: 'billing/v1/products?productCategory=SERVER' });
+
+    return out;
+  },
+
+  async cachedCommand({ getters, commit, dispatch }, { credentialId, command }) {
+    let out = getters['fromCache']({ credentialId, key: command });
+
+    if ( !out ) {
+      out = await dispatch('request', { credentialId, command });
+      commit('setCache', {
+        credentialId, key: command, value: out
+      });
+    }
+
+    return out;
+  },
+
+  async request({ dispatch }, {
+    clientId, clientSecret, credentialId, command, opt, out
+  }) {
+    opt = opt || {};
+
+    let url = '/meta/proxy/';
+    const body = null;
+    let method = 'GET';
+
+    if ( opt.url ) {
+      url += opt.url.replace(/^https?:\/\//, '');
+    } else {
+      url += `${ ENDPOINT }/${ command }`;
+      url = addParam(url, 'per_page', opt.per_page || 1000);
+      url = addParams(url, opt.params || {});
+    }
+
+    const headers = { Accept: 'application/json' };
+
+    if ( credentialId ) {
+      headers['X-API-CattleAuth-Header'] = `Bearer credID=${ credentialId } passwordField=token`;
+    } else if ( clientId ) {
+      const credentials = `${ clientId }:${ clientSecret }`;
+      const encoded = base64Encode(credentials);
+
+      headers['Content-Type'] = 'application/json';
+      headers['X-API-Auth-Header'] = `Basic ${ encoded }`;
+      url = '/meta/proxy/auth.phoenixnap.com/auth/realms/BMC/protocol/openid-connect/token/';
+      // body = `grant_type:client_credentials`;
+      method = 'POST';
+    }
+
+    const res = await dispatch('management/request', {
+      url,
+      method,
+      headers,
+      data:                 body,
+      redirectUnauthorized: false,
+    }, { root: true });
+
+    if ( out ) {
+      out[command] = out[command].concat(res[command]);
+    } else {
+      out = res;
+    }
+
+    // De-pagination
+    if ( res?.links?.pages?.next ) {
+      opt.url = res.links.pages.next;
+
+      return dispatch('request', {
+        clientId, clientSecret, credentialId, command, opt, out
+      });
+    }
+
+    return out;
+  }
+};

package/store/prefs.js

@@ -74,7 +74,7 @@ export const HIDE_REPOS = create('hide-repos', [], { parseJSON });
 export const HIDE_DESC = create('hide-desc', [], { parseJSON });
 export const HIDE_SENSITIVE = create('hide-sensitive', true, { options: [true, false], parseJSON });
 export const SHOW_PRE_RELEASE = create('show-pre-release', false, { options: [false, true], parseJSON });
-export const SHOW_CHART_MODE = create('chartMode', 'featured', { parseJSON });
+export const SHOW_CHART_MODE = create('chart-mode', 'featured', { parseJSON });
 
 export const DATE_FORMAT = create('date-format', 'ddd, MMM D YYYY', {
   options: [
@@ -109,7 +109,7 @@ export const PLUGIN_DEVELOPER = create('plugin-developer', false, { parseJSON, i
 
 export const _RKE1 = 'rke1';
 export const _RKE2 = 'rke2';
-export const PROVISIONER = create('provisioner', _RKE1, { options: [_RKE1, _RKE2] });
+export const PROVISIONER = create('provisioner', _RKE2, { options: [_RKE1, _RKE2] });
 
 // Promo for Cluster Tools feature on Cluster Dashboard page
 export const CLUSTER_TOOLS_TIP = create('hide-cluster-tools-tip', false, { parseJSON });
@@ -120,6 +120,8 @@ export const PSP_DEPRECATION_BANNER = create('hide-psp-deprecation-banner', fals
 // Maximum number of clusters to show in the slide-in menu
 export const MENU_MAX_CLUSTERS = create('menu-max-clusters', 4, { options: [2, 3, 4, 5, 6, 7, 8, 9, 10], parseJSON });
 
+// Prompt for confirm when scaling down node pool in GUI and save the pref
+export const SCALE_POOL_PROMPT = create('scale-pool-prompt', null, { parseJSON });
 // --------------------
 
 const cookiePrefix = 'R_';

package/store/type-map.js

@@ -42,6 +42,7 @@
 //   category,                -- Group to show the product in for the nav hamburger menu
 //   typeStoreMap,            -- An object mapping types to the store that should be used to retrieve information about the type
 //   hideSystemResources      -- Hide resources in namespaces where namespace.isSystem === true, or a namespace managed by fleet (per its annotation) and hide those namespaces from ns/project list and nsfilter (default false)
+//   hideNamespaceLocation    -- Hide the namespace link in the ResourceDetail masthead of namespaced resources and hide the ExplorerProjectsNamespaces namespace link (default false)
 // })
 //
 // externalLink(stringOrFn)  The product has an external page (function gets context object
@@ -137,7 +138,7 @@ import {
   ensureRegex, escapeHtml, escapeRegex, ucFirst, pluralize
 } from '@shell/utils/string';
 import {
-  importChart, importList, importDetail, importEdit, listProducts, loadProduct, importCustomPromptRemove, resolveList, resolveEdit, resolveWindowComponent, importWindowComponent, resolveChart, resolveDetail, importDialog
+  importChart, importList, importDetail, importEdit, listProducts, loadProduct, importCustomPromptRemove, resolveList, resolveEdit, resolveWindowComponent, importWindowComponent, resolveChart, resolveDetail, importDialog, importMachineConfig, resolveMachineConfigComponent, resolveCloudCredentialComponent, importCloudCredential
 } from '@shell/utils/dynamic-importer';
 
 import { NAME as EXPLORER } from '@shell/config/product/explorer';
@@ -147,6 +148,8 @@ import { sortBy } from '@shell/utils/sort';
 import { haveV1Monitoring, haveV2Monitoring } from '@shell/utils/monitoring';
 import { NEU_VECTOR_NAMESPACE } from '@shell/config/product/neuvector';
 
+import { ExtensionPoint, TableColumnLocation } from '@shell/core/types';
+
 export const NAMESPACED = 'namespaced';
 export const CLUSTER_LEVEL = 'cluster';
 export const BOTH = 'both';
@@ -221,6 +224,30 @@ export function DSL(store, product, module = 'type-map') {
     },
 
     headers(type, headers) {
+      const extensionCols = store.$plugin.getUIConfig(ExtensionPoint.TABLE_COL, TableColumnLocation.RESOURCE);
+
+      // Try and insert the columns before the Age column, if that is the last column
+      let insertPosition = headers.length;
+
+      if (headers.length > 0) {
+        const lastColumn = headers[headers.length - 1];
+
+        if (lastColumn?.name === AGE.name) {
+          insertPosition--;
+        }
+      }
+
+      // adding extension defined cols to the correct header config
+      extensionCols.forEach((col) => {
+        if (col.locationConfig.resource) {
+          col.locationConfig.resource.forEach((resource) => {
+            if (resource && type === resource) {
+              headers.splice(insertPosition, 0, col);
+            }
+          });
+        }
+      });
+
       headers.forEach((header) => {
         // If on the client, then use the value getter if there is one
         if (header.getValue) {
@@ -365,16 +392,19 @@ export const state = function() {
     hideBulkActions:         {},
     schemaGeneration:        1,
     cache:                   {
-      typeMove:         {},
-      groupLabel:       {},
-      ignore:           {},
-      list:             {},
-      chart:            {},
-      detail:           {},
-      edit:             {},
-      componentFor:     {},
-      promptRemove:     {},
-      windowComponents: {},
+      typeMove:           {},
+      groupLabel:         {},
+      ignore:             {},
+      list:               {},
+      chart:              {},
+      detail:             {},
+      edit:               {},
+      componentFor:       {},
+      promptRemove:       {},
+      windowComponents:   {},
+      'machine-config':   {},
+      'cloud-credential': {}
+
     },
   };
 };
@@ -914,7 +944,15 @@ export const getters = {
 
           item.mode = mode;
           item.weight = weight;
-          item.label = item.label || item.name;
+
+          // Ensure labelKey is taken into account... with a mock count
+          // This is harmless if the translation doesn't require count
+          if (item.labelKey && rootGetters['i18n/exists'](item.labelKey)) {
+            item.label = rootGetters['i18n/t'](item.labelKey, { count: 2 }).trim();
+            delete item.labelKey; // Label should really take precedence over labelKey, but it doesn't, so remove it
+          } else {
+            item.label = item.label || item.name;
+          }
 
           out[id] = item;
         }
@@ -1010,9 +1048,11 @@ export const getters = {
           formatter = 'Number';
         }
 
+        const colName = col.name.includes(' ') ? col.name.split(' ').map(word => word.charAt(0).toUpperCase() + word.substring(1) ).join('') : col.name;
+
         const exists = rootGetters['i18n/exists'];
         const t = rootGetters['i18n/t'];
-        const labelKey = `tableHeaders.${ col.name }`;
+        const labelKey = `tableHeaders.${ colName.charAt(0).toLowerCase() + colName.slice(1) }`;
         const description = col.description || '';
         const tooltip = description && description[description.length - 1] === '.' ? description.slice(0, -1) : description;
 
@@ -1104,6 +1144,22 @@ export const getters = {
     };
   },
 
+  hasCustomMachineConfigComponent(state, getters, rootState) {
+    return (rawType, subType) => {
+      const key = getters.componentFor(rawType, subType);
+
+      return hasCustom(state, rootState, 'machine-config', key, key => resolveMachineConfigComponent(key));
+    };
+  },
+
+  hasCustomCloudCredentialComponent(state, getters, rootState) {
+    return (rawType, subType) => {
+      const key = getters.componentFor(rawType, subType);
+
+      return hasCustom(state, rootState, 'machine-config', key, key => resolveCloudCredentialComponent(key));
+    };
+  },
+
   importComponent(state, getters) {
     return (path) => {
       return importEdit(path);
@@ -1152,6 +1208,18 @@ export const getters = {
     };
   },
 
+  importMachineConfig(state, getters, rootState) {
+    return (rawType, subType) => {
+      return loadExtension(rootState, 'machine-config', getters.componentFor(rawType, subType), importMachineConfig);
+    };
+  },
+
+  importCloudCredential(state, getters, rootState) {
+    return (rawType, subType) => {
+      return loadExtension(rootState, 'cloud-credential', getters.componentFor(rawType, subType), importCloudCredential);
+    };
+  },
+
   componentFor(state, getters) {
     return (type, subType) => {
       let key = type;

package/types/pod-security-admission.ts

@@ -0,0 +1,36 @@
+/**
+ * Mode Description
+ * - 'enforce': Policy violations will cause the pod to be rejected.
+ * - 'audit':   Policy violations will trigger the addition of an audit annotation to the event recorded in the audit log, but are otherwise allowed.
+ * - 'warn':    Policy violations will trigger a user-facing warning, but are otherwise allowed.
+ */
+export type PSAMode = 'enforce' | 'audit' | 'warn';
+
+/**
+ * Pod Security admission places requirements on a Pod's Security Context and other related fields according to the three levels defined by the Pod Security Standards:
+ * privileged, baseline, and restricted.
+ * Refer to the Pod Security Standards page for an in-depth look at those requirements.
+ */
+export type PSALevel = 'privileged' | 'baseline' | 'restricted';
+
+/**
+ * Usernames:         requests from users with an exempt authenticated (or impersonated) username are ignored.
+ * RuntimeClassNames: pods and workload resources specifying an exempt runtime class name are ignored.
+ * Namespaces:        pods and workload resources in an exempt namespace are ignored.
+ */
+export type PSADimension = 'usernames' | 'runtimeClasses' | 'namespaces'
+
+export type PSADefaults = Record<PSAMode, PSALevel>
+export type PSAExemptions = Record<PSADimension, string[]>
+
+export interface PSAConfig {
+  defaults: PSADefaults,
+  exemptions: PSAExemptions
+}
+
+export interface PSA {
+  configuration: PSAConfig,
+  metadata: {
+    labels: Record<string, string>
+  }
+}