Skip to content

fix: incorrect enum value, swapped log rotation descriptions, wrong JSDoc, and stray artifacts in error messages #1279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZLeventer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: incorrect enum value, swapped log rotation descriptions, wrong JSDoc, and stray artifacts in error messages #1279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions messages/envVars.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ Level of messages that the CLI writes to the log file. Valid values are trace, d

# sfdxLogRotationCount

The default rotation period for logs. Example '1d' will rotate logs daily (at midnight).
The number of backup rotated log files to keep. Example: '3' will have the base sf.log file, and the past 3 (period) log files.

# sfdxLogRotationPeriod

The number of backup rotated log files to keep. Example: '3' will have the base sf.log file, and the past 3 (period) log files.
The default rotation period for logs. Example '1d' will rotate logs daily (at midnight).

# sfdxMaxQueryLimit

Expand Down Expand Up @@ -244,11 +244,11 @@ Level of messages that the CLI writes to the log file. Valid values are trace, d

# sfLogRotationCount

The default rotation period for logs. Example '1d' will rotate logs daily (at midnight).
The number of backup rotated log files to keep. Example: '3' will have the base sf.log file, and the past 3 (period) log files.

# sfLogRotationPeriod

The number of backup rotated log files to keep. Example: '3' will have the base sf.log file, and the past 3 (period) log files.
The default rotation period for logs. Example '1d' will rotate logs daily (at midnight).

# sfOrgMaxQueryLimit

Expand Down
12 changes: 6 additions & 6 deletions messages/scratchOrgInfoGenerator.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
# 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.",
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",
The ancestor versionNumber must be in the format major.minor.patch but the value found is %s

# NoMatchingAncestorError

The ancestor for ancestorVersion %s can't be found. Package ID %s.",
The ancestor for ancestorVersion %s can't be found. Package ID %s.

# NoMatchingAncestorIdError

The ancestor for ancestorId [%s] can't be found. Package ID %s."
The ancestor for ancestorId [%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.",
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."
The ancestorVersion in sfdx-project.json is not the version expected for the ancestorId you supplied. ancestorVersion %s. ancestorID %s.

# unsupportedSnapshotOrgCreateOptions

Expand Down
4 changes: 2 additions & 2 deletions src/config/configAggregator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,9 @@ export class ConfigAggregator extends AsyncOptionalCreatable<ConfigAggregator.Op
* Gets a resolved config property location.
*
* For example, `getLocation('logLevel')` will return:
* 1. `Location.GLOBAL` if resolved to an environment variable.
* 1. `Location.ENVIRONMENT` if resolved to an environment variable.
* 1. `Location.LOCAL` if resolved to local project config.
* 1. `Location.ENVIRONMENT` if resolved to the global config.
* 1. `Location.GLOBAL` if resolved to the global config.
*
* @param key The key of the property.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/config/envVars.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ export const SUPPORTED_ENV_VARS: EnvType = {
synonymOf: EnvironmentVariable.SF_USE_PROGRESS_BAR,
},
[EnvironmentVariable.SFDX_LAZY_LOAD_MODULES]: {
description: getMessage(EnvironmentVariable.SFDX_USE_PROGRESS_BAR),
description: getMessage(EnvironmentVariable.SFDX_LAZY_LOAD_MODULES),
synonymOf: EnvironmentVariable.SF_LAZY_LOAD_MODULES,
},
[EnvironmentVariable.SFDX_S3_HOST]: {
Expand Down
2 changes: 1 addition & 1 deletion src/org/org.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1865,7 +1865,7 @@ export namespace Org {
NAME = 'name',
NAMESPACE_PREFIX = 'namespacePrefix',
INSTANCE_NAME = 'instanceName',
TRIAL_EXPIRATION_DATE = 'trailExpirationDate',
TRIAL_EXPIRATION_DATE = 'trialExpirationDate',

/**
* The Salesforce instance the org was created on. e.g. `cs42`.
Expand Down