@salesforce/plugin-release-management 3.17.8 → 4.0.5
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 +8 -7
- package/lib/amazonS3.js.map +1 -1
- package/lib/codeSigning/NpmName.d.ts +11 -47
- package/lib/codeSigning/NpmName.js +63 -116
- package/lib/codeSigning/NpmName.js.map +1 -1
- package/lib/codeSigning/packAndSign.js +1 -2
- package/lib/codeSigning/packAndSign.js.map +1 -1
- package/lib/commands/channel/promote.d.ts +5 -5
- package/lib/commands/channel/promote.js +17 -8
- package/lib/commands/channel/promote.js.map +1 -1
- package/lib/commands/cli/artifacts/compare.d.ts +5 -5
- package/lib/commands/cli/artifacts/compare.js +14 -19
- package/lib/commands/cli/artifacts/compare.js.map +1 -1
- package/lib/commands/cli/install/test.js +2 -9
- package/lib/commands/cli/install/test.js.map +1 -1
- package/lib/commands/cli/release/automerge.js +14 -11
- package/lib/commands/cli/release/automerge.js.map +1 -1
- package/lib/commands/cli/release/build.d.ts +6 -6
- package/lib/commands/cli/release/build.js +11 -17
- package/lib/commands/cli/release/build.js.map +1 -1
- package/lib/commands/cli/releasenotes.d.ts +1 -1
- package/lib/commands/cli/releasenotes.js +54 -52
- package/lib/commands/cli/releasenotes.js.map +1 -1
- package/lib/commands/cli/schemas/compare.d.ts +4 -1
- package/lib/commands/cli/schemas/compare.js +36 -9
- package/lib/commands/cli/schemas/compare.js.map +1 -1
- package/lib/commands/cli/tarballs/prepare.js +2 -2
- package/lib/commands/cli/tarballs/prepare.js.map +1 -1
- package/lib/commands/cli/tarballs/smoke.js +8 -2
- package/lib/commands/cli/tarballs/smoke.js.map +1 -1
- package/lib/commands/cli/tarballs/verify.js +2 -7
- package/lib/commands/cli/tarballs/verify.js.map +1 -1
- package/lib/commands/cli/versions/inspect.d.ts +3 -3
- package/lib/commands/cli/versions/inspect.js +7 -14
- package/lib/commands/cli/versions/inspect.js.map +1 -1
- package/lib/commands/dependabot/automerge.d.ts +2 -2
- package/lib/commands/dependabot/automerge.js +10 -13
- package/lib/commands/dependabot/automerge.js.map +1 -1
- package/lib/commands/github/check/closed.js +7 -5
- package/lib/commands/github/check/closed.js.map +1 -1
- package/lib/commands/npm/dependencies/pin.js +1 -1
- package/lib/commands/npm/dependencies/pin.js.map +1 -1
- package/lib/commands/npm/package/release.d.ts +2 -2
- package/lib/commands/npm/package/release.js +10 -33
- package/lib/commands/npm/package/release.js.map +1 -1
- package/lib/commands/repositories/index.js +1 -1
- package/lib/commands/repositories/index.js.map +1 -1
- package/lib/dependabot.d.ts +1 -4
- package/lib/dependabot.js +2 -15
- package/lib/dependabot.js.map +1 -1
- package/lib/dependencies.d.ts +9 -2
- package/lib/dependencies.js +8 -1
- package/lib/dependencies.js.map +1 -1
- package/lib/package.d.ts +13 -11
- package/lib/package.js +47 -42
- package/lib/package.js.map +1 -1
- package/lib/registry.d.ts +3 -4
- package/lib/registry.js +8 -9
- package/lib/registry.js.map +1 -1
- package/lib/repositories.js +1 -1
- package/lib/repositories.js.map +1 -1
- package/lib/repository.d.ts +4 -18
- package/lib/repository.js +13 -28
- package/lib/repository.js.map +1 -1
- package/lib/types.js +2 -2
- package/lib/types.js.map +1 -1
- package/oclif.manifest.json +1 -227
- package/package.json +24 -28
- package/lib/commands/cli/schemas/collect.d.ts +0 -13
- package/lib/commands/cli/schemas/collect.js +0 -93
- package/lib/commands/cli/schemas/collect.js.map +0 -1
- package/lib/commands/dependabot/consolidate.d.ts +0 -18
- package/lib/commands/dependabot/consolidate.js +0 -124
- package/lib/commands/dependabot/consolidate.js.map +0 -1
- package/lib/commands/npm/package/promote.d.ts +0 -12
- package/lib/commands/npm/package/promote.js +0 -69
- package/lib/commands/npm/package/promote.js.map +0 -1
- package/lib/commands/npm/release/validate.d.ts +0 -20
- package/lib/commands/npm/release/validate.js +0 -39
- package/lib/commands/npm/release/validate.js.map +0 -1
- package/lib/commands/typescript/update.d.ts +0 -21
- package/lib/commands/typescript/update.js +0 -132
- package/lib/commands/typescript/update.js.map +0 -1
- package/lib/inspectCommits.d.ts +0 -24
- package/lib/inspectCommits.js +0 -84
- package/lib/inspectCommits.js.map +0 -1
package/lib/amazonS3.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import { S3 } from 'aws-sdk';
|
|
1
2
|
import { CredentialsOptions } from 'aws-sdk/lib/credentials';
|
|
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
5
|
type GetObjectOption = Omit<GetObjectRequest, 'Bucket'>;
|
|
@@ -25,8 +25,8 @@ export declare class AmazonS3 {
|
|
|
25
25
|
getManifestFromVersion(version: string, sha: string): Promise<S3Manifest>;
|
|
26
26
|
getFileAtUrl(url: string): Promise<string>;
|
|
27
27
|
getObject(options: GetObjectOption): Promise<GetObjectOutput>;
|
|
28
|
-
listCommonPrefixes(key: string): Promise<
|
|
29
|
-
listKeyContents(key: string
|
|
28
|
+
listCommonPrefixes(key: string): Promise<string[]>;
|
|
29
|
+
listKeyContents(key: string): Promise<S3.ObjectList>;
|
|
30
30
|
private resolveCredentials;
|
|
31
31
|
}
|
|
32
32
|
export {};
|
package/lib/amazonS3.js
CHANGED
|
@@ -15,13 +15,14 @@ const got_1 = require("got");
|
|
|
15
15
|
const core_2 = require("@salesforce/core");
|
|
16
16
|
const chalk = require("chalk");
|
|
17
17
|
const AWS = require("aws-sdk");
|
|
18
|
+
const ts_types_1 = require("@salesforce/ts-types");
|
|
18
19
|
const packAndSign_1 = require("./codeSigning/packAndSign");
|
|
19
20
|
const BASE_URL = 'https://developer.salesforce.com';
|
|
20
21
|
const BUCKET = 'dfc-data-production';
|
|
21
22
|
class AmazonS3 {
|
|
22
23
|
constructor(options) {
|
|
23
24
|
this.options = options;
|
|
24
|
-
this.directory = `https://developer.salesforce.com/media/salesforce-cli/${this.options.cli
|
|
25
|
+
this.directory = `https://developer.salesforce.com/media/salesforce-cli/${this.options.cli ?? ''}`;
|
|
25
26
|
this.baseKey = this.directory.replace(BASE_URL, '').replace(/^\//, '');
|
|
26
27
|
const agent = packAndSign_1.api.getAgentForUri('https://s3.amazonaws.com');
|
|
27
28
|
this.s3 = new AWS.S3({
|
|
@@ -89,23 +90,23 @@ class AmazonS3 {
|
|
|
89
90
|
async getObject(options) {
|
|
90
91
|
options.Key = options.Key.replace(BASE_URL, '').replace(/^\//, '');
|
|
91
92
|
const object = (await this.s3
|
|
92
|
-
.getObject({ ...options, ...{ Bucket: this.options.bucket
|
|
93
|
+
.getObject({ ...options, ...{ Bucket: this.options.bucket ?? BUCKET } })
|
|
93
94
|
.promise());
|
|
94
95
|
return object;
|
|
95
96
|
}
|
|
96
97
|
async listCommonPrefixes(key) {
|
|
97
98
|
const prefix = key.startsWith(this.baseKey) ? key : `${this.baseKey}/${key}/`;
|
|
98
99
|
const objects = await this.s3
|
|
99
|
-
.listObjectsV2({ Bucket: this.options.bucket
|
|
100
|
+
.listObjectsV2({ Bucket: this.options.bucket ?? BUCKET, Delimiter: '/', Prefix: prefix })
|
|
100
101
|
.promise();
|
|
101
|
-
return objects.CommonPrefixes;
|
|
102
|
+
return (objects.CommonPrefixes ?? [])?.map((item) => item.Prefix).filter(ts_types_1.isString);
|
|
102
103
|
}
|
|
103
|
-
async listKeyContents(key
|
|
104
|
+
async listKeyContents(key) {
|
|
104
105
|
const prefix = key.startsWith(this.baseKey) ? key : `${this.baseKey}/${key}/`;
|
|
105
106
|
const objects = await this.s3
|
|
106
|
-
.listObjectsV2({ Bucket: this.options.bucket
|
|
107
|
+
.listObjectsV2({ Bucket: this.options.bucket ?? BUCKET, Delimiter: '/', Prefix: prefix })
|
|
107
108
|
.promise();
|
|
108
|
-
return objects.Contents
|
|
109
|
+
return objects.Contents ?? [];
|
|
109
110
|
}
|
|
110
111
|
resolveCredentials() {
|
|
111
112
|
const credentials = {};
|
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,sCAAiC;AACjC,6BAAkC;AAClC,2CAA2C;AAC3C,+BAA+B;AAC/B,+BAA+B;
|
|
1
|
+
{"version":3,"file":"amazonS3.js","sourceRoot":"","sources":["../src/amazonS3.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,52 +1,16 @@
|
|
|
1
|
+
interface NpmNameResponse {
|
|
2
|
+
scope?: string;
|
|
3
|
+
name: string;
|
|
4
|
+
tag: string;
|
|
5
|
+
}
|
|
1
6
|
/**
|
|
2
|
-
*
|
|
7
|
+
* Get the parsed components of an NpmName
|
|
3
8
|
*
|
|
4
9
|
* @example
|
|
5
|
-
* const f
|
|
10
|
+
* const f = parseNpmName('@salesforce/jj@foo');
|
|
6
11
|
* console.log(f.tag === 'foo')
|
|
12
|
+
* console.log(f.name === 'jj')
|
|
13
|
+
* console.log(f.scope === 'salesforce')
|
|
7
14
|
*/
|
|
8
|
-
export declare
|
|
9
|
-
|
|
10
|
-
scope: string;
|
|
11
|
-
tag: string;
|
|
12
|
-
name: string;
|
|
13
|
-
/**
|
|
14
|
-
* Private ctor. Use static parse method.
|
|
15
|
-
*/
|
|
16
|
-
private constructor();
|
|
17
|
-
/**
|
|
18
|
-
* Parse an NPM package name into {scope, name, tag}. The tag is 'latest' by default and can be any semver string.
|
|
19
|
-
*
|
|
20
|
-
* @param {string} npmName - The npm name to parse.
|
|
21
|
-
* @return {NpmName} - An object with the parsed components.
|
|
22
|
-
*/
|
|
23
|
-
static parse(npmName: string): NpmName;
|
|
24
|
-
/**
|
|
25
|
-
* Static helper to parse the name and scope.
|
|
26
|
-
*
|
|
27
|
-
* @param {string} name - The string to parse.
|
|
28
|
-
* @param returnNpmName - The object to update.
|
|
29
|
-
*/
|
|
30
|
-
private static setNameAndScope;
|
|
31
|
-
/**
|
|
32
|
-
* Validate a component part that it's not empty and return it trimmed.
|
|
33
|
-
*
|
|
34
|
-
* @param {string} name The component to validate.
|
|
35
|
-
* @return {string} A whitespace trimmed version of the component.
|
|
36
|
-
*/
|
|
37
|
-
private static validateComponentString;
|
|
38
|
-
/**
|
|
39
|
-
* Produce a string that can be used by npm. @salesforce/jj@1.2.3 becomes "salesforce-jj-1.2.3.tgz
|
|
40
|
-
*
|
|
41
|
-
* @param {string} [ext = tgz] The file extension to use.
|
|
42
|
-
* @param {boolean} includeLatestTag - True if the "latest" tag should be used. Generally you wouldn't do this.
|
|
43
|
-
* @return {string} Formatted npm string thats compatible with the npm utility
|
|
44
|
-
*/
|
|
45
|
-
toFilename(ext?: string, includeLatestTag?: boolean): string;
|
|
46
|
-
/**
|
|
47
|
-
* Produces a formatted string version of the object.
|
|
48
|
-
*
|
|
49
|
-
* @return {string} A formatted string version of the object.
|
|
50
|
-
*/
|
|
51
|
-
toString(includeTag?: boolean): string;
|
|
52
|
-
}
|
|
15
|
+
export declare const parseNpmName: (npmName: string) => NpmNameResponse;
|
|
16
|
+
export {};
|
|
@@ -6,132 +6,79 @@
|
|
|
6
6
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.
|
|
9
|
+
exports.parseNpmName = void 0;
|
|
10
10
|
const kit_1 = require("@salesforce/kit");
|
|
11
|
+
const DEFAULT_TAG = 'latest';
|
|
11
12
|
/**
|
|
12
|
-
*
|
|
13
|
+
* Get the parsed components of an NpmName
|
|
13
14
|
*
|
|
14
15
|
* @example
|
|
15
|
-
* const f
|
|
16
|
+
* const f = parseNpmName('@salesforce/jj@foo');
|
|
16
17
|
* console.log(f.tag === 'foo')
|
|
18
|
+
* console.log(f.name === 'jj')
|
|
19
|
+
* console.log(f.scope === 'salesforce')
|
|
17
20
|
*/
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
*/
|
|
22
|
-
constructor() {
|
|
23
|
-
this.tag = NpmName.DEFAULT_TAG;
|
|
21
|
+
const parseNpmName = (npmName) => {
|
|
22
|
+
if (!npmName || npmName.length < 1) {
|
|
23
|
+
throw new kit_1.NamedError('MissingOrInvalidNpmName', 'The npm name is missing or invalid.');
|
|
24
24
|
}
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
* @return {NpmName} - An object with the parsed components.
|
|
30
|
-
*/
|
|
31
|
-
static parse(npmName) {
|
|
32
|
-
if (!npmName || npmName.length < 1) {
|
|
33
|
-
throw new kit_1.NamedError('MissingOrInvalidNpmName', 'The npm name is missing or invalid.');
|
|
34
|
-
}
|
|
35
|
-
const returnNpmName = new NpmName();
|
|
36
|
-
const components = npmName.split('@');
|
|
37
|
-
// salesforce/jj
|
|
38
|
-
if (components.length === 1) {
|
|
39
|
-
NpmName.setNameAndScope(components[0], returnNpmName);
|
|
40
|
-
return returnNpmName;
|
|
41
|
-
}
|
|
42
|
-
if (components[0].includes('/')) {
|
|
43
|
-
// salesforce/jj@tag
|
|
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];
|
|
54
|
-
}
|
|
55
|
-
if (components.length > 2) {
|
|
56
|
-
returnNpmName.tag = components[2];
|
|
57
|
-
}
|
|
58
|
-
return returnNpmName;
|
|
25
|
+
const components = npmName.split('@');
|
|
26
|
+
// salesforce/jj
|
|
27
|
+
if (components.length === 1) {
|
|
28
|
+
return setNameAndScope(components[0]);
|
|
59
29
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
* @param {string} name - The string to parse.
|
|
64
|
-
* @param returnNpmName - The object to update.
|
|
65
|
-
*/
|
|
66
|
-
static setNameAndScope(name, returnNpmName) {
|
|
67
|
-
// There are at least 2 components. So there is likely a scope.
|
|
68
|
-
const subComponents = name.split('/');
|
|
69
|
-
if (subComponents.length === 2 && subComponents[0].trim().length > 0 && subComponents[1].trim().length > 0) {
|
|
70
|
-
returnNpmName.scope = NpmName.validateComponentString(subComponents[0]);
|
|
71
|
-
returnNpmName.name = NpmName.validateComponentString(subComponents[1]);
|
|
72
|
-
}
|
|
73
|
-
else if (subComponents.length === 1) {
|
|
74
|
-
returnNpmName.name = NpmName.validateComponentString(subComponents[0]);
|
|
75
|
-
}
|
|
76
|
-
else {
|
|
77
|
-
throw new kit_1.NamedError('InvalidNpmName', 'The npm name is invalid.');
|
|
78
|
-
}
|
|
30
|
+
if (components[0].includes('/')) {
|
|
31
|
+
// salesforce/jj@tag
|
|
32
|
+
return setNameAndScope(components[0], components.length > 2 ? components[2] : DEFAULT_TAG);
|
|
79
33
|
}
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
* @param {string} name The component to validate.
|
|
84
|
-
* @return {string} A whitespace trimmed version of the component.
|
|
85
|
-
*/
|
|
86
|
-
static validateComponentString(name) {
|
|
87
|
-
const trimmedName = name.trim();
|
|
88
|
-
if (trimmedName && trimmedName.length > 0) {
|
|
89
|
-
return trimmedName;
|
|
90
|
-
}
|
|
91
|
-
else {
|
|
92
|
-
throw new kit_1.NamedError('MissingOrInvalidNpmName', 'The npm name is missing or invalid.');
|
|
93
|
-
}
|
|
34
|
+
else if (components[1].includes('/')) {
|
|
35
|
+
// @salesforce/jj@tag
|
|
36
|
+
return setNameAndScope(components[1], components.length > 2 ? components[2] : DEFAULT_TAG);
|
|
94
37
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
* @param {string} [ext = tgz] The file extension to use.
|
|
99
|
-
* @param {boolean} includeLatestTag - True if the "latest" tag should be used. Generally you wouldn't do this.
|
|
100
|
-
* @return {string} Formatted npm string thats compatible with the npm utility
|
|
101
|
-
*/
|
|
102
|
-
toFilename(ext = 'tgz', includeLatestTag) {
|
|
103
|
-
const nameComponents = [];
|
|
104
|
-
if (this.scope) {
|
|
105
|
-
nameComponents.push(this.scope);
|
|
106
|
-
}
|
|
107
|
-
nameComponents.push(this.name);
|
|
108
|
-
if (this.tag) {
|
|
109
|
-
if (this.tag !== NpmName.DEFAULT_TAG) {
|
|
110
|
-
nameComponents.push(this.tag);
|
|
111
|
-
}
|
|
112
|
-
else if (includeLatestTag) {
|
|
113
|
-
nameComponents.push(this.tag);
|
|
114
|
-
}
|
|
115
|
-
}
|
|
116
|
-
return nameComponents.join('-').concat(ext.startsWith('.') ? ext : `.${ext}`);
|
|
38
|
+
else {
|
|
39
|
+
// Allow something like salesforcedx/pre-release
|
|
40
|
+
return setNameAndScope(components[0], components[1]);
|
|
117
41
|
}
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
42
|
+
};
|
|
43
|
+
exports.parseNpmName = parseNpmName;
|
|
44
|
+
/**
|
|
45
|
+
* Subroutine for getting name and scope
|
|
46
|
+
*
|
|
47
|
+
* @param {string} name - The string to parse.
|
|
48
|
+
*/
|
|
49
|
+
const setNameAndScope = (name, tag = DEFAULT_TAG) => {
|
|
50
|
+
// There are at least 2 components. So there is likely a scope.
|
|
51
|
+
const subComponents = name.split('/');
|
|
52
|
+
if (subComponents.length === 2 && subComponents[0].trim().length > 0 && subComponents[1].trim().length > 0) {
|
|
53
|
+
return {
|
|
54
|
+
tag,
|
|
55
|
+
scope: validateComponentString(subComponents[0]),
|
|
56
|
+
name: validateComponentString(subComponents[1]),
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
else if (subComponents.length === 1) {
|
|
60
|
+
return {
|
|
61
|
+
tag,
|
|
62
|
+
name: validateComponentString(subComponents[0]),
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
throw new kit_1.NamedError('InvalidNpmName', 'The npm name is invalid.');
|
|
67
|
+
}
|
|
68
|
+
};
|
|
69
|
+
/**
|
|
70
|
+
* Validate a component part that it's not empty and return it trimmed.
|
|
71
|
+
*
|
|
72
|
+
* @param {string} name The component to validate.
|
|
73
|
+
* @return {string} A whitespace trimmed version of the component.
|
|
74
|
+
*/
|
|
75
|
+
const validateComponentString = (name) => {
|
|
76
|
+
const trimmedName = name.trim();
|
|
77
|
+
if (trimmedName && trimmedName.length > 0) {
|
|
78
|
+
return trimmedName;
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
throw new kit_1.NamedError('MissingOrInvalidNpmName', 'The npm name is missing or invalid.');
|
|
133
82
|
}
|
|
134
|
-
}
|
|
135
|
-
exports.NpmName = NpmName;
|
|
136
|
-
NpmName.DEFAULT_TAG = 'latest';
|
|
83
|
+
};
|
|
137
84
|
//# sourceMappingURL=NpmName.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NpmName.js","sourceRoot":"","sources":["../../src/codeSigning/NpmName.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yCAA6C;
|
|
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;QAClC,MAAM,IAAI,gBAAU,CAAC,yBAAyB,EAAE,qCAAqC,CAAC,CAAC;KACxF;IAED,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEtC,gBAAgB;IAChB,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QAC3B,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;KACvC;IAED,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC/B,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;KAC5F;SAAM,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QACtC,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;KAC5F;SAAM;QACL,gDAAgD;QAChD,OAAO,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;KACtD;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;QAC1G,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;KACH;SAAM,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;QACrC,OAAO;YACL,GAAG;YACH,IAAI,EAAE,uBAAuB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;SAChD,CAAC;KACH;SAAM;QACL,MAAM,IAAI,gBAAU,CAAC,gBAAgB,EAAE,0BAA0B,CAAC,CAAC;KACpE;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;QACzC,OAAO,WAAW,CAAC;KACpB;SAAM;QACL,MAAM,IAAI,gBAAU,CAAC,yBAAyB,EAAE,qCAAqC,CAAC,CAAC;KACxF;AACH,CAAC,CAAC"}
|
|
@@ -198,7 +198,7 @@ exports.api = {
|
|
|
198
198
|
cliUx.warn(`WARNING: The following patterns are recommended in ${filename} for code signing: *.tgz, *.sig, package.json.bak.`);
|
|
199
199
|
}
|
|
200
200
|
// get the packageJson name/version
|
|
201
|
-
const npmName = NpmName_1.
|
|
201
|
+
const npmName = (0, NpmName_1.parseNpmName)(packageJson.name);
|
|
202
202
|
logger.debug(`parsed the following npmName components: ${JSON.stringify(npmName, null, 4)}`);
|
|
203
203
|
npmName.tag = packageJson.version;
|
|
204
204
|
// make a backup of the packageJson
|
|
@@ -228,7 +228,6 @@ exports.api = {
|
|
|
228
228
|
}
|
|
229
229
|
},
|
|
230
230
|
getAgentForUri(url) {
|
|
231
|
-
/* eslint-disable @typescript-eslint/no-unsafe-call */
|
|
232
231
|
const proxyUrl = (0, proxy_from_env_1.getProxyForUrl)(url);
|
|
233
232
|
const agent = ProxyAgent(proxyUrl);
|
|
234
233
|
/* eslint-disable @typescript-eslint/no-unsafe-call */
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"packAndSign.js","sourceRoot":"","sources":["../../src/codeSigning/packAndSign.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,15 +9,15 @@ export default class Promote extends SfCommand<AnyJson> {
|
|
|
9
9
|
static readonly flags: {
|
|
10
10
|
dryrun: Interfaces.BooleanFlag<boolean>;
|
|
11
11
|
'promote-to-channel': Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
12
|
-
'promote-from-channel': Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
13
|
-
platform: Interfaces.OptionFlag<string[], import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
12
|
+
'promote-from-channel': Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
13
|
+
platform: Interfaces.OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
14
14
|
cli: Interfaces.OptionFlag<CLI, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
15
|
-
sha: Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
15
|
+
sha: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
16
16
|
'max-age': Interfaces.OptionFlag<number, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
17
17
|
indexes: Interfaces.BooleanFlag<boolean>;
|
|
18
18
|
xz: Interfaces.BooleanFlag<boolean>;
|
|
19
|
-
'architecture-target': Interfaces.OptionFlag<string[], import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
20
|
-
version: Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
19
|
+
'architecture-target': Interfaces.OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
20
|
+
version: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
21
21
|
};
|
|
22
22
|
private flags;
|
|
23
23
|
run(): Promise<AnyJson>;
|
|
@@ -74,12 +74,14 @@ class Promote extends sf_plugins_core_1.SfCommand {
|
|
|
74
74
|
const deps = (0, dependencies_1.verifyDependencies)(this.flags, (dep) => dep.name.startsWith('AWS'), (args) => !args.dryrun);
|
|
75
75
|
if (deps.failures > 0) {
|
|
76
76
|
const errType = 'MissingDependencies';
|
|
77
|
-
const missing = deps.results
|
|
77
|
+
const missing = deps.results
|
|
78
|
+
.filter((d) => d.passed === false)
|
|
79
|
+
.map((d) => d.message)
|
|
80
|
+
.filter(ts_types_1.isString);
|
|
78
81
|
throw new core_1.SfError(messages.getMessage(errType), errType, missing);
|
|
79
82
|
}
|
|
80
83
|
}
|
|
81
84
|
}
|
|
82
|
-
exports.default = Promote;
|
|
83
85
|
Promote.description = messages.getMessage('description');
|
|
84
86
|
Promote.summary = messages.getMessage('summary');
|
|
85
87
|
Promote.examples = messages.getMessages('examples');
|
|
@@ -160,6 +162,7 @@ Promote.flags = {
|
|
|
160
162
|
validate: (input) => (0, semver_1.valid)(input) !== null,
|
|
161
163
|
}),
|
|
162
164
|
};
|
|
165
|
+
exports.default = Promote;
|
|
163
166
|
/**
|
|
164
167
|
* find a manifest file in the channel
|
|
165
168
|
*
|
|
@@ -180,13 +183,13 @@ const findManifestForCandidate = async (cli, channel) => {
|
|
|
180
183
|
*/
|
|
181
184
|
const findVersionForSha = async (cli, sha) => {
|
|
182
185
|
const amazonS3 = new amazonS3_1.AmazonS3({ cli });
|
|
183
|
-
const
|
|
186
|
+
const foundVersionPrefix = (await Promise.all((await amazonS3.listCommonPrefixes('versions')).map(async (versionPrefix) => amazonS3.listCommonPrefixes(versionPrefix))))
|
|
184
187
|
.flat()
|
|
185
|
-
.find((s) => s.
|
|
186
|
-
if (
|
|
188
|
+
.find((s) => s.replace(/\/$/, '').endsWith(sha));
|
|
189
|
+
if (foundVersionPrefix) {
|
|
187
190
|
// Prefix looks like this "media/salesforce-cli/sf/versions/0.0.10/1d4b10d/",
|
|
188
191
|
// when reversed after split version number should occupy entry 1 of the array
|
|
189
|
-
return
|
|
192
|
+
return foundVersionPrefix?.replace(/\/$/, '').split('/').reverse()[1];
|
|
190
193
|
}
|
|
191
194
|
const error = new core_1.SfError(messages.getMessage('CouldNotLocateVersionForSha', [sha]));
|
|
192
195
|
const logger = core_1.Logger.childFromRoot('Promote.findVersionForSha');
|
|
@@ -230,13 +233,16 @@ const findShaForVersion = async (cli, version) => {
|
|
|
230
233
|
const logger = core_1.Logger.childFromRoot('Promote.findShaForVersion');
|
|
231
234
|
const amazonS3 = new amazonS3_1.AmazonS3({ cli });
|
|
232
235
|
const versions = await amazonS3.listCommonPrefixes('versions');
|
|
233
|
-
const foundVersion = versions.find((v) => v.
|
|
236
|
+
const foundVersion = versions.find((v) => v.endsWith(`${version}/`));
|
|
234
237
|
if (foundVersion) {
|
|
235
238
|
logger.debug(`Looking for version ${version} for cli ${cli}. Found ${foundVersion}`);
|
|
236
239
|
const versionShas = await amazonS3.listCommonPrefixes(foundVersion);
|
|
237
240
|
logger.debug(`Looking for version ${version} for cli ${cli} shas. Found ${versionShas.length} entries`);
|
|
238
241
|
const manifestForMostRecentSha = (await Promise.all(versionShas.map(async (versionSha) => {
|
|
239
|
-
|
|
242
|
+
if (!versionSha) {
|
|
243
|
+
throw new core_1.SfError(`Could not find prefix for ${versionSha}`);
|
|
244
|
+
}
|
|
245
|
+
const versionShaContents = (await amazonS3.listKeyContents(versionSha));
|
|
240
246
|
return versionShaContents.map((content) => ({
|
|
241
247
|
...content,
|
|
242
248
|
...{ LastModifiedDate: new Date(content.LastModified) },
|
|
@@ -250,6 +256,9 @@ const findShaForVersion = async (cli, version) => {
|
|
|
250
256
|
Key: manifestForMostRecentSha.Key,
|
|
251
257
|
ResponseContentType: 'application/json',
|
|
252
258
|
});
|
|
259
|
+
if (!manifest.Body) {
|
|
260
|
+
throw new core_1.SfError(`Could not load manifest body from S3 getObject response for ${manifestForMostRecentSha.Key}`);
|
|
261
|
+
}
|
|
253
262
|
logger.debug(`Loaded manifest ${manifestForMostRecentSha.Key} contents: ${manifest.toString()}`);
|
|
254
263
|
const json = JSON.parse(manifest.Body.toString());
|
|
255
264
|
return json.sha;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promote.js","sourceRoot":"","sources":["../../../src/commands/channel/promote.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,iCAA6B;AAC7B,mCAA8C;AAE9C,qCAA+B;AAC/B,2CAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"promote.js","sourceRoot":"","sources":["../../../src/commands/channel/promote.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,12 +5,12 @@ import { Interfaces } from '@oclif/core';
|
|
|
5
5
|
export type ArtifactsCompareResult = {
|
|
6
6
|
[plugin: string]: {
|
|
7
7
|
current: {
|
|
8
|
-
version: string;
|
|
8
|
+
version: string | null;
|
|
9
9
|
snapshot: CommandSnapshot[];
|
|
10
10
|
schemas: Record<string, JsonMap>;
|
|
11
11
|
};
|
|
12
12
|
previous: {
|
|
13
|
-
version: string;
|
|
13
|
+
version: string | null;
|
|
14
14
|
snapshot: CommandSnapshot[];
|
|
15
15
|
schemas: Record<string, JsonMap>;
|
|
16
16
|
};
|
|
@@ -70,9 +70,9 @@ export default class ArtifactsTest extends SfCommand<ArtifactsCompareResult> {
|
|
|
70
70
|
static readonly summary: string;
|
|
71
71
|
static readonly examples: string[];
|
|
72
72
|
static readonly flags: {
|
|
73
|
-
plugin: Interfaces.OptionFlag<string[], import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
74
|
-
previous: Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
75
|
-
current: Interfaces.OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
73
|
+
plugin: Interfaces.OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
74
|
+
previous: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
75
|
+
current: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
76
76
|
};
|
|
77
77
|
private octokit;
|
|
78
78
|
private currentPlugins;
|