@rancher/shell 3.0.12-rc.4 → 3.0.12-rc.6

package/store/auth.js

@@ -76,7 +76,7 @@ export const getters = {
 
   selfUser(state) {
     return state.selfUser;
-  }
+  },
 };
 
 export const mutations = {
@@ -208,6 +208,16 @@ export const actions = {
     return findBy(authConfigs, 'id', id);
   },
 
+  /**
+   * Is the local auth provider enabled?
+   */
+  async getLocalProviderEnabled({ dispatch }) {
+    // If it exists as an option to log in --> enabled
+    const localProvider = await dispatch('getAuthProvider', 'local');
+
+    return !!localProvider;
+  },
+
   /**
    * Create the basic json object used for the nonce (this includes the random nonce/state)
    */

package/store/features.js

@@ -39,6 +39,11 @@ export const PROVISIONING_PRE_BOOTSTRAP = create('provisioningprebootstrap', fal
 export const SCHEDULING_CUSTOMIZATION = create(SCHEDULING_CUSTOMIZATION_FEATURE, false);
 export const SCC = create('rancher-scc-registration-extension', true);
 export const AUTOSCALER = create('cluster-autoscaling', false);
+// Feature flags for disabling shell access to clusters, nodes, pods
+export const CLUSTER_SHELL = create('cluster-shell', true);
+export const NODE_SHELL = create('node-shell', true);
+export const POD_SHELL = create('pod-shell', true);
+export const HIDE_LOCAL_AUTH_PROVIDER = create('hide-local-auth-provider', false);
 
 // Not currently used.. no point defining ones we don't use
 // export const EMBEDDED_CLUSTER_API = create('embedded-cluster-api', true);

package/store/plugins.js

@@ -129,6 +129,12 @@ export const state = function() {
   return {};
 };
 
+export const actions = {
+  mapDriver(ctx, { name, to }) {
+    mapDriver(name, to);
+  },
+};
+
 export const getters = {
   credentialOptions() {
     return (name) => {

package/types/rancher/steve.api.ts

@@ -13,13 +13,13 @@ export const STEVE_RESPONSE_CODE = {
 /**
  * Steve API JSON response for GET requests
  */
-export interface SteveGetResponse extends KubeGetResponse {
+export type SteveGetResponse<T = Record<string, any>> = T & KubeGetResponse & {
   // Rancher specific properties (there are more)
   id: string,
 
   // Bucket for everything else (hopefully to remove once above populated)
   [key: string]: any
-}
+};
 
 /**
  * Steve API JSON response for LIST requests

package/types/shell/index.d.ts

@@ -28,6 +28,7 @@ export const IMPORTED_CLUSTER_VERSION_MANAGEMENT: "rancher.io/imported-cluster-v
 export const UI_PROJECT_SECRET: "management.cattle.io/project-scoped-secret";
 export const UI_PROJECT_SECRET_COPY: "management.cattle.io/project-scoped-secret-copy";
 export const SERVICE_LINKS: "ui.rancher/service-links";
+export const NODE_DRIVER_FIELD_HINTS: "io.cattle.nodedriver/ui-field-hints";
 export namespace KUBERNETES {
     let SERVICE_ACCOUNT_UID: string;
     let SERVICE_ACCOUNT_NAME: string;
@@ -141,6 +142,9 @@ export namespace SNAPSHOT {
     let CLUSTER_NAME_1: string;
     export { CLUSTER_NAME_1 as CLUSTER_NAME };
 }
+export namespace OPERATION_ANNOTATIONS {
+    let ENABLED: string;
+}
 export namespace ISTIO {
     let AUTO_INJECTION: string;
 }
@@ -196,6 +200,7 @@ export const IMPORTED_CLUSTER_VERSION_MANAGEMENT: "rancher.io/imported-cluster-v
 export const UI_PROJECT_SECRET: "management.cattle.io/project-scoped-secret";
 export const UI_PROJECT_SECRET_COPY: "management.cattle.io/project-scoped-secret-copy";
 export const SERVICE_LINKS: "ui.rancher/service-links";
+export const NODE_DRIVER_FIELD_HINTS: "io.cattle.nodedriver/ui-field-hints";
 export namespace KUBERNETES {
     let SERVICE_ACCOUNT_UID: string;
     let SERVICE_ACCOUNT_NAME: string;
@@ -309,6 +314,9 @@ export namespace SNAPSHOT {
     let CLUSTER_NAME_1: string;
     export { CLUSTER_NAME_1 as CLUSTER_NAME };
 }
+export namespace OPERATION_ANNOTATIONS {
+    let ENABLED: string;
+}
 export namespace ISTIO {
     let AUTO_INJECTION: string;
 }
@@ -2363,6 +2371,7 @@ export namespace FEATURE_DESCRIPTION {
     export { formatter_65 as formatter };
     export namespace formatterOpts_16 {
         let prefix: string;
+        let fallbackPath: string;
     }
     export { formatterOpts_16 as formatterOpts };
 }
@@ -4160,6 +4169,7 @@ export namespace FEATURE_DESCRIPTION {
     export { formatter_65 as formatter };
     export namespace formatterOpts_16 {
         let prefix: string;
+        let fallbackPath: string;
     }
     export { formatterOpts_16 as formatterOpts };
 }
@@ -4511,6 +4521,11 @@ export const LONGHORN_DRIVER: "driver.longhorn.io";
 export const LONGHORN_VERSION_V1: "LonghornV1";
 export const LONGHORN_VERSION_V2: "LonghornV2";
 export const SNAPSHOT: "rke.cattle.io.etcdsnapshot";
+export namespace OPERATION {
+    let ETCD_SNAPSHOT: string;
+    let ETCD_SNAPSHOT_RESTORE: string;
+    let ENCRYPTION_KEY_ROTATE: string;
+}
 export namespace MANAGEMENT {
     let AUTH_CONFIG_1: string;
     export { AUTH_CONFIG_1 as AUTH_CONFIG };
@@ -4688,6 +4703,7 @@ export namespace AUTH_TYPE {
     let _S3: string;
     let _RKE: string;
     let _IMAGE_PULL_SECRET: string;
+    let _GITHUB_APP: string;
 }
 export const LOCAL_CLUSTER: "local";
 export namespace CLUSTER_REPO_TYPES {
@@ -4896,6 +4912,11 @@ export const LONGHORN_DRIVER: "driver.longhorn.io";
 export const LONGHORN_VERSION_V1: "LonghornV1";
 export const LONGHORN_VERSION_V2: "LonghornV2";
 export const SNAPSHOT: "rke.cattle.io.etcdsnapshot";
+export namespace OPERATION {
+    let ETCD_SNAPSHOT: string;
+    let ETCD_SNAPSHOT_RESTORE: string;
+    let ENCRYPTION_KEY_ROTATE: string;
+}
 export namespace MANAGEMENT {
     let AUTH_CONFIG_1: string;
     export { AUTH_CONFIG_1 as AUTH_CONFIG };
@@ -5073,6 +5094,7 @@ export namespace AUTH_TYPE {
     let _S3: string;
     let _RKE: string;
     let _IMAGE_PULL_SECRET: string;
+    let _GITHUB_APP: string;
 }
 export const LOCAL_CLUSTER: "local";
 export namespace CLUSTER_REPO_TYPES {
@@ -6624,6 +6646,7 @@ export namespace STATES_ENUM {
     let BUILDING: string;
     let COMPLETED: string;
     let CORDONED: string;
+    let CANCELLED: string;
     let COUNT: string;
     let CREATED: string;
     let CREATING: string;
@@ -6862,6 +6885,8 @@ export default class Resource {
     doActionGrowl(actionName: any, body: any, opt?: {}): Promise<any>;
     patch(data: any, opt?: {}, merge?: boolean, alertOnError?: boolean): any;
     save(...args: any[]): Promise<this>;
+    _collectionUrl(): any;
+    dryRunCreate(data: any): Promise<any>;
     /**
      * Remove any unwanted properties from the object that will be saved
      */
@@ -7202,6 +7227,7 @@ export namespace STATES_ENUM {
     let BUILDING: string;
     let COMPLETED: string;
     let CORDONED: string;
+    let CANCELLED: string;
     let COUNT: string;
     let CREATED: string;
     let CREATING: string;
@@ -7440,6 +7466,8 @@ export default class Resource {
     doActionGrowl(actionName: any, body: any, opt?: {}): Promise<any>;
     patch(data: any, opt?: {}, merge?: boolean, alertOnError?: boolean): any;
     save(...args: any[]): Promise<this>;
+    _collectionUrl(): any;
+    dryRunCreate(data: any): Promise<any>;
     /**
      * Remove any unwanted properties from the object that will be saved
      */
@@ -7846,6 +7874,18 @@ export default class SteveModel extends HybridModel {
      * @param {*} res
      */
     processSaveResponse(res: any, opt?: {}): void;
+    /**
+     * RESOURCES API - ResourceInstance update method to send a PATCH request
+     */
+    update(data: any): Promise<this>;
+    /**
+     * RESOURCES API - ResourceInstance update method to send a PUT request
+     */
+    replace(): Promise<this>;
+    /**
+     * RESOURCES API - ResourceInstance delete method to send a DELETE request
+     */
+    delete(): Promise<void>;
 }
 import HybridModel from './hybrid-class';
 }
@@ -7875,6 +7915,18 @@ export default class SteveModel extends HybridModel {
      * @param {*} res
      */
     processSaveResponse(res: any, opt?: {}): void;
+    /**
+     * RESOURCES API - ResourceInstance update method to send a PATCH request
+     */
+    update(data: any): Promise<this>;
+    /**
+     * RESOURCES API - ResourceInstance update method to send a PUT request
+     */
+    replace(): Promise<this>;
+    /**
+     * RESOURCES API - ResourceInstance delete method to send a DELETE request
+     */
+    delete(): Promise<void>;
 }
 import HybridModel from './hybrid-class';
 }
@@ -7901,6 +7953,10 @@ export const PROVISIONING_PRE_BOOTSTRAP: any;
 export const SCHEDULING_CUSTOMIZATION: any;
 export const SCC: any;
 export const AUTOSCALER: any;
+export const CLUSTER_SHELL: any;
+export const NODE_SHELL: any;
+export const POD_SHELL: any;
+export const HIDE_LOCAL_AUTH_PROVIDER: any;
 export namespace getters {
     function get(state: any, getters: any, rootState: any, rootGetters: any): (name: any) => any;
 }
@@ -7934,6 +7990,10 @@ export const PROVISIONING_PRE_BOOTSTRAP: any;
 export const SCHEDULING_CUSTOMIZATION: any;
 export const SCC: any;
 export const AUTOSCALER: any;
+export const CLUSTER_SHELL: any;
+export const NODE_SHELL: any;
+export const POD_SHELL: any;
+export const HIDE_LOCAL_AUTH_PROVIDER: any;
 export namespace getters {
     function get(state: any, getters: any, rootState: any, rootGetters: any): (name: any) => any;
 }
@@ -7958,6 +8018,12 @@ export const fullFields: any[];
 export const prefixFields: any[];
 export const suffixFields: any[];
 export function state(): {};
+export namespace actions {
+    function mapDriver(ctx: any, { name, to }: {
+        name: any;
+        to: any;
+    }): void;
+}
 export namespace getters {
     function credentialOptions(): (name: any) => any;
     function credentialDriverFor(): (name: any) => any;
@@ -7983,6 +8049,12 @@ export const fullFields: any[];
 export const prefixFields: any[];
 export const suffixFields: any[];
 export function state(): {};
+export namespace actions {
+    function mapDriver(ctx: any, { name, to }: {
+        name: any;
+        to: any;
+    }): void;
+}
 export namespace getters {
     function credentialOptions(): (name: any) => any;
     function credentialDriverFor(): (name: any) => any;
@@ -9496,6 +9568,14 @@ export function monitoringStatus(): {
     };
 };
 export function haveV2Monitoring(getters: any): boolean;
+/**
+ * Look up the installed Rancher monitoring app, preferring the new
+ * `rancher-monitoring-dashboards` chart and falling back to the legacy
+ * `rancher-monitoring`. Returns null if the user lacks permission, neither
+ * chart is installed, or any lookup fails.
+ */
+export function fetchMonitoringApp(store: any, storeName: any): Promise<any>;
+export function fetchMonitoringVersion(store: any, storeName: any): Promise<any>;
 export function canViewGrafanaLink(store: any): Promise<boolean>;
 export function canViewAlertManagerLink(store: any): Promise<boolean>;
 export function canViewPrometheusLink(store: any): Promise<boolean>;
@@ -9511,6 +9591,14 @@ export function monitoringStatus(): {
     };
 };
 export function haveV2Monitoring(getters: any): boolean;
+/**
+ * Look up the installed Rancher monitoring app, preferring the new
+ * `rancher-monitoring-dashboards` chart and falling back to the legacy
+ * `rancher-monitoring`. Returns null if the user lacks permission, neither
+ * chart is installed, or any lookup fails.
+ */
+export function fetchMonitoringApp(store: any, storeName: any): Promise<any>;
+export function fetchMonitoringVersion(store: any, storeName: any): Promise<any>;
 export function canViewGrafanaLink(store: any): Promise<boolean>;
 export function canViewAlertManagerLink(store: any): Promise<boolean>;
 export function canViewPrometheusLink(store: any): Promise<boolean>;
@@ -9765,6 +9853,38 @@ export function convertStringToKV(input: string): {};
 declare function isEqualBasic(from: any, to: any): boolean;
 }
 
+// @shell/utils/operation-cr
+
+declare module '@shell/utils/operation-cr' {
+/**
+ * Create a day 2 operation CR for imported clusters.
+ *
+ * @param {Function} dispatch - The Vuex dispatch function
+ * @param {string} type - The operation CRD type
+ * @param {object} spec - The operation spec
+ * @param {string} namespace - The namespace for the operation CR
+ * @param {string} namePrefix - The name prefix for the generated name
+ * @returns {Promise} The saved resource
+ */
+export function createOperationCR(dispatch: Function, type: string, spec: object, namespace: string, namePrefix: string): Promise<any>;
+}
+
+// @shell/utils/operation-cr.js
+
+declare module '@shell/utils/operation-cr.js' {
+/**
+ * Create a day 2 operation CR for imported clusters.
+ *
+ * @param {Function} dispatch - The Vuex dispatch function
+ * @param {string} type - The operation CRD type
+ * @param {object} spec - The operation spec
+ * @param {string} namespace - The namespace for the operation CR
+ * @param {string} namePrefix - The name prefix for the generated name
+ * @returns {Promise} The saved resource
+ */
+export function createOperationCR(dispatch: Function, type: string, spec: object, namespace: string, namePrefix: string): Promise<any>;
+}
+
 // @shell/utils/parse-externalid
 
 declare module '@shell/utils/parse-externalid' {

package/types/store/dashboard-store.types.ts

@@ -180,7 +180,7 @@ export type ActionFindPageTransientResponse<T = any> = {
  *
  * If the request was not transient this will just be the array of resources
  */
-export type ActionFindPageResponse<T = any> = ActionFindPageTransientResponse | T[];
+export type ActionFindPageResponse<T = Record<string, any>> = ActionFindPageTransientResponse<T> | T[];
 
 /**
  * Args used for findMatching action
@@ -221,7 +221,7 @@ export interface ActionFindMatchingArgs extends ActionCoreFindOptions {
  * @internal
  * Response to the findMatching action
  */
-export type ActionFindMatchingResponse<T = any> = ActionFindPageResponse<T>
+export type ActionFindMatchingResponse<T = any> = T[]
 
 /**
  * @internal

package/types/store/type-map.ts

@@ -1,3 +1,264 @@
+import { PluginRouteRecordRaw } from '@shell/core/types';
+
+/**
+ * The product as seen by the type-map
+ */
+export interface TypeMapProduct {
+  /**
+   * The category this product belongs under. i.e. 'config'
+   */
+  category?: string;
+
+  /**
+   * Hide the Copy KubeConfig button in the header
+   */
+  hideCopyConfig?: boolean;
+
+  /**
+   * Hide the Download KubeConfig button in the header
+   */
+  hideKubeConfig?: boolean;
+
+  /**
+   * Hide the Kubectl Shell button in the header
+   */
+  hideKubeShell?: boolean;
+
+  /**
+   * Hide the Namespace location
+   */
+  hideNamespaceLocation?: boolean;
+
+  /**
+   * Hide the system resources
+   */
+  hideSystemResources?: boolean;
+
+  /**
+   * The icon that should be displayed beside this item in the navigation.
+   */
+  icon?: string;
+
+    /**
+   * Alternative to the icon property. Uses require
+   */
+  svg?: Function;
+
+  /**
+   * Only load the product if the feature is present
+   */
+  ifFeature?: string | RegExp;
+
+  /**
+   * Only load the product if the type is present
+   */
+  ifHave?: string;
+
+  /**
+   * Only load the product if the group is present
+   */
+  ifHaveGroup?: string | RegExp;
+
+  /**
+   * Only load the product if the type is present
+   */
+  ifHaveType?: string | RegExp;
+
+  /**
+   * Hide the product if the type is present (opposite of ifHaveType)
+   */
+  ifNotHaveType?: string | RegExp;
+
+  /**
+   * The vuex store that this product should use by default i.e. 'management'
+   */
+  inStore?: string;
+
+  /**
+   * Show the cluster switcher in the navigation
+   */
+  showClusterSwitcher?: boolean;
+
+  /**
+   * Indicates whether UI Extensions can add pages to this product
+   */
+  extendable?: boolean;
+
+  /**
+   * Show the namespace filter in the header
+   */
+  showNamespaceFilter?: boolean;
+
+  /**
+   * A number used to determine where in navigation this item will be placed. The highest number will be at the top of the list.
+   */
+  weight?: number;
+
+  /**
+   * The route that the product will lead to if click on in navigation.
+   */
+  to?: PluginRouteRecordRaw;
+
+  /**
+   * Product name
+   *
+   * Defaults to the DSL fn product arg
+   */
+  name?: string;
+
+  /**
+   *
+   */
+  label?: string;
+
+  labelKey?: string;
+
+  iconHeader?: string;
+
+  // Do not use - internal use only
+  version?: number;
+
+  renameGroups?: {
+    /** String or regex to match against group internal IDs */
+    groupSelector: RegExp | string;
+    /** Display name to use for matching groups */
+    newName: string;
+  }[];
+
+  moveToGroup?: {
+    /** Page identifier — the resource `type` string or the custom page `name` */
+    entryId: string;
+    /** Target group name as defined in your group config (`name` property) */
+    groupName: string;
+    /** Ordering weight for the mapping (default: 5). Higher weight takes precedence when multiple rules match */
+    weight?: number;
+  }[];
+
+  ignoreGroups?: {
+    /** String or regex to match against group names */
+    groupSelector: string | RegExp;
+    /** Optional conditional function that accepts the root Dashboard Vuex store getters and returns true if the group should be ignored */
+    condition?: (getters: any) => boolean;
+  }[];
+
+  /**
+   * Whether the product can be removed by users (default: false — products are built-in/not removable unless explicitly set to true)
+   */
+  removable?: boolean;
+  /**
+   *  controls whether a workspace switcher dropdown appears in the header (instead of the namespace filter) if set to true
+   */
+  showWorkspaceSwitcher?: boolean;
+
+  /**
+   * Leaving these here for completeness but I don't think these should be advertised as useable to plugin creators.
+   */
+  // ifHaveVerb: string | RegExp;
+  // supportRoute: string;
+  // typeStoreMap: string;
+}
+
+/**
+ * Used by type-map configureType
+ */
+export interface TypeMapConfigureType {
+  /** Override for the name displayed */
+  displayName?: string;
+  /** Override for the create button string on a list view */
+  listCreateButtonLabelKey?: string;
+  /** If false, disable create even if schema says it's allowed */
+  isCreatable?: boolean;
+  /** If false, disable for edit */
+  isEditable?: boolean;
+  /** If false, disable for remove/delete */
+  isRemovable?: boolean;
+  /** If false, hide state in columns and masthead */
+  showState?: boolean;
+  /** If false, hide age in columns and masthead */
+  showAge?: boolean;
+  /** If false, hide masthead config button in view mode */
+  showConfigView?: boolean;
+  /** If false, hide masthead in list view */
+  showListMasthead?: boolean;
+  /** If false, cannot edit or show yaml */
+  canYaml?: boolean;
+  /** Show the Masthead in the edit resource component */
+  resourceEditMasthead?: boolean;
+  /** Entry route definition for this resource page */
+  customRoute?: PluginRouteRecordRaw | Object;
+  /** Hide this type from the nav/search bar on downstream clusters (will only show in "local" cluster) */
+  localOnly?: boolean;
+  // resource: undefined; // Use this resource in ResourceDetails instead
+  // resourceDetail: undefined; // Use this resource specifically for ResourceDetail's detail component
+  // resourceEdit: undefined; // Use this resource specifically for ResourceDetail's edit component
+  /**
+   * Use this to depaginate requests for this type
+   */
+  depaginate?: undefined;
+  // notFilterNamespace: undefined; // Define namespaces that do not need to be filtered
+  // used in configureType options, to be typed later if needed
+
+  /**
+   * Whether this custom page has list groups (definition for grouping items in the list view)
+   */
+  listGroups?: {
+    /** Icon for the group (relates to icons in rancher-icons */
+    icon?: string;
+    /** Value for the group (used for grouping items in the list view) */
+    value?: string;
+    /** Field for the group (used for grouping items in the list view) */
+    field?: string;
+    /** Column to hide when this group is active */
+    hideColumn?: string;
+    /** Tooltip key for the group */
+    tooltipKey?: string;
+  }[];
+
+      /**
+     * Whether the provided list groups will override the default grouping options (e.g. group by namespace, group by cluster, etc.) or be added to them
+     */
+    listGroupsWillOverride?: boolean;
+
+    /**
+    * Use this to configure subtypes that should be shown in the list view for this type (e.g. show "pods" and "deployments" in the list view for "workloads")
+    */
+    subTypes?: string[];
+}
+
+/**
+ * Used by type-map virtualType
+ */
+export interface TypeMapVirtualType {
+  /** Display only if condition is met (relates to IF_HAVE in shell/store/type-map) */
+  ifHave?: boolean;
+  /** Display only if feature is present (relates to shell/store/features) */
+  ifFeature?: string;
+  /** Display only if resource type exists */
+  ifHaveType?: string;
+  /** Used in conjunction with "ifHaveType", display only if resource type allows this verb (GET, POST, PUT, DELETE) */
+  ifHaveVerb?: string;
+  /** Display label for the custom page */
+  label?: string;
+  /** Translation key for the label */
+  labelKey?: string;
+  name: string;
+  // /** Name of the page (unique identifier) */
+  // name?: string;
+  /** Entry route definition for this custom page */
+  route?: PluginRouteRecordRaw | Object;
+  /** Icon for the custom page (relates to icons in https://github.com/rancher/icons) */
+  icon?: 'compass';
+  /** Whether this custom page is namespaced or not */
+  namespaced?: boolean;
+  /** Ordering weight for the custom page */
+  weight?: number;
+  /** Whether this custom page is exact match */
+  exact?: boolean;
+  /** Whether this custom page will act as an overview page */
+  overview?: boolean;
+  /** Whether this custom page has an exact path match */
+  'exact-path'?: boolean;
+}
 
 /**
  * interface for type-map's' definition for table headers/columns
@@ -11,7 +272,7 @@ export interface TableColumn {
   formatterOpts?: any,
   width?: number,
   tooltip?: string,
-  search?: string | boolean,
+  search?: string | string[] | boolean,
 }
 
 export const COLUMN_BREAKPOINTS = {

package/utils/__tests__/operation-cr.test.ts

@@ -0,0 +1,34 @@
+import { createOperationCR } from '@shell/utils/operation-cr';
+
+describe('util: operation-cr', () => {
+  it('should dispatch create and save the operation resource', async() => {
+    const save = jest.fn().mockResolvedValue({ id: 'op-1' });
+    const dispatch = jest.fn().mockResolvedValue({ save });
+    const spec = {
+      clusterRef: {
+        apiVersion: 'management.cattle.io/v3',
+        kind:       'Cluster',
+        name:       'c-m-1',
+      }
+    };
+
+    const out = await createOperationCR(dispatch, 'operation.test', spec, 'c-m-1', 'cluster-name');
+
+    expect(dispatch).toHaveBeenCalledWith('management/create', {
+      type:     'operation.test',
+      metadata: {
+        namespace:    'c-m-1',
+        generateName: 'cluster-name-'
+      },
+      spec,
+    }, { root: true });
+    expect(save).toHaveBeenCalledWith();
+    expect(out).toStrictEqual({ id: 'op-1' });
+  });
+
+  it('should surface create failures', async() => {
+    const dispatch = jest.fn().mockRejectedValue(new Error('forbidden'));
+
+    await expect(createOperationCR(dispatch, 'operation.test', {}, 'c-m-1', 'cluster-name')).rejects.toThrow('forbidden');
+  });
+});

package/utils/async.ts

@@ -5,6 +5,8 @@ export const waitFor = (testFn: Function, msg = '', timeoutMs = 3000000, interva
     if (testFn()) {
       gatedLog('Wait for', msg || 'unknown', 'done immediately');
       resolve(this);
+
+      return;
     }
     const timeout = setTimeout(() => {
       gatedLog('Wait for', msg, 'timed out');