@salesforce/plugin-release-management 5.7.73-jf1.0 → 5.7.73-jf2.0
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 +16 -16
- package/lib/amazonS3.d.ts +6 -7
- package/lib/amazonS3.js +17 -17
- package/lib/amazonS3.js.map +1 -1
- package/lib/codeSigning/SimplifiedSigning.js +1 -1
- package/lib/codeSigning/SimplifiedSigning.js.map +1 -1
- package/lib/codeSigning/upload.d.ts +2 -2
- package/lib/codeSigning/upload.js +10 -15
- package/lib/codeSigning/upload.js.map +1 -1
- package/npm-shrinkwrap.json +1116 -603
- package/oclif.lock +472 -120
- package/oclif.manifest.json +274 -274
- package/package.json +5 -3
package/README.md
CHANGED
|
@@ -145,7 +145,7 @@ EXAMPLES
|
|
|
145
145
|
$ sfdx channel promote --candidate latest-rc --target latest --platform win --platform mac
|
|
146
146
|
```
|
|
147
147
|
|
|
148
|
-
_See code: [src/commands/channel/promote.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-
|
|
148
|
+
_See code: [src/commands/channel/promote.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-jf2.0/src/commands/channel/promote.ts)_
|
|
149
149
|
|
|
150
150
|
## `sfdx cli artifacts compare`
|
|
151
151
|
|
|
@@ -169,7 +169,7 @@ EXAMPLES
|
|
|
169
169
|
$ sfdx cli artifacts compare
|
|
170
170
|
```
|
|
171
171
|
|
|
172
|
-
_See code: [src/commands/cli/artifacts/compare.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-
|
|
172
|
+
_See code: [src/commands/cli/artifacts/compare.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-jf2.0/src/commands/cli/artifacts/compare.ts)_
|
|
173
173
|
|
|
174
174
|
## `sfdx cli install jit test`
|
|
175
175
|
|
|
@@ -190,7 +190,7 @@ EXAMPLES
|
|
|
190
190
|
$ sfdx cli install jit test
|
|
191
191
|
```
|
|
192
192
|
|
|
193
|
-
_See code: [src/commands/cli/install/jit/test.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-
|
|
193
|
+
_See code: [src/commands/cli/install/jit/test.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-jf2.0/src/commands/cli/install/jit/test.ts)_
|
|
194
194
|
|
|
195
195
|
## `sfdx cli install test`
|
|
196
196
|
|
|
@@ -231,7 +231,7 @@ EXAMPLES
|
|
|
231
231
|
$ sfdx cli install test --cli sf --method tarball --channel stable-rc
|
|
232
232
|
```
|
|
233
233
|
|
|
234
|
-
_See code: [src/commands/cli/install/test.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-
|
|
234
|
+
_See code: [src/commands/cli/install/test.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-jf2.0/src/commands/cli/install/test.ts)_
|
|
235
235
|
|
|
236
236
|
## `sfdx cli release automerge`
|
|
237
237
|
|
|
@@ -262,7 +262,7 @@ EXAMPLES
|
|
|
262
262
|
$ sfdx cli release automerge --owner salesforcecli --repo sfdx-cli --pul-number 1049
|
|
263
263
|
```
|
|
264
264
|
|
|
265
|
-
_See code: [src/commands/cli/release/automerge.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-
|
|
265
|
+
_See code: [src/commands/cli/release/automerge.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-jf2.0/src/commands/cli/release/automerge.ts)_
|
|
266
266
|
|
|
267
267
|
## `sfdx cli release build`
|
|
268
268
|
|
|
@@ -325,7 +325,7 @@ EXAMPLES
|
|
|
325
325
|
$ sfdx cli release build --only @salesforce/plugin-source,@salesforce/plugin-info@1.2.3
|
|
326
326
|
```
|
|
327
327
|
|
|
328
|
-
_See code: [src/commands/cli/release/build.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-
|
|
328
|
+
_See code: [src/commands/cli/release/build.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-jf2.0/src/commands/cli/release/build.ts)_
|
|
329
329
|
|
|
330
330
|
## `sfdx cli releasenotes`
|
|
331
331
|
|
|
@@ -366,7 +366,7 @@ EXAMPLES
|
|
|
366
366
|
$ sfdx cli releasenotes --cli sf --markdown > changes.md
|
|
367
367
|
```
|
|
368
368
|
|
|
369
|
-
_See code: [src/commands/cli/releasenotes.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-
|
|
369
|
+
_See code: [src/commands/cli/releasenotes.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-jf2.0/src/commands/cli/releasenotes.ts)_
|
|
370
370
|
|
|
371
371
|
## `sfdx cli tarballs prepare`
|
|
372
372
|
|
|
@@ -394,7 +394,7 @@ EXAMPLES
|
|
|
394
394
|
$ sfdx cli tarballs prepare
|
|
395
395
|
```
|
|
396
396
|
|
|
397
|
-
_See code: [src/commands/cli/tarballs/prepare.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-
|
|
397
|
+
_See code: [src/commands/cli/tarballs/prepare.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-jf2.0/src/commands/cli/tarballs/prepare.ts)_
|
|
398
398
|
|
|
399
399
|
## `sfdx cli tarballs smoke`
|
|
400
400
|
|
|
@@ -424,7 +424,7 @@ EXAMPLES
|
|
|
424
424
|
$ sfdx cli tarballs smoke
|
|
425
425
|
```
|
|
426
426
|
|
|
427
|
-
_See code: [src/commands/cli/tarballs/smoke.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-
|
|
427
|
+
_See code: [src/commands/cli/tarballs/smoke.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-jf2.0/src/commands/cli/tarballs/smoke.ts)_
|
|
428
428
|
|
|
429
429
|
## `sfdx cli tarballs verify`
|
|
430
430
|
|
|
@@ -456,7 +456,7 @@ EXAMPLES
|
|
|
456
456
|
$ sfdx cli tarballs verify --cli sf
|
|
457
457
|
```
|
|
458
458
|
|
|
459
|
-
_See code: [src/commands/cli/tarballs/verify.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-
|
|
459
|
+
_See code: [src/commands/cli/tarballs/verify.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-jf2.0/src/commands/cli/tarballs/verify.ts)_
|
|
460
460
|
|
|
461
461
|
## `sfdx cli versions inspect`
|
|
462
462
|
|
|
@@ -508,7 +508,7 @@ EXAMPLES
|
|
|
508
508
|
$ sfdx cli versions inspect -l npm -c latest -d chalk -s
|
|
509
509
|
```
|
|
510
510
|
|
|
511
|
-
_See code: [src/commands/cli/versions/inspect.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-
|
|
511
|
+
_See code: [src/commands/cli/versions/inspect.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-jf2.0/src/commands/cli/versions/inspect.ts)_
|
|
512
512
|
|
|
513
513
|
## `sfdx dependabot automerge`
|
|
514
514
|
|
|
@@ -548,7 +548,7 @@ EXAMPLES
|
|
|
548
548
|
$ sfdx dependabot automerge --max-version-bump major
|
|
549
549
|
```
|
|
550
550
|
|
|
551
|
-
_See code: [src/commands/dependabot/automerge.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-
|
|
551
|
+
_See code: [src/commands/dependabot/automerge.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-jf2.0/src/commands/dependabot/automerge.ts)_
|
|
552
552
|
|
|
553
553
|
## `sfdx github check closed`
|
|
554
554
|
|
|
@@ -575,7 +575,7 @@ EXAMPLES
|
|
|
575
575
|
$ sfdx github check closed -o me@gus.com
|
|
576
576
|
```
|
|
577
577
|
|
|
578
|
-
_See code: [src/commands/github/check/closed.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-
|
|
578
|
+
_See code: [src/commands/github/check/closed.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-jf2.0/src/commands/github/check/closed.ts)_
|
|
579
579
|
|
|
580
580
|
## `sfdx npm dependencies pin`
|
|
581
581
|
|
|
@@ -601,7 +601,7 @@ DESCRIPTION
|
|
|
601
601
|
in the package.json
|
|
602
602
|
```
|
|
603
603
|
|
|
604
|
-
_See code: [src/commands/npm/dependencies/pin.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-
|
|
604
|
+
_See code: [src/commands/npm/dependencies/pin.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-jf2.0/src/commands/npm/dependencies/pin.ts)_
|
|
605
605
|
|
|
606
606
|
## `sfdx npm package release`
|
|
607
607
|
|
|
@@ -633,7 +633,7 @@ DESCRIPTION
|
|
|
633
633
|
publish npm package
|
|
634
634
|
```
|
|
635
635
|
|
|
636
|
-
_See code: [src/commands/npm/package/release.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-
|
|
636
|
+
_See code: [src/commands/npm/package/release.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-jf2.0/src/commands/npm/package/release.ts)_
|
|
637
637
|
|
|
638
638
|
## `sfdx plugins trust verify`
|
|
639
639
|
|
|
@@ -701,6 +701,6 @@ EXAMPLES
|
|
|
701
701
|
$ sfdx repositories --json | jq -r '.result[] | select(.name=="sfdx-core") | .packages[] | .url
|
|
702
702
|
```
|
|
703
703
|
|
|
704
|
-
_See code: [src/commands/repositories/index.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-
|
|
704
|
+
_See code: [src/commands/repositories/index.ts](https://github.com/salesforcecli/plugin-release-management/blob/5.7.73-jf2.0/src/commands/repositories/index.ts)_
|
|
705
705
|
|
|
706
706
|
<!-- commandsstop -->
|
package/lib/amazonS3.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { GetObjectRequest, GetObjectOutput } from 'aws-sdk/clients/s3.js';
|
|
1
|
+
import { _Object, GetObjectRequest, GetObjectOutput } from '@aws-sdk/client-s3';
|
|
2
|
+
import { AwsCredentialIdentity } from '@smithy/types';
|
|
4
3
|
import { Channel, CLI, S3Manifest, ServiceAvailability } from './types.js';
|
|
5
4
|
type GetObjectOption = Omit<GetObjectRequest, 'Bucket'>;
|
|
6
5
|
type AmazonS3Options = {
|
|
@@ -8,7 +7,7 @@ type AmazonS3Options = {
|
|
|
8
7
|
cli: CLI;
|
|
9
8
|
channel?: Channel;
|
|
10
9
|
baseUrl?: string;
|
|
11
|
-
credentials?:
|
|
10
|
+
credentials?: AwsCredentialIdentity;
|
|
12
11
|
baseKey?: string;
|
|
13
12
|
};
|
|
14
13
|
export declare class AmazonS3 {
|
|
@@ -16,17 +15,17 @@ export declare class AmazonS3 {
|
|
|
16
15
|
static STATUS_URL: string;
|
|
17
16
|
directory: string;
|
|
18
17
|
private s3;
|
|
19
|
-
private baseKey;
|
|
18
|
+
private readonly baseKey;
|
|
20
19
|
constructor(options: AmazonS3Options);
|
|
21
20
|
ping(): Promise<ServiceAvailability>;
|
|
22
21
|
getManifestFromChannel(channel: string): Promise<S3Manifest>;
|
|
23
22
|
getObject(options: GetObjectOption): Promise<GetObjectOutput>;
|
|
24
23
|
listAllObjects(key: string): Promise<{
|
|
25
|
-
contents:
|
|
24
|
+
contents: _Object[];
|
|
26
25
|
commonPrefixes: string[];
|
|
27
26
|
}>;
|
|
28
27
|
listCommonPrefixes(key: string): Promise<string[]>;
|
|
29
|
-
listKeyContents(key: string): Promise<
|
|
28
|
+
listKeyContents(key: string): Promise<_Object[]>;
|
|
30
29
|
}
|
|
31
30
|
export declare const download: (url: string, location: string, silent?: boolean) => Promise<void>;
|
|
32
31
|
export {};
|
package/lib/amazonS3.js
CHANGED
|
@@ -11,7 +11,8 @@ import { ux } from '@oclif/core';
|
|
|
11
11
|
import got from 'got';
|
|
12
12
|
import { SfError } from '@salesforce/core';
|
|
13
13
|
import chalk from 'chalk';
|
|
14
|
-
import
|
|
14
|
+
import { S3 } from '@aws-sdk/client-s3';
|
|
15
|
+
import { NodeHttpHandler } from '@smithy/node-http-handler';
|
|
15
16
|
import { isString } from '@salesforce/ts-types';
|
|
16
17
|
import { api } from './codeSigning/packAndSign.js';
|
|
17
18
|
const BASE_URL = 'https://developer.salesforce.com';
|
|
@@ -26,12 +27,11 @@ export class AmazonS3 {
|
|
|
26
27
|
this.options = options;
|
|
27
28
|
this.directory = `https://developer.salesforce.com/media/salesforce-cli/${this.options.cli ?? ''}`;
|
|
28
29
|
this.baseKey = this.directory.replace(BASE_URL, '').replace(/^\//, '');
|
|
29
|
-
this.s3 = new
|
|
30
|
+
this.s3 = new S3({
|
|
31
|
+
region: 'us-east-1',
|
|
30
32
|
...resolveCredentials(options.credentials),
|
|
31
|
-
...
|
|
33
|
+
...buildRequestHandler(),
|
|
32
34
|
});
|
|
33
|
-
// eslint-disable-next-line no-console
|
|
34
|
-
console.log(`JFDEBUG: amazonS3.ts: Region is ${this.s3.config.region ?? 'undefined'}`);
|
|
35
35
|
}
|
|
36
36
|
// there's an abstract class for cli:install:test using this
|
|
37
37
|
// eslint-disable-next-line class-methods-use-this
|
|
@@ -45,14 +45,11 @@ export class AmazonS3 {
|
|
|
45
45
|
return JSON.parse(fs.readFileSync(filename, 'utf8'));
|
|
46
46
|
}
|
|
47
47
|
async getObject(options) {
|
|
48
|
-
|
|
49
|
-
.getObject({
|
|
48
|
+
return this.s3.getObject({
|
|
50
49
|
...options,
|
|
51
|
-
Key: options.Key
|
|
50
|
+
Key: options.Key?.replace(BASE_URL, '').replace(/^\//, ''),
|
|
52
51
|
...{ Bucket: this.options.bucket ?? BUCKET },
|
|
53
|
-
})
|
|
54
|
-
.promise());
|
|
55
|
-
return object;
|
|
52
|
+
});
|
|
56
53
|
}
|
|
57
54
|
// Paginates listObjectV2 and returns both Contents and CommonPrefixes
|
|
58
55
|
async listAllObjects(key) {
|
|
@@ -65,14 +62,12 @@ export class AmazonS3 {
|
|
|
65
62
|
const MAX_ITERATIONS = 100;
|
|
66
63
|
for (let i = 1; i <= MAX_ITERATIONS; i++) {
|
|
67
64
|
// eslint-disable-next-line no-await-in-loop
|
|
68
|
-
const response = await this.s3
|
|
69
|
-
.listObjectsV2({
|
|
65
|
+
const response = await this.s3.listObjectsV2({
|
|
70
66
|
Bucket: bucket,
|
|
71
67
|
Delimiter: '/',
|
|
72
68
|
Prefix: prefix,
|
|
73
69
|
ContinuationToken: continuationToken,
|
|
74
|
-
})
|
|
75
|
-
.promise();
|
|
70
|
+
});
|
|
76
71
|
if (response.Contents) {
|
|
77
72
|
allContents.push(...response.Contents);
|
|
78
73
|
}
|
|
@@ -146,8 +141,13 @@ const fileIsAvailable = async (url) => {
|
|
|
146
141
|
const { statusCode } = await got.head(url, { throwHttpErrors: false });
|
|
147
142
|
return { service: 'file', name: url, available: statusCode >= 200 && statusCode < 300 };
|
|
148
143
|
};
|
|
149
|
-
const
|
|
144
|
+
const buildRequestHandler = () => {
|
|
150
145
|
const agent = api.getAgentForUri('https://s3.amazonaws.com');
|
|
151
|
-
|
|
146
|
+
const options = agent && agent.http
|
|
147
|
+
? {
|
|
148
|
+
httpAgent: agent.http,
|
|
149
|
+
}
|
|
150
|
+
: {};
|
|
151
|
+
return new NodeHttpHandler(options);
|
|
152
152
|
};
|
|
153
153
|
//# sourceMappingURL=amazonS3.js.map
|
package/lib/amazonS3.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amazonS3.js","sourceRoot":"","sources":["../src/amazonS3.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,GAAG,MAAM,KAAK,CAAC;AACtB,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,
|
|
1
|
+
{"version":3,"file":"amazonS3.js","sourceRoot":"","sources":["../src/amazonS3.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
*/
|
|
23
23
|
import { generateKeyPair, createSign, createVerify } from 'node:crypto';
|
|
24
24
|
import { createReadStream } from 'node:fs';
|
|
25
|
-
import { putObject } from '
|
|
25
|
+
import { putObject } from './upload.js';
|
|
26
26
|
const CRYPTO_LEVEL = 'RSA-SHA256';
|
|
27
27
|
const BUCKET = 'dfc-data-production';
|
|
28
28
|
export const BASE_URL = 'https://developer.salesforce.com';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimplifiedSigning.js","sourceRoot":"","sources":["../../src/codeSigning/SimplifiedSigning.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"SimplifiedSigning.js","sourceRoot":"","sources":["../../src/codeSigning/SimplifiedSigning.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH;;;;;;;;;;;;;;;GAeG;AACH,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAG3C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,MAAM,YAAY,GAAG,YAAY,CAAC;AAClC,MAAM,MAAM,GAAG,qBAAqB,CAAC;AACrC,MAAM,CAAC,MAAM,QAAQ,GAAG,kCAAkC,CAAC;AAC3D,MAAM,CAAC,MAAM,aAAa,GAAG,+BAA+B,CAAC;AAoC7D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,WAAmB,EAAE,cAAsB,EAA2B,EAAE;IACtG,MAAM,mBAAmB,GAAG,GAAG,QAAQ,IAAI,aAAa,IAAI,WAAW,IAAI,cAAc,EAAE,CAAC;IAC5F,OAAO;QACL,YAAY,EAAE,GAAG,mBAAmB,MAAM;QAC1C,YAAY,EAAE,GAAG,mBAAmB,MAAM;KAC3C,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,cAA8B,EAA4B,EAAE;IACjG,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,MAAM,iBAAiB,EAAE,CAAC;IAC5D,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,cAAc,CAAC;IACvD,MAAM,iBAAiB,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,cAAc,CAAC,gBAAgB,CAAC,CAAC;IAE1F,iDAAiD;IACjD,MAAM,MAAM,CAAC,cAAc,CAAC,gBAAgB,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAC5E,MAAM,MAAM,GAAoB;QAC9B,iBAAiB,EAAE,SAAS;QAC5B,iBAAiB;QACjB,uBAAuB,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CAAC;QACrE,WAAW,EAAE,cAAc,CAAC,gBAAgB;QAC5C,WAAW;QACX,cAAc;KACf,CAAC;IAEF,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;QAC1B,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,GAAG,KAAK,EAAE,KAAsB,EAAqC,EAAE,CACjF,OAAO,CAAC,GAAG,CAAC;IACV,iBAAiB;IACjB,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,uBAAuB,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,QAAQ,GAAG,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC;IAClH,YAAY;IACZ,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,uBAAuB,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,QAAQ,GAAG,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC;CACnH,CAAC,CAAC;AAEL,MAAM,iBAAiB,GAAG,GAAqB,EAAE,CAC/C,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IACvC,eAAe,CACb,KAAK,EACL;QACE,aAAa,EAAE,IAAI;QACnB,iBAAiB,EAAE;YACjB,IAAI,EAAE,MAAM;YACZ,MAAM,EAAE,KAAK;SACd;QACD,kBAAkB,EAAE;YAClB,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,KAAK;SACd;KACF,EACD,CAAC,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE;QAC7B,IAAI,GAAG;YAAE,MAAM,CAAC,GAAG,CAAC,CAAC;QACrB,OAAO,CAAC;YACN,SAAS;YACT,UAAU;SACX,CAAC,CAAC;IACL,CAAC,CACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEL,MAAM,YAAY,GAAG,KAAK,EAAE,UAAkB,EAAE,kBAA0B,EAAmB,EAAE;IAC7F,MAAM,OAAO,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;IAEzC,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;QACtF,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/B,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;QAE9E,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,KAAK,EAAE,kBAA0B,EAAE,SAAiB,EAAE,SAAiB,EAAoB,EAAE,CAC1G,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IACvC,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;IAC5C,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,kBAAkB,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;IACxF,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClC,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;QAChC,IAAI,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,CAAC;YACpD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;QACD,OAAO,MAAM,CAAC,8BAA8B,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,kBAAkB,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AACvD,CAAC,CAAC,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import
|
|
2
|
-
export declare function putObject(bucket: string, key: string, body: string): Promise<
|
|
1
|
+
import { PutObjectCommandOutput } from '@aws-sdk/client-s3';
|
|
2
|
+
export declare function putObject(bucket: string, key: string, body: string): Promise<PutObjectCommandOutput>;
|
|
@@ -4,23 +4,18 @@
|
|
|
4
4
|
* Licensed under the BSD 3-Clause license.
|
|
5
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
6
|
*/
|
|
7
|
-
import
|
|
7
|
+
import { PutObjectCommand, S3 } from '@aws-sdk/client-s3';
|
|
8
|
+
import { NodeHttpHandler } from '@smithy/node-http-handler';
|
|
8
9
|
import { api } from './packAndSign.js';
|
|
9
10
|
export async function putObject(bucket, key, body) {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
console.log(`JFDEBUG: upload.ts: region is ${s3.config.region ?? 'undefined'}`);
|
|
18
|
-
s3.putObject({ Bucket: bucket, Key: key, Body: body }, (err, resp) => {
|
|
19
|
-
if (err)
|
|
20
|
-
reject(err);
|
|
21
|
-
if (resp)
|
|
22
|
-
resolve(resp);
|
|
23
|
-
});
|
|
11
|
+
const agent = api.getAgentForUri('https://s3.amazonaws.com');
|
|
12
|
+
const s3 = new S3({
|
|
13
|
+
requestHandler: new NodeHttpHandler({
|
|
14
|
+
region: 'us-east-1',
|
|
15
|
+
httpAgent: agent.http,
|
|
16
|
+
httpsAgent: agent.https,
|
|
17
|
+
}),
|
|
24
18
|
});
|
|
19
|
+
return s3.send(new PutObjectCommand({ Bucket: bucket, Key: key, Body: body }));
|
|
25
20
|
}
|
|
26
21
|
//# sourceMappingURL=upload.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/codeSigning/upload.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/codeSigning/upload.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,gBAAgB,EAA0B,EAAE,EAAE,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAE,eAAe,EAA0B,MAAM,2BAA2B,CAAC;AAEpF,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAC;AAEvC,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,MAAc,EAAE,GAAW,EAAE,IAAY;IACvE,MAAM,KAAK,GAAG,GAAG,CAAC,cAAc,CAAC,0BAA0B,CAAW,CAAC;IACvE,MAAM,EAAE,GAAG,IAAI,EAAE,CAAC;QAChB,cAAc,EAAE,IAAI,eAAe,CAAC;YAClC,MAAM,EAAE,WAAW;YACnB,SAAS,EAAE,KAAK,CAAC,IAAI;YACrB,UAAU,EAAE,KAAK,CAAC,KAAK;SACE,CAAC;KAC7B,CAAC,CAAC;IACH,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,gBAAgB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACjF,CAAC"}
|