@rancher/shell 0.4.0 → 0.5.1

package/utils/__tests__/create-yaml.test.ts

@@ -60,4 +60,64 @@ describe('fx: dumpBlock', () => {
       });
     });
   });
+
+  it('should retain line breaks when a line longer than 80 characters exists', () => {
+    const data = {
+      'managerApiConfiguration.properties': `# Sample XPlanManagerAPI Configuration (if this comment is longer than 80 characters, the output should remain the same)
+
+apiUrl=https://example.com/xplan-api-manager
+contactEmailAddress=contact@example.com
+termsOfServiceUrl=https://example.com/terms
+documentationUrl=https://example.com/docs
+wmsUrl=https://example.com/xplan-wms/services
+skipSemantic=false
+skipGeometric=true`
+    };
+
+    const expectedResult = `managerApiConfiguration.properties: >+
+  # Sample XPlanManagerAPI Configuration (if this comment is longer than 80 characters, the output should remain the same)
+
+  apiUrl=https://example.com/xplan-api-manager
+  contactEmailAddress=contact@example.com
+  termsOfServiceUrl=https://example.com/terms
+  documentationUrl=https://example.com/docs
+  wmsUrl=https://example.com/xplan-wms/services
+  skipSemantic=false
+  skipGeometric=true
+`;
+
+    const yamlModifiers = {
+      lineWidth:                            -1,
+      'managerApiConfiguration.properties': {
+        chomping:    '+',
+        scalarStyle: '>',
+      }
+    };
+
+    const result = dumpBlock(data, yamlModifiers);
+
+    expect(result).toStrictEqual(expectedResult);
+  });
+
+  it('should not attempt to replace indicators when a header cannot be found', () => {
+    const data = {
+      a: 'a\nb\tc',
+      b: 'a\nb\tc',
+      c: `a
+b c`
+    };
+
+    const expectedResult = `a: "a\\nb\\tc"\nb: "a\\nb\\tc"\nc: |+\n  a\n  b c\n`;
+
+    const yamlModifiers = {
+      lineWidth: -1,
+      a:         { chomping: '+' },
+      b:         { chomping: '+' },
+      c:         { chomping: '+' },
+    };
+
+    const result = dumpBlock(data, yamlModifiers);
+
+    expect(result).toStrictEqual(expectedResult);
+  });
 });

package/utils/axios.js

