@salesforce/plugin-release-management 3.5.8 → 3.5.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/lib/amazonS3.d.ts +3 -3
- package/lib/amazonS3.js +7 -4
- package/lib/amazonS3.js.map +1 -1
- package/lib/codeSigning/NpmName.js +12 -15
- package/lib/codeSigning/NpmName.js.map +1 -1
- package/lib/codeSigning/SimplifiedSigning.js +37 -49
- package/lib/codeSigning/SimplifiedSigning.js.map +1 -1
- package/lib/codeSigning/error.d.ts +1 -1
- package/lib/codeSigning/error.js.map +1 -1
- package/lib/codeSigning/packAndSign.js +6 -4
- package/lib/codeSigning/packAndSign.js.map +1 -1
- package/lib/commands/channel/promote.d.ts +0 -8
- package/lib/commands/channel/promote.js +20 -25
- package/lib/commands/channel/promote.js.map +1 -1
- package/lib/commands/cli/install/test.d.ts +0 -3
- package/lib/commands/cli/install/test.js +21 -17
- package/lib/commands/cli/install/test.js.map +1 -1
- package/lib/commands/cli/latestrc/build.js.map +1 -1
- package/lib/commands/cli/releasenotes.d.ts +3 -5
- package/lib/commands/cli/releasenotes.js +50 -51
- package/lib/commands/cli/releasenotes.js.map +1 -1
- package/lib/commands/cli/schemas/collect.js +6 -7
- package/lib/commands/cli/schemas/collect.js.map +1 -1
- package/lib/commands/cli/schemas/compare.d.ts +6 -7
- package/lib/commands/cli/schemas/compare.js +25 -25
- package/lib/commands/cli/schemas/compare.js.map +1 -1
- package/lib/commands/cli/tarballs/prepare.d.ts +0 -1
- package/lib/commands/cli/tarballs/prepare.js +27 -29
- package/lib/commands/cli/tarballs/prepare.js.map +1 -1
- package/lib/commands/cli/tarballs/smoke.js.map +1 -1
- package/lib/commands/cli/tarballs/verify.js +4 -7
- package/lib/commands/cli/tarballs/verify.js.map +1 -1
- package/lib/commands/cli/versions/inspect.d.ts +0 -2
- package/lib/commands/cli/versions/inspect.js +20 -20
- package/lib/commands/cli/versions/inspect.js.map +1 -1
- package/lib/commands/dependabot/automerge.js.map +1 -1
- package/lib/commands/dependabot/consolidate.js +3 -0
- package/lib/commands/dependabot/consolidate.js.map +1 -1
- package/lib/commands/npm/dependencies/pin.js.map +1 -1
- package/lib/commands/npm/package/promote.js +1 -1
- package/lib/commands/npm/package/promote.js.map +1 -1
- package/lib/commands/npm/package/release.js +8 -2
- package/lib/commands/npm/package/release.js.map +1 -1
- package/lib/commands/npm/release/validate.js +5 -9
- package/lib/commands/npm/release/validate.js.map +1 -1
- package/lib/commands/typescript/update.d.ts +0 -2
- package/lib/commands/typescript/update.js +22 -22
- package/lib/commands/typescript/update.js.map +1 -1
- package/lib/dependabot.d.ts +1 -2
- package/lib/dependabot.js +2 -2
- package/lib/dependabot.js.map +1 -1
- package/lib/dependencies.d.ts +2 -2
- package/lib/inspectCommits.d.ts +2 -1
- package/lib/inspectCommits.js +2 -1
- package/lib/inspectCommits.js.map +1 -1
- package/lib/package.js +1 -0
- package/lib/package.js.map +1 -1
- package/lib/pluginCommand.d.ts +1 -18
- package/lib/pluginCommand.js +52 -53
- package/lib/pluginCommand.js.map +1 -1
- package/lib/registry.js +2 -0
- package/lib/registry.js.map +1 -1
- package/lib/repository.d.ts +1 -1
- package/lib/repository.js +5 -0
- package/lib/repository.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +15 -23
- package/lib/circleCiEnvvars.d.ts +0 -23
- package/lib/circleCiEnvvars.js +0 -132
- package/lib/circleCiEnvvars.js.map +0 -1
- package/lib/commands/circleci/envvar/create.d.ts +0 -14
- package/lib/commands/circleci/envvar/create.js +0 -100
- package/lib/commands/circleci/envvar/create.js.map +0 -1
- package/lib/commands/circleci/envvar/update.d.ts +0 -14
- package/lib/commands/circleci/envvar/update.js +0 -104
- package/lib/commands/circleci/envvar/update.js.map +0 -1
- package/lib/commands/circleci/index.d.ts +0 -7
- package/lib/commands/circleci/index.js +0 -37
- package/lib/commands/circleci/index.js.map +0 -1
package/lib/amazonS3.d.ts
CHANGED
|
@@ -2,9 +2,8 @@ import { CredentialsOptions } from 'aws-sdk/lib/credentials';
|
|
|
2
2
|
import { CommonPrefixList, ObjectList } from 'aws-sdk/clients/s3';
|
|
3
3
|
import { GetObjectRequest, GetObjectOutput } from 'aws-sdk/clients/s3';
|
|
4
4
|
import { Channel, CLI, S3Manifest, ServiceAvailability } from './types';
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
export declare type AmazonS3Options = {
|
|
5
|
+
declare type GetObjectOption = Omit<GetObjectRequest, 'Bucket'>;
|
|
6
|
+
declare type AmazonS3Options = {
|
|
8
7
|
bucket?: string;
|
|
9
8
|
cli?: CLI;
|
|
10
9
|
channel?: Channel;
|
|
@@ -30,3 +29,4 @@ export declare class AmazonS3 {
|
|
|
30
29
|
listKeyContents(key: string, filter?: (entry: any) => boolean): Promise<ObjectList[]>;
|
|
31
30
|
private resolveCredentials;
|
|
32
31
|
}
|
|
32
|
+
export {};
|
package/lib/amazonS3.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.AmazonS3 =
|
|
3
|
+
exports.AmazonS3 = void 0;
|
|
4
4
|
/*
|
|
5
5
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
6
6
|
* All rights reserved.
|
|
@@ -16,27 +16,30 @@ const core_2 = require("@salesforce/core");
|
|
|
16
16
|
const chalk = require("chalk");
|
|
17
17
|
const AWS = require("aws-sdk");
|
|
18
18
|
const packAndSign_1 = require("./codeSigning/packAndSign");
|
|
19
|
-
|
|
19
|
+
const BASE_URL = 'https://developer.salesforce.com';
|
|
20
20
|
const BUCKET = 'dfc-data-production';
|
|
21
21
|
class AmazonS3 {
|
|
22
22
|
constructor(options) {
|
|
23
23
|
this.options = options;
|
|
24
24
|
this.directory = `https://developer.salesforce.com/media/salesforce-cli/${this.options.cli || ''}`;
|
|
25
|
-
this.baseKey = this.directory.replace(
|
|
25
|
+
this.baseKey = this.directory.replace(BASE_URL, '').replace(/^\//, '');
|
|
26
26
|
const agent = packAndSign_1.api.getAgentForUri('https://s3.amazonaws.com');
|
|
27
27
|
this.s3 = new AWS.S3({
|
|
28
28
|
...this.resolveCredentials(),
|
|
29
29
|
httpOptions: { agent: agent.http },
|
|
30
30
|
});
|
|
31
31
|
}
|
|
32
|
+
// eslint-disable-next-line class-methods-use-this
|
|
32
33
|
async ping() {
|
|
33
34
|
const { statusCode } = await got_1.default.get(AmazonS3.STATUS_URL);
|
|
34
35
|
return { service: 'Amazon S3', available: statusCode >= 200 && statusCode < 300 };
|
|
35
36
|
}
|
|
37
|
+
// eslint-disable-next-line class-methods-use-this
|
|
36
38
|
async fileIsAvailable(url) {
|
|
37
39
|
const { statusCode } = await got_1.default.get(url, { throwHttpErrors: false });
|
|
38
40
|
return { service: 'file', name: url, available: statusCode >= 200 && statusCode < 300 };
|
|
39
41
|
}
|
|
42
|
+
// eslint-disable-next-line class-methods-use-this
|
|
40
43
|
async download(url, location, silent = false) {
|
|
41
44
|
const downloadStream = got_1.default.stream(url);
|
|
42
45
|
const fileWriterStream = fs.createWriteStream(location);
|
|
@@ -84,7 +87,7 @@ class AmazonS3 {
|
|
|
84
87
|
}
|
|
85
88
|
}
|
|
86
89
|
async getObject(options) {
|
|
87
|
-
options.Key = options.Key.replace(
|
|
90
|
+
options.Key = options.Key.replace(BASE_URL, '').replace(/^\//, '');
|
|
88
91
|
const object = (await this.s3
|
|
89
92
|
.getObject({ ...options, ...{ Bucket: this.options.bucket || BUCKET } })
|
|
90
93
|
.promise());
|
package/lib/amazonS3.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amazonS3.js","sourceRoot":"","sources":["../src/amazonS3.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yBAAyB;AACzB,6BAA6B;AAC7B,yBAAyB;AACzB,sCAAoC;AACpC,6BAAkC;AAClC,2CAA2C;AAC3C,+BAA+B;AAC/B,+BAA+B;AAM/B,2DAAgD;
|
|
1
|
+
{"version":3,"file":"amazonS3.js","sourceRoot":"","sources":["../src/amazonS3.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,23 +37,20 @@ class NpmName {
|
|
|
37
37
|
// salesforce/jj
|
|
38
38
|
if (components.length === 1) {
|
|
39
39
|
NpmName.setNameAndScope(components[0], returnNpmName);
|
|
40
|
+
return returnNpmName;
|
|
40
41
|
}
|
|
41
|
-
|
|
42
|
+
if (components[0].includes('/')) {
|
|
42
43
|
// salesforce/jj@tag
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
NpmName.setNameAndScope(components[0], returnNpmName);
|
|
54
|
-
returnNpmName.tag = components[1];
|
|
55
|
-
}
|
|
56
|
-
}
|
|
44
|
+
NpmName.setNameAndScope(components[0], returnNpmName);
|
|
45
|
+
}
|
|
46
|
+
else if (components[1].includes('/')) {
|
|
47
|
+
// @salesforce/jj@tag
|
|
48
|
+
NpmName.setNameAndScope(components[1], returnNpmName);
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
// Allow something like salesforcedx/pre-release
|
|
52
|
+
NpmName.setNameAndScope(components[0], returnNpmName);
|
|
53
|
+
returnNpmName.tag = components[1];
|
|
57
54
|
}
|
|
58
55
|
if (components.length > 2) {
|
|
59
56
|
returnNpmName.tag = components[2];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NpmName.js","sourceRoot":"","sources":["../../src/codeSigning/NpmName.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yCAA6C;AAO7C;;;;;;GAMG;AACH,MAAa,OAAO;IAMlB;;OAEG;IACH;QACE,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC;IACjC,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,OAAe;QACjC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YAClC,MAAM,IAAI,gBAAU,CAAC,yBAAyB,EAAE,qCAAqC,CAAC,CAAC;SACxF;QAED,MAAM,aAAa,GAAG,IAAI,OAAO,EAAE,CAAC;QAEpC,MAAM,UAAU,
|
|
1
|
+
{"version":3,"file":"NpmName.js","sourceRoot":"","sources":["../../src/codeSigning/NpmName.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,63 +61,51 @@ exports.signVerifyUpload = signVerifyUpload;
|
|
|
61
61
|
/**
|
|
62
62
|
* Save the security items (publicKey and .sig file) to AWS based on the generates filenames
|
|
63
63
|
*/
|
|
64
|
-
const upload = async (input) =>
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
resolve({
|
|
88
|
-
publicKey,
|
|
89
|
-
privateKey,
|
|
90
|
-
});
|
|
64
|
+
const upload = async (input) => Promise.all([
|
|
65
|
+
// signature file
|
|
66
|
+
(0, upload_1.putObject)(BUCKET, input.packageJsonSfdxProperty.signatureUrl.replace(`${exports.BASE_URL}/`, ''), input.signatureContents),
|
|
67
|
+
// publicKey
|
|
68
|
+
(0, upload_1.putObject)(BUCKET, input.packageJsonSfdxProperty.publicKeyUrl.replace(`${exports.BASE_URL}/`, ''), input.publicKeyContents),
|
|
69
|
+
]);
|
|
70
|
+
const getOneTimeUseKeys = () => new Promise((resolve, reject) => {
|
|
71
|
+
(0, crypto_1.generateKeyPair)('rsa', {
|
|
72
|
+
modulusLength: 4096,
|
|
73
|
+
publicKeyEncoding: {
|
|
74
|
+
type: 'spki',
|
|
75
|
+
format: 'pem',
|
|
76
|
+
},
|
|
77
|
+
privateKeyEncoding: {
|
|
78
|
+
type: 'pkcs8',
|
|
79
|
+
format: 'pem',
|
|
80
|
+
},
|
|
81
|
+
}, (err, publicKey, privateKey) => {
|
|
82
|
+
if (err)
|
|
83
|
+
reject(err);
|
|
84
|
+
resolve({
|
|
85
|
+
publicKey,
|
|
86
|
+
privateKey,
|
|
91
87
|
});
|
|
92
88
|
});
|
|
93
|
-
};
|
|
89
|
+
});
|
|
94
90
|
const getSignature = async (privateKey, dataToSignFilePath) => {
|
|
95
91
|
const signApi = (0, crypto_1.createSign)(CRYPTO_LEVEL);
|
|
96
92
|
return new Promise((resolve, reject) => {
|
|
97
93
|
const dataToSignStream = (0, fs_1.createReadStream)(dataToSignFilePath, { encoding: 'binary' });
|
|
98
94
|
dataToSignStream.pipe(signApi);
|
|
99
|
-
dataToSignStream.on('end', () =>
|
|
100
|
-
|
|
101
|
-
});
|
|
102
|
-
dataToSignStream.on('error', (err) => {
|
|
103
|
-
return reject(err);
|
|
104
|
-
});
|
|
95
|
+
dataToSignStream.on('end', () => resolve(signApi.sign(privateKey, 'base64')));
|
|
96
|
+
dataToSignStream.on('error', (err) => reject(err));
|
|
105
97
|
});
|
|
106
98
|
};
|
|
107
|
-
const verify = async (dataToSignFilePath, publicKey, signature) => {
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
return reject('The signature did not verify');
|
|
117
|
-
});
|
|
118
|
-
dataToVerifyStream.on('error', (err) => {
|
|
119
|
-
return reject(err);
|
|
120
|
-
});
|
|
99
|
+
const verify = async (dataToSignFilePath, publicKey, signature) => new Promise((resolve, reject) => {
|
|
100
|
+
const verifier = (0, crypto_1.createVerify)(CRYPTO_LEVEL);
|
|
101
|
+
const dataToVerifyStream = (0, fs_1.createReadStream)(dataToSignFilePath, { encoding: 'binary' });
|
|
102
|
+
dataToVerifyStream.pipe(verifier);
|
|
103
|
+
dataToVerifyStream.on('end', () => {
|
|
104
|
+
if (verifier.verify(publicKey, signature, 'base64')) {
|
|
105
|
+
return resolve(true);
|
|
106
|
+
}
|
|
107
|
+
return reject('The signature did not verify');
|
|
121
108
|
});
|
|
122
|
-
|
|
109
|
+
dataToVerifyStream.on('error', (err) => reject(err));
|
|
110
|
+
});
|
|
123
111
|
//# sourceMappingURL=SimplifiedSigning.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SimplifiedSigning.js","sourceRoot":"","sources":["../../src/codeSigning/SimplifiedSigning.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH;;;;;;;;;;;;;;;GAeG;AACH,mCAAmE;AACnE,2BAAsC;AAEtC,kDAAkD;AAElD,MAAM,YAAY,GAAG,YAAY,CAAC;AAClC,MAAM,MAAM,GAAG,qBAAqB,CAAC;AACxB,QAAA,QAAQ,GAAG,kCAAkC,CAAC;AAC9C,QAAA,aAAa,GAAG,+BAA+B,CAAC;AAoCtD,MAAM,eAAe,GAAG,CAAC,WAAmB,EAAE,cAAsB,EAA2B,EAAE;IACtG,MAAM,mBAAmB,GAAG,GAAG,gBAAQ,IAAI,qBAAa,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;AANW,QAAA,eAAe,mBAM1B;AAEK,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,IAAA,uBAAe,EAAC,WAAW,EAAE,cAAc,CAAC;QACrE,WAAW,EAAE,cAAc,CAAC,gBAAgB;QAC5C,WAAW;QACX,cAAc;KACf,CAAC;IAEF,IAAI,cAAc,CAAC,MAAM,EAAE;QACzB,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;KACtB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AApBW,QAAA,gBAAgB,oBAoB3B;AAEF;;GAEG;AACH,MAAM,MAAM,GAAG,KAAK,EAAE,KAAsB,EAAiC,EAAE
|
|
1
|
+
{"version":3,"file":"SimplifiedSigning.js","sourceRoot":"","sources":["../../src/codeSigning/SimplifiedSigning.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/codeSigning/error.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yCAA6C;AAE7C,MAAa,iBAAkB,SAAQ,gBAAU;IAC/C,YAAmB,OAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/codeSigning/error.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yCAA6C;AAE7C,MAAa,iBAAkB,SAAQ,gBAAU;IAC/C,YAAmB,OAAe,EAAE,SAA0B,EAAE,OAAe;QAC7E,KAAK,CACH,qBAAqB,EACrB,qBAAqB,OAAO,4BAA4B,SAAS,kBAAkB,OAAO,IAAI,CAC/F,CAAC;IACJ,CAAC;CACF;AAPD,8CAOC"}
|
|
@@ -26,7 +26,7 @@ class PathGetter {
|
|
|
26
26
|
if (!target) {
|
|
27
27
|
this._target = this._cwd;
|
|
28
28
|
}
|
|
29
|
-
else if (target
|
|
29
|
+
else if (target?.includes(this._cwd)) {
|
|
30
30
|
this._target = target;
|
|
31
31
|
}
|
|
32
32
|
else {
|
|
@@ -66,8 +66,10 @@ exports.api = {
|
|
|
66
66
|
pathGetter = new PathGetter();
|
|
67
67
|
return new Promise((resolve, reject) => {
|
|
68
68
|
const command = 'npm pack -p';
|
|
69
|
-
(0, child_process_1.exec)(command, { cwd: pathGetter.target, maxBuffer: 1024 * 4096 },
|
|
70
|
-
|
|
69
|
+
(0, child_process_1.exec)(command, { cwd: pathGetter.target, maxBuffer: 1024 * 4096 },
|
|
70
|
+
// we expect an error code from this command, so we're adding it to the normal Error type
|
|
71
|
+
(error, stdout, stderr) => {
|
|
72
|
+
if (error?.code) {
|
|
71
73
|
return reject(new error_1.ExecProcessFailed(command, error['code'], stderr));
|
|
72
74
|
}
|
|
73
75
|
else {
|
|
@@ -75,7 +77,7 @@ exports.api = {
|
|
|
75
77
|
if (output.length > 1) {
|
|
76
78
|
// note the output end with a newline;
|
|
77
79
|
const path = output[output.length - 2];
|
|
78
|
-
if (path
|
|
80
|
+
if (path?.endsWith('tgz')) {
|
|
79
81
|
return resolve(pathGetter.getFile(path));
|
|
80
82
|
}
|
|
81
83
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packAndSign.js","sourceRoot":"","sources":["../../src/codeSigning/packAndSign.ts"],"names":[],"mappings":";;AACA;;;;;GAKG;;;AAEH,yCAAyC;AAEzC,kCAAkC;AAClC,iDAAqC;AACrC,2BAAyB;AACzB,+BAAwC;AAIxC,2CAA0C;AAC1C,yCAA6C;AAC7C,0CAA0C;AAC1C,mDAAgD;AAEhD,2DAAkG;AAClG,mCAA4C;AAC5C,uCAAoC;AAEpC,MAAM,UAAU;IAQd,YAAmB,MAAe;QAChC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC,MAAM,EAAE;YACX,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;SAC1B;aAAM,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"packAndSign.js","sourceRoot":"","sources":["../../src/codeSigning/packAndSign.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,14 +22,6 @@ export default class Promote extends SfdxCommand {
|
|
|
22
22
|
* @private
|
|
23
23
|
*/
|
|
24
24
|
private validateFlags;
|
|
25
|
-
/**
|
|
26
|
-
* find a manifest file in the channel
|
|
27
|
-
*
|
|
28
|
-
* @param cli
|
|
29
|
-
* @param channel
|
|
30
|
-
* @private
|
|
31
|
-
*/
|
|
32
|
-
private findManifestForCandidate;
|
|
33
25
|
/**
|
|
34
26
|
* find the sha that was uploaded most recently for the named version
|
|
35
27
|
*
|
|
@@ -55,10 +55,8 @@ class Promote extends command_1.SfdxCommand {
|
|
|
55
55
|
});
|
|
56
56
|
this.ux.log(results.stdout);
|
|
57
57
|
}
|
|
58
|
-
else {
|
|
59
|
-
|
|
60
|
-
this.log(messages.getMessage('DryRunMessage', [cli, version, sha, target, (0, ts_types_1.ensureArray)(this.flags.platform).join(', ')].map((s) => (0, chalk_1.bold)(s))));
|
|
61
|
-
}
|
|
58
|
+
else if (!this.flags.json) {
|
|
59
|
+
this.log(messages.getMessage('DryRunMessage', [cli, version, sha, target, (0, ts_types_1.ensureArray)(this.flags.platform).join(', ')].map((s) => (0, chalk_1.bold)(s))));
|
|
62
60
|
}
|
|
63
61
|
return {
|
|
64
62
|
dryRun: !!this.flags.dryrun,
|
|
@@ -81,7 +79,7 @@ class Promote extends command_1.SfdxCommand {
|
|
|
81
79
|
*/
|
|
82
80
|
async determineShaAndVersion(cli) {
|
|
83
81
|
if (this.flags.candidate) {
|
|
84
|
-
const manifest = await
|
|
82
|
+
const manifest = await findManifestForCandidate(cli, this.flags.candidate);
|
|
85
83
|
return { sha: manifest.sha, version: manifest.version };
|
|
86
84
|
}
|
|
87
85
|
else if (this.flags.version) {
|
|
@@ -117,17 +115,6 @@ class Promote extends command_1.SfdxCommand {
|
|
|
117
115
|
throw new core_1.SfError(messages.getMessage(errType), errType, missing);
|
|
118
116
|
}
|
|
119
117
|
}
|
|
120
|
-
/**
|
|
121
|
-
* find a manifest file in the channel
|
|
122
|
-
*
|
|
123
|
-
* @param cli
|
|
124
|
-
* @param channel
|
|
125
|
-
* @private
|
|
126
|
-
*/
|
|
127
|
-
async findManifestForCandidate(cli, channel) {
|
|
128
|
-
const amazonS3 = new amazonS3_1.AmazonS3({ cli, channel });
|
|
129
|
-
return await amazonS3.getManifestFromChannel(channel);
|
|
130
|
-
}
|
|
131
118
|
/**
|
|
132
119
|
* find the sha that was uploaded most recently for the named version
|
|
133
120
|
*
|
|
@@ -145,9 +132,10 @@ class Promote extends command_1.SfdxCommand {
|
|
|
145
132
|
this.logger.debug(`Looking for version ${version} for cli ${cli} shas. Found ${versionShas.length} entries`);
|
|
146
133
|
const manifestForMostRecentSha = (await Promise.all(versionShas.map(async (versionSha) => {
|
|
147
134
|
const versionShaContents = (await amazonS3.listKeyContents(versionSha.Prefix));
|
|
148
|
-
return versionShaContents.map((content) => {
|
|
149
|
-
|
|
150
|
-
|
|
135
|
+
return versionShaContents.map((content) => ({
|
|
136
|
+
...content,
|
|
137
|
+
...{ LastModifiedDate: new Date(content.LastModified) },
|
|
138
|
+
}));
|
|
151
139
|
}))).flat()
|
|
152
140
|
.filter((content) => content.Key.includes('manifest'))
|
|
153
141
|
.sort((left, right) => right.LastModifiedDate.getMilliseconds() - left.LastModifiedDate.getMilliseconds())
|
|
@@ -175,9 +163,7 @@ class Promote extends command_1.SfdxCommand {
|
|
|
175
163
|
*/
|
|
176
164
|
async findVersionForSha(cli, sha) {
|
|
177
165
|
const amazonS3 = new amazonS3_1.AmazonS3({ cli });
|
|
178
|
-
const foundVersion = (await Promise.all((await amazonS3.listCommonPrefixes('versions')).map(async (version) =>
|
|
179
|
-
return await amazonS3.listCommonPrefixes(version.Prefix);
|
|
180
|
-
})))
|
|
166
|
+
const foundVersion = (await Promise.all((await amazonS3.listCommonPrefixes('versions')).map(async (version) => amazonS3.listCommonPrefixes(version.Prefix))))
|
|
181
167
|
.flat()
|
|
182
168
|
.find((s) => s.Prefix.replace(/\/$/, '').endsWith(sha));
|
|
183
169
|
if (foundVersion) {
|
|
@@ -229,9 +215,7 @@ Promote.flagsConfig = {
|
|
|
229
215
|
char: 's',
|
|
230
216
|
description: messages.getMessage('sha'),
|
|
231
217
|
exclusive: ['candidate'],
|
|
232
|
-
parse: (input) =>
|
|
233
|
-
return Promise.resolve(input.slice(0, 7));
|
|
234
|
-
},
|
|
218
|
+
parse: (input) => Promise.resolve(input.slice(0, 7)),
|
|
235
219
|
validate: (input) => {
|
|
236
220
|
if (input.length < 7) {
|
|
237
221
|
return false;
|
|
@@ -269,4 +253,15 @@ Promote.flagsConfig = {
|
|
|
269
253
|
validate: (input) => /^([0-9]+\.){2}[0-9]+$/.test(input),
|
|
270
254
|
}),
|
|
271
255
|
};
|
|
256
|
+
/**
|
|
257
|
+
* find a manifest file in the channel
|
|
258
|
+
*
|
|
259
|
+
* @param cli
|
|
260
|
+
* @param channel
|
|
261
|
+
* @private
|
|
262
|
+
*/
|
|
263
|
+
const findManifestForCandidate = async (cli, channel) => {
|
|
264
|
+
const amazonS3 = new amazonS3_1.AmazonS3({ cli, channel });
|
|
265
|
+
return amazonS3.getManifestFromChannel(channel);
|
|
266
|
+
};
|
|
272
267
|
//# sourceMappingURL=promote.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promote.js","sourceRoot":"","sources":["../../../src/commands/channel/promote.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,yBAAyB;AACzB,iDAAsE;AACtE,2CAAqD;AACrD,mDAAiG;AAEjG,iCAA6B;AAC7B,uCAA2E;AAC3E,6CAA0C;AAC1C,qDAA+D;AAC/D,uDAAoD;AAEpD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,uCAAuC,EAAE,iBAAiB,CAAC,CAAC;AACnG,MAAM,OAAO,GAAG,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;AACnF,MAAqB,OAAQ,SAAQ,qBAAW;
|
|
1
|
+
{"version":3,"file":"promote.js","sourceRoot":"","sources":["../../../src/commands/channel/promote.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
import { FlagsConfig, SfdxCommand } from '@salesforce/command';
|
|
2
|
-
import { CLI } from '../../../types';
|
|
3
|
-
export declare type Results = Record<string, Record<CLI, boolean>>;
|
|
4
2
|
export default class Test extends SfdxCommand {
|
|
5
3
|
static readonly description: string;
|
|
6
4
|
static readonly examples: string[];
|
|
7
5
|
static readonly flagsConfig: FlagsConfig;
|
|
8
6
|
run(): Promise<void>;
|
|
9
|
-
private makeWorkingDir;
|
|
10
7
|
}
|
|
@@ -66,9 +66,11 @@ var Method;
|
|
|
66
66
|
}
|
|
67
67
|
return {};
|
|
68
68
|
}
|
|
69
|
+
// eslint-disable-next-line class-methods-use-this
|
|
69
70
|
async ping() {
|
|
70
71
|
return Promise.resolve({ available: true, service: 'Service' });
|
|
71
72
|
}
|
|
73
|
+
// eslint-disable-next-line class-methods-use-this
|
|
72
74
|
logResult(cli, success) {
|
|
73
75
|
const msg = success ? chalk.green('true') : chalk.red('false');
|
|
74
76
|
core_1.CliUx.ux.log(`${chalk.bold(`${cli} Success`)}: ${msg}`);
|
|
@@ -118,7 +120,9 @@ class Tarball extends Method.Base {
|
|
|
118
120
|
const results = {};
|
|
119
121
|
for (const [tarball, location] of Object.entries(tarballs)) {
|
|
120
122
|
try {
|
|
123
|
+
// eslint-disable-next-line no-await-in-loop
|
|
121
124
|
await this.s3.download(tarball, location);
|
|
125
|
+
// eslint-disable-next-line no-await-in-loop
|
|
122
126
|
const extracted = await this.extract(location);
|
|
123
127
|
const testResults = this.test(extracted);
|
|
124
128
|
for (const [cli, success] of Object.entries(testResults)) {
|
|
@@ -138,9 +142,7 @@ class Tarball extends Method.Base {
|
|
|
138
142
|
}
|
|
139
143
|
getTarballs(platform) {
|
|
140
144
|
const paths = platform === 'linux' && os.arch().includes('arm') ? this.paths['linux-arm'] : this.paths[platform];
|
|
141
|
-
const s3Tarballs = paths.map((p) => {
|
|
142
|
-
return `${this.s3.directory}/channels/${this.options.channel}/${this.options.cli}-${platform}-${p}`;
|
|
143
|
-
});
|
|
145
|
+
const s3Tarballs = paths.map((p) => `${this.s3.directory}/channels/${this.options.channel}/${this.options.cli}-${platform}-${p}`);
|
|
144
146
|
const tarballs = {};
|
|
145
147
|
for (const tarball of s3Tarballs) {
|
|
146
148
|
const name = path.basename(tarball);
|
|
@@ -200,6 +202,7 @@ class Npm extends Method.Base {
|
|
|
200
202
|
async linux() {
|
|
201
203
|
return this.installAndTest();
|
|
202
204
|
}
|
|
205
|
+
// eslint-disable-next-line class-methods-use-this
|
|
203
206
|
async ping() {
|
|
204
207
|
// I'm not confident that this is the best way to preempt any issues related to Npm's availability. Mainly
|
|
205
208
|
// because I couldn't find any documetation related to what status indicators might be used and when.
|
|
@@ -288,6 +291,7 @@ class Installer extends Method.Base {
|
|
|
288
291
|
for (const exe of executables) {
|
|
289
292
|
const url = `${this.s3.directory}/channels/${this.options.channel}/${exe}`;
|
|
290
293
|
const location = path.join(this.options.directory, exe);
|
|
294
|
+
// eslint-disable-next-line no-await-in-loop
|
|
291
295
|
await this.s3.download(url, location);
|
|
292
296
|
const installLocation = `C:\\install-test\\${this.options.cli}\\${exe.includes('x86') ? 'x86' : 'x64'}`;
|
|
293
297
|
const cmd = `Start-Process -Wait -FilePath "${location}" -ArgumentList "/S", "/D=${installLocation}" -PassThru`;
|
|
@@ -310,7 +314,7 @@ class Installer extends Method.Base {
|
|
|
310
314
|
}
|
|
311
315
|
return results;
|
|
312
316
|
}
|
|
313
|
-
// eslint-disable-next-line @typescript-eslint/require-await
|
|
317
|
+
// eslint-disable-next-line @typescript-eslint/require-await, class-methods-use-this
|
|
314
318
|
async linux() {
|
|
315
319
|
throw new Error('Installers not supported for linux.');
|
|
316
320
|
}
|
|
@@ -347,7 +351,7 @@ class Test extends command_1.SfdxCommand {
|
|
|
347
351
|
const method = (0, ts_types_1.ensure)(this.flags.method);
|
|
348
352
|
const channel = (0, ts_types_1.ensure)(this.flags.channel);
|
|
349
353
|
const outputFile = (0, ts_types_1.ensure)(this.flags['output-file']);
|
|
350
|
-
const directory = await
|
|
354
|
+
const directory = await makeWorkingDir(cli, channel, method);
|
|
351
355
|
core_1.CliUx.ux.log(`Working Directory: ${directory}`);
|
|
352
356
|
core_1.CliUx.ux.log();
|
|
353
357
|
let results = {};
|
|
@@ -383,18 +387,6 @@ class Test extends command_1.SfdxCommand {
|
|
|
383
387
|
core_1.CliUx.ux.styledJSON(results);
|
|
384
388
|
core_1.CliUx.ux.log(`Results written to ${outputFile}`);
|
|
385
389
|
}
|
|
386
|
-
async makeWorkingDir(cli, channel, method) {
|
|
387
|
-
const tmpDir = path.join(os.tmpdir(), 'cli-install-test', cli, channel, method);
|
|
388
|
-
// ensure that we are starting with a clean directory
|
|
389
|
-
try {
|
|
390
|
-
await fs.rm(tmpDir, { recursive: true, force: true });
|
|
391
|
-
}
|
|
392
|
-
catch {
|
|
393
|
-
// error means that folder doesn't exist which is okay
|
|
394
|
-
}
|
|
395
|
-
await fs.mkdir(tmpDir, { recursive: true });
|
|
396
|
-
return tmpDir;
|
|
397
|
-
}
|
|
398
390
|
}
|
|
399
391
|
exports.default = Test;
|
|
400
392
|
Test.description = messages.getMessage('description');
|
|
@@ -422,4 +414,16 @@ Test.flagsConfig = {
|
|
|
422
414
|
default: 'test-results.json',
|
|
423
415
|
}),
|
|
424
416
|
};
|
|
417
|
+
const makeWorkingDir = async (cli, channel, method) => {
|
|
418
|
+
const tmpDir = path.join(os.tmpdir(), 'cli-install-test', cli, channel, method);
|
|
419
|
+
// ensure that we are starting with a clean directory
|
|
420
|
+
try {
|
|
421
|
+
await fs.rm(tmpDir, { recursive: true, force: true });
|
|
422
|
+
}
|
|
423
|
+
catch {
|
|
424
|
+
// error means that folder doesn't exist which is okay
|
|
425
|
+
}
|
|
426
|
+
await fs.mkdir(tmpDir, { recursive: true });
|
|
427
|
+
return tmpDir;
|
|
428
|
+
};
|
|
425
429
|
//# sourceMappingURL=test.js.map
|