Merge pull request #528 from forcedotcom/wr/v2ToV3

Wr/v2 to v3

Author: WillieRuemmele

.vscode/launch.json

@@ -30,6 +30,21 @@
       "args": ["--timeout", "999999", "dist/test/unit/**/*.js"],
       "sourceMaps": true,
       "outFiles": ["${workspaceRoot}/dist/**/*.js"]
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Debug Active Test",
+      "protocol": "inspector",
+      "skipFiles": ["<node_internals>/**"],
+      "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+      "args": ["--inspect", "--no-timeouts", "--colors", "${file}"],
+      "console": "integratedTerminal",
+      "sourceMaps": true,
+      "internalConsoleOptions": "openOnSessionStart",
+      "env": {
+        "NODE_ENV": "testing"
+      }
     }
   ]
 }

messages/org.md

@@ -41,3 +41,7 @@ The sandbox %s does not have an authorized username.
 # orgPollingTimeout
 
 Sandbox status is %s; timed out waiting for completion.
+
+# NotFoundOnDevHub
+
+The scratch org does not belong to the dev hub username %s.

messages/scratchOrgCreate.md

@@ -0,0 +1,27 @@
+# UnsupportedSnapshotOrgCreateOptionsError
+
+Org snapshots don’t support one or more options you specified: %s.
+
+# SourceStatusResetFailureError
+
+Successfully created org with ID: %s and name: %s. Unfortunately, source tracking isn’t working as expected. If you run force:source:status, the results may be incorrect. Try again by creating another scratch org.
+
+# DurationDaysValidationMinError
+
+Expected 'durationDays' greater than or equal to %s but received %s.
+
+# DurationDaysValidationMaxError
+
+Expected 'durationDays' less than or equal to %s but received %s.
+
+# DurationDaysNotIntError
+
+Expected 'durationDays' to be an integer number.
+
+# RetryNotIntError
+
+Expected 'retry' to be an integer number.
+
+# WaitValidationMaxError
+
+Expected 'wait' greater than or equal to %s but received %s.

messages/scratchOrgErrorCodes.md

@@ -0,0 +1,99 @@
+# SignupFailedError
+
+The request to create a scratch org failed with error code: %s.
+
+# SignupFailedUnknownError
+
+An unknown server error occurred. Please try again. If you still see this error, contact Salesforce support for assistance. Include the information from 'sfdx force:data:record:get -s ScratchOrgInfo -i %s -u %s'.
+
+# SignupFailedActionError
+
+See https://developer.salesforce.com/docs/atlas.en-us.api.meta/api/sforce_api_objects_signuprequest.htm for information on error code %s.
+
+# SignupUnexpectedError
+
+The request to create a scratch org returned an unexpected status
+
+# INVALID_ID_FIELD
+
+Provide a valid template ID, in the format 0TTxxxxxxxxxxxx.
+
+# T-0002
+
+We couldn’t find a template or snapshot with the ID or name specified in the scratch org definition. If you’re sure the ID is correct, contact Salesforce Support.
+
+# T-0003
+
+The template specified in the scratch org definition is unapproved. Contact Salesforce Support to request template approval.
+
+# T-0004
+
+The Trialforce Source Organization (TSO) for the template doesn’t exist or has expired.
+
+# S-1006
+
+Provide a valid email address in your scratch org definition or your %s file.
+
+# S-2006
+
+Provide a valid country code in your scratch org definition or your %s file.
+
+# S-1017
+
+Specify a namespace that’s used by a release org associated with your Dev Hub org.
+
+# S-1018
+
+Provide a valid My Domain value. This value can’t include double hyphens, end in a hyphen, include restricted words, or be more than 40 characters long.
+
+# S-1019
+
+The My Domain value you chose is already in use.
+
+# S-1026
+
+Provide a valid namespace value. This value must begin with a letter. It can’t include consecutive underscores, end in an underscore, be more than 15 characters long, or be a restricted or reserved namespace. Only alphanumeric characters and underscores are allowed.
+
+# S-9999
+
+A fatal signup error occurred. Please try again. If you still see this error, contact Salesforce Support for assistance.
+
+# SH-0001
+
+Can’t create scratch org. Contact the source org admin to add your Dev Hub org ID to Setup > Org Shape. Then try again.
+
+# SH-0002
+
+Can’t create scratch org. No org shape exists for the specified sourceOrg. Create an org shape and try again.
+
+# SH-0003
+
+Can’t create scratch org from org shape. The org shape version is outdated. Recreate the org shape and try again.
+
+# C-1007
+
+The username provided to the org:create command is already in use. Run 'force:org:list --clean' to remove stale org authentications or create the org with a different username.
+
+# C-1015
+
+We encountered a problem while registering your My Domain value with the DNS provider. Please try again.
+
+# C-1016
+
+We encountered a problem while attempting to configure and approve the Connected App for your org. Verify the Connected App configuration with your Salesforce admin.
+
+# C-1017
+
+Provide a valid namespace prefix. This value must begin with a letter. It can’t include consecutive underscores, end in an underscore, be more than 15 characters long, or be a restricted or reserved namespace. Only alphanumeric characters and underscores are allowed.
+
+# C-1020
+
+We couldn't find a template with the ID specified in the scratch org definition. If you’re sure the ID is correct, contact Salesforce Support.
+
+# C-1027
+
+The template specified in the Scratch Definition isn’t supported. Specify a generic edition (such as Developer or Enterprise), or specify a template ID.
+
+# C-9999
+
+A fatal signup error occurred. Please try again. If you still see this error, contact Salesforce Support for assistance

