@rancher/shell 0.5.1 → 0.5.3

package/plugins/steve/actions.js

@@ -1,14 +1,14 @@
 import https from 'https';
 import { addParam, parse as parseUrl, stringify as unParseUrl } from '@shell/utils/url';
 import { handleSpoofedRequest, loadSchemas } from '@shell/plugins/dashboard-store/actions';
-import { set } from '@shell/utils/object';
+import { dropKeys, set } from '@shell/utils/object';
 import { deferred } from '@shell/utils/promise';
 import { streamJson, streamingSupported } from '@shell/utils/stream';
 import isObject from 'lodash/isObject';
 import { classify } from '@shell/plugins/dashboard-store/classify';
 import { NAMESPACE } from '@shell/config/types';
-import jsyaml from 'js-yaml';
 import { handleKubeApiHeaderWarnings } from '@shell/plugins/steve/header-warnings';
+import { steveCleanForDownload } from '@shell/plugins/steve/resource-utils';
 
 export default {
 
@@ -330,31 +330,7 @@ export default {
 
   // remove fields added by steve before showing/downloading yamls
   cleanForDownload(ctx, yaml) {
-    if (!yaml) {
-      return;
-    }
-    const rootKeys = [
-      'id',
-      'links',
-      'type',
-      'actions'
-    ];
-    const metadataKeys = [
-      'fields',
-      'relationships',
-      'state',
-    ];
-    const conditionKeys = [
-      'error',
-      'transitioning',
-    ];
-    const obj = jsyaml.load(yaml);
-
-    dropKeys(obj, rootKeys);
-    dropKeys(obj?.metadata, metadataKeys);
-    (obj?.status?.conditions || []).forEach((condition) => dropKeys(condition, conditionKeys));
-
-    return jsyaml.dump(obj);
+    return steveCleanForDownload(yaml);
   }
 };
 
@@ -398,16 +374,6 @@ function dropUnderscores(obj) {
   }
 }
 
-function dropKeys(obj, keys) {
-  if ( !obj ) {
-    return;
-  }
-
-  for ( const k of keys ) {
-    delete obj[k];
-  }
-}
-
 function dropCattleKeys(obj) {
   if ( !obj ) {
     return;

package/plugins/steve/getters.js

@@ -33,6 +33,12 @@ export default {
     const parsedUrl = parse(url);
     const isSteve = steveRegEx.test(parsedUrl.path);
 
+    // labelSelector
+    if ( opt.labelSelector ) {
+      url += `${ url.includes('?') ? '&' : '?' }labelSelector=${ opt.labelSelector }`;
+    }
+    // End: labelSelector
+
     // Filter
     if ( opt.filter ) {
       url += `${ (url.includes('?') ? '&' : '?') }`;

package/plugins/steve/resource-utils.ts

@@ -0,0 +1,38 @@
+import { dropKeys } from '@shell/utils/object';
+import jsyaml from 'js-yaml';
+
+export function steveCleanForDownload(yaml: string, keys?: {
+  rootKeys?: string[],
+  metadataKeys?: string[],
+  conditionKeys?: string[]
+ }): string | undefined {
+  if (!yaml) {
+    return;
+  }
+
+  const {
+    rootKeys = [
+      'id',
+      'links',
+      'type',
+      'actions'
+    ],
+    metadataKeys = [
+      'fields',
+      'relationships',
+      'state',
+    ],
+    conditionKeys = [
+      'error',
+      'transitioning',
+    ]
+  } = keys || {};
+
+  const obj: any = jsyaml.load(yaml);
+
+  dropKeys(obj, rootKeys);
+  dropKeys(obj?.metadata, metadataKeys);
+  (obj?.status?.conditions || []).forEach((condition: any) => dropKeys(condition, conditionKeys));
+
+  return jsyaml.dump(obj);
+}

package/scripts/extension/parse-tag-name

@@ -4,8 +4,8 @@ GITHUB_RELEASE_TAG=$1
 GITHUB_RUN_ID=$2
 GITHUB_WORKFLOW_TYPE=$3
 
-# Check packages for released tag name
-if [[ "${GITHUB_WORKFLOW_TYPE}" == "charts" ]]; then
+# Ensure "catalog" workflow release tag name does not match a pkg/<pkg-name>
+if [[ "${GITHUB_WORKFLOW_TYPE}" == "catalog" ]]; then
   for d in pkg/*/ ; do
     pkg=$(basename $d)
 
@@ -19,7 +19,7 @@ if [[ "${GITHUB_WORKFLOW_TYPE}" == "charts" ]]; then
     fi
   done
 else
-  # Check base extension name for tag name
+  # Ensure "charts" workflow release tag name does not match the root <pkg-name>
   BASE_EXT=$(jq -r .name package.json)
   EXT_VERSION=$(jq -r .version package.json)