@rancher/shell 0.3.21 → 0.3.23

package/vue-config-helper.js

@@ -0,0 +1,135 @@
+const dev = (process.env.NODE_ENV !== 'production');
+const devPorts = dev || process.env.DEV_PORTS === 'true';
+const prime = process.env.PRIME;
+
+let api = process.env.API || 'http://localhost:8989';
+
+if ( !api.startsWith('http') ) {
+  api = `https://${ api }`;
+}
+
+// ===============================================================================================
+// Functions for the request proxying used in dev
+// ===============================================================================================
+
+function proxyMetaOpts(target) {
+  return {
+    target,
+    followRedirects: true,
+    secure:          !dev,
+    changeOrigin:    true,
+    onProxyReq,
+    onProxyReqWs,
+    onError,
+    onProxyRes,
+  };
+}
+
+function proxyOpts(target) {
+  return {
+    target,
+    secure:       !devPorts,
+    changeOrigin: true,
+    onProxyReq,
+    onProxyReqWs,
+    onError,
+    onProxyRes
+  };
+}
+
+// Intercept the /rancherversion API call wnad modify the 'RancherPrime' value
+// if configured to do so by the environment variable PRIME
+function proxyPrimeOpts(target) {
+  const opts = proxyOpts(target);
+
+  // Don't intercept if the PRIME environment variable is not set
+  if (!prime?.length) {
+    return opts;
+  }
+
+  opts.onProxyRes = (proxyRes, req, res) => {
+    const _end = res.end;
+    let body = '';
+
+    proxyRes.on( 'data', (data) => {
+      data = data.toString('utf-8');
+      body += data;
+    });
+
+    res.write = () => {};
+
+    res.end = () => {
+      let output = body;
+
+      try {
+        const out = JSON.parse(body);
+
+        out.RancherPrime = prime;
+        output = JSON.stringify(out);
+      } catch (err) {}
+
+      res.setHeader('content-length', output.length );
+      res.setHeader('content-type', 'application/json' );
+      res.setHeader('transfer-encoding', '');
+      res.setHeader('cache-control', 'no-cache');
+      res.writeHead(proxyRes.statusCode);
+      _end.apply(res, [output]);
+    };
+  };
+
+  return opts;
+}
+
+function onProxyRes(proxyRes, req, res) {
+  if (devPorts) {
+    proxyRes.headers['X-Frame-Options'] = 'ALLOWALL';
+  }
+}
+
+function proxyWsOpts(target) {
+  return {
+    ...proxyOpts(target),
+    ws:           true,
+    changeOrigin: true,
+  };
+}
+
+function onProxyReq(proxyReq, req) {
+  if (!(proxyReq._currentRequest && proxyReq._currentRequest._headerSent)) {
+    proxyReq.setHeader('x-api-host', req.headers['host']);
+    proxyReq.setHeader('x-forwarded-proto', 'https');
+  }
+}
+
+function onProxyReqWs(proxyReq, req, socket, options, head) {
+  req.headers.origin = options.target.href;
+  proxyReq.setHeader('origin', options.target.href);
+  proxyReq.setHeader('x-api-host', req.headers['host']);
+  proxyReq.setHeader('x-forwarded-proto', 'https');
+  // console.log(proxyReq.getHeaders());
+
+  socket.on('error', (err) => {
+    console.error('Proxy WS Error:', err); // eslint-disable-line no-console
+  });
+}
+
+function onError(err, req, res) {
+  res.statusCode = 598;
+  console.error('Proxy Error:', err); // eslint-disable-line no-console
+  res.write(JSON.stringify(err));
+}
+
+module.exports = {
+  dev,
+  devPorts,
+  prime,
+  api,
+  proxyMetaOpts,
+  proxyOpts,
+  proxyPrimeOpts,
+  onProxyRes,
+  proxyWsOpts,
+  onProxyReq,
+  onProxyReqWs,
+  onError
+};

package/vue.config.js

@@ -5,6 +5,7 @@ const webpack = require('webpack');
 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');
 
 // Suppress info level logging messages from http-proxy-middleware
 // This hides all of the "[HPM Proxy created] ..." messages
@@ -20,24 +21,18 @@ console.info = oldInfoLogger; // eslint-disable-line no-console
 // const { STANDARD } = require('./config/private-label');
 const STANDARD = 1;
 
-const dev = (process.env.NODE_ENV !== 'production');
-const devPorts = dev || process.env.DEV_PORTS === 'true';
+const dev = configHelper.dev;
+const devPorts = configHelper.devPorts;
 
 // human readable version used on rancher dashboard about page
 const dashboardVersion = process.env.DASHBOARD_VERSION;
 
