@salesforce/plugin-deploy-retrieve 1.4.3 → 1.5.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/README.md +35 -10
- package/lib/commands/deploy/metadata/quick.d.ts +0 -1
- package/lib/commands/deploy/metadata/quick.js +1 -4
- package/lib/commands/deploy/metadata/quick.js.map +1 -1
- package/lib/commands/deploy/metadata/resume.d.ts +0 -1
- package/lib/commands/deploy/metadata/resume.js +4 -5
- package/lib/commands/deploy/metadata/resume.js.map +1 -1
- package/lib/commands/deploy/metadata/validate.d.ts +0 -1
- package/lib/commands/deploy/metadata/validate.js +3 -5
- package/lib/commands/deploy/metadata/validate.js.map +1 -1
- package/lib/commands/deploy/metadata.d.ts +3 -2
- package/lib/commands/deploy/metadata.js +26 -10
- package/lib/commands/deploy/metadata.js.map +1 -1
- package/lib/commands/deploy.js +5 -0
- package/lib/commands/deploy.js.map +1 -1
- package/lib/commands/retrieve/metadata.d.ts +3 -0
- package/lib/commands/retrieve/metadata.js +51 -16
- package/lib/commands/retrieve/metadata.js.map +1 -1
- package/lib/utils/conflicts.d.ts +2 -0
- package/lib/utils/conflicts.js +22 -0
- package/lib/utils/conflicts.js.map +1 -0
- package/lib/utils/deploy.d.ts +5 -3
- package/lib/utils/deploy.js +44 -14
- package/lib/utils/deploy.js.map +1 -1
- package/lib/utils/metadataDeployer.js +9 -6
- package/lib/utils/metadataDeployer.js.map +1 -1
- package/lib/utils/output.js.map +1 -1
- package/messages/deploy.md +4 -0
- package/messages/deploy.metadata.md +21 -3
- package/messages/retrieve.metadata.md +23 -1
- package/messages/tracking.md +3 -0
- package/oclif.manifest.json +1 -1
- package/package.json +20 -17
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,20 @@
|
|
|
2
2
|
|
|
3
3
|
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.
|
|
4
4
|
|
|
5
|
+
### [1.5.2](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/v1.5.1...v1.5.2) (2022-06-29)
|
|
6
|
+
|
|
7
|
+
### [1.5.1](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/v1.5.0...v1.5.1) (2022-06-28)
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
- move missing message ([0fb2517](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/0fb2517fb48d3e30a73ddf297a0d2313cdec26da))
|
|
12
|
+
|
|
13
|
+
## [1.5.0](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/v1.4.3...v1.5.0) (2022-06-23)
|
|
14
|
+
|
|
15
|
+
### Features
|
|
16
|
+
|
|
17
|
+
- use StateAggregator ([a5bb05b](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/a5bb05ba85c8d2b11ff83734d5f007541446ee9a))
|
|
18
|
+
|
|
5
19
|
### [1.4.3](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/v1.4.2...v1.4.3) (2022-05-11)
|
|
6
20
|
|
|
7
21
|
### [1.4.2](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/v1.4.1...v1.4.2) (2022-05-04)
|
package/README.md
CHANGED
|
@@ -115,7 +115,7 @@ EXAMPLES
|
|
|
115
115
|
$ sf deploy --interactive
|
|
116
116
|
```
|
|
117
117
|
|
|
118
|
-
_See code: [src/commands/deploy.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/v1.
|
|
118
|
+
_See code: [src/commands/deploy.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/v1.5.1/src/commands/deploy.ts)_
|
|
119
119
|
|
|
120
120
|
## `sf deploy metadata`
|
|
121
121
|
|
|
@@ -123,12 +123,13 @@ Deploy metadata in source format to an org from your local project.
|
|
|
123
123
|
|
|
124
124
|
```
|
|
125
125
|
USAGE
|
|
126
|
-
$ sf deploy metadata [--json] [-a <value>] [--async | -w <value>] [--concise | --verbose] [--dry-run] [-
|
|
127
|
-
<value>
|
|
128
|
-
NoTestRun|RunSpecifiedTests|RunLocalTests|RunAllTestsInOrg]
|
|
126
|
+
$ sf deploy metadata [--json] [-a <value>] [--async | -w <value>] [--concise | --verbose] [--dry-run] [-c] [-r]
|
|
127
|
+
[-g] [-x <value> | -d <value> | -m <value> | --metadata-dir <value>] [--single-package ] [-o <value>] [-t <value>]
|
|
128
|
+
[-l NoTestRun|RunSpecifiedTests|RunLocalTests|RunAllTestsInOrg]
|
|
129
129
|
|
|
130
130
|
FLAGS
|
|
131
131
|
-a, --api-version=<value> Target API version for the deploy.
|
|
132
|
+
-c, --ignore-conflicts Ignore conflicts and deploy local files, even if they overwrite changes in the org.
|
|
132
133
|
-d, --source-dir=<value>... Path to the local source files to deploy.
|
|
133
134
|
-g, --ignore-warnings Ignore warnings and allow a deployment to complete successfully.
|
|
134
135
|
-l, --test-level=<option> [default: NoTestRun] Deployment Apex testing level.
|
|
@@ -156,14 +157,19 @@ DESCRIPTION
|
|
|
156
157
|
|
|
157
158
|
You must run this command from within a project.
|
|
158
159
|
|
|
159
|
-
|
|
160
|
-
|
|
160
|
+
If your org allows source tracking, then this command tracks the changes in your source. Some orgs, such as production
|
|
161
|
+
org, never allow source tracking. You can also use the "--no-track-source" flag when you create a scratch or sandbox
|
|
162
|
+
org to disable source tracking.
|
|
161
163
|
|
|
162
164
|
To deploy multiple metadata components, either set multiple --metadata <name> flags or a single --metadata flag with
|
|
163
165
|
multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same syntax
|
|
164
166
|
applies to --manifest and --source-dir.
|
|
165
167
|
|
|
166
168
|
EXAMPLES
|
|
169
|
+
Deploy local changes not in the org:
|
|
170
|
+
|
|
171
|
+
$ sf deploy metadata
|
|
172
|
+
|
|
167
173
|
Deploy the source files in a directory:
|
|
168
174
|
|
|
169
175
|
$ sf deploy metadata --source-dir path/to/source
|
|
@@ -204,6 +210,11 @@ FLAG DESCRIPTIONS
|
|
|
204
210
|
Use this flag to override the default API version, which is the latest version supported the CLI, with the API
|
|
205
211
|
version of your package.xml file.
|
|
206
212
|
|
|
213
|
+
-c, --ignore-conflicts Ignore conflicts and deploy local files, even if they overwrite changes in the org.
|
|
214
|
+
|
|
215
|
+
This flag applies only to orgs that allow source tracking. It has no effect on orgs that don't allow it, such as
|
|
216
|
+
production orgs.
|
|
217
|
+
|
|
207
218
|
-d, --source-dir=<value>... Path to the local source files to deploy.
|
|
208
219
|
|
|
209
220
|
The supplied path can be to a single file (in which case the operation is applied to only one file) or to a folder
|
|
@@ -645,11 +656,13 @@ Retrieve metadata in source format from an org to your local project.
|
|
|
645
656
|
|
|
646
657
|
```
|
|
647
658
|
USAGE
|
|
648
|
-
$ sf retrieve metadata [--json] [-a <value>] [-x <value> | -m <value> | -d <value>] [-n <value>] [-o <value>]
|
|
649
|
-
<value>]
|
|
659
|
+
$ sf retrieve metadata [--json] [-a <value>] [-c] [-x <value> | -m <value> | -d <value>] [-n <value>] [-o <value>]
|
|
660
|
+
[-w <value>]
|
|
650
661
|
|
|
651
662
|
FLAGS
|
|
652
663
|
-a, --api-version=<value> Target API version for the retrieve.
|
|
664
|
+
-c, --ignore-conflicts Ignore conflicts and retrieve and save files to your local filesystem, even if they
|
|
665
|
+
overwrite your local changes.
|
|
653
666
|
-d, --source-dir=<value>... File paths for source to retrieve from the org.
|
|
654
667
|
-m, --metadata=<value>... Metadata component names to retrieve.
|
|
655
668
|
-n, --package-name=<value>... Package names to retrieve.
|
|
@@ -666,14 +679,19 @@ DESCRIPTION
|
|
|
666
679
|
|
|
667
680
|
You must run this command from within a project.
|
|
668
681
|
|
|
669
|
-
|
|
670
|
-
|
|
682
|
+
If your org allows source tracking, then this command tracks the changes in your source. Some orgs, such as production
|
|
683
|
+
org, never allow source tracking. You can also use the "--no-track-source" flag when you create a scratch or sandbox
|
|
684
|
+
org to disable source tracking.
|
|
671
685
|
|
|
672
686
|
To retrieve multiple metadata components, either use multiple --metadata <name> flags or use a single --metadata flag
|
|
673
687
|
with multiple names separated by spaces. Enclose names that contain spaces in one set of double quotes. The same
|
|
674
688
|
syntax applies to --manifest and --source-dir.
|
|
675
689
|
|
|
676
690
|
EXAMPLES
|
|
691
|
+
Retrieve remote changes:
|
|
692
|
+
|
|
693
|
+
$ sf retrieve metadata
|
|
694
|
+
|
|
677
695
|
Retrieve the source files in a directory:
|
|
678
696
|
|
|
679
697
|
$ sf retrieve metadata --source-dir path/to/source
|
|
@@ -715,6 +733,13 @@ FLAG DESCRIPTIONS
|
|
|
715
733
|
Use this flag to override the default API version, which is the latest version supported the CLI, with the API
|
|
716
734
|
version in your package.xml file.
|
|
717
735
|
|
|
736
|
+
-c, --ignore-conflicts
|
|
737
|
+
|
|
738
|
+
Ignore conflicts and retrieve and save files to your local filesystem, even if they overwrite your local changes.
|
|
739
|
+
|
|
740
|
+
This flag applies only to orgs that allow source tracking. It has no effect on orgs that don't allow it, such as
|
|
741
|
+
production orgs.
|
|
742
|
+
|
|
718
743
|
-d, --source-dir=<value>... File paths for source to retrieve from the org.
|
|
719
744
|
|
|
720
745
|
The supplied paths can be to a single file (in which case the operation is applied to only one file) or to a folder
|
|
@@ -19,5 +19,4 @@ export default class DeployMetadataQuick extends SfCommand<DeployResultJson> {
|
|
|
19
19
|
static errorCodes: import("@salesforce/sf-plugins-core/lib/util").HelpSection;
|
|
20
20
|
run(): Promise<DeployResultJson>;
|
|
21
21
|
protected catch(error: SfCommand.Error): Promise<SfCommand.Error>;
|
|
22
|
-
private setExitCode;
|
|
23
22
|
}
|
|
@@ -40,7 +40,7 @@ class DeployMetadataQuick extends sf_plugins_core_1.SfCommand {
|
|
|
40
40
|
if (!this.jsonEnabled())
|
|
41
41
|
formatter.display();
|
|
42
42
|
await deploy_1.DeployCache.update(jobId, { status: result.response.status });
|
|
43
|
-
|
|
43
|
+
process.exitCode = (0, deploy_1.determineExitCode)(result);
|
|
44
44
|
if (result.response.status === source_deploy_retrieve_1.RequestStatus.Succeeded) {
|
|
45
45
|
this.log();
|
|
46
46
|
this.logSuccess(messages.getMessage('info.QuickDeploySuccess', [jobId]));
|
|
@@ -57,9 +57,6 @@ class DeployMetadataQuick extends sf_plugins_core_1.SfCommand {
|
|
|
57
57
|
}
|
|
58
58
|
return super.catch(error);
|
|
59
59
|
}
|
|
60
|
-
setExitCode(result) {
|
|
61
|
-
process.exitCode = (0, deploy_1.determineExitCode)(result);
|
|
62
|
-
}
|
|
63
60
|
}
|
|
64
61
|
exports.default = DeployMetadataQuick;
|
|
65
62
|
DeployMetadataQuick.description = messages.getMessage('description');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quick.js","sourceRoot":"","sources":["../../../../src/commands/deploy/metadata/quick.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,iCAA6B;AAC7B,2CAAiD;AACjD,iEAA8E;AAC9E,+
|
|
1
|
+
{"version":3,"file":"quick.js","sourceRoot":"","sources":["../../../../src/commands/deploy/metadata/quick.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,5 +17,4 @@ export default class DeployMetadataResume extends SfCommand<DeployResultJson> {
|
|
|
17
17
|
static envVariablesSection: import("@salesforce/sf-plugins-core/lib/util").HelpSection;
|
|
18
18
|
static errorCodes: import("@salesforce/sf-plugins-core/lib/util").HelpSection;
|
|
19
19
|
run(): Promise<DeployResultJson>;
|
|
20
|
-
private setExitCode;
|
|
21
20
|
}
|
|
@@ -26,12 +26,14 @@ class DeployMetadataResume extends sf_plugins_core_1.SfCommand {
|
|
|
26
26
|
throw messages.createError('error.DeployNotResumable', [jobId, deployOpts.status]);
|
|
27
27
|
}
|
|
28
28
|
const wait = flags.wait || kit_1.Duration.minutes(deployOpts.wait);
|
|
29
|
-
const { deploy, componentSet } = await (0, deploy_1.executeDeploy)(
|
|
29
|
+
const { deploy, componentSet } = await (0, deploy_1.executeDeploy)(
|
|
30
|
+
// there will always be conflicts on a resume if anything deployed--the changes on the server are not synced to local
|
|
31
|
+
{ ...deployOpts, wait, 'dry-run': false, 'ignore-conflicts': true }, this.project, jobId);
|
|
30
32
|
this.log((0, output_1.getVersionMessage)('Resuming Deployment', componentSet, deployOpts.api));
|
|
31
33
|
this.log(`Deploy ID: ${(0, chalk_1.bold)(jobId)}`);
|
|
32
34
|
new progressBar_1.DeployProgress(deploy, this.jsonEnabled()).start();
|
|
33
35
|
const result = await deploy.pollStatus(500, wait.seconds);
|
|
34
|
-
|
|
36
|
+
process.exitCode = (0, deploy_1.determineExitCode)(result);
|
|
35
37
|
const formatter = new output_1.DeployResultFormatter(result, {
|
|
36
38
|
...flags,
|
|
37
39
|
verbose: deployOpts.verbose,
|
|
@@ -43,9 +45,6 @@ class DeployMetadataResume extends sf_plugins_core_1.SfCommand {
|
|
|
43
45
|
await cache.write();
|
|
44
46
|
return formatter.getJson();
|
|
45
47
|
}
|
|
46
|
-
setExitCode(result) {
|
|
47
|
-
process.exitCode = (0, deploy_1.determineExitCode)(result);
|
|
48
|
-
}
|
|
49
48
|
}
|
|
50
49
|
exports.default = DeployMetadataResume;
|
|
51
50
|
DeployMetadataResume.description = messages.getMessage('description');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../../../src/commands/deploy/metadata/resume.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,iCAA6B;AAC7B,2CAAiE;
|
|
1
|
+
{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../../../src/commands/deploy/metadata/resume.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,5 +25,4 @@ export default class DeployMetadataValidate extends SfCommand<DeployResultJson>
|
|
|
25
25
|
static envVariablesSection: import("@salesforce/sf-plugins-core/lib/util").HelpSection;
|
|
26
26
|
static errorCodes: import("@salesforce/sf-plugins-core/lib/util").HelpSection;
|
|
27
27
|
run(): Promise<DeployResultJson>;
|
|
28
|
-
private setExitCode;
|
|
29
28
|
}
|
|
@@ -26,10 +26,11 @@ class DeployMetadataValidate extends sf_plugins_core_1.SfCommand {
|
|
|
26
26
|
const api = await (0, deploy_1.resolveApi)();
|
|
27
27
|
const { deploy, componentSet } = await (0, deploy_1.executeDeploy)({
|
|
28
28
|
...flags,
|
|
29
|
+
'ignore-conflicts': true,
|
|
29
30
|
'dry-run': true,
|
|
30
31
|
'target-org': flags['target-org'].getUsername(),
|
|
31
32
|
api,
|
|
32
|
-
});
|
|
33
|
+
}, this.project);
|
|
33
34
|
this.log((0, output_1.getVersionMessage)('Validating Deployment', componentSet, api));
|
|
34
35
|
this.log(`Deploy ID: ${(0, chalk_1.bold)(deploy.id)}`);
|
|
35
36
|
new progressBar_1.DeployProgress(deploy, this.jsonEnabled()).start();
|
|
@@ -40,7 +41,7 @@ class DeployMetadataValidate extends sf_plugins_core_1.SfCommand {
|
|
|
40
41
|
return asyncFormatter.getJson();
|
|
41
42
|
}
|
|
42
43
|
const result = await deploy.pollStatus(500, flags.wait.seconds);
|
|
43
|
-
|
|
44
|
+
process.exitCode = (0, deploy_1.determineExitCode)(result);
|
|
44
45
|
const formatter = new output_1.DeployResultFormatter(result, flags);
|
|
45
46
|
if (!this.jsonEnabled()) {
|
|
46
47
|
formatter.display();
|
|
@@ -56,9 +57,6 @@ class DeployMetadataValidate extends sf_plugins_core_1.SfCommand {
|
|
|
56
57
|
}
|
|
57
58
|
return formatter.getJson();
|
|
58
59
|
}
|
|
59
|
-
setExitCode(result) {
|
|
60
|
-
process.exitCode = (0, deploy_1.determineExitCode)(result);
|
|
61
|
-
}
|
|
62
60
|
}
|
|
63
61
|
exports.default = DeployMetadataValidate;
|
|
64
62
|
DeployMetadataValidate.description = messages.getMessage('description');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/commands/deploy/metadata/validate.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,iCAA6B;AAC7B,2CAAsF;AACtF,+
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/commands/deploy/metadata/validate.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,iCAA6B;AAC7B,2CAAsF;AACtF,+EAAmE;AACnE,iEAA8E;AAC9E,kDAA6G;AAC7G,4DAA4D;AAC5D,gDAAmE;AACnE,kDAAqF;AACrF,0DAA6E;AAC7E,oDAAiD;AACjD,gDAAoE;AAEpE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,0BAA0B,CAAC,CAAC;AAEzG,MAAM,iBAAiB,GAAG,CAAC,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;AAEjF,MAAqB,sBAAuB,SAAQ,2BAA2B;IA+FtE,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC3D,MAAM,GAAG,GAAG,MAAM,IAAA,mBAAU,GAAE,CAAC;QAC/B,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,sBAAa,EAClD;YACE,GAAG,KAAK;YACR,kBAAkB,EAAE,IAAI;YACxB,SAAS,EAAE,IAAI;YACf,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,WAAW,EAAE;YAC/C,GAAG;SACJ,EACD,IAAI,CAAC,OAAO,CACb,CAAC;QAEF,IAAI,CAAC,GAAG,CAAC,IAAA,0BAAiB,EAAC,uBAAuB,EAAE,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,cAAc,IAAA,YAAI,EAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;QAC1C,IAAI,4BAAc,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QAEvD,IAAI,KAAK,CAAC,KAAK,EAAE;YACf,MAAM,cAAc,GAAG,IAAI,mCAA0B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACjE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;gBAAE,cAAc,CAAC,OAAO,EAAE,CAAC;YAClD,OAAO,cAAc,CAAC,OAAO,EAAE,CAAC;SACjC;QAED,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAChE,OAAO,CAAC,QAAQ,GAAG,IAAA,0BAAiB,EAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,IAAI,8BAAqB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAE3D,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE;YACvB,SAAS,CAAC,OAAO,EAAE,CAAC;SACrB;QAED,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,sCAAa,CAAC,SAAS,EAAE;YACtD,IAAI,CAAC,GAAG,EAAE,CAAC;YACX,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,2BAA2B,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAE/E,MAAM,gBAAgB,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,mCAAmC,MAAM,CAAC,EAAE,EAAE,CAAC;YAC1F,IAAI,CAAC,GAAG,CAAC,SAAS,IAAA,YAAI,EAAC,gBAAgB,CAAC,0BAA0B,CAAC,CAAC;SACrE;aAAM;YACL,MAAM,QAAQ,CAAC,WAAW,CAAC,wBAAwB,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;SACnE;QAED,OAAO,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;;AA1IH,yCA2IC;AA1IwB,kCAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;AACjD,8BAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;AACzC,+BAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAC5C,sCAAe,GAAG,IAAI,CAAC;AACvB,4BAAK,GAAG,MAAM,CAAC;AAExB,4BAAK,GAAG;IACpB,aAAa,EAAE,uBAAK,CAAC,aAAa,CAAC;QACjC,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;QACzD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,+BAA+B,CAAC;KAClE,CAAC;IACF,KAAK,EAAE,uBAAK,CAAC,OAAO,CAAC;QACnB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;QACnD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;KAC5D,CAAC;IACF,OAAO,EAAE,uBAAK,CAAC,OAAO,CAAC;QACrB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC;QACrD,SAAS,EAAE,CAAC,SAAS,CAAC;KACvB,CAAC;IACF,QAAQ,EAAE,uBAAK,CAAC,IAAI,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,4BAA4B,CAAC;QAC9D,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC;QACtD,UAAU,EAAE,iBAAiB;KAC9B,CAAC;IACF,QAAQ,EAAE,uBAAK,CAAC,MAAM,CAAC;QACrB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC;QACtD,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,iBAAiB;KAC9B,CAAC;IACF,YAAY,EAAE,uBAAK,CAAC,MAAM,CAAC;QACzB,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC;QAChE,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;QACxD,QAAQ,EAAE,IAAI;QACd,UAAU,EAAE,iBAAiB;KAC9B,CAAC;IACF,cAAc,EAAE,IAAA,qBAAa,EAAC;QAC5B,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,4BAA4B,CAAC;QAC1D,UAAU,EAAE,iBAAiB;QAC7B,MAAM,EAAE,IAAI;KACb,CAAC;IACF,gBAAgB,EAAE,uBAAK,CAAC,OAAO,CAAC;QAC9B,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC;QAC5D,SAAS,EAAE,CAAC,cAAc,CAAC;KAC5B,CAAC;IACF,YAAY,EAAE,uBAAK,CAAC,WAAW,CAAC;QAC9B,IAAI,EAAE,GAAG;QACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC;QAChE,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;KACzD,CAAC;IACF,KAAK,EAAE,uBAAK,CAAC,MAAM,CAAC;QAClB,IAAI,EAAE,GAAG;QACT,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;KACpD,CAAC;IACF,YAAY,EAAE,IAAA,qBAAa,EAAC;QAC1B,OAAO,EAAE,CAAC,iBAAS,CAAC,gBAAgB,EAAE,iBAAS,CAAC,aAAa,EAAE,iBAAS,CAAC,iBAAiB,CAAC;QAC3F,OAAO,EAAE,iBAAS,CAAC,aAAa;QAChC,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC;QAChE,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;KACzD,CAAC;IACF,OAAO,EAAE,uBAAK,CAAC,OAAO,CAAC;QACrB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC;QACrD,SAAS,EAAE,CAAC,SAAS,CAAC;KACvB,CAAC;IACF,IAAI,EAAE,uBAAK,CAAC,QAAQ,CAAC;QACnB,IAAI,EAAE,GAAG;QACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC;QAClD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC;QAC1D,IAAI,EAAE,SAAS;QACf,YAAY,EAAE,EAAE;QAChB,SAAS,EAAE,WAAW;QACtB,GAAG,EAAE,CAAC;KACP,CAAC;CACH,CAAC;AAEY,oDAA6B,GAAG,IAAA,+BAAa,EACzD,yBAAyB,EACzB,0BAAmB,CAAC,UAAU,EAC9B,0BAAmB,CAAC,eAAe,EACnC,uBAAU,CAAC,wBAAwB,CACpC,CAAC;AAEY,0CAAmB,GAAG,IAAA,+BAAa,EAC/C,uBAAuB,EACvB,0BAAmB,CAAC,aAAa,EACjC,0BAAmB,CAAC,mBAAmB,CACxC,CAAC;AAEY,iCAAU,GAAG,IAAA,+BAAa,EAAC,aAAa,EAAE,6CAAgC,CAAC,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { SfError } from '@salesforce/core';
|
|
1
2
|
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
2
3
|
import { DeployResultJson, TestLevel } from '../../utils/types';
|
|
3
4
|
export default class DeployMetadata extends SfCommand<DeployResultJson> {
|
|
@@ -11,6 +12,7 @@ export default class DeployMetadata extends SfCommand<DeployResultJson> {
|
|
|
11
12
|
async: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
12
13
|
concise: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
13
14
|
'dry-run': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
15
|
+
'ignore-conflicts': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
14
16
|
'ignore-errors': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
15
17
|
'ignore-warnings': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
16
18
|
manifest: import("@oclif/core/lib/interfaces").OptionFlag<string>;
|
|
@@ -28,6 +30,5 @@ export default class DeployMetadata extends SfCommand<DeployResultJson> {
|
|
|
28
30
|
static envVariablesSection: import("@salesforce/sf-plugins-core/lib/util").HelpSection;
|
|
29
31
|
static errorCodes: import("@salesforce/sf-plugins-core/lib/util").HelpSection;
|
|
30
32
|
run(): Promise<DeployResultJson>;
|
|
31
|
-
protected catch(error:
|
|
32
|
-
private setExitCode;
|
|
33
|
+
protected catch(error: Error | SfError): Promise<SfCommand.Error>;
|
|
33
34
|
}
|
|
@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
const chalk_1 = require("chalk");
|
|
10
10
|
const core_1 = require("@salesforce/core");
|
|
11
11
|
const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
|
|
12
|
+
const source_tracking_1 = require("@salesforce/source-tracking");
|
|
12
13
|
const output_1 = require("../../utils/output");
|
|
13
14
|
const progressBar_1 = require("../../utils/progressBar");
|
|
14
15
|
const types_1 = require("../../utils/types");
|
|
@@ -16,9 +17,10 @@ const deploy_1 = require("../../utils/deploy");
|
|
|
16
17
|
const errorCodes_1 = require("../../utils/errorCodes");
|
|
17
18
|
const configMeta_1 = require("../../configMeta");
|
|
18
19
|
const flags_1 = require("../../utils/flags");
|
|
20
|
+
const conflicts_1 = require("../../utils/conflicts");
|
|
19
21
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
20
22
|
const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata');
|
|
21
|
-
const
|
|
23
|
+
const exclusiveFlags = ['manifest', 'source-dir', 'metadata', 'metadata-dir'];
|
|
22
24
|
class DeployMetadata extends sf_plugins_core_1.SfCommand {
|
|
23
25
|
async run() {
|
|
24
26
|
const { flags } = await this.parse(DeployMetadata);
|
|
@@ -30,7 +32,7 @@ class DeployMetadata extends sf_plugins_core_1.SfCommand {
|
|
|
30
32
|
...flags,
|
|
31
33
|
'target-org': flags['target-org'].getUsername(),
|
|
32
34
|
api,
|
|
33
|
-
});
|
|
35
|
+
}, this.project);
|
|
34
36
|
const action = flags['dry-run'] ? 'Deploying (dry-run)' : 'Deploying';
|
|
35
37
|
this.log((0, output_1.getVersionMessage)(action, componentSet, api));
|
|
36
38
|
this.log(`Deploy ID: ${(0, chalk_1.bold)(deploy.id)}`);
|
|
@@ -42,7 +44,7 @@ class DeployMetadata extends sf_plugins_core_1.SfCommand {
|
|
|
42
44
|
}
|
|
43
45
|
new progressBar_1.DeployProgress(deploy, this.jsonEnabled()).start();
|
|
44
46
|
const result = await deploy.pollStatus({ timeout: flags.wait });
|
|
45
|
-
|
|
47
|
+
process.exitCode = (0, deploy_1.determineExitCode)(result);
|
|
46
48
|
const formatter = new output_1.DeployResultFormatter(result, flags);
|
|
47
49
|
if (!this.jsonEnabled()) {
|
|
48
50
|
formatter.display();
|
|
@@ -53,15 +55,23 @@ class DeployMetadata extends sf_plugins_core_1.SfCommand {
|
|
|
53
55
|
return formatter.getJson();
|
|
54
56
|
}
|
|
55
57
|
catch(error) {
|
|
58
|
+
if (error instanceof source_tracking_1.SourceConflictError) {
|
|
59
|
+
if (!this.jsonEnabled()) {
|
|
60
|
+
(0, conflicts_1.writeConflictTable)(error.data);
|
|
61
|
+
// set the message and add plugin-specific actions
|
|
62
|
+
return super.catch({
|
|
63
|
+
...error,
|
|
64
|
+
message: messages.getMessage('error.Conflicts'),
|
|
65
|
+
actions: messages.getMessages('error.Conflicts.Actions'),
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
}
|
|
56
69
|
if (error.message.includes('client has timed out')) {
|
|
57
70
|
const err = messages.createError('error.ClientTimeout');
|
|
58
71
|
return super.catch({ ...error, name: err.name, message: err.message, code: err.code });
|
|
59
72
|
}
|
|
60
73
|
return super.catch(error);
|
|
61
74
|
}
|
|
62
|
-
setExitCode(result) {
|
|
63
|
-
process.exitCode = (0, deploy_1.determineExitCode)(result);
|
|
64
|
-
}
|
|
65
75
|
}
|
|
66
76
|
exports.default = DeployMetadata;
|
|
67
77
|
DeployMetadata.description = messages.getMessage('description');
|
|
@@ -88,6 +98,12 @@ DeployMetadata.flags = {
|
|
|
88
98
|
summary: messages.getMessage('flags.dry-run.summary'),
|
|
89
99
|
default: false,
|
|
90
100
|
}),
|
|
101
|
+
'ignore-conflicts': sf_plugins_core_1.Flags.boolean({
|
|
102
|
+
char: 'c',
|
|
103
|
+
summary: messages.getMessage('flags.ignore-conflicts.summary'),
|
|
104
|
+
description: messages.getMessage('flags.ignore-conflicts.description'),
|
|
105
|
+
default: false,
|
|
106
|
+
}),
|
|
91
107
|
'ignore-errors': sf_plugins_core_1.Flags.boolean({
|
|
92
108
|
char: 'r',
|
|
93
109
|
summary: messages.getMessage('flags.ignore-errors.summary'),
|
|
@@ -104,18 +120,18 @@ DeployMetadata.flags = {
|
|
|
104
120
|
char: 'x',
|
|
105
121
|
description: messages.getMessage('flags.manifest.description'),
|
|
106
122
|
summary: messages.getMessage('flags.manifest.summary'),
|
|
107
|
-
|
|
123
|
+
exclusive: exclusiveFlags.filter((f) => f !== 'manifest'),
|
|
108
124
|
exists: true,
|
|
109
125
|
}),
|
|
110
126
|
metadata: sf_plugins_core_1.Flags.string({
|
|
111
127
|
char: 'm',
|
|
112
128
|
summary: messages.getMessage('flags.metadata.summary'),
|
|
113
129
|
multiple: true,
|
|
114
|
-
|
|
130
|
+
exclusive: exclusiveFlags.filter((f) => f !== 'metadata'),
|
|
115
131
|
}),
|
|
116
132
|
'metadata-dir': (0, flags_1.fileOrDirFlag)({
|
|
117
133
|
summary: messages.getMessage('flags.metadata-dir.summary'),
|
|
118
|
-
|
|
134
|
+
exclusive: exclusiveFlags.filter((f) => f !== 'metadata-dir'),
|
|
119
135
|
exists: true,
|
|
120
136
|
}),
|
|
121
137
|
'single-package': sf_plugins_core_1.Flags.boolean({
|
|
@@ -127,7 +143,7 @@ DeployMetadata.flags = {
|
|
|
127
143
|
description: messages.getMessage('flags.source-dir.description'),
|
|
128
144
|
summary: messages.getMessage('flags.source-dir.summary'),
|
|
129
145
|
multiple: true,
|
|
130
|
-
|
|
146
|
+
exclusive: exclusiveFlags.filter((f) => f !== 'source-dir'),
|
|
131
147
|
}),
|
|
132
148
|
'target-org': sf_plugins_core_1.Flags.requiredOrg({
|
|
133
149
|
char: 'o',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/commands/deploy/metadata.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,iCAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/commands/deploy/metadata.ts"],"names":[],"mappings":"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"}
|
package/lib/commands/deploy.js
CHANGED
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* Licensed under the BSD 3-Clause license.
|
|
6
6
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
7
|
*/
|
|
8
|
+
/* eslint-disable class-methods-use-this */
|
|
8
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
10
|
exports.DEPLOY_OPTIONS_FILE = void 0;
|
|
10
11
|
const os_1 = require("os");
|
|
@@ -47,6 +48,8 @@ class Deploy extends sf_plugins_core_1.SfCommand {
|
|
|
47
48
|
const deployOptions = {};
|
|
48
49
|
for (const deployer of deployers) {
|
|
49
50
|
const opts = (_a = options[deployer.getName()]) !== null && _a !== void 0 ? _a : {};
|
|
51
|
+
// setup must be done sequentially
|
|
52
|
+
// eslint-disable-next-line no-await-in-loop
|
|
50
53
|
deployOptions[deployer.getName()] = await deployer.setup(flags, opts);
|
|
51
54
|
}
|
|
52
55
|
if (flags.interactive && (await this.askToSave())) {
|
|
@@ -59,6 +62,8 @@ class Deploy extends sf_plugins_core_1.SfCommand {
|
|
|
59
62
|
}
|
|
60
63
|
}
|
|
61
64
|
for (const deployer of deployers) {
|
|
65
|
+
// deployments must be done sequentially?
|
|
66
|
+
// eslint-disable-next-line no-await-in-loop
|
|
62
67
|
await deployer.deploy();
|
|
63
68
|
}
|
|
64
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { SfError } from '@salesforce/core';
|
|
1
2
|
import { RetrieveResult } from '@salesforce/source-deploy-retrieve';
|
|
2
3
|
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
3
4
|
import { RetrieveResultJson } from '../../utils/types';
|
|
@@ -9,6 +10,7 @@ export default class RetrieveMetadata extends SfCommand<RetrieveResultJson> {
|
|
|
9
10
|
static readonly state = "beta";
|
|
10
11
|
static flags: {
|
|
11
12
|
'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string>;
|
|
13
|
+
'ignore-conflicts': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
12
14
|
manifest: import("@oclif/core/lib/interfaces").OptionFlag<string>;
|
|
13
15
|
metadata: import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
|
|
14
16
|
'package-name': import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
|
|
@@ -20,4 +22,5 @@ export default class RetrieveMetadata extends SfCommand<RetrieveResultJson> {
|
|
|
20
22
|
static envVariablesSection: import("@salesforce/sf-plugins-core/lib/util").HelpSection;
|
|
21
23
|
protected retrieveResult: RetrieveResult;
|
|
22
24
|
run(): Promise<RetrieveResultJson>;
|
|
25
|
+
protected catch(error: Error | SfError): Promise<SfCommand.Error>;
|
|
23
26
|
}
|