@salesforce/plugin-deploy-retrieve 3.2.7 → 3.2.9
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/README.md +17 -17
- package/lib/commands/project/deploy/cancel.js +2 -2
- package/lib/commands/project/deploy/cancel.js.map +1 -1
- package/lib/commands/project/deploy/quick.js +25 -4
- package/lib/commands/project/deploy/quick.js.map +1 -1
- package/lib/commands/project/deploy/report.js +7 -5
- package/lib/commands/project/deploy/report.js.map +1 -1
- package/lib/commands/project/deploy/resume.js +3 -3
- package/lib/commands/project/deploy/resume.js.map +1 -1
- package/lib/utils/deployCache.d.ts +17 -0
- package/lib/utils/deployCache.js +55 -20
- package/lib/utils/deployCache.js.map +1 -1
- package/messages/cache.md +4 -0
- package/messages/deploy.metadata.quick.md +4 -0
- package/oclif.lock +780 -795
- package/oclif.manifest.json +1106 -1106
- package/package.json +5 -5
package/README.md
CHANGED
|
@@ -139,7 +139,7 @@ FLAG DESCRIPTIONS
|
|
|
139
139
|
If you specify this parameter, don’t specify --metadata or --source-dir.
|
|
140
140
|
```
|
|
141
141
|
|
|
142
|
-
_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.
|
|
142
|
+
_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.9/src/commands/project/convert/mdapi.ts)_
|
|
143
143
|
|
|
144
144
|
## `sf project convert source`
|
|
145
145
|
|
|
@@ -151,7 +151,7 @@ USAGE
|
|
|
151
151
|
<value> | -m <value>]
|
|
152
152
|
|
|
153
153
|
FLAGS
|
|
154
|
-
-d, --output-dir=<value> [default:
|
|
154
|
+
-d, --output-dir=<value> [default: metadataPackage_1706639694053] Output directory to store the Metadata
|
|
155
155
|
API–formatted files in.
|
|
156
156
|
-m, --metadata=<value>... Metadata component names to convert.
|
|
157
157
|
-n, --package-name=<value> Name of the package to associate with the metadata-formatted files.
|
|
@@ -211,7 +211,7 @@ FLAG DESCRIPTIONS
|
|
|
211
211
|
Override the api version used for api requests made by this command
|
|
212
212
|
```
|
|
213
213
|
|
|
214
|
-
_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.
|
|
214
|
+
_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.9/src/commands/project/convert/source.ts)_
|
|
215
215
|
|
|
216
216
|
## `sf project delete source`
|
|
217
217
|
|
|
@@ -350,7 +350,7 @@ FLAG DESCRIPTIONS
|
|
|
350
350
|
- Separate the test names with spaces: --tests Test1 Test2 "Test With Space"
|
|
351
351
|
```
|
|
352
352
|
|
|
353
|
-
_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.
|
|
353
|
+
_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.9/src/commands/project/delete/source.ts)_
|
|
354
354
|
|
|
355
355
|
## `sf project delete tracking`
|
|
356
356
|
|
|
@@ -386,7 +386,7 @@ EXAMPLES
|
|
|
386
386
|
$ sf project delete tracking --target-org my-scratch
|
|
387
387
|
```
|
|
388
388
|
|
|
389
|
-
_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.
|
|
389
|
+
_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.9/src/commands/project/delete/tracking.ts)_
|
|
390
390
|
|
|
391
391
|
## `sf project deploy cancel`
|
|
392
392
|
|
|
@@ -456,7 +456,7 @@ FLAG DESCRIPTIONS
|
|
|
456
456
|
project deploy report".
|
|
457
457
|
```
|
|
458
458
|
|
|
459
|
-
_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.
|
|
459
|
+
_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.9/src/commands/project/deploy/cancel.ts)_
|
|
460
460
|
|
|
461
461
|
## `sf project deploy preview`
|
|
462
462
|
|
|
@@ -540,7 +540,7 @@ FLAG DESCRIPTIONS
|
|
|
540
540
|
All child components are included. If you specify this flag, don’t specify --metadata or --source-dir.
|
|
541
541
|
```
|
|
542
542
|
|
|
543
|
-
_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.
|
|
543
|
+
_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.9/src/commands/project/deploy/preview.ts)_
|
|
544
544
|
|
|
545
545
|
## `sf project deploy quick`
|
|
546
546
|
|
|
@@ -624,7 +624,7 @@ FLAG DESCRIPTIONS
|
|
|
624
624
|
deploy report".
|
|
625
625
|
```
|
|
626
626
|
|
|
627
|
-
_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.
|
|
627
|
+
_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.9/src/commands/project/deploy/quick.ts)_
|
|
628
628
|
|
|
629
629
|
## `sf project deploy report`
|
|
630
630
|
|
|
@@ -719,7 +719,7 @@ FLAG DESCRIPTIONS
|
|
|
719
719
|
--coverage-formatters lcov --coverage-formatters clover
|
|
720
720
|
```
|
|
721
721
|
|
|
722
|
-
_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.
|
|
722
|
+
_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.9/src/commands/project/deploy/report.ts)_
|
|
723
723
|
|
|
724
724
|
## `sf project deploy resume`
|
|
725
725
|
|
|
@@ -803,7 +803,7 @@ FLAG DESCRIPTIONS
|
|
|
803
803
|
--coverage-formatters lcov --coverage-formatters clover
|
|
804
804
|
```
|
|
805
805
|
|
|
806
|
-
_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.
|
|
806
|
+
_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.9/src/commands/project/deploy/resume.ts)_
|
|
807
807
|
|
|
808
808
|
## `sf project deploy start`
|
|
809
809
|
|
|
@@ -1015,7 +1015,7 @@ FLAG DESCRIPTIONS
|
|
|
1015
1015
|
--coverage-formatters lcov --coverage-formatters clover
|
|
1016
1016
|
```
|
|
1017
1017
|
|
|
1018
|
-
_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.
|
|
1018
|
+
_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.9/src/commands/project/deploy/start.ts)_
|
|
1019
1019
|
|
|
1020
1020
|
## `sf project deploy validate`
|
|
1021
1021
|
|
|
@@ -1177,7 +1177,7 @@ FLAG DESCRIPTIONS
|
|
|
1177
1177
|
--coverage-formatters lcov --coverage-formatters clover
|
|
1178
1178
|
```
|
|
1179
1179
|
|
|
1180
|
-
_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.
|
|
1180
|
+
_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.9/src/commands/project/deploy/validate.ts)_
|
|
1181
1181
|
|
|
1182
1182
|
## `sf project generate manifest`
|
|
1183
1183
|
|
|
@@ -1252,7 +1252,7 @@ EXAMPLES
|
|
|
1252
1252
|
$ sf project generate manifest --from-org test@myorg.com --include-packages unlocked
|
|
1253
1253
|
```
|
|
1254
1254
|
|
|
1255
|
-
_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.
|
|
1255
|
+
_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.9/src/commands/project/generate/manifest.ts)_
|
|
1256
1256
|
|
|
1257
1257
|
## `sf project list ignored`
|
|
1258
1258
|
|
|
@@ -1293,7 +1293,7 @@ EXAMPLES
|
|
|
1293
1293
|
$ sf project list ignored --source-dir package.xml
|
|
1294
1294
|
```
|
|
1295
1295
|
|
|
1296
|
-
_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.
|
|
1296
|
+
_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.9/src/commands/project/list/ignored.ts)_
|
|
1297
1297
|
|
|
1298
1298
|
## `sf project reset tracking`
|
|
1299
1299
|
|
|
@@ -1341,7 +1341,7 @@ EXAMPLES
|
|
|
1341
1341
|
$ sf project reset tracking --revision 30
|
|
1342
1342
|
```
|
|
1343
1343
|
|
|
1344
|
-
_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.
|
|
1344
|
+
_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.9/src/commands/project/reset/tracking.ts)_
|
|
1345
1345
|
|
|
1346
1346
|
## `sf project retrieve preview`
|
|
1347
1347
|
|
|
@@ -1397,7 +1397,7 @@ FLAG DESCRIPTIONS
|
|
|
1397
1397
|
Overrides your default org.
|
|
1398
1398
|
```
|
|
1399
1399
|
|
|
1400
|
-
_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.
|
|
1400
|
+
_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.9/src/commands/project/retrieve/preview.ts)_
|
|
1401
1401
|
|
|
1402
1402
|
## `sf project retrieve start`
|
|
1403
1403
|
|
|
@@ -1543,6 +1543,6 @@ FLAG DESCRIPTIONS
|
|
|
1543
1543
|
If you specify this parameter, don’t specify --metadata or --source-dir.
|
|
1544
1544
|
```
|
|
1545
1545
|
|
|
1546
|
-
_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.
|
|
1546
|
+
_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.2.9/src/commands/project/retrieve/start.ts)_
|
|
1547
1547
|
|
|
1548
1548
|
<!-- commandsstop -->
|
|
@@ -56,7 +56,7 @@ export default class DeployMetadataCancel extends SfCommand {
|
|
|
56
56
|
const [{ flags }, cache] = await Promise.all([this.parse(DeployMetadataCancel), DeployCache.create()]);
|
|
57
57
|
const jobId = cache.resolveLatest(flags['use-most-recent'], flags['job-id']);
|
|
58
58
|
// cancel don't care about your tracking conflicts
|
|
59
|
-
const deployOpts = { ...cache.
|
|
59
|
+
const deployOpts = { ...cache.maybeGet(jobId), 'ignore-conflicts': true };
|
|
60
60
|
// we may already know the job finished
|
|
61
61
|
if (deployOpts.status &&
|
|
62
62
|
[RequestStatus.Canceled, RequestStatus.Failed, RequestStatus.Succeeded, RequestStatus.SucceededPartial].includes(deployOpts.status)) {
|
|
@@ -70,7 +70,7 @@ export default class DeployMetadataCancel extends SfCommand {
|
|
|
70
70
|
return formatter.getJson();
|
|
71
71
|
}
|
|
72
72
|
else {
|
|
73
|
-
const wait = flags.wait ?? Duration.minutes(deployOpts.wait);
|
|
73
|
+
const wait = flags.wait ?? Duration.minutes(deployOpts.wait ?? 33);
|
|
74
74
|
const result = await cancelDeploy({ ...deployOpts, wait }, jobId);
|
|
75
75
|
const formatter = new DeployCancelResultFormatter(result);
|
|
76
76
|
if (!this.jsonEnabled())
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../../src/commands/project/deploy/cancel.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cancel.js","sourceRoot":"","sources":["../../../../src/commands/project/deploy/cancel.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,gCAAgC,EAAE,MAAM,yDAAyD,CAAC;AAC3G,OAAO,EAAE,2BAA2B,EAAE,MAAM,oDAAoD,CAAC;AAGjG,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,wBAAwB,CAAC,CAAC;AAEvG,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,SAA2B;IACpE,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjE,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACzD,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,OAAO,GAAG,CAAC,wBAAwB,CAAC,CAAC;IACrD,MAAM,CAAU,gBAAgB,GAAG,IAAI,CAAC;IAExC,MAAM,CAAU,KAAK,GAAG;QAC7B,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;YACnD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;YAC3D,SAAS,EAAE,CAAC,MAAM,CAAC;SACpB,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC;YAC3B,IAAI,EAAE,GAAG;YACT,UAAU,EAAE,KAAK;YACjB,MAAM,EAAE,MAAM;YACd,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;YAC5D,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC;YACpD,UAAU,EAAE,CAAC,iBAAiB,EAAE,QAAQ,CAAC;SAC1C,CAAC;QACF,iBAAiB,EAAE,KAAK,CAAC,OAAO,CAAC;YAC/B,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,mCAAmC,CAAC;YACrE,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,+BAA+B,CAAC;YAC7D,UAAU,EAAE,CAAC,iBAAiB,EAAE,QAAQ,CAAC;SAC1C,CAAC;QACF,6DAA6D;QAC7D,0DAA0D;QAC1D,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC;YAClD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC;YAC1D,IAAI,EAAE,SAAS;YACf,SAAS,EAAE,WAAW;YACtB,GAAG,EAAE,CAAC;YACN,SAAS,EAAE,CAAC,OAAO,CAAC;SACrB,CAAC;KACH,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACvG,MAAM,KAAK,GAAG,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE7E,kDAAkD;QAClD,MAAM,UAAU,GAAG,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC;QAC1E,uCAAuC;QACvC,IACE,UAAU,CAAC,MAAM;YACjB,CAAC,aAAa,CAAC,QAAQ,EAAE,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,SAAS,EAAE,aAAa,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAC9G,UAAU,CAAC,MAAM,CAClB,EACD,CAAC;YACD,QAAQ,CAAC,WAAW,CAAC,6BAA6B,EAAE,CAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;QAClF,CAAC;QAED,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,MAAM,WAAW,GAAG,MAAM,iBAAiB,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;YAC/F,MAAM,SAAS,GAAG,IAAI,gCAAgC,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACxF,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;gBAAE,SAAS,CAAC,OAAO,EAAE,CAAC;YAC7C,OAAO,SAAS,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;YACnE,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,EAAE,GAAG,UAAU,EAAE,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;YAClE,MAAM,SAAS,GAAG,IAAI,2BAA2B,CAAC,MAAM,CAAC,CAAC;YAC1D,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;gBAAE,SAAS,CAAC,OAAO,EAAE,CAAC;YAE7C,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;YACrE,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;YACpB,IAAI,CAAC,aAAa,CAAC,SAAS,EAAE,aAAa,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC/F,MAAM,QAAQ,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC;YACzD,CAAC;YACD,OAAO,SAAS,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;IACH,CAAC;IAES,KAAK,CAAC,KAAsB;QACpC,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC5C,MAAM,GAAG,GAAG,QAAQ,CAAC,WAAW,CAAC,0BAA0B,CAAC,CAAC;YAC7D,OAAO,KAAK,CAAC,KAAK,CAAC;gBACjB,GAAG,KAAK;gBACR,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,GAAG,CAAC,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC5F,CAAC,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC"}
|
|
@@ -77,11 +77,10 @@ export default class DeployMetadataQuick extends SfCommand {
|
|
|
77
77
|
async run() {
|
|
78
78
|
const [{ flags }, cache] = await Promise.all([this.parse(DeployMetadataQuick), DeployCache.create()]);
|
|
79
79
|
// This is the ID of the validation request
|
|
80
|
-
const jobId = cache
|
|
81
|
-
const
|
|
82
|
-
const org = flags['target-org'] ?? (await Org.create({ aliasOrUsername: deployOpts['target-org'] }));
|
|
80
|
+
const jobId = resolveJobId(cache, flags['use-most-recent'], flags['job-id']);
|
|
81
|
+
const targetOrg = await resolveTargetOrg(cache, jobId, flags['target-org']);
|
|
83
82
|
const api = await resolveApi(this.configAggregator);
|
|
84
|
-
const connection =
|
|
83
|
+
const connection = targetOrg.getConnection(flags['api-version']);
|
|
85
84
|
// This is the ID of the deploy (of the validated metadata)
|
|
86
85
|
const deployId = await connection.metadata.deployRecentValidation({
|
|
87
86
|
id: jobId,
|
|
@@ -132,4 +131,26 @@ export default class DeployMetadataQuick extends SfCommand {
|
|
|
132
131
|
return super.catch(error);
|
|
133
132
|
}
|
|
134
133
|
}
|
|
134
|
+
/** Resolve a job ID for a validated deploy using cache, most recent, or a job ID flag. */
|
|
135
|
+
const resolveJobId = (cache, useMostRecentFlag, jobIdFlag) => {
|
|
136
|
+
try {
|
|
137
|
+
return cache.resolveLatest(useMostRecentFlag, jobIdFlag, true);
|
|
138
|
+
}
|
|
139
|
+
catch (e) {
|
|
140
|
+
if (e instanceof Error && e.name === 'NoMatchingJobIdError' && jobIdFlag) {
|
|
141
|
+
return jobIdFlag; // Use the specified 15 char job ID
|
|
142
|
+
}
|
|
143
|
+
throw e;
|
|
144
|
+
}
|
|
145
|
+
};
|
|
146
|
+
/** Resolve a target org using job ID in cache, or a target org flag. */
|
|
147
|
+
const resolveTargetOrg = async (cache, jobId, targetOrgFlag) => {
|
|
148
|
+
const orgFromCache = cache.maybeGet(jobId)?.['target-org'];
|
|
149
|
+
const targetOrg = orgFromCache ? await Org.create({ aliasOrUsername: orgFromCache }) : targetOrgFlag;
|
|
150
|
+
// If we don't have a target org at this point, throw.
|
|
151
|
+
if (!targetOrg) {
|
|
152
|
+
throw messages.createError('error.NoTargetOrg');
|
|
153
|
+
}
|
|
154
|
+
return targetOrg;
|
|
155
|
+
};
|
|
135
156
|
//# sourceMappingURL=quick.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quick.js","sourceRoot":"","sources":["../../../../src/commands/project/deploy/quick.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,
|
|
1
|
+
{"version":3,"file":"quick.js","sourceRoot":"","sources":["../../../../src/commands/project/deploy/quick.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACtF,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,gCAAgC,EAAE,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,0BAA0B,EAAE,MAAM,mDAAmD,CAAC;AAC/F,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,EAAE,GAAG,EAAoB,MAAM,yBAAyB,CAAC;AAEhE,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,uBAAuB,CAAC,CAAC;AAEtG,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,SAA2B;IACnE,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjE,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACzD,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,OAAO,GAAG,CAAC,uBAAuB,CAAC,CAAC;IACpD,MAAM,CAAU,gBAAgB,GAAG,IAAI,CAAC;IAExC,MAAM,CAAU,KAAK,GAAG;QAC7B,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;YACnD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC;YAC3D,SAAS,EAAE,CAAC,MAAM,CAAC;SACpB,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;YACrB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC;YACrD,SAAS,EAAE,CAAC,SAAS,CAAC;SACvB,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC;YAC3B,IAAI,EAAE,GAAG;YACT,UAAU,EAAE,KAAK;YACjB,MAAM,EAAE,MAAM;YACd,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;YAC5D,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC;YACpD,UAAU,EAAE,CAAC,iBAAiB,EAAE,QAAQ,CAAC;SAC1C,CAAC;QACF,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC;YAC9B,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC;YAChE,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;SACzD,CAAC;QACF,iBAAiB,EAAE,KAAK,CAAC,OAAO,CAAC;YAC/B,IAAI,EAAE,GAAG;YACT,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,mCAAmC,CAAC;YACrE,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,+BAA+B,CAAC;YAC7D,UAAU,EAAE,CAAC,iBAAiB,EAAE,QAAQ,CAAC;SAC1C,CAAC;QACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;YACrB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC;YACrD,SAAS,EAAE,CAAC,SAAS,CAAC;SACvB,CAAC;QACF,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC;YAClD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,wBAAwB,CAAC;YAC1D,IAAI,EAAE,SAAS;YACf,YAAY,EAAE,EAAE;YAChB,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC7B,SAAS,EAAE,WAAW;YACtB,GAAG,EAAE,CAAC;YACN,SAAS,EAAE,CAAC,OAAO,CAAC;SACrB,CAAC;QACF,aAAa,EAAE,KAAK,CAAC,aAAa,CAAC;YACjC,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;YACzD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,+BAA+B,CAAC;SAClE,CAAC;KACH,CAAC;IAEK,MAAM,CAAC,UAAU,GAAG,aAAa,CAAC,aAAa,EAAE,gCAAgC,CAAC,CAAC;IAEnF,KAAK,CAAC,GAAG;QACd,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAEtG,2CAA2C;QAC3C,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,iBAAiB,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC7E,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;QAC5E,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACpD,MAAM,UAAU,GAAG,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;QAEjE,2DAA2D;QAC3D,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,sBAAsB,CAAC;YAChE,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC,MAAM,CAAC;SAC1B,CAAC,CAAC;QACH,IAAI,CAAC,GAAG,CAAC,cAAc,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAE/C,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,MAAM,cAAc,GAAG,IAAI,0BAA0B,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACjF,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;gBAAE,cAAc,CAAC,OAAO,EAAE,CAAC;YAClD,OAAO,cAAc,CAAC,OAAO,EAAE,CAAC;QAClC,CAAC;QAED,MAAM,WAAW,GAAG,IAAI,iBAAiB,CAAC;YACxC,oBAAoB,EAAE,UAAU;YAChC,EAAE,EAAE,QAAQ;YACZ,UAAU,EAAE;gBACV,IAAI,EAAE,GAAG,KAAK,GAAG,CAAC,MAAM,CAAC;aAC1B;SACF,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC;YAC1C,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;YAC9B,OAAO,EAAE,KAAK,CAAC,IAAI;SACpB,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,IAAI,qBAAqB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAE3D,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YAAE,SAAS,CAAC,OAAO,EAAE,CAAC;QAE7C,MAAM,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;QAEvE,OAAO,CAAC,QAAQ,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,aAAa,CAAC,SAAS,EAAE,CAAC;YACvD,IAAI,CAAC,GAAG,EAAE,CAAC;YACX,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,yBAAyB,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC9E,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,0BAA0B,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAChG,CAAC;QAED,OAAO,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAES,KAAK,CAAC,KAAsB;QACpC,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAC5C,MAAM,GAAG,GAAG,QAAQ,CAAC,WAAW,CAAC,yBAAyB,CAAC,CAAC;YAC5D,OAAO,KAAK,CAAC,KAAK,CAAC;gBACjB,GAAG,KAAK;gBACR,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,OAAO,EAAE,GAAG,CAAC,OAAO;gBACpB,GAAG,CAAC,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC5F,CAAC,CAAC;QACL,CAAC;QACD,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;;AAGH,0FAA0F;AAC1F,MAAM,YAAY,GAAG,CAAC,KAAkB,EAAE,iBAA0B,EAAE,SAAkB,EAAU,EAAE;IAClG,IAAI,CAAC;QACH,OAAO,KAAK,CAAC,aAAa,CAAC,iBAAiB,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;IACjE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,IAAI,KAAK,sBAAsB,IAAI,SAAS,EAAE,CAAC;YACzE,OAAO,SAAS,CAAC,CAAC,mCAAmC;QACvD,CAAC;QACD,MAAM,CAAC,CAAC;IACV,CAAC;AACH,CAAC,CAAC;AAEF,wEAAwE;AACxE,MAAM,gBAAgB,GAAG,KAAK,EAAE,KAAkB,EAAE,KAAa,EAAE,aAAkB,EAAgB,EAAE;IACrG,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;IAC3D,MAAM,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;IAErG,sDAAsD;IACtD,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,QAAQ,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}
|
|
@@ -67,13 +67,15 @@ export default class DeployMetadataReport extends SfCommand {
|
|
|
67
67
|
async run() {
|
|
68
68
|
const [{ flags }, cache] = await Promise.all([this.parse(DeployMetadataReport), DeployCache.create()]);
|
|
69
69
|
const jobId = cache.resolveLatest(flags['use-most-recent'], flags['job-id'], false);
|
|
70
|
-
const deployOpts = cache.
|
|
70
|
+
const deployOpts = cache.maybeGet(jobId);
|
|
71
71
|
const wait = flags['wait'];
|
|
72
|
-
const org =
|
|
72
|
+
const org = deployOpts?.['target-org']
|
|
73
|
+
? await Org.create({ aliasOrUsername: deployOpts['target-org'] })
|
|
74
|
+
: flags['target-org'];
|
|
73
75
|
// if we're using mdapi we won't have a component set
|
|
74
76
|
let componentSet = new ComponentSet();
|
|
75
|
-
if (!deployOpts
|
|
76
|
-
if (!cache.
|
|
77
|
+
if (!deployOpts?.isMdapi) {
|
|
78
|
+
if (!cache.maybeGet(jobId)) {
|
|
77
79
|
// If the cache file isn't there, use the project package directories for the CompSet
|
|
78
80
|
try {
|
|
79
81
|
this.project = await SfProject.resolve();
|
|
@@ -95,7 +97,7 @@ export default class DeployMetadataReport extends SfCommand {
|
|
|
95
97
|
id: jobId,
|
|
96
98
|
components: componentSet,
|
|
97
99
|
apiOptions: {
|
|
98
|
-
rest: deployOpts
|
|
100
|
+
rest: deployOpts?.api === API['REST'],
|
|
99
101
|
},
|
|
100
102
|
});
|
|
101
103
|
const getDeployResult = async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"report.js","sourceRoot":"","sources":["../../../../src/commands/project/deploy/report.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"report.js","sourceRoot":"","sources":["../../../../src/commands/project/deploy/report.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,9 +73,9 @@ export default class DeployMetadataResume extends SfCommand {
|
|
|
73
73
|
static errorCodes = toHelpSection('ERROR CODES', DEPLOY_STATUS_CODES_DESCRIPTIONS);
|
|
74
74
|
async run() {
|
|
75
75
|
const [{ flags }, cache] = await Promise.all([this.parse(DeployMetadataResume), DeployCache.create()]);
|
|
76
|
-
const jobId = cache.resolveLatest(flags['use-most-recent'], flags['job-id']);
|
|
76
|
+
const jobId = cache.resolveLatest(flags['use-most-recent'], flags['job-id'], true);
|
|
77
77
|
// if it was async before, then it should not be async now.
|
|
78
|
-
const deployOpts = { ...cache.
|
|
78
|
+
const deployOpts = { ...cache.maybeGet(jobId), async: false };
|
|
79
79
|
let result;
|
|
80
80
|
// If we already have a status from cache that is not resumable, display a warning and the deploy result.
|
|
81
81
|
if (isNotResumable(deployOpts.status)) {
|
|
@@ -96,7 +96,7 @@ export default class DeployMetadataResume extends SfCommand {
|
|
|
96
96
|
result = new DeployResult(deployStatus, componentSet);
|
|
97
97
|
}
|
|
98
98
|
else {
|
|
99
|
-
const wait = flags.wait ?? Duration.minutes(deployOpts.wait);
|
|
99
|
+
const wait = flags.wait ?? Duration.minutes(deployOpts.wait ?? 33);
|
|
100
100
|
const { deploy } = await executeDeploy(
|
|
101
101
|
// there will always be conflicts on a resume if anything deployed--the changes on the server are not synced to local
|
|
102
102
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../../../src/commands/project/deploy/resume.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"resume.js","sourceRoot":"","sources":["../../../../src/commands/project/deploy/resume.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,24 @@ export declare class DeployCache extends TTLConfig<TTLConfig.Options, CachedOpti
|
|
|
13
13
|
static set(key: string, value: Partial<DeployOptions>): Promise<void>;
|
|
14
14
|
static unset(key: string): Promise<void>;
|
|
15
15
|
static update(key: string, obj: JsonMap): Promise<void>;
|
|
16
|
+
update(key: string, obj: JsonMap): void;
|
|
17
|
+
/** will return an 18 character ID if throwOnNotFound is true (because the cache can be used to shift 15 to 18) */
|
|
16
18
|
resolveLatest(useMostRecent: boolean, key: string | undefined, throwOnNotFound?: boolean): string;
|
|
19
|
+
/**
|
|
20
|
+
* @deprecated. Use maybeGet to handle both 15 and 18 char IDs
|
|
21
|
+
* returns 18-char ID unmodified, regardless of whether it's in cache or not
|
|
22
|
+
* returns 15-char ID if it matches a key in the cache, otherwise throws
|
|
23
|
+
*/
|
|
17
24
|
resolveLongId(jobId: string): string;
|
|
25
|
+
/**
|
|
26
|
+
*
|
|
27
|
+
* @deprecated. Use maybeGet because the typings are wrong in sfdx-core
|
|
28
|
+
*/
|
|
18
29
|
get(jobId: string): TTLConfig.Entry<CachedOptions>;
|
|
30
|
+
/**
|
|
31
|
+
* works with 18 and 15-character IDs.
|
|
32
|
+
* Prefer 18 as that's how the cache is keyed.
|
|
33
|
+
* Returns undefined if no match is found.
|
|
34
|
+
*/
|
|
35
|
+
maybeGet(jobId: string): TTLConfig.Entry<CachedOptions> | undefined;
|
|
19
36
|
}
|
package/lib/utils/deployCache.js
CHANGED
|
@@ -36,41 +36,76 @@ export class DeployCache extends TTLConfig {
|
|
|
36
36
|
}
|
|
37
37
|
static async unset(key) {
|
|
38
38
|
const cache = await DeployCache.create();
|
|
39
|
-
cache.unset(key);
|
|
39
|
+
cache.unset(ensure18(key, cache));
|
|
40
40
|
await Promise.all([cache.write(), maybeDestroyManifest(key)]);
|
|
41
41
|
}
|
|
42
42
|
static async update(key, obj) {
|
|
43
43
|
const cache = await DeployCache.create();
|
|
44
|
-
cache.update(key, obj);
|
|
44
|
+
cache.update(ensure18(key, cache), obj);
|
|
45
45
|
await cache.write();
|
|
46
46
|
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
47
|
+
update(key, obj) {
|
|
48
|
+
super.update(ensure18(key, this), obj);
|
|
49
|
+
}
|
|
50
|
+
/** will return an 18 character ID if throwOnNotFound is true (because the cache can be used to shift 15 to 18) */
|
|
51
|
+
resolveLatest(useMostRecent, key, throwOnNotFound) {
|
|
52
|
+
const resolvedKey = useMostRecent ? this.getLatestKey() : key;
|
|
53
|
+
if (!resolvedKey)
|
|
50
54
|
throw cacheMessages.createError('error.NoRecentJobId');
|
|
51
|
-
const
|
|
52
|
-
if (throwOnNotFound && !
|
|
53
|
-
throw cacheMessages.createError('error.
|
|
55
|
+
const match = this.maybeGet(resolvedKey);
|
|
56
|
+
if (throwOnNotFound === true && !match) {
|
|
57
|
+
throw cacheMessages.createError('error.NoMatchingJobId', [resolvedKey]);
|
|
54
58
|
}
|
|
55
|
-
return
|
|
59
|
+
return throwOnNotFound ? ensure18(resolvedKey, this) : resolvedKey;
|
|
56
60
|
}
|
|
61
|
+
/**
|
|
62
|
+
* @deprecated. Use maybeGet to handle both 15 and 18 char IDs
|
|
63
|
+
* returns 18-char ID unmodified, regardless of whether it's in cache or not
|
|
64
|
+
* returns 15-char ID if it matches a key in the cache, otherwise throws
|
|
65
|
+
*/
|
|
57
66
|
resolveLongId(jobId) {
|
|
67
|
+
return ensure18(jobId, this);
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
*
|
|
71
|
+
* @deprecated. Use maybeGet because the typings are wrong in sfdx-core
|
|
72
|
+
*/
|
|
73
|
+
get(jobId) {
|
|
74
|
+
return super.get(this.resolveLongId(jobId));
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* works with 18 and 15-character IDs.
|
|
78
|
+
* Prefer 18 as that's how the cache is keyed.
|
|
79
|
+
* Returns undefined if no match is found.
|
|
80
|
+
*/
|
|
81
|
+
maybeGet(jobId) {
|
|
58
82
|
if (jobId.length === 18) {
|
|
59
|
-
return jobId;
|
|
83
|
+
return super.get(jobId);
|
|
60
84
|
}
|
|
61
|
-
|
|
85
|
+
if (jobId.length === 15) {
|
|
62
86
|
const match = this.keys().find((k) => k.startsWith(jobId));
|
|
63
|
-
|
|
64
|
-
return match;
|
|
65
|
-
}
|
|
66
|
-
throw cacheMessages.createError('error.InvalidJobId', [jobId]);
|
|
87
|
+
return match ? super.get(match) : undefined;
|
|
67
88
|
}
|
|
68
|
-
|
|
69
|
-
|
|
89
|
+
throw cacheMessages.createError('error.InvalidJobId', [jobId]);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
/**
|
|
93
|
+
* if the jobId is 15 characters, use the cache to convert to 18
|
|
94
|
+
* will throw if the value is not in the cache
|
|
95
|
+
*/
|
|
96
|
+
const ensure18 = (jobId, cache) => {
|
|
97
|
+
if (jobId.length === 18) {
|
|
98
|
+
return jobId;
|
|
99
|
+
}
|
|
100
|
+
else if (jobId.length === 15) {
|
|
101
|
+
const match = cache.keys().find((k) => k.startsWith(jobId));
|
|
102
|
+
if (match) {
|
|
103
|
+
return match;
|
|
70
104
|
}
|
|
105
|
+
throw cacheMessages.createError('error.NoMatchingJobId', [jobId]);
|
|
71
106
|
}
|
|
72
|
-
|
|
73
|
-
|
|
107
|
+
else {
|
|
108
|
+
throw cacheMessages.createError('error.InvalidJobId', [jobId]);
|
|
74
109
|
}
|
|
75
|
-
}
|
|
110
|
+
};
|
|
76
111
|
//# sourceMappingURL=deployCache.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deployCache.js","sourceRoot":"","sources":["../../src/utils/deployCache.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,OAAO,EAAgC,aAAa,EAAE,MAAM,aAAa,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,MAAM,OAAO,WAAY,SAAQ,SAA2C;IACnE,MAAM,CAAC,WAAW;QACvB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAEM,MAAM,CAAC,iBAAiB;QAC7B,OAAO;YACL,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,WAAW,CAAC,WAAW,EAAE;YACnC,WAAW,EAAE,MAAM,CAAC,eAAe;YACnC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;SACtB,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,KAA6B;QAChE,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,CAAC;QACzC,8DAA8D;QAC9D,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,UAAU,EAAE,GAAG,KAAK,CAAC;QACtF,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACtF,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAW;QACnC,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,CAAC;QACzC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"deployCache.js","sourceRoot":"","sources":["../../src/utils/deployCache.ts"],"names":[],"mappings":"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"}
|
package/messages/cache.md
CHANGED
|
@@ -84,6 +84,10 @@ Job ID can't be used for quick deployment. Possible reasons include the deployme
|
|
|
84
84
|
|
|
85
85
|
Deployment %s exited with status code: %s.
|
|
86
86
|
|
|
87
|
+
# error.NoTargetOrg
|
|
88
|
+
|
|
89
|
+
No target org found in cache, from a flag, or in the environment.
|
|
90
|
+
|
|
87
91
|
# info.QuickDeploySuccess
|
|
88
92
|
|
|
89
93
|
Successfully deployed (%s).
|