@@ -75,10 +75,6 @@ const createAxiosInstance = (axiosOptions) => {
 };
 
 const setupProgress = (axios) => {
-  if (process.server) {
-    return;
-  }
-
   // A noop loading inteterface for when $nuxt is not yet ready
   const noopLoading = {
     finish: () => { },
@@ -167,21 +163,6 @@ export default (ctx, inject) => {
     headers
   };
 
-  // Proxy SSR request headers headers
-  if (process.server && ctx.req && ctx.req.headers) {
-    const reqHeaders = { ...ctx.req.headers };
-
-    for (const h of ['accept', 'host', 'cf-ray', 'cf-connecting-ip', 'content-length', 'content-md5', 'content-type']) {
-      delete reqHeaders[h];
-    }
-    axiosOptions.headers.common = { ...reqHeaders, ...axiosOptions.headers.common };
-  }
-
-  if (process.server) {
-    // Don't accept brotli encoding because Node can't parse it
-    axiosOptions.headers.common['accept-encoding'] = 'gzip, deflate';
-  }
-
   const axios = createAxiosInstance(axiosOptions);
 
   // Inject axios to the context as $axios

package/utils/azure.js

@@ -0,0 +1,24 @@
+const AZURE_ERROR_MSG_REGEX = /^.*Message=\"(.*)\"$/;
+const AZURE_ERROR_JSON_REGEX = /^.*Response body: ({.*})/;
+
+export const parseAzureError = (err) => {
+  // Try and parse the response from Azure a couple of ways
+  const msgMatch = err.match(AZURE_ERROR_MSG_REGEX);
+
+  if (msgMatch?.length === 2) {
+    return msgMatch[1];
+  } else {
+    const jsonMatch = err.match(AZURE_ERROR_JSON_REGEX);
+
+    if (jsonMatch?.length === 2) {
+      try {
+        const errorObj = JSON.parse(jsonMatch[1]);
+
+        return errorObj.error_description;
+      } catch (e) {}
+    }
+  }
+
+  // Can't parse error
+  return false;
+};

package/utils/create-yaml.js

@@ -32,7 +32,6 @@ const ALWAYS_ADD = [
 ];
 
 export const NEVER_ADD = [
-  'metadata.clusterName',
   'metadata.clusterName',
   'metadata.creationTimestamp',
   'metadata.deletionGracePeriodSeconds',
@@ -46,11 +45,16 @@ export const NEVER_ADD = [
   'metadata.resourceVersion',
   'metadata.relationships',
   'metadata.selfLink',
+  'metadata.state',
   'metadata.uid',
   // CRD -> Schema describes the schema used for validation, pruning, and defaulting of this version of the custom resource. If we allow processing we fall into inf loop on openAPIV3Schema.allOf which contains a cyclical ref of allOf props.
   'spec.versions.schema',
   'status',
   'stringData',
+  'links',
+  '_name',
+  '_labels',
+  '_annotations',
 ];
 
 export const ACTIVELY_REMOVE = [
@@ -443,20 +447,21 @@ export function saferDump(obj) {
  *
  * this is required since jsyaml.dump doesn't support chomping and scalar style at the moment.
  * see: https://github.com/nodeca/js-yaml/issues/171
+
+ * @typedef {Object} DumpBlockOptions
+ * @property {('>' | '|')} [scalarStyle] - The scalar style.
+ * @property {('-' | '+' | '' | null)} [chomping] - The chomping style.
  *
  * @param {*} data the multiline block
- * @param {*} options blocks indicators, see: https://yaml-multiline.info
+ * @param {Object} options - Serialization options for jsyaml.dump.
+ * @param {number} options.lineWidth - Set max line width. Set -1 for unlimited width.
+ * @param {DumpBlockOptions} [options.dynamicProperties] - Options for dynamic properties.
+ *   Developers can provide their own property names under `options`.
  *
- * - scalarStyle:
- *     one of '|', '>'
- *     default '|'
- * - chomping:
- *     one of: null, '', '-', '+'
- *     default: null
  * @returns the result of jsyaml.dump with the addition of multiline indicators
  */
 export function dumpBlock(data, options = {}) {
-  const parsed = jsyaml.dump(data);
+  const parsed = jsyaml.dump(data, options);
 
   let out = parsed;
 
@@ -472,7 +477,9 @@ export function dumpBlock(data, options = {}) {
       /**
        * Replace the original block indicators with the ones provided in the options param
        */
-      out = out.replace(header, `${ key }: ${ scalarStyle }${ chomping }${ indentation }`);
+      if (header) {
+        out = out.replace(header, `${ key }: ${ scalarStyle }${ chomping }${ indentation }`);
+      }
     }
   }
 

package/utils/monitoring.js

@@ -42,7 +42,7 @@ export function haveV1Monitoring(getters) {
   return !!cluster?.status?.monitoringStatus;
 }
 
-const CATTLE_MONITORING_NAMESPACE = 'cattle-monitoring-system';
+export const CATTLE_MONITORING_NAMESPACE = 'cattle-monitoring-system';
 
 export async function haveV1MonitoringWorkloads(store) {
   const workloadsByType = await Promise.all(

package/utils/nuxt.js

@@ -5,12 +5,10 @@ import {
 
 // window.{{globals.loadedCallback}} hook
 // Useful for jsdom testing or plugins (https://github.com/tmpvar/jsdom#dealing-with-asynchronous-script-loading)
-if (process.client) {
-  window.onNuxtReadyCbs = [];
-  window.onNuxtReady = (cb) => {
-    window.onNuxtReadyCbs.push(cb);
-  };
-}
+window.onNuxtReadyCbs = [];
+window.onNuxtReady = (cb) => {
+  window.onNuxtReadyCbs.push(cb);
+};
 
 export function createGetCounter(counterObject, defaultKey = '') {
   return function getCounter(id = defaultKey) {
@@ -92,10 +90,6 @@ export function applyAsyncData(Component, asyncData) {
   Component.options.data = function() {
     const data = ComponentData.call(this, this);
 
-    if (this.$ssrContext) {
-      asyncData = this.$ssrContext.asyncData[Component.cid];
-    }
-
     return { ...data, ...asyncData };
   };
 
@@ -210,15 +204,14 @@ export async function setContext(app, context) {
   // If context not defined, create it
   if (!app.context) {
     app.context = {
-      isStatic: process.static,
-      isDev:    true,
-      isHMR:    false,
+      isDev:   true,
+      isHMR:   false,
       app,
-      store:    app.store,
-      payload:  context.payload,
-      error:    context.error,
-      base:     app.router.options.base,
-      env:      {
+      store:   app.store,
+      payload: context.payload,
+      error:   context.error,
+      base:    app.router.options.base,
+      env:     {
         commit: 'head', version: '0.1.2', dev: true, pl: 1, perfTest: false, rancherEnv: 'web', api: 'http://localhost:8989'
       }
     };
@@ -231,9 +224,6 @@ export async function setContext(app, context) {
       app.context.res = context.res;
     }
 
-    if (context.ssrContext) {
-      app.context.ssrContext = context.ssrContext;
-    }
     app.context.redirect = (status, path, query) => {
       if (!status) {
         return;
@@ -260,27 +250,16 @@ export async function setContext(app, context) {
         });
       } else {
         path = withQuery(path, query);
-        if (process.server) {
-          app.context.next({
-            path,
-            status
-          });
-        }
-        if (process.client) {
-          // https://developer.mozilla.org/en-US/docs/Web/API/Location/replace
-          window.location.replace(path);
 
-          // Throw a redirect error
-          throw new Error('ERR_REDIRECT');
-        }
+        // https://developer.mozilla.org/en-US/docs/Web/API/Location/replace
+        window.location.replace(path);
+
+        // Throw a redirect error
+        throw new Error('ERR_REDIRECT');
       }
     };
-    if (process.server) {
-      app.context.beforeNuxtRender = (fn) => context.beforeRenderFns.push(fn);
-    }
-    if (process.client) {
-      app.context.nuxtState = window.__NUXT__;
-    }
+
+    app.context.nuxtState = window.__NUXT__;
   }
 
   // Dynamic keys

package/utils/object.js

@@ -110,6 +110,20 @@ export function remove(obj, path) {
   return obj;
 }
 
+/**
+ * `delete` a property at the given path.
+ *
+ * This is similar to `remove` but doesn't need any fancy kube obj path splitting
+ * and doesn't use `Vue.set` (avoids reactivity)
+ */
+export function deleteProperty(obj, path) {
+  const pathAr = path.split('.');
+  const propToDelete = pathAr.pop();
+
+  // Walk down path until final prop, then delete final prop
+  delete pathAr.reduce((o, k) => o[k] || {}, obj)[propToDelete];
+}
+
 export function getter(path) {
   return function(obj) {
     return get(obj, path);

package/utils/router.scrollBehavior.js

@@ -1,21 +1,19 @@
 import { getMatchedComponents, setScrollRestoration } from './nuxt';
 
-if (process.client) {
-  if ('scrollRestoration' in window.history) {
-    setScrollRestoration('manual');
+if ('scrollRestoration' in window.history) {
+  setScrollRestoration('manual');
 
-    // reset scrollRestoration to auto when leaving page, allowing page reload
-    // and back-navigation from other pages to use the browser to restore the
-    // scrolling position.
-    window.addEventListener('beforeunload', () => {
-      setScrollRestoration('auto');
-    });
+  // reset scrollRestoration to auto when leaving page, allowing page reload
+  // and back-navigation from other pages to use the browser to restore the
+  // scrolling position.
+  window.addEventListener('beforeunload', () => {
+    setScrollRestoration('auto');
+  });
 
-    // Setting scrollRestoration to manual again when returning to this page.
-    window.addEventListener('load', () => {
-      setScrollRestoration('manual');
-    });
-  }
+  // Setting scrollRestoration to manual again when returning to this page.
+  window.addEventListener('load', () => {
+    setScrollRestoration('manual');
+  });
 }
 
 function shouldScrollToTop(route) {

package/utils/time.js

@@ -10,7 +10,7 @@ export function diffFrom(value, from, t) {
   const now = day();
 
   from = from || now;
-  const diff = value.diff(now, 'seconds');
+  const diff = value.diff(from, 'seconds');
 
   let absDiff = Math.abs(diff);
 

package/utils/url.ts

@@ -2,7 +2,7 @@ type UriField = 'source' | 'protocol' | 'authority' | 'userInfo' | 'user' | 'pas
 type UriFields = {
   [key in UriField]: string; // eslint-disable-line no-unused-vars
 }
-type QueryParams = {
+export type QueryParams = {
   [key: string]: string
 }
 

package/vue.config.js

@@ -6,6 +6,7 @@ const { generateDynamicTypeImport } = require('./pkg/auto-import');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const serverMiddlewares = require('./server/server-middleware.js');
 const configHelper = require('./vue-config-helper.js');
+const har = require('./server/har-file');
 
 // Suppress info level logging messages from http-proxy-middleware
 // This hides all of the "[HPM Proxy created] ..." messages
@@ -291,6 +292,14 @@ module.exports = function(dir, _appConfig) {
     '/engines-dist':   configHelper.proxyOpts('https://127.0.0.1:8000'),
   };
 
+  // HAR File support - load network responses from the specified .har file and use those rather than communicating to the Rancher server
+  const harFile = process.env.HAR_FILE;
+  let harData;
+
+  if (harFile) {
+    harData = har.loadFile(harFile, devPorts ? 8005 : 80, ''); // eslint-disable-line no-console
+  }
+
   const config = {
     // Vue server
     devServer: {
@@ -313,6 +322,19 @@ module.exports = function(dir, _appConfig) {
 
         app.use(serverMiddlewares);
 
+        if (harData) {
+          console.log('Installing HAR file middleware'); // eslint-disable-line no-console
+          app.use(har.harProxy(harData, process.env.HAR_DIR));
+
+          server.websocketProxies.push({
+            upgrade(req, socket, head) {
+              const responseHeaders = ['HTTP/1.1 101 Web Socket Protocol Handshake', 'Upgrade: WebSocket', 'Connection: Upgrade'];
+
+              socket.write(`${ responseHeaders.join('\r\n') }\r\n\r\n`);
+            }
+          });
+        }
+
         Object.keys(proxy).forEach((p) => {
           const px = createProxyMiddleware({
             ...proxy[p],
@@ -387,7 +409,6 @@ module.exports = function(dir, _appConfig) {
       // DefinePlugin does string replacement within our code. We may want to consider replacing it with something else. In code we'll see something like
       // process.env.commit even though process and env aren't even defined objects. This could cause people to be mislead.
       config.plugins.push(new webpack.DefinePlugin({
-        'process.client':                  JSON.stringify(true),
         'process.env.commit':              JSON.stringify(commit),
         'process.env.version':             JSON.stringify(dashboardVersion),
         'process.env.dev':                 JSON.stringify(dev),
@@ -544,7 +565,7 @@ module.exports = function(dir, _appConfig) {
               options: { mode: ['body'] }
             }
           ]
-        }
+        },
       ];
 
       config.module.rules.push(...loaders);

package/assets/images/providers/aks-black.svg

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<polygon points="49.9,37.8 49.9,62.2 64.6,56.3 64.6,43.2 	"/>
-	<path d="M35.4,41.3V58l11.5,4.1V37.8L35.4,41.3z M38.1,57.2l-1.8-0.7V43.2l1.8-0.5V57.2z M41.4,58.4l-2.5-0.9V42.4l2.5-0.8V58.4z
-		 M45.5,59.7l-3.3-1V41.3l3.3-1V59.7z"/>
-	<polygon points="14.5,37.8 14.5,62.2 29.2,56.3 29.2,43.2 	"/>
-	<path d="M0,41.3V58l11.5,4.1V37.8L0,41.3z M2.8,57.2L1,56.5V43.2l1.8-0.5V57.2z M6,58.4l-2.5-0.9V42.4L6,41.6V58.4z M10.1,59.7
-		l-3.3-1V41.3l3.3-1V59.7z"/>
-	<polygon points="85.3,37.8 85.3,62.2 100,56.3 100,43.2 	"/>
-	<path d="M70.8,41.3V58l11.5,4.1V37.8L70.8,41.3z M73.4,57.2l-1.8-0.7V43.2l1.8-0.5V57.2z M76.8,58.4l-2.5-0.9V42.4l2.5-0.8V58.4z
-		 M80.9,59.7l-3.3-1V41.3l3.3-1V59.7z"/>
-	<polygon points="31.1,62.6 31.1,87 45.7,81.1 45.7,68 	"/>
-	<path d="M16.5,66.3v16.6L28,87V62.6L16.5,66.3z M19.1,82l-1.8-0.7V68.1l1.8-0.5V82z M22.5,83.2L20,82.3V67.2l2.5-0.8V83.2z
-		 M26.6,84.6l-3.3-1V66.1l3.3-1V84.6z"/>
-	<polygon points="67.1,62.6 67.1,87 81.8,81.1 81.8,68 	"/>
-	<path d="M52.4,66.3v16.6L64,87V62.6L52.4,66.3z M55.2,82l-1.8-0.7V68.1l1.8-0.5V82z M58.5,83.2l-2.5-1v-15l2.5-0.8V83.2z
-		 M62.6,84.6l-3.3-1V66.1l3.3-1V84.6z"/>
-	<polygon points="31.1,13 31.1,37.3 45.7,31.5 45.7,18.4 	"/>
-	<path d="M16.5,16.6v16.6L28,37.3V13L16.5,16.6z M19.1,32.3l-1.8-0.7V18.4l1.8-0.5V32.3z M22.5,33.5L20,32.7V17.6l2.5-0.8V33.5z
-		 M26.6,34.9l-3.3-1V16.6l3.3-1V34.9z"/>
-	<polygon points="67.1,13 67.1,37.3 81.8,31.5 81.8,18.4 	"/>
-	<path d="M52.4,16.6v16.6L64,37.3V13L52.4,16.6z M55.2,32.3l-1.8-0.7V18.4l1.8-0.5V32.3z M58.5,33.5L56,32.7V17.6l2.5-0.8
-		C58.5,16.8,58.5,33.5,58.5,33.5z M62.6,34.9l-3.3-1V16.6l3.3-1V34.9z"/>
-</g>
-</svg>

package/assets/images/providers/aks.svg

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 25.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#0079D6;}
-</style>
-<g>
-	<polygon class="st0" points="49.9,37.8 49.9,62.2 64.6,56.3 64.6,43.2 	"/>
-	<path class="st0" d="M35.4,41.3V58l11.5,4.1V37.8L35.4,41.3z M38.1,57.2l-1.8-0.7V43.2l1.8-0.5V57.2z M41.4,58.4l-2.5-0.9V42.4
-		l2.5-0.8V58.4z M45.5,59.7l-3.3-1V41.3l3.3-1V59.7z"/>
-	<polygon class="st0" points="14.5,37.8 14.5,62.2 29.2,56.3 29.2,43.2 	"/>
-	<path class="st0" d="M0,41.3V58l11.5,4.1V37.8L0,41.3z M2.8,57.2l-1.8-0.7V43.2l1.8-0.5V57.2z M6,58.4l-2.5-0.9V42.4L6,41.6V58.4z
-		 M10.1,59.7l-3.3-1V41.3l3.3-1V59.7z"/>
-	<polygon class="st0" points="85.3,37.8 85.3,62.2 100,56.3 100,43.2 	"/>
-	<path class="st0" d="M70.8,41.3V58l11.5,4.1V37.8L70.8,41.3z M73.4,57.2l-1.8-0.7V43.2l1.8-0.5V57.2z M76.8,58.4l-2.5-0.9V42.4
-		l2.5-0.8V58.4z M80.9,59.7l-3.3-1V41.3l3.3-1V59.7z"/>
-	<polygon class="st0" points="31.1,62.6 31.1,87 45.7,81.1 45.7,68 	"/>
-	<path class="st0" d="M16.5,66.3v16.6L28,87V62.6L16.5,66.3z M19.1,82l-1.8-0.7V68.1l1.8-0.5V82z M22.5,83.2l-2.5-0.9V67.2l2.5-0.8
-		V83.2z M26.6,84.6l-3.3-1V66.1l3.3-1V84.6z"/>
-	<polygon class="st0" points="67.1,62.6 67.1,87 81.8,81.1 81.8,68 	"/>
-	<path class="st0" d="M52.4,66.3v16.6L64,87V62.6L52.4,66.3z M55.2,82l-1.8-0.7V68.1l1.8-0.5V82z M58.5,83.2L56,82.2V67.2l2.5-0.8
-		V83.2z M62.6,84.6l-3.3-1V66.1l3.3-1V84.6z"/>
-	<polygon class="st0" points="31.1,13 31.1,37.3 45.7,31.5 45.7,18.4 	"/>
-	<path class="st0" d="M16.5,16.6v16.6L28,37.3V13L16.5,16.6z M19.1,32.3l-1.8-0.7V18.4l1.8-0.5V32.3z M22.5,33.5l-2.5-0.8V17.6
-		l2.5-0.8V33.5z M26.6,34.9l-3.3-1V16.6l3.3-1V34.9z"/>
-	<polygon class="st0" points="67.1,13 67.1,37.3 81.8,31.5 81.8,18.4 	"/>
-	<path class="st0" d="M52.4,16.6v16.6L64,37.3V13L52.4,16.6z M55.2,32.3l-1.8-0.7V18.4l1.8-0.5V32.3z M58.5,33.5L56,32.7V17.6
-		l2.5-0.8C58.5,16.8,58.5,33.5,58.5,33.5z M62.6,34.9l-3.3-1V16.6l3.3-1V34.9z"/>
-</g>
-</svg>