messages/scratchOrgFeatureDeprecation.md

@@ -0,0 +1,11 @@
+# quantifiedFeatureWithoutQuantityWarning
+
+The feature %s will be deprecated in a future release. It's been replaced by %s:<value>, which requires you to specify a quantity.
+
+# mappedFeatureWarning
+
+The feature %s has been deprecated. It has been replaced with %s in this scratch org create request.
+
+# deprecatedFeatureWarning
+
+The feature %s has been deprecated. It has been removed from the list of requested features.

messages/scratchOrgInfoApi.md

@@ -0,0 +1,11 @@
+# SignupFieldsMissingError
+
+Required fields are missing for org creation: [%s]
+
+# SignupDuplicateSettingsSpecifiedError
+
+You cannot use 'settings' and `'orgPreferences' in your scratch definition file, please specify one or the other.
+
+# DeprecatedPrefFormat
+
+We've deprecated OrgPreferences. Update the scratch org definition file to replace OrgPreferences with their corresponding settings.

messages/scratchOrgInfoGenerator.md

@@ -0,0 +1,19 @@
+# Package2AncestorsIdsKeyNotSupportedError
+
+The package2AncestorIds key is no longer supported in a scratch org definition. Ancestors defined in sfdx-project.json will be included in the scratch org.",
+
+# InvalidAncestorVersionFormatError
+
+The ancestor versionNumber must be in the format major.minor.patch but the value found is %s",
+
+# NoMatchingAncestorError
+
+The ancestorId for ancestorVersion %s can't be found. Package ID %s.",
+
+# AncestorNotReleasedError
+
+The ancestor package version [%s] specified in the sfdx-project.json file may exist hasn’t been promoted and released. Release the ancestor package version before specifying it as the ancestor in a new package or patch version.",
+
+# AncestorIdVersionMismatchError
+
+The ancestorVersion in sfdx-project.json is not the version expected for the ancestorId you supplied. ancestorVersion %s. ancestorID %s."

messages/user.md

@@ -29,3 +29,7 @@ Invalid complexity value. Specify a value between 0 and 5, inclusive.
 # lengthOutOfBound
 
 Invalid length value. Specify a value between 8 and 1000, inclusive.
+
+# problemsDescribingTheUserObject
+
+Problems occurred while attempting to describe the user object.

package.json

@@ -42,6 +42,8 @@
     "@types/graceful-fs": "^4.1.5",
     "@types/mkdirp": "^1.0.2",
     "@types/semver": "^7.3.9",
+    "archiver": "^5.3.0",
+    "js2xmlparser": "^4.0.1",
     "change-case": "^4.1.2",
     "debug": "^3.2.7",
     "faye": "^1.4.0",
@@ -58,6 +60,7 @@
     "@salesforce/dev-scripts": "^2.0.0",
     "@salesforce/prettier-config": "^0.0.2",
     "@salesforce/ts-sinon": "^1.3.21",
+    "@types/archiver": "^5.3.1",
     "@types/debug": "0.0.31",
     "@types/jsen": "0.0.21",
     "@types/jsonwebtoken": "8.5.7",

src/config/configStore.ts

@@ -80,7 +80,6 @@ export abstract class BaseConfigStore<
   implements ConfigStore<P>
 {
   protected static encryptedKeys: Array<string | RegExp> = [];
-
   protected options: T;
   protected crypto?: Crypto;
 
@@ -317,7 +316,7 @@ export abstract class BaseConfigStore<
   }
 
   protected getEncryptedKeys(): Array<string | RegExp> {
-    return [...(this.options.encryptedKeys || []), ...(this.statics.encryptedKeys || [])];
+    return [...(this.options?.encryptedKeys || []), ...(this.statics?.encryptedKeys || [])];
   }
 
   /**