@salesforce/plugin-release-management 4.5.27 → 4.6.1

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.
Files changed (94) hide show
  1. package/README.md +18 -41
  2. package/bin/dev.js +8 -6
  3. package/bin/run.js +7 -5
  4. package/lib/amazonS3.d.ts +4 -8
  5. package/lib/amazonS3.js +76 -81
  6. package/lib/amazonS3.js.map +1 -1
  7. package/lib/codeSigning/NpmName.js +5 -9
  8. package/lib/codeSigning/NpmName.js.map +1 -1
  9. package/lib/codeSigning/SimplifiedSigning.d.ts +1 -1
  10. package/lib/codeSigning/SimplifiedSigning.js +16 -21
  11. package/lib/codeSigning/SimplifiedSigning.js.map +1 -1
  12. package/lib/codeSigning/error.js +2 -6
  13. package/lib/codeSigning/error.js.map +1 -1
  14. package/lib/codeSigning/packAndSign.d.ts +2 -2
  15. package/lib/codeSigning/packAndSign.js +45 -44
  16. package/lib/codeSigning/packAndSign.js.map +1 -1
  17. package/lib/codeSigning/upload.d.ts +1 -1
  18. package/lib/codeSigning/upload.js +4 -8
  19. package/lib/codeSigning/upload.js.map +1 -1
  20. package/lib/commands/channel/promote.d.ts +11 -4
  21. package/lib/commands/channel/promote.js +113 -115
  22. package/lib/commands/channel/promote.js.map +1 -1
  23. package/lib/commands/cli/artifacts/compare.js +58 -52
  24. package/lib/commands/cli/artifacts/compare.js.map +1 -1
  25. package/lib/commands/cli/install/jit/test.d.ts +1 -1
  26. package/lib/commands/cli/install/jit/test.js +18 -21
  27. package/lib/commands/cli/install/jit/test.js.map +1 -1
  28. package/lib/commands/cli/install/test.d.ts +4 -4
  29. package/lib/commands/cli/install/test.js +114 -106
  30. package/lib/commands/cli/install/test.js.map +1 -1
  31. package/lib/commands/cli/release/automerge.d.ts +5 -5
  32. package/lib/commands/cli/release/automerge.js +44 -47
  33. package/lib/commands/cli/release/automerge.js.map +1 -1
  34. package/lib/commands/cli/release/build.d.ts +12 -12
  35. package/lib/commands/cli/release/build.js +78 -81
  36. package/lib/commands/cli/release/build.js.map +1 -1
  37. package/lib/commands/cli/releasenotes.d.ts +4 -4
  38. package/lib/commands/cli/releasenotes.js +49 -54
  39. package/lib/commands/cli/releasenotes.js.map +1 -1
  40. package/lib/commands/cli/tarballs/prepare.js +31 -33
  41. package/lib/commands/cli/tarballs/prepare.js.map +1 -1
  42. package/lib/commands/cli/tarballs/smoke.js +32 -31
  43. package/lib/commands/cli/tarballs/smoke.js.map +1 -1
  44. package/lib/commands/cli/tarballs/verify.d.ts +1 -1
  45. package/lib/commands/cli/tarballs/verify.js +58 -62
  46. package/lib/commands/cli/tarballs/verify.js.map +1 -1
  47. package/lib/commands/cli/versions/inspect.d.ts +4 -3
  48. package/lib/commands/cli/versions/inspect.js +79 -84
  49. package/lib/commands/cli/versions/inspect.js.map +1 -1
  50. package/lib/commands/dependabot/automerge.d.ts +6 -6
  51. package/lib/commands/dependabot/automerge.js +48 -48
  52. package/lib/commands/dependabot/automerge.js.map +1 -1
  53. package/lib/commands/github/check/closed.d.ts +7 -5
  54. package/lib/commands/github/check/closed.js +25 -28
  55. package/lib/commands/github/check/closed.js.map +1 -1
  56. package/lib/commands/npm/dependencies/pin.d.ts +3 -3
  57. package/lib/commands/npm/dependencies/pin.js +21 -24
  58. package/lib/commands/npm/dependencies/pin.js.map +1 -1
  59. package/lib/commands/npm/package/release.d.ts +11 -12
  60. package/lib/commands/npm/package/release.js +58 -61
  61. package/lib/commands/npm/package/release.js.map +1 -1
  62. package/lib/commands/repositories/index.d.ts +4 -3
  63. package/lib/commands/repositories/index.js +17 -20
  64. package/lib/commands/repositories/index.js.map +1 -1
  65. package/lib/dependabot.d.ts +1 -1
  66. package/lib/dependabot.js +13 -17
  67. package/lib/dependabot.js.map +1 -1
  68. package/lib/dependencies.d.ts +1 -1
  69. package/lib/dependencies.js +3 -7
  70. package/lib/dependencies.js.map +1 -1
  71. package/lib/index.d.ts +1 -2
  72. package/lib/index.js +1 -2
  73. package/lib/index.js.map +1 -1
  74. package/lib/jit.js +18 -22
  75. package/lib/jit.js.map +1 -1
  76. package/lib/package.d.ts +0 -2
  77. package/lib/package.js +36 -59
  78. package/lib/package.js.map +1 -1
  79. package/lib/registry.js +19 -18
  80. package/lib/registry.js.map +1 -1
  81. package/lib/repositories.js +5 -9
  82. package/lib/repositories.js.map +1 -1
  83. package/lib/repository.d.ts +5 -7
  84. package/lib/repository.js +41 -43
  85. package/lib/repository.js.map +1 -1
  86. package/lib/types.js +4 -7
  87. package/lib/types.js.map +1 -1
  88. package/npm-shrinkwrap.json +2953 -2229
  89. package/oclif.manifest.json +17 -69
  90. package/package.json +9 -9
  91. package/lib/commands/cli/schemas/compare.d.ts +0 -19
  92. package/lib/commands/cli/schemas/compare.js +0 -114
  93. package/lib/commands/cli/schemas/compare.js.map +0 -1
  94. package/messages/cli.schemas.compare.md +0 -7
