@salesforce/core 2.36.0 → 2.36.3

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.36.3](https://github.com/forcedotcom/sfdx-core/compare/v2.36.2...v2.36.3) (2022-04-21)
+
+### Bug Fixes
+
+- log rotation errors ([#562](https://github.com/forcedotcom/sfdx-core/issues/562)) ([16a5423](https://github.com/forcedotcom/sfdx-core/commit/16a5423079daad37e1ada6d47767923ec0b7cc94))
+
+### [2.36.2](https://github.com/forcedotcom/sfdx-core/compare/v2.36.1...v2.36.2) (2022-04-20)
+
+### [2.36.1](https://github.com/forcedotcom/sfdx-core/compare/v2.36.0...v2.36.1) (2022-04-14)
+
+### Bug Fixes
+
+- sandbox cname recognition ([#555](https://github.com/forcedotcom/sfdx-core/issues/555)) ([105bc9a](https://github.com/forcedotcom/sfdx-core/commit/105bc9a043b3c984846e060e5176b290fe49b5bc))
+
 ## [2.36.0](https://github.com/forcedotcom/sfdx-core/compare/v2.35.3...v2.36.0) (2022-03-23)
 
 ### Features

package/lib/config/config.js

@@ -16,7 +16,6 @@ const sfdxError_1 = require("../sfdxError");
 const sfdc_1 = require("../util/sfdc");
 const sfdcUrl_1 = require("../util/sfdcUrl");
 const configFile_1 = require("./configFile");
-const log = logger_1.Logger.childFromRoot('core:config');
 const SFDX_CONFIG_FILE_NAME = 'sfdx-config.json';
 /**
  * The files where sfdx config values are stored for projects and the global space.
@@ -64,9 +63,12 @@ class Config extends configFile_1.ConfigFile {
      */
     static addAllowedProperties(metas) {
         const currentMetaKeys = Object.keys(Config.propertyConfigMap);
+        // If logger is needed elsewhere in this file, do not move this outside of the Config class.
+        // It was causing issues with Bunyan log rotation. See https://github.com/forcedotcom/sfdx-core/pull/562
+        const logger = logger_1.Logger.childFromRoot('core:config');
         metas.forEach((meta) => {
             if (currentMetaKeys.includes(meta.key)) {
-                log.info(`Key ${meta.key} already exists in allowedProperties, skipping.`);
+                logger.info(`Key ${meta.key} already exists in allowedProperties, skipping.`);
                 return;
             }
             Config.allowedProperties.push(meta);

package/lib/org.d.ts

@@ -113,6 +113,17 @@ export declare class Org extends AsyncCreatable<Org.Options> {
      * @returns {ScratchOrgCreateResult}
      */
     scratchOrgCreate(options: ScratchOrgRequest): Promise<ScratchOrgCreateResult>;
+    /**
+     * Reports sandbox org creation status. If the org is ready, authenticates to the org.
+     *
+     * @param {sandboxname} string the sandbox name
+     * @param options Wait: The amount of time to wait before timing out, Interval: The time interval between polling
+     * @returns {SandboxProcessObject} the sandbox process object
+     */
+    sandboxStatus(sandboxname: string, options: {
+        wait?: Duration;
+        interval?: Duration;
+    }): Promise<SandboxProcessObject>;
     /**
      * Clean all data files in the org's data path. Usually <workspace>/.sfdx/orgs/<username>.
      *
@@ -264,6 +275,29 @@ export declare class Org extends AsyncCreatable<Org.Options> {
      * **Throws** *{@link SfdxError} Throws and unsupported error.
      */
     protected getDefaultOptions(): Org.Options;
+    /**
+     * Query the sandbox for the SandboxProcessObject by sandbox name
+     *
+     * @param sandboxName The name of the sandbox to query
+     * @returns {SandboxProcessObject} The SandboxProcessObject for the sandbox
+     */
+    private queryLatestSandboxProcessBySandboxName;
+    /**
+     * Gets the sandboxProcessObject and then polls for it to complete.
+     *
+     * @param sandboxProcessName sanbox process name
+     * @param options { wait?: Duration; interval?: Duration }
+     * @returns {SandboxProcessObject} The SandboxProcessObject for the sandbox
+     */
+    private authWithRetriesByName;
+    /**
+     * Polls the sandbox org for the sandboxProcessObject.
+     *
+     * @param sandboxProcessObj: The in-progress sandbox signup request
+     * @param options { wait?: Duration; interval?: Duration }
+     * @returns {SandboxProcessObject}
+     */
+    private authWithRetries;
     private queryProduction;
     /**
      * this method will delete the sandbox org from the production org and clean up any local files

package/lib/org.js

@@ -110,6 +110,16 @@ class Org extends kit_1.AsyncCreatable {
     async scratchOrgCreate(options) {
         return scratchOrgCreate_1.scratchOrgCreate({ ...options, hubOrg: this });
     }
+    /**
+     * Reports sandbox org creation status. If the org is ready, authenticates to the org.
+     *
+     * @param {sandboxname} string the sandbox name
+     * @param options Wait: The amount of time to wait before timing out, Interval: The time interval between polling
+     * @returns {SandboxProcessObject} the sandbox process object
+     */
+    async sandboxStatus(sandboxname, options) {
+        return this.authWithRetriesByName(sandboxname, options);
+    }
     /**
      * Clean all data files in the org's data path. Usually <workspace>/.sfdx/orgs/<username>.
      *
@@ -500,6 +510,58 @@ class Org extends kit_1.AsyncCreatable {
     getDefaultOptions() {
         throw new sfdxError_1.SfdxError('Not Supported');
     }
+    /**
+     * Query the sandbox for the SandboxProcessObject by sandbox name
+     *
+     * @param sandboxName The name of the sandbox to query
+     * @returns {SandboxProcessObject} The SandboxProcessObject for the sandbox
+     */
+    async queryLatestSandboxProcessBySandboxName(sandboxNameIn) {
+        var _a;
+        const { tooling } = this.getConnection();
+        this.logger.debug('QueryLatestSandboxProcessBySandboxName called with SandboxName: %s ', sandboxNameIn);
+        const queryStr = `SELECT Id, Status, SandboxName, SandboxInfoId, LicenseType, CreatedDate, CopyProgress, SandboxOrganization, SourceId, Description, EndDate FROM SandboxProcess WHERE SandboxName='${sandboxNameIn}' AND Status != 'D' ORDER BY CreatedDate DESC LIMIT 1`;
+        const queryResult = await tooling.query(queryStr);
+        this.logger.debug('Return from calling queryToolingApi: %s ', queryResult);
+        if (((_a = queryResult === null || queryResult === void 0 ? void 0 : queryResult.records) === null || _a === void 0 ? void 0 : _a.length) === 1) {
+            return queryResult.records[0];
+        }
+        else if (queryResult.records && queryResult.records.length > 1) {
+            throw sfdxError_1.SfdxError.create('@salesforce/core', 'org', 'MultiSandboxProcessNotFoundBySandboxName', [sandboxNameIn]);
+        }
+        else {
+            throw sfdxError_1.SfdxError.create('@salesforce/core', 'org', 'SandboxProcessNotFoundBySandboxName', [sandboxNameIn]);
+        }
+    }
+    /**
+     * Gets the sandboxProcessObject and then polls for it to complete.
+     *
+     * @param sandboxProcessName sanbox process name
+     * @param options { wait?: Duration; interval?: Duration }
+     * @returns {SandboxProcessObject} The SandboxProcessObject for the sandbox
+     */
+    async authWithRetriesByName(sandboxProcessName, options) {
+        return this.authWithRetries(await this.queryLatestSandboxProcessBySandboxName(sandboxProcessName), options);
+    }
+    /**
+     * Polls the sandbox org for the sandboxProcessObject.
+     *
+     * @param sandboxProcessObj: The in-progress sandbox signup request
+     * @param options { wait?: Duration; interval?: Duration }
+     * @returns {SandboxProcessObject}
+     */
+    async authWithRetries(sandboxProcessObj, options) {
+        var _a;
+        const retries = options.wait ? options.wait.seconds / kit_1.Duration.seconds(30).seconds : 0;
+        const pollInterval = (_a = options.interval) !== null && _a !== void 0 ? _a : kit_1.Duration.seconds(30);
+        this.logger.debug('AuthWithRetries sandboxProcessObj %s, retries %i', sandboxProcessObj, retries);
+        return this.pollStatusAndAuth({
+            sandboxProcessObj,
+            retries,
+            shouldPoll: retries > 0,
+            pollInterval,
+        });
+    }
     async queryProduction(org, field, value) {
         return org.connection.singleRecordQuery(`SELECT SandboxInfoId FROM SandboxProcess WHERE ${field} ='${value}' AND Status NOT IN ('D', 'E')`, { tooling: true });
     }

package/lib/util/sfdcUrl.d.ts

@@ -62,7 +62,7 @@ export declare class SfdcUrl extends URL {
     isSandboxUrl(createdOrgInstance?: string): boolean;
     /**
      * Tests whether this url is a sandbox url
-     * otherwise tryies to resolve dns cnames and then look if any is sandbox url
+     * otherwise tries to resolve dns cnames and then look if any is sandbox url
      *
      * @param createdOrgInstance The Salesforce instance the org was created on. e.g. `cs42`
      * @returns {Promise<boolean>} true if this domain resolves to sanbox url

package/lib/util/sfdcUrl.js

@@ -156,13 +156,15 @@ class SfdcUrl extends url_1.URL {
             this.origin.endsWith('sandbox.my.salesforce.mil') ||
             /sandbox\.my\.salesforce\.com/gi.test(this.origin) || // enhanced domains >= 230
             /(cs[0-9]+(\.my|)\.salesforce\.com)/gi.test(this.origin) || // my domains on CS instance OR CS instance without my domain
+            /(cs[0-9]+\.force\.com)/gi.test(this.origin) || // sandboxes have cnames like cs123.force.com
+            /(\w+--\w+\.my\.salesforce\.com)/gi.test(this.origin) || // sandboxes myDomain like foo--bar.my.salesforce.com
             /([a-z]{3}[0-9]+s\.sfdc-.+\.salesforce\.com)/gi.test(this.origin) || // falcon sandbox ex: usa2s.sfdc-whatever.salesforce.com
             /([a-z]{3}[0-9]+s\.sfdc-.+\.force\.com)/gi.test(this.origin) || // falcon sandbox ex: usa2s.sfdc-whatever.force.com
             this.hostname === 'test.salesforce.com');
     }
     /**
      * Tests whether this url is a sandbox url
-     * otherwise tryies to resolve dns cnames and then look if any is sandbox url
+     * otherwise tries to resolve dns cnames and then look if any is sandbox url
      *
      * @param createdOrgInstance The Salesforce instance the org was created on. e.g. `cs42`
      * @returns {Promise<boolean>} true if this domain resolves to sanbox url

package/messages/org.json

@@ -9,5 +9,7 @@
   "SandboxNotFound": "We can't find a SandboxProcess for the sandbox org %s.",
   "SandboxInfoCreateFailed": "The sandbox org creation failed with a result of %s.",
   "MissingAuthUsername": "The sandbox %s does not have an authorized username.",
-  "OrgPollingTimeout": "Sandbox status is %s; timed out waiting for completion."
+  "OrgPollingTimeout": "Sandbox status is %s; timed out waiting for completion.",
+  "SandboxProcessNotFoundBySandboxName": "We can't find a SandboxProcess with the SandboxName %s.",
+  "MultiSandboxProcessNotFoundBySandboxName": "We found more than one SandboxProcess with the SandboxName %s."
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "2.36.0",
+  "version": "2.36.3",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",