@rancher/shell 0.3.10 → 0.3.12

package/scripts/extension/publish

@@ -2,6 +2,7 @@
 
 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 BASE_DIR="$(pwd)"
+BASE_EXT=$(basename ${BASE_DIR})
 
 CYAN="\033[96m"
 YELLOW="\033[93m"
@@ -162,15 +163,16 @@ CHART_TMP=${BASE_DIR}/tmp/_charts
 rm -rf ${TMP}
 mkdir -p ${TMP}
 
-CHART_TEMPLATE=${BASE_DIR}/tmp/ui-plugin-server
-
 # --------------------------------------------------------------------------------
-# Clone the plugin server template into the temporary folder
+# Copy the plugin server template into the temporary folder
 # --------------------------------------------------------------------------------
 pushd ${TMP} > /dev/null
-git clone -q https://github.com/nwmac/ui-plugin-server.git
+cp -r ${SCRIPT_DIR}/helm .
 popd > /dev/null
 
+CHART_TEMPLATE=${BASE_DIR}/tmp/helm
+ROOT_INDEX=${BASE_DIR}/index.yaml
+
 # --------------------------------------------------------------------------------
 # Iterate through all packages - built them all or build only those specified on the command line
 # --------------------------------------------------------------------------------
@@ -211,8 +213,6 @@ for d in pkg/*/ ; do
     find plugin -type f | sort > files.txt
     popd > /dev/null
 
-    rm -rf ${TMP}/container
-
     # --------------------------------------------------------------------------------
     # Create the Helm chart
     # --------------------------------------------------------------------------------
@@ -241,21 +241,21 @@ for d in pkg/*/ ; do
       cp ./pkg/${pkg}/README.md ${CHART_FOLDER}/README.md
     fi
 
+    pushd ${CHART_FOLDER}/templates > /dev/null
+    
     if [ "${GITHUB_BUILD}" == "true" ]; then
       echo "Patching for GitHub build"
-      pushd ${CHART_FOLDER} > /dev/null
-      cd templates
-      mv cr.yaml temp.cr
-      rm *.yaml
-      mv temp.cr cr.yaml
       ENDPOINT=https://raw.githubusercontent.com/${GITHUB_SOURCE}/${GITHUB_BRANCH}/extensions/${pkg}/${PKG_VERSION}
-      sed -i.bak -e 's@endpoint: .*@endpoint: '"${ENDPOINT}"'@g' cr.yaml
-      rm *.bak
-      popd > /dev/null
+    else
+      echo "Patching for container build"
+      ENDPOINT=http://${IMAGE_PREFIX}${BASE_EXT}-svc.cattle-ui-plugin-system:8080/plugin/${PKG_NAME}
     fi
+    sed -i.bak -e 's@endpoint: .*@endpoint: '"${ENDPOINT}"'@g' cr.yaml
+    rm *.bak
+    popd > /dev/null
 
     # Additional patches
-    ${SCRIPT_DIR}/helmpatch ${CHART_FOLDER} "${BASE_DIR}/pkg/${pkg}/package.json" "${REGISTRY}${REGISTRY_ORG}/${IMAGE_PREFIX}${pkg}"
+    ${SCRIPT_DIR}/helmpatch ${CHART_FOLDER} "${BASE_DIR}/pkg/${pkg}/package.json"
 
     # Package into a .tgz helm chart
     helm package ${CHART_FOLDER} -d ${ASSETS}/${pkg}
@@ -268,10 +268,11 @@ for d in pkg/*/ ; do
     if [ -f "${HELM_INDEX}" ]; then
       UPDATE="--merge ${HELM_INDEX}"
     elif [ "${GITHUB_BUILD}" == "true" ] && [[ -n ${GITHUB_SOURCE} ]]; then
+      # Check if git branch contains index.yaml
       GITHUB_SOURCE=$(echo -e "${GITHUB_SOURCE}" | sed 's/https:\/\///g')
 
-      # Check if git branch contains index.yaml
-      wget -P ${BASE_DIR} https://raw.githubusercontent.com/${GITHUB_SOURCE}/${GITHUB_BRANCH}/index.yaml
+      wget -P ${BASE_DIR} https://raw.githubusercontent.com/${GITHUB_SOURCE}/${GITHUB_BRANCH}/index.yaml 2>/dev/null
+      HELM_INDEX="${BASE_DIR}/index.yaml"
 
       if [ -f "${HELM_INDEX}" ]; then
         UPDATE="--merge ${HELM_INDEX}"
@@ -281,44 +282,58 @@ for d in pkg/*/ ; do
     # Base URL referencing assets directly from GitHub
     BASE_URL="assets/${pkg}"
 