package/README.md CHANGED
@@ -107,7 +107,6 @@ sfdx plugins
107
107
  - [`sfdx cli release automerge`](#sfdx-cli-release-automerge)
108
108
  - [`sfdx cli release build`](#sfdx-cli-release-build)
109
109
  - [`sfdx cli releasenotes`](#sfdx-cli-releasenotes)
110
- - [`sfdx cli schemas compare`](#sfdx-cli-schemas-compare)
111
110
  - [`sfdx cli tarballs prepare`](#sfdx-cli-tarballs-prepare)
112
111
  - [`sfdx cli tarballs smoke`](#sfdx-cli-tarballs-smoke)
113
112
  - [`sfdx cli tarballs verify`](#sfdx-cli-tarballs-verify)
@@ -157,7 +156,7 @@ EXAMPLES
157
156
  $ sfdx channel promote --candidate latest-rc --target latest --platform win --platform mac
158
157
  ```
159
158
 
160
- _See code: [src/commands/channel/promote.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.5.27/src/commands/channel/promote.ts)_
159
+ _See code: [src/commands/channel/promote.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.6.1/src/commands/channel/promote.ts)_
161
160
 
162
161
  ## `sfdx cli artifacts compare`
163
162
 
@@ -180,7 +179,7 @@ EXAMPLES
180
179
  $ sfdx cli artifacts compare
181
180
  ```
182
181
 
183
- _See code: [src/commands/cli/artifacts/compare.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.5.27/src/commands/cli/artifacts/compare.ts)_
182
+ _See code: [src/commands/cli/artifacts/compare.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.6.1/src/commands/cli/artifacts/compare.ts)_
184
183
 
185
184
  ## `sfdx cli install jit test`
186
185
 
@@ -200,7 +199,7 @@ EXAMPLES
200
199
  $ sfdx cli install jit test
201
200
  ```
202
201
 
203
- _See code: [src/commands/cli/install/jit/test.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.5.27/src/commands/cli/install/jit/test.ts)_
202
+ _See code: [src/commands/cli/install/jit/test.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.6.1/src/commands/cli/install/jit/test.ts)_
204
203
 
205
204
  ## `sfdx cli install test`
206
205
 
@@ -240,7 +239,7 @@ EXAMPLES
240
239
  $ sfdx cli install test --cli sf --method tarball --channel stable-rc
241
240
  ```
242
241
 
243
- _See code: [src/commands/cli/install/test.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.5.27/src/commands/cli/install/test.ts)_
242
+ _See code: [src/commands/cli/install/test.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.6.1/src/commands/cli/install/test.ts)_
244
243
 
245
244
  ## `sfdx cli release automerge`
246
245
 
@@ -269,7 +268,7 @@ EXAMPLES
269
268
  $ sfdx cli release automerge --owner salesforcecli --repo sfdx-cli --pul-number 1049
270
269
  ```
271
270
 
272
- _See code: [src/commands/cli/release/automerge.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.5.27/src/commands/cli/release/automerge.ts)_
271
+ _See code: [src/commands/cli/release/automerge.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.6.1/src/commands/cli/release/automerge.ts)_
273
272
 
274
273
  ## `sfdx cli release build`
275
274
 
@@ -330,7 +329,7 @@ EXAMPLES
330
329
  $ sfdx cli release build --only @salesforce/plugin-source,@salesforce/plugin-info@1.2.3,@sf/config
331
330
  ```
332
331
 
333
- _See code: [src/commands/cli/release/build.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.5.27/src/commands/cli/release/build.ts)_
332
+ _See code: [src/commands/cli/release/build.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.6.1/src/commands/cli/release/build.ts)_
334
333
 
335
334
  ## `sfdx cli releasenotes`
336
335
 
@@ -370,29 +369,7 @@ EXAMPLES
370
369
  $ sfdx cli releasenotes --cli sf --markdown > changes.md
371
370
  ```
372
371
 
373
- _See code: [src/commands/cli/releasenotes.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.5.27/src/commands/cli/releasenotes.ts)_
374
-
375
- ## `sfdx cli schemas compare`
376
-
377
- compare schemas from installed plugins
378
-
379
- ```
380
- USAGE
381
- $ sfdx cli schemas compare [--json]
382
-
383
- GLOBAL FLAGS
384
- --json Format output as json.
385
-
386
- DESCRIPTION
387
- compare schemas from installed plugins
388
-
389
- compare schemas from installed plugins
390
-
391
- EXAMPLES
392
- $ sfdx cli schemas compare
393
- ```
394
-
395
- _See code: [src/commands/cli/schemas/compare.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.5.27/src/commands/cli/schemas/compare.ts)_
372
+ _See code: [src/commands/cli/releasenotes.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.6.1/src/commands/cli/releasenotes.ts)_
396
373
 
397
374
  ## `sfdx cli tarballs prepare`
398
375
 
@@ -419,7 +396,7 @@ EXAMPLES
419
396
  $ sfdx cli tarballs prepare
420
397
  ```
421
398
 
422
- _See code: [src/commands/cli/tarballs/prepare.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.5.27/src/commands/cli/tarballs/prepare.ts)_
399
+ _See code: [src/commands/cli/tarballs/prepare.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.6.1/src/commands/cli/tarballs/prepare.ts)_
423
400
 
424
401
  ## `sfdx cli tarballs smoke`
425
402
 
@@ -448,7 +425,7 @@ EXAMPLES
448
425
  $ sfdx cli tarballs smoke
449
426
  ```
450
427
 
451
- _See code: [src/commands/cli/tarballs/smoke.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.5.27/src/commands/cli/tarballs/smoke.ts)_
428
+ _See code: [src/commands/cli/tarballs/smoke.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.6.1/src/commands/cli/tarballs/smoke.ts)_
452
429
 
453
430
  ## `sfdx cli tarballs verify`
454
431
 
@@ -479,7 +456,7 @@ EXAMPLES
479
456
  $ sfdx cli tarballs verify --cli sf
480
457
  ```
481
458
 
482
- _See code: [src/commands/cli/tarballs/verify.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.5.27/src/commands/cli/tarballs/verify.ts)_
459
+ _See code: [src/commands/cli/tarballs/verify.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.6.1/src/commands/cli/tarballs/verify.ts)_
483
460
 
484
461
  ## `sfdx cli versions inspect`
485
462
 
@@ -531,7 +508,7 @@ EXAMPLES
531
508
  $ sfdx cli versions inspect -l npm -c latest -d chalk -s
532
509
  ```
533
510
 
534
- _See code: [src/commands/cli/versions/inspect.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.5.27/src/commands/cli/versions/inspect.ts)_
511
+ _See code: [src/commands/cli/versions/inspect.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.6.1/src/commands/cli/versions/inspect.ts)_
535
512
 
536
513
  ## `sfdx dependabot automerge`
537
514
 
@@ -570,7 +547,7 @@ EXAMPLES
570
547
  $ sfdx dependabot automerge --max-version-bump major
571
548
  ```
572
549
 
573
- _See code: [src/commands/dependabot/automerge.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.5.27/src/commands/dependabot/automerge.ts)_
550
+ _See code: [src/commands/dependabot/automerge.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.6.1/src/commands/dependabot/automerge.ts)_
574
551
 
575
552
  ## `sfdx github check closed`
576
553
 
@@ -596,7 +573,7 @@ EXAMPLES
596
573
  $ sfdx github check closed -o me@gus.com
597
574
  ```
598
575
 
599
- _See code: [src/commands/github/check/closed.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.5.27/src/commands/github/check/closed.ts)_
576
+ _See code: [src/commands/github/check/closed.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.6.1/src/commands/github/check/closed.ts)_
600
577
 
601
578
  ## `sfdx npm dependencies pin`
602
579
 
@@ -621,7 +598,7 @@ DESCRIPTION
621
598
  in the package.json
622
599
  ```
623
600
 
624
- _See code: [src/commands/npm/dependencies/pin.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.5.27/src/commands/npm/dependencies/pin.ts)_
601
+ _See code: [src/commands/npm/dependencies/pin.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.6.1/src/commands/npm/dependencies/pin.ts)_
625
602
 
626
603
  ## `sfdx npm package release`
627
604
 
@@ -652,7 +629,7 @@ DESCRIPTION
652
629
  publish npm package
653
630
  ```
654
631
 
655
- _See code: [src/commands/npm/package/release.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.5.27/src/commands/npm/package/release.ts)_
632
+ _See code: [src/commands/npm/package/release.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.6.1/src/commands/npm/package/release.ts)_
656
633
 
657
634
  ## `sfdx plugins trust verify`
658
635
 
@@ -675,12 +652,12 @@ DESCRIPTION
675
652
  Verifies the digital signature on an npm package matches the signature and key stored at the expected URLs.
676
653
 
677
654
  EXAMPLES
678
- $ sfdx plugins trust verify --npm @scope/npmName --registry http://my.repo.org:4874
655
+ $ sfdx plugins trust verify --npm @scope/npmName --registry https://npm.pkg.github.com
679
656
 
680
657
  $ sfdx plugins trust verify --npm @scope/npmName
681
658
  ```
682
659
 
683
- _See code: [@salesforce/plugin-trust](https://github.com/salesforcecli/plugin-trust/blob/2.6.23/src/commands/plugins/trust/verify.ts)_
660
+ _See code: [@salesforce/plugin-trust](https://github.com/salesforcecli/plugin-trust/blob/3.3.1/src/commands/plugins/trust/verify.ts)_
684
661
 
685
662
  ## `sfdx repositories`
686
663
 
@@ -718,6 +695,6 @@ EXAMPLES
718
695
  $ sfdx repositories --json | jq -r '.result[] | select(.name=="sfdx-core") | .packages[] | .url
719
696
  ```
720
697
 
721
- _See code: [src/commands/repositories/index.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.5.27/src/commands/repositories/index.ts)_
698
+ _See code: [src/commands/repositories/index.ts](https://github.com/salesforcecli/plugin-release-management/blob/4.6.1/src/commands/repositories/index.ts)_
722
699
 
723
700
  <!-- commandsstop -->
package/bin/dev.js CHANGED
@@ -1,6 +1,8 @@
1
- #!/usr/bin/env ts-node
2
- // eslint-disable-next-line node/shebang, unicorn/prefer-top-level-await
3
- (async () => {
4
- const oclif = await import('@oclif/core');
5
- await oclif.execute({ development: true, dir: __dirname });
6
- })();
1
+ #!/usr/bin/env -S node --loader ts-node/esm --no-warnings=ExperimentalWarning
2
+ // eslint-disable-next-line node/shebang
3
+ async function main() {
4
+ const { execute } = await import('@oclif/core');
5
+ await execute({ development: true, dir: import.meta.url });
6
+ }
7
+
8
+ await main();
package/bin/run.js CHANGED
@@ -1,7 +1,9 @@
1
1
  #!/usr/bin/env node
2
2
 
3
- // eslint-disable-next-line unicorn/prefer-top-level-await
4
- (async () => {
5
- const oclif = await import('@oclif/core');
6
- await oclif.execute({ development: false, dir: __dirname });
7
- })();
3
+ // eslint-disable-next-line node/shebang
4
+ async function main() {
5
+ const { execute } = await import('@oclif/core');
6
+ await execute({ dir: import.meta.url });
7
+ }
8
+
9
+ await main();
package/lib/amazonS3.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { S3 } from 'aws-sdk';
2
- import { CredentialsOptions } from 'aws-sdk/lib/credentials';
3
- import { GetObjectRequest, GetObjectOutput } from 'aws-sdk/clients/s3';
4
- import { Channel, CLI, S3Manifest, ServiceAvailability } from './types';
2
+ import { CredentialsOptions } from 'aws-sdk/lib/credentials.js';
3
+ import { GetObjectRequest, GetObjectOutput } from 'aws-sdk/clients/s3.js';
4
+ import { Channel, CLI, S3Manifest, ServiceAvailability } from './types.js';
5
5
  type GetObjectOption = Omit<GetObjectRequest, 'Bucket'>;
6
6
  type AmazonS3Options = {
7
7
  bucket?: string;
@@ -19,14 +19,10 @@ export declare class AmazonS3 {
19
19
  private baseKey;
20
20
  constructor(options: AmazonS3Options);
21
21
  ping(): Promise<ServiceAvailability>;
22
- fileIsAvailable(url: string): Promise<ServiceAvailability>;
23
- download(url: string, location: string, silent?: boolean): Promise<void>;
24
22
  getManifestFromChannel(channel: string): Promise<S3Manifest>;
25
- getManifestFromVersion(version: string, sha: string): Promise<S3Manifest>;
26
- getFileAtUrl(url: string): Promise<string>;
27
23
  getObject(options: GetObjectOption): Promise<GetObjectOutput>;
28
24
  listCommonPrefixes(key: string): Promise<string[]>;
29
25
  listKeyContents(key: string): Promise<S3.ObjectList>;
30
- private resolveCredentials;
31
26
  }
27
+ export declare const download: (url: string, location: string, silent?: boolean) => Promise<void>;
32
28
  export {};
package/lib/amazonS3.js CHANGED
@@ -1,92 +1,47 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.AmazonS3 = void 0;
4
1
  /*
5
2
  * Copyright (c) 2020, salesforce.com, inc.
6
3
  * All rights reserved.
7
4
  * Licensed under the BSD 3-Clause license.
8
5
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
9
6
  */
10
- const os = require("node:os");
11
- const path = require("node:path");
12
- const fs = require("node:fs");
13
- const core_1 = require("@oclif/core");
14
- const got_1 = require("got");
15
- const core_2 = require("@salesforce/core");
16
- const chalk = require("chalk");
17
- const AWS = require("aws-sdk");
18
- const ts_types_1 = require("@salesforce/ts-types");
19
- const packAndSign_1 = require("./codeSigning/packAndSign");
7
+ import os from 'node:os';
8
+ import path from 'node:path';
9
+ import fs from 'node:fs';
10
+ import { ux } from '@oclif/core';
11
+ import got from 'got';
12
+ import { SfError } from '@salesforce/core';
13
+ import chalk from 'chalk';
14
+ import AWS from 'aws-sdk';
15
+ import { isString } from '@salesforce/ts-types';
16
+ import { api } from './codeSigning/packAndSign.js';
20
17
  const BASE_URL = 'https://developer.salesforce.com';
21
18
  const BUCKET = 'dfc-data-production';
22
- class AmazonS3 {
19
+ export class AmazonS3 {
20
+ options;
21
+ static STATUS_URL = 'https://s3.amazonaws.com';
22
+ directory;
23
+ s3;
24
+ baseKey;
23
25
  constructor(options) {
24
26
  this.options = options;
25
27
  this.directory = `https://developer.salesforce.com/media/salesforce-cli/${this.options.cli ?? ''}`;
26
28
  this.baseKey = this.directory.replace(BASE_URL, '').replace(/^\//, '');
27
- const agent = packAndSign_1.api.getAgentForUri('https://s3.amazonaws.com');
28
29
  this.s3 = new AWS.S3({
29
- ...this.resolveCredentials(),
30
- httpOptions: { agent: agent.http },
30
+ ...resolveCredentials(options.credentials),
31
+ ...buildHttpOptions(),
31
32
  });
32
33
  }
34
+ // there's an abstract class for cli:install:test using this
33
35
  // eslint-disable-next-line class-methods-use-this
34
36
  async ping() {
35
- const { statusCode } = await got_1.default.get(AmazonS3.STATUS_URL);
37
+ const { statusCode } = await got.get(AmazonS3.STATUS_URL);
36
38
  return { service: 'Amazon S3', available: statusCode >= 200 && statusCode < 300 };
37
39
  }
38
- // eslint-disable-next-line class-methods-use-this
39
- async fileIsAvailable(url) {
40
- const { statusCode } = await got_1.default.get(url, { throwHttpErrors: false });
41
- return { service: 'file', name: url, available: statusCode >= 200 && statusCode < 300 };
42
- }
43
- // eslint-disable-next-line class-methods-use-this
44
- async download(url, location, silent = false) {
45
- const downloadStream = got_1.default.stream(url);
46
- const fileWriterStream = fs.createWriteStream(location);
47
- return new Promise((resolve) => {
48
- downloadStream.on('error', (error) => {
49
- if (!silent)
50
- core_1.ux.error(`Download failed: ${error.message}`);
51
- });
52
- fileWriterStream
53
- .on('error', (error) => {
54
- if (!silent)
55
- core_1.ux.action.stop('Failed');
56
- if (!silent)
57
- core_1.ux.error(`Could not write file to system: ${error.message}`);
58
- })
59
- .on('finish', () => {
60
- if (!silent)
61
- core_1.ux.action.stop();
62
- resolve();
63
- });
64
- if (!silent)
65
- core_1.ux.action.start(`Downloading ${chalk.cyan(url)}`);
66
- downloadStream.pipe(fileWriterStream);
67
- });
68
- }
69
40
  async getManifestFromChannel(channel) {
70
41
  const url = `${this.directory}/channels/${channel}/${this.options.cli}-darwin-x64-buildmanifest`;
71
- const filename = await this.getFileAtUrl(url);
42
+ const filename = await getFileAtUrl(url);
72
43
  return JSON.parse(fs.readFileSync(filename, 'utf8'));
73
44
  }
74
- async getManifestFromVersion(version, sha) {
75
- const url = `${this.directory}/versions/${version}/${sha}/${this.options.cli}-v${version}-darwin-x64-buildmanifest`;
76
- const filename = await this.getFileAtUrl(url);
77
- return JSON.parse(fs.readFileSync(filename, 'utf8'));
78
- }
79
- async getFileAtUrl(url) {
80
- const availability = await this.fileIsAvailable(url);
81
- if (availability.available) {
82
- const filename = path.join(os.tmpdir(), `file${Math.random()}`);
83
- await this.download(url, filename, true);
84
- return filename;
85
- }
86
- else {
87
- throw new core_2.SfError(`File at url: ${url} does not exist`);
88
- }
89
- }
90
45
  async getObject(options) {
91
46
  options.Key = options.Key.replace(BASE_URL, '').replace(/^\//, '');
92
47
  const object = (await this.s3
@@ -99,7 +54,7 @@ class AmazonS3 {
99
54
  const objects = await this.s3
100
55
  .listObjectsV2({ Bucket: this.options.bucket ?? BUCKET, Delimiter: '/', Prefix: prefix })
101
56
  .promise();
102
- return (objects.CommonPrefixes ?? [])?.map((item) => item.Prefix).filter(ts_types_1.isString);
57
+ return (objects.CommonPrefixes ?? [])?.map((item) => item.Prefix).filter(isString);
103
58
  }
104
59
  async listKeyContents(key) {
105
60
  const prefix = key.startsWith(this.baseKey) ? key : `${this.baseKey}/${key}/`;
@@ -108,19 +63,59 @@ class AmazonS3 {
108
63
  .promise();
109
64
  return objects.Contents ?? [];
110
65
  }
111
- resolveCredentials() {
112
- const credentials = {};
113
- if (this.options.credentials) {
114
- return { credentials: this.options.credentials };
115
- }
116
- if (process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) {
117
- return {
118
- credentials: { accessKeyId: process.env.AWS_ACCESS_KEY_ID, secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY },
119
- };
120
- }
121
- return credentials;
122
- }
123
66
  }
124
- exports.AmazonS3 = AmazonS3;
125
- AmazonS3.STATUS_URL = 'https://s3.amazonaws.com';
67
+ export const download = async (url, location, silent = false) => {
68
+ const downloadStream = got.stream(url);
69
+ const fileWriterStream = fs.createWriteStream(location);
70
+ return new Promise((resolve) => {
71
+ downloadStream.on('error', (error) => {
72
+ if (!silent)
73
+ ux.error(`Download failed: ${error.message}`);
74
+ });
75
+ fileWriterStream
76
+ .on('error', (error) => {
77
+ if (!silent)
78
+ ux.action.stop('Failed');
79
+ if (!silent)
80
+ ux.error(`Could not write file to system: ${error.message}`);
81
+ })
82
+ .on('finish', () => {
83
+ if (!silent)
84
+ ux.action.stop();
85
+ resolve();
86
+ });
87
+ if (!silent)
88
+ ux.action.start(`Downloading ${chalk.cyan(url)}`);
89
+ downloadStream.pipe(fileWriterStream);
90
+ });
91
+ };
92
+ const getFileAtUrl = async (url) => {
93
+ const availability = await fileIsAvailable(url);
94
+ if (availability.available) {
95
+ const filename = path.join(os.tmpdir(), `file${Math.random()}`);
96
+ await download(url, filename, true);
97
+ return filename;
98
+ }
99
+ else {
100
+ throw new SfError(`File at url: ${url} does not exist`);
101
+ }
102
+ };
103
+ const resolveCredentials = (credentialOptions) => {
104
+ if (credentialOptions) {
105
+ return { credentials: credentialOptions };
106
+ }
107
+ return process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY
108
+ ? {
109
+ credentials: { accessKeyId: process.env.AWS_ACCESS_KEY_ID, secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY },
110
+ }
111
+ : {};
112
+ };
113
+ const fileIsAvailable = async (url) => {
114
+ const { statusCode } = await got.head(url, { throwHttpErrors: false });
115
+ return { service: 'file', name: url, available: statusCode >= 200 && statusCode < 300 };
116
+ };
117
+ const buildHttpOptions = () => {
118
+ const agent = api.getAgentForUri('https://s3.amazonaws.com');
119
+ return agent && agent.http ? { httpOptions: { agent: agent.http } } : {};
120
+ };
126
121
  //# sourceMappingURL=amazonS3.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"amazonS3.js","sourceRoot":"","sources":["../src/amazonS3.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"amazonS3.js","sourceRoot":"","sources":["../src/amazonS3.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,10 @@
1
- "use strict";
2
1
  /*
3
2
  * Copyright (c) 2018, salesforce.com, inc.
4
3
  * All rights reserved.
5
4
  * Licensed under the BSD 3-Clause license.
6
5
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
7
6
  */
8
- Object.defineProperty(exports, "__esModule", { value: true });
9
- exports.parseNpmName = void 0;
10
- const kit_1 = require("@salesforce/kit");
7
+ import { NamedError } from '@salesforce/kit';
11
8
  const DEFAULT_TAG = 'latest';
12
9
  /**
13
10
  * Get the parsed components of an NpmName
@@ -18,9 +15,9 @@ const DEFAULT_TAG = 'latest';
18
15
  * console.log(f.name === 'jj')
19
16
  * console.log(f.scope === 'salesforce')
20
17
  */
21
- const parseNpmName = (npmName) => {
18
+ export const parseNpmName = (npmName) => {
22
19
  if (!npmName || npmName.length < 1) {
23
- throw new kit_1.NamedError('MissingOrInvalidNpmName', 'The npm name is missing or invalid.');
20
+ throw new NamedError('MissingOrInvalidNpmName', 'The npm name is missing or invalid.');
24
21
  }
25
22
  const components = npmName.split('@');
26
23
  // salesforce/jj
@@ -40,7 +37,6 @@ const parseNpmName = (npmName) => {
40
37
  return setNameAndScope(components[0], components[1]);
41
38
  }
42
39
  };
43
- exports.parseNpmName = parseNpmName;
44
40
  /**
45
41
  * Subroutine for getting name and scope
46
42
  *
@@ -63,7 +59,7 @@ const setNameAndScope = (name, tag = DEFAULT_TAG) => {
63
59
  };
64
60
  }
65
61
  else {
66
- throw new kit_1.NamedError('InvalidNpmName', 'The npm name is invalid.');
62
+ throw new NamedError('InvalidNpmName', 'The npm name is invalid.');
67
63
  }
68
64
  };
69
65
  /**
@@ -78,7 +74,7 @@ const validateComponentString = (name) => {
78
74
  return trimmedName;
79
75
  }
80
76
  else {
81
- throw new kit_1.NamedError('MissingOrInvalidNpmName', 'The npm name is missing or invalid.');
77
+ throw new NamedError('MissingOrInvalidNpmName', 'The npm name is missing or invalid.');
82
78
  }
83
79
  };
84
80
  //# sourceMappingURL=NpmName.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"NpmName.js","sourceRoot":"","sources":["../../src/codeSigning/NpmName.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yCAA6C;AAE7C,MAAM,WAAW,GAAG,QAAQ,CAAC;AAO7B;;;;;;;;GAQG;AAEI,MAAM,YAAY,GAAG,CAAC,OAAe,EAAmB,EAAE;IAC/D,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,gBAAU,CAAC,yBAAyB,EAAE,qCAAqC,CAAC,CAAC;IACzF,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEtC,gBAAgB;IAChB,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAChC,oBAAoB;QACpB,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IAC7F,CAAC;SAAM,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACvC,qBAAqB;QACrB,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IAC7F,CAAC;SAAM,CAAC;QACN,gDAAgD;QAChD,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;AACH,CAAC,CAAC;AAtBW,QAAA,YAAY,gBAsBvB;AAEF;;;;GAIG;AACH,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,GAAG,GAAG,WAAW,EAAmB,EAAE;IAC3E,+DAA+D;IAC/D,MAAM,aAAa,GAAa,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3G,OAAO;YACL,GAAG;YACH,KAAK,EAAE,uBAAuB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;YAChD,IAAI,EAAE,uBAAuB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;SAChD,CAAC;IACJ,CAAC;SAAM,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtC,OAAO;YACL,GAAG;YACH,IAAI,EAAE,uBAAuB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;SAChD,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,gBAAU,CAAC,gBAAgB,EAAE,0BAA0B,CAAC,CAAC;IACrE,CAAC;AACH,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,uBAAuB,GAAG,CAAC,IAAY,EAAU,EAAE;IACvD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAChC,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1C,OAAO,WAAW,CAAC;IACrB,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,gBAAU,CAAC,yBAAyB,EAAE,qCAAqC,CAAC,CAAC;IACzF,CAAC;AACH,CAAC,CAAC"}
1
+ {"version":3,"file":"NpmName.js","sourceRoot":"","sources":["../../src/codeSigning/NpmName.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,WAAW,GAAG,QAAQ,CAAC;AAO7B;;;;;;;;GAQG;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,OAAe,EAAmB,EAAE;IAC/D,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,UAAU,CAAC,yBAAyB,EAAE,qCAAqC,CAAC,CAAC;IACzF,CAAC;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEtC,gBAAgB;IAChB,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAChC,oBAAoB;QACpB,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IAC7F,CAAC;SAAM,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACvC,qBAAqB;QACrB,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IAC7F,CAAC;SAAM,CAAC;QACN,gDAAgD;QAChD,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;AACH,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,GAAG,GAAG,WAAW,EAAmB,EAAE;IAC3E,+DAA+D;IAC/D,MAAM,aAAa,GAAa,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAChD,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3G,OAAO;YACL,GAAG;YACH,KAAK,EAAE,uBAAuB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;YAChD,IAAI,EAAE,uBAAuB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;SAChD,CAAC;IACJ,CAAC;SAAM,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtC,OAAO;YACL,GAAG;YACH,IAAI,EAAE,uBAAuB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;SAChD,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,UAAU,CAAC,gBAAgB,EAAE,0BAA0B,CAAC,CAAC;IACrE,CAAC;AACH,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,uBAAuB,GAAG,CAAC,IAAY,EAAU,EAAE;IACvD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAChC,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1C,OAAO,WAAW,CAAC;IACrB,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,UAAU,CAAC,yBAAyB,EAAE,qCAAqC,CAAC,CAAC;IACzF,CAAC;AACH,CAAC,CAAC"}
@@ -1,4 +1,4 @@
1
- import { PackageJsonSfdxProperty } from '../package';
1
+ import { PackageJsonSfdxProperty } from '../package.js';
2
2
  export declare const BASE_URL = "https://developer.salesforce.com";
3
3
  export declare const SECURITY_PATH = "media/salesforce-cli/security";
4
4
  interface SigningRequest {