-const prime = process.env.PRIME;
-
 const pl = process.env.PL || STANDARD;
 const commit = process.env.COMMIT || 'head';
 const perfTest = (process.env.PERF_TEST === 'true'); // Enable performance testing when in dev
 const instrumentCode = (process.env.TEST_INSTRUMENT === 'true'); // Instrument code for code coverage in e2e tests
 
-let api = process.env.API || 'http://localhost:8989';
-
-if ( !api.startsWith('http') ) {
-  api = `https://${ api }`;
-}
+const api = configHelper.api;
 // ===============================================================================================
 // Nuxt configuration
 // ===============================================================================================
@@ -77,7 +72,9 @@ module.exports = function(dir, _appConfig) {
   ];
 
   if (instrumentCode) {
-    babelPlugins.push('babel-plugin-istanbul');
+    babelPlugins.push([
+      'babel-plugin-istanbul', { extension: ['.js', '.vue'] }, 'add-vue'
+    ]);
 
     console.warn('Instrumenting code for coverage'); // eslint-disable-line no-console
   }
@@ -276,26 +273,26 @@ module.exports = function(dir, _appConfig) {
   console.log(`API: '${ api }'. Env: '${ rancherEnv }'`); // eslint-disable-line no-console
   const proxy = {
     ...appConfig.proxies,
-    '/k8s':            proxyWsOpts(api), // Straight to a remote cluster (/k8s/clusters/<id>/)
-    '/pp':             proxyWsOpts(api), // For (epinio) standalone API
-    '/api':            proxyWsOpts(api), // Management k8s API
-    '/apis':           proxyWsOpts(api), // Management k8s API
-    '/v1':             proxyWsOpts(api), // Management Steve API
-    '/v3':             proxyWsOpts(api), // Rancher API
-    '/v3-public':      proxyOpts(api), // Rancher Unauthed API
-    '/api-ui':         proxyOpts(api), // Browser API UI
-    '/meta':           proxyMetaOpts(api), // Browser API UI
-    '/v1-*':           proxyOpts(api), // SAML, KDM, etc
-    '/rancherversion': proxyPrimeOpts(api), // Rancher version endpoint
+    '/k8s':            configHelper.proxyWsOpts(api), // Straight to a remote cluster (/k8s/clusters/<id>/)
+    '/pp':             configHelper.proxyWsOpts(api), // For (epinio) standalone API
+    '/api':            configHelper.proxyWsOpts(api), // Management k8s API
+    '/apis':           configHelper.proxyWsOpts(api), // Management k8s API
+    '/v1':             configHelper.proxyWsOpts(api), // Management Steve API
+    '/v3':             configHelper.proxyWsOpts(api), // Rancher API
+    '/v3-public':      configHelper.proxyOpts(api), // Rancher Unauthed API
+    '/api-ui':         configHelper.proxyOpts(api), // Browser API UI
+    '/meta':           configHelper.proxyMetaOpts(api), // Browser API UI
+    '/v1-*':           configHelper.proxyOpts(api), // SAML, KDM, etc
+    '/rancherversion': configHelper.proxyPrimeOpts(api), // Rancher version endpoint
     // These are for Ember embedding
-    '/c/*/edit':       proxyOpts('https://127.0.0.1:8000'), // Can't proxy all of /c because that's used by Vue too
-    '/k/':             proxyOpts('https://127.0.0.1:8000'),
-    '/g/':             proxyOpts('https://127.0.0.1:8000'),
-    '/n/':             proxyOpts('https://127.0.0.1:8000'),
-    '/p/':             proxyOpts('https://127.0.0.1:8000'),
-    '/assets':         proxyOpts('https://127.0.0.1:8000'),
-    '/translations':   proxyOpts('https://127.0.0.1:8000'),
-    '/engines-dist':   proxyOpts('https://127.0.0.1:8000'),
+    '/c/*/edit':       configHelper.proxyOpts('https://127.0.0.1:8000'), // Can't proxy all of /c because that's used by Vue too
+    '/k/':             configHelper.proxyOpts('https://127.0.0.1:8000'),
+    '/g/':             configHelper.proxyOpts('https://127.0.0.1:8000'),
+    '/n/':             configHelper.proxyOpts('https://127.0.0.1:8000'),
+    '/p/':             configHelper.proxyOpts('https://127.0.0.1:8000'),
+    '/assets':         configHelper.proxyOpts('https://127.0.0.1:8000'),
+    '/translations':   configHelper.proxyOpts('https://127.0.0.1:8000'),
+    '/engines-dist':   configHelper.proxyOpts('https://127.0.0.1:8000'),
   };
 
   const config = {
@@ -456,7 +453,9 @@ module.exports = function(dir, _appConfig) {
       ];
 
       if (instrumentCode) {
-        babelPlugins.push('babel-plugin-istanbul');
+        babelPlugins.push([
+          'babel-plugin-istanbul', { extension: ['.js', '.vue'] }, 'add-vue'
+        ]);
 
         console.warn('Instrumenting code for coverage'); // eslint-disable-line no-console
       }
@@ -570,114 +569,3 @@ module.exports = function(dir, _appConfig) {
 
   return config;
 };
-
-// ===============================================================================================
-// Functions for the request proxying used in dev
-// ===============================================================================================
-
-function proxyMetaOpts(target) {
-  return {
-    target,
-    followRedirects: true,
-    secure:          !dev,
-    changeOrigin:    true,
-    onProxyReq,
-    onProxyReqWs,
-    onError,
-    onProxyRes,
-  };
-}
-
-function proxyOpts(target) {
-  return {
-    target,
-    secure:       !devPorts,
-    changeOrigin: true,
-    onProxyReq,
-    onProxyReqWs,
-    onError,
-    onProxyRes
-  };
-}
-
-// Intercept the /rancherversion API call wnad modify the 'RancherPrime' value
-// if configured to do so by the environment variable PRIME
-function proxyPrimeOpts(target) {
-  const opts = proxyOpts(target);
-
-  // Don't intercept if the PRIME environment variable is not set
-  if (!prime?.length) {
-    return opts;
-  }
-
-  opts.onProxyRes = (proxyRes, req, res) => {
-    const _end = res.end;
-    let body = '';
-
-    proxyRes.on( 'data', (data) => {
-      data = data.toString('utf-8');
-      body += data;
-    });
-
-    res.write = () => {};
-
-    res.end = () => {
-      let output = body;
-
-      try {
-        const out = JSON.parse(body);
-
-        out.RancherPrime = prime;
-        output = JSON.stringify(out);
-      } catch (err) {}
-
-      res.setHeader('content-length', output.length );
-      res.setHeader('content-type', 'application/json' );
-      res.setHeader('transfer-encoding', '');
-      res.setHeader('cache-control', 'no-cache');
-      res.writeHead(proxyRes.statusCode);
-      _end.apply(res, [output]);
-    };
-  };
-
-  return opts;
-}
-
-function onProxyRes(proxyRes, req, res) {
-  if (devPorts) {
-    proxyRes.headers['X-Frame-Options'] = 'ALLOWALL';
-  }
-}
-
-function proxyWsOpts(target) {
-  return {
-    ...proxyOpts(target),
-    ws:           true,
-    changeOrigin: true,
-  };
-}
-
-function onProxyReq(proxyReq, req) {
-  if (!(proxyReq._currentRequest && proxyReq._currentRequest._headerSent)) {
-    proxyReq.setHeader('x-api-host', req.headers['host']);
-    proxyReq.setHeader('x-forwarded-proto', 'https');
-  }
-}
-
-function onProxyReqWs(proxyReq, req, socket, options, head) {
-  req.headers.origin = options.target.href;
-  proxyReq.setHeader('origin', options.target.href);
-  proxyReq.setHeader('x-api-host', req.headers['host']);
-  proxyReq.setHeader('x-forwarded-proto', 'https');
-  // console.log(proxyReq.getHeaders());
-
-  socket.on('error', (err) => {
-    console.error('Proxy WS Error:', err); // eslint-disable-line no-console
-  });
-}
-
-function onError(err, req, res) {
-  res.statusCode = 598;
-  console.error('Proxy Error:', err); // eslint-disable-line no-console
-  res.write(JSON.stringify(err));
-}

package/creators/pkg/files/.github/workflows/build-container.yml

@@ -1,64 +0,0 @@
-name: Build and release container to registry
-
-on:
-  push:
-    branches:
-      - main
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  build:
-    name: Build container image
-    if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
-    runs-on: ubuntu-latest
-    permissions: write-all
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Configure Git
-        run: |
-          git config user.name "${{ github.actor }}"
-          git config user.email "${{ github.actor }}@users.noreply.github.com"
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Setup Helm
-        uses: azure/setup-helm@v3
-        with:
-          version: v3.8.0
-
-      - name: Setup yq
-        uses: chrisdickinson/setup-yq@v1.0.1
-        with:
-          yq-version: v4.28.2
-
-      - name: Setup Nodejs and npm
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-
-      - name: Setup yarn
-        run: npm install -g yarn
-
-      - name: Setup Nodejs with yarn caching
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-          cache: yarn
-
-      - name: Install dependencies
-        run: yarn
-
-      - name: Build and push UI image
-        run: |
-          yarn publish-pkgs -cp -r ${{ env.REGISTRY }} -o ${{ github.repository_owner }}

package/creators/pkg/files/.github/workflows/build-extension.yml

@@ -1,110 +0,0 @@
-name: Build and Release Extension
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-
-env:
-  ACTIONS_RUNNER_DEBUG: false
-  CI_COMMIT_MESSAGE: CI Build Artifacts
-
-defaults:
-  run:
-    shell: bash
-    working-directory: ./
-
-jobs:
-  build:
-    name: Build extension artifact
-    runs-on: ubuntu-latest
-    permissions: write-all
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Configure Git
-        run: |
-          git config user.name "$GITHUB_ACTOR"
-          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
-
-      - name: Setup Helm
-        uses: azure/setup-helm@v3
-        with:
-          version: v3.8.0
-
-      - name: Setup yq
-        uses: chrisdickinson/setup-yq@v1.0.1
-        with:
-          yq-version: v4.28.2
-
-      - name: Setup Nodejs and npm
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-
-      - name: Setup yarn
-        run: npm install -g yarn
-
-      - name: Setup Nodejs with yarn caching
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-          cache: yarn
-
-      - name: Install dependencies
-        run: yarn
-
-      - name: Run build script
-        shell: bash
-        id: build_script
-        run: |
-          yarn publish-pkgs -s "${{ github.repository }}" -b gh-pages
-
-      - name: Upload charts artifact
-        if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
-        uses: actions/upload-artifact@v3
-        with:
-          name: charts
-          path: tmp
-
-  release:
-    name: Release Build
-    if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
-    needs: build
-    runs-on: ubuntu-latest
-    permissions: write-all
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: gh-pages
-
-      - name: Configure Git
-        run: |
-          git config user.name "$GITHUB_ACTOR"
-          git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
-
-      - name: Download build artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: charts
-
-      - name: Commit build
-        run: |
-          git add ./{assets,charts,extensions,index.yaml}
-          git commit -a -m "${{ env.CI_COMMIT_MESSAGE }}"
-          git push
-
-      - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.4.1
-        with:
-          charts_dir: ./charts/*
-        env:
-          CR_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          CR_SKIP_EXISTING: true

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

@@ -1,37 +0,0 @@
-import { mount } from '@vue/test-utils';
-import { Card } from './index';
-
-describe('component: Card', () => {
-  const title = 'Card title';
-  const body = 'Card body';
-
-  it('should have a card title', () => {
-    const wrapper = mount(Card, {
-      propsData: { title },
-      slots:     { title: '<div>Card title</div>' }
-    });
-
-    const element = wrapper.find('[data-testid="card-title-slot"]');
-
-    expect(element.exists()).toBe(true);
-    expect(element.text()).toBe(title);
-  });
-
-  it('should have a card body', () => {
-    const wrapper = mount(Card, {
-      propsData: { body },
-      slots:     { body: '<div>Card body</div>' }
-    });
-    const element = wrapper.find('[data-testid="card-body-slot"]');
-
-    expect(element.exists()).toBe(true);
-    expect(element.text()).toBe(body);
-  });
-
-  it('should display the default card actions', () => {
-    const wrapper = mount(Card);
-    const element = wrapper.find('[data-testid="card-actions-slot"]');
-
-    expect(element.exists()).toBe(true);
-  });
-});

package/rancher-components/Form/Radio/RadioButton.test.ts

@@ -1,31 +0,0 @@
-import { shallowMount } from '@vue/test-utils';
-import { RadioButton } from './index';
-import { cleanHtmlDirective } from '@shell/plugins/clean-html-directive';
-
-describe('radioButton.vue', () => {
-  it('renders label slot contents', () => {
-    const wrapper = shallowMount(RadioButton, { slots: { label: 'Test Label' } });
-
-    expect(wrapper.find('.radio-label').text()).toBe('Test Label');
-  });
-
-  it('renders label prop contents', () => {
-    const wrapper = shallowMount(
-      RadioButton,
-      {
-        directives: { cleanHtmlDirective },
-        propsData:  { label: 'Test Label' }
-      });
-
-    expect(wrapper.find('.radio-label').text()).toBe('Test Label');
-  });
-
-  it('renders slot contents when both slot and label prop are provided', () => {
-    const wrapper = shallowMount(RadioButton, {
-      slots:     { label: 'Test Label - Slot' },
-      propsData: { label: 'Test Label - Props' },
-    });
-
-    expect(wrapper.find('.radio-label').text()).toBe('Test Label - Slot');
-  });
-});