+    # Relative URL references assets within the container deployment
+    RELATIVE_URL="plugin/"
+    
     rm -rf ${CHART_TMP}
     mkdir -p ${CHART_TMP}
     cp ${ASSETS}/${pkg}/*.tgz ${CHART_TMP}
 
-    helm repo index ${CHART_TMP} --url ${BASE_URL} ${UPDATE}
-
-    cp ${CHART_TMP}/index.yaml ${HELM_INDEX}
-
     if [ "${GITHUB_BUILD}" == "true" ]; then
-      # Make temp directory for workflow build artifact
-      mkdir -p tmp/{assets,charts,extensions}/$pkg
-
-      cp -r ${PKG_ASSET} tmp/assets/$pkg
-      cp -r ${CHARTS}/${pkg}/${PKG_VERSION} tmp/charts/$pkg
-      cp -r ${EXT_FOLDER} tmp/extensions/$pkg
+      helm repo index ${ASSETS} --url ${BASE_URL} ${UPDATE}
+    elif ! [ -e "${HELM_INDEX}" ]; then
+      helm repo index ${ASSETS} --url ${RELATIVE_URL}
     fi
 
     BUILT="true"
   fi
 done
 
+if [ -f ${ROOT_INDEX} ]; then
+  UPDATE="--merge ${ROOT_INDEX}"
+  helm repo index ${ASSETS} ${UPDATE}
+fi
+
+if [ -f ${ASSETS}/index.yaml ]; then
+  cp ${ASSETS}/index.yaml ${BASE_DIR}
+fi
+
 if [ "${GITHUB_BUILD}" == "false" ]; then
-  BASE=$(basename ${BASE_DIR})
   EXT_VERSION=$(jq -r .version ${BASE_DIR}/package.json)
 
   if [ -z ${EXT_VERSION} ]; then
     EXT_VERSION="0.0.0"
   fi
 
-  echo -e "${CYAN}Base extension: ${BASE}${RESET}"
+  echo -e "${CYAN}Base extension: ${BASE_EXT}${RESET}"
   echo -e "${CYAN}Extension version: ${EXT_VERSION}${RESET}"
 
   # Build the docker image
-  ${SCRIPT_DIR}/bundle ${BASE} ${EXT_VERSION} ${REGISTRY} ${REGISTRY_ORG} ${IMAGE_PREFIX} ${PUSH}
+  ${SCRIPT_DIR}/bundle ${BASE_EXT} ${EXT_VERSION} ${REGISTRY} ${REGISTRY_ORG} ${IMAGE_PREFIX} ${PUSH}
 fi
 
-if [ "${GITHUB_BUILD}" == "true" ]; then
-  cp index.yaml tmp
+if [ "${GITHUB_BUILD}" == "true" ] && [ -f ${ROOT_INDEX} ]; then
+  cp ${ROOT_INDEX} tmp
+fi
+
+if [ "${GITHUB_BUILD}" == "true" ] && [ "${BUILT}" == "true" ]; then
+  echo -e "${BOLD}${CYAN}Packaging for Github Build${RESET}"
+  # Make temp directory for workflow build artifact
+  mkdir -p tmp/{assets,charts,extensions}
+
+  cp -r ${ASSETS}/* tmp/assets
+  cp -r ${CHARTS}/* tmp/charts
+  cp -r ${BASE_DIR}/extensions/* tmp/extensions
 fi
 
 if [ "${BUILT}" == "true" ]; then

package/types/shell/index.d.ts

@@ -1546,30 +1546,36 @@ export namespace FLEET_BUNDLE_TYPE {
     const width_30: number;
     export { width_30 as width };
 }
-export namespace RBAC_USERS {
-    const name_111: string;
-    export { name_111 as name };
-    const sort_101: string[];
-    export { sort_101 as sort };
-    export function getValue_13(row: any): any;
-    export { getValue_13 as getValue };
-}
-export namespace RBAC_GROUPS {
-    const name_112: string;
-    export { name_112 as name };
-    const sort_102: string[];
-    export { sort_102 as sort };
-    export function getValue_14(row: any): any;
-    export { getValue_14 as getValue };
-}
-export namespace RBAC_SERVICE_ACCOUNTS {
-    const name_113: string;
-    export { name_113 as name };
-    const sort_103: string[];
-    export { sort_103 as sort };
-    export function getValue_15(row: any): any;
-    export { getValue_15 as getValue };
-}
+export const UI_PLUGIN_CATALOG: ({
+    name: string;
+    labelKey: string;
+    sort: string[];
+    value: string;
+    width: number;
+    default: string;
+    formatter: string;
+    formatterOpts: {
+        arbitrary: boolean;
+    };
+} | {
+    name: string;
+    labelKey: string;
+    value: string;
+    sort: string[];
+    formatter: string;
+    width?: undefined;
+    default?: undefined;
+    formatterOpts?: undefined;
+} | {
+    name: string;
+    sort: string[];
+    labelKey: string;
+    value: string;
+    width?: undefined;
+    default?: undefined;
+    formatter?: undefined;
+    formatterOpts?: undefined;
+})[];
 }
 
 // @shell/config/types

package/utils/__tests__/grafana.test.ts

@@ -29,7 +29,7 @@ describe('fx: getClusterPrefix', () => {
   it('future monitoring version, local cluster', () => {
     const prefix = getClusterPrefix('103.0.0+up41.0.0', 'local');
 
-    expect(prefix).toStrictEqual('/k8s/clusters/local');
+    expect(prefix).toStrictEqual('');
   });
   it('empty monitoring version, downstream cluster', () => {
     const prefix = getClusterPrefix('', 'c-abcd');
@@ -39,6 +39,6 @@ describe('fx: getClusterPrefix', () => {
   it('empty monitoring version, local cluster', () => {
     const prefix = getClusterPrefix('', 'local');
 
-    expect(prefix).toStrictEqual('/k8s/clusters/local');
+    expect(prefix).toStrictEqual('');
   });
 });

package/utils/error.js

@@ -39,6 +39,17 @@ export function stringify(err) {
   } else if ( err && typeof err === 'object' ) {
     if ( err.message ) {
       str = err.message;
+
+      if (typeof str === 'string') {
+        try {
+          const data = JSON.parse(str).data;
+
+          if (data) {
+            return data;
+          }
+        } catch {}
+      }
+
       if ( err.detail ) {
         if ( str ) {
           str += ` (${ err.detail })`;

package/utils/grafana.js

@@ -1,12 +1,13 @@
 import { haveV2Monitoring } from '@shell/utils/monitoring';
 import { parse as parseUrl, addParam } from '@shell/utils/url';
-import { compare } from '@shell/utils/version';
 import { CATALOG } from '@shell/config/types';
 
-const MONITORING_VERSION_NEW_URL_PATTERN = '102.0.0+up40.1.2';
+// these two versions of monitoring included a bug fix attempt that required the local cluster to use a different url
+// the solution going forward doesn't require this, see https://github.com/rancher/dashboard/issues/8885
+const MONITORING_VERSION_ALT_URL = ['100.2.0+up40.1.2', '102.0.0+up40.1.2'];
 
 export function getClusterPrefix(monitoringVersion, clusterId) {
-  if (compare(monitoringVersion, MONITORING_VERSION_NEW_URL_PATTERN) >= 0) {
+  if (MONITORING_VERSION_ALT_URL.includes(monitoringVersion)) {
     return `/k8s/clusters/${ clusterId }`;
   }
 
@@ -53,7 +54,7 @@ export async function dashboardExists(monitoringVersion, store, clusterId, embed
 }
 
 export async function allDashboardsExist(store, clusterId, embeddedUrls, storeName = 'cluster') {
-  let res;
+  let res;
 
   try {
     res = await store.dispatch(`${ storeName }/find`, { type: CATALOG.APP, id: 'cattle-monitoring-system/rancher-monitoring' });

package/vue.config.js

@@ -248,9 +248,6 @@ module.exports = function(dir, _appConfig) {
     resourceBase += '/';
   }
 
-  // Store the Router Base as env variable that we can use in `nuxt/router.js`
-  process.env.VUE_APP_ROUTER_BASE = routerBasePath;
-
   console.log(`Build: ${ dev ? 'Development' : 'Production' }`); // eslint-disable-line no-console
 
   if ( !dev ) {
@@ -352,6 +349,7 @@ module.exports = function(dir, _appConfig) {
     },
     publicPath: resourceBase || undefined,
     css:        {
+      extract:       false, // inline css styles instead of including with `<links`
       loaderOptions: {
         sass: {
           // This is effectively added to the beginning of each style that's imported or included in a vue file. We may want to look into including these in app.scss
@@ -400,6 +398,8 @@ module.exports = function(dir, _appConfig) {
         'process.env.rancherEnv':      JSON.stringify(rancherEnv),
         'process.env.harvesterPkgUrl': JSON.stringify(process.env.HARVESTER_PKG_URL),
         'process.env.api':             JSON.stringify(api),
+        // Store the Router Base as env variable that we can use in `shell/config/router.js`
+        'process.env.routerBase':      JSON.stringify(routerBasePath),
 
         // This is a replacement of the nuxt publicRuntimeConfig
         'nuxt.publicRuntimeConfig': JSON.stringify({
@@ -533,20 +533,6 @@ module.exports = function(dir, _appConfig) {
           ]
         },
         // Prevent warning in log with the md files in the content folder
-        {
-          test: /\.md$/,
-          use:  [
-            {
-              loader:  'url-loader',
-              options: {
-                name:     '[path][name].[ext]',
-                limit:    1,
-                esModule: false
-              },
-            }
-          ]
-        },
-        // Prevent warning in log with the md files in the content folder
         {
           test: /\.md$/,
           use:  [