@salesforce/plugin-deploy-retrieve 1.6.17 → 1.6.18
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/LICENSE.txt +1 -1
- package/lib/commands/deploy/metadata/cancel.d.ts +3 -3
- package/lib/commands/deploy/metadata/cancel.js +3 -2
- package/lib/commands/deploy/metadata/cancel.js.map +1 -1
- package/lib/commands/deploy/metadata/preview.d.ts +4 -4
- package/lib/commands/deploy/metadata/preview.js +1 -0
- package/lib/commands/deploy/metadata/preview.js.map +1 -1
- package/lib/commands/deploy/metadata/quick.d.ts +6 -5
- package/lib/commands/deploy/metadata/quick.js +6 -4
- package/lib/commands/deploy/metadata/quick.js.map +1 -1
- package/lib/commands/deploy/metadata/report.d.ts +2 -2
- package/lib/commands/deploy/metadata/report.js +2 -1
- package/lib/commands/deploy/metadata/report.js.map +1 -1
- package/lib/commands/deploy/metadata/resume.d.ts +5 -5
- package/lib/commands/deploy/metadata/resume.js +3 -2
- package/lib/commands/deploy/metadata/resume.js.map +1 -1
- package/lib/commands/deploy/metadata/validate.d.ts +11 -11
- package/lib/commands/deploy/metadata/validate.js +2 -1
- package/lib/commands/deploy/metadata/validate.js.map +1 -1
- package/lib/commands/deploy/metadata.d.ts +11 -11
- package/lib/commands/deploy/metadata.js +3 -1
- package/lib/commands/deploy/metadata.js.map +1 -1
- package/lib/commands/deploy.d.ts +4 -4
- package/lib/commands/deploy.js +2 -2
- package/lib/commands/deploy.js.map +1 -1
- package/lib/commands/retrieve/metadata/preview.d.ts +1 -1
- package/lib/commands/retrieve/metadata/preview.js +1 -0
- package/lib/commands/retrieve/metadata/preview.js.map +1 -1
- package/lib/commands/retrieve/metadata.d.ts +12 -11
- package/lib/commands/retrieve/metadata.js +37 -21
- package/lib/commands/retrieve/metadata.js.map +1 -1
- package/lib/utils/deploy.d.ts +7 -16
- package/lib/utils/deploy.js +28 -82
- package/lib/utils/deploy.js.map +1 -1
- package/lib/utils/deployCache.d.ts +13 -0
- package/lib/utils/deployCache.js +71 -0
- package/lib/utils/deployCache.js.map +1 -0
- package/lib/utils/flags.d.ts +2 -1
- package/lib/utils/flags.js +8 -7
- package/lib/utils/flags.js.map +1 -1
- package/lib/utils/metadataDeployer.js +4 -3
- package/lib/utils/metadataDeployer.js.map +1 -1
- package/lib/utils/output.d.ts +1 -1
- package/lib/utils/output.js +38 -34
- package/lib/utils/output.js.map +1 -1
- package/lib/utils/previewOutput.d.ts +3 -3
- package/lib/utils/previewOutput.js +14 -7
- package/lib/utils/previewOutput.js.map +1 -1
- package/lib/utils/project.d.ts +2 -2
- package/lib/utils/types.d.ts +13 -7
- package/lib/utils/types.js +10 -1
- package/lib/utils/types.js.map +1 -1
- package/oclif.manifest.json +1 -1
- package/package.json +21 -21
- package/schemas/deploy-metadata-cancel.json +74 -173
- package/schemas/deploy-metadata-quick.json +74 -173
- package/schemas/deploy-metadata-report.json +74 -173
- package/schemas/deploy-metadata-resume.json +74 -173
- package/schemas/deploy-metadata-validate.json +74 -173
- package/schemas/deploy-metadata.json +74 -173
- package/schemas/retrieve-metadata.json +55 -49
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { SfError } from '@salesforce/core';
|
|
2
2
|
import { RetrieveResult } from '@salesforce/source-deploy-retrieve';
|
|
3
3
|
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
4
|
+
import { Duration } from '@salesforce/kit';
|
|
4
5
|
import { RetrieveResultJson } from '../../utils/types';
|
|
5
6
|
export default class RetrieveMetadata extends SfCommand<RetrieveResultJson> {
|
|
6
7
|
static readonly summary: string;
|
|
@@ -8,22 +9,22 @@ export default class RetrieveMetadata extends SfCommand<RetrieveResultJson> {
|
|
|
8
9
|
static readonly examples: string[];
|
|
9
10
|
static readonly requiresProject = true;
|
|
10
11
|
static readonly state = "beta";
|
|
11
|
-
static flags: {
|
|
12
|
-
'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string>;
|
|
12
|
+
static readonly flags: {
|
|
13
|
+
'api-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
|
|
13
14
|
'ignore-conflicts': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
14
|
-
manifest: import("@oclif/core/lib/interfaces").OptionFlag<string>;
|
|
15
|
-
metadata: import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
|
|
16
|
-
'package-name': import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
|
|
15
|
+
manifest: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
|
|
16
|
+
metadata: import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined>;
|
|
17
|
+
'package-name': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined>;
|
|
17
18
|
'single-package': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
18
|
-
'source-dir': import("@oclif/core/lib/interfaces").OptionFlag<string[]>;
|
|
19
|
-
'target-metadata-dir': import("@oclif/core/lib/interfaces").OptionFlag<string>;
|
|
19
|
+
'source-dir': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined>;
|
|
20
|
+
'target-metadata-dir': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
|
|
20
21
|
'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org>;
|
|
21
|
-
wait: import("@oclif/core/lib/interfaces").OptionFlag<
|
|
22
|
+
wait: import("@oclif/core/lib/interfaces").OptionFlag<Duration>;
|
|
22
23
|
unzip: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
23
|
-
'zip-file-name': import("@oclif/core/lib/interfaces").OptionFlag<string>;
|
|
24
|
+
'zip-file-name': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
|
|
24
25
|
};
|
|
25
|
-
static configurationVariablesSection: import("@
|
|
26
|
-
static envVariablesSection: import("@
|
|
26
|
+
static configurationVariablesSection: import("@oclif/core").HelpSection;
|
|
27
|
+
static envVariablesSection: import("@oclif/core").HelpSection;
|
|
27
28
|
protected retrieveResult: RetrieveResult;
|
|
28
29
|
run(): Promise<RetrieveResultJson>;
|
|
29
30
|
protected catch(error: Error | SfError): Promise<SfCommand.Error>;
|
|
@@ -13,6 +13,7 @@ const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
|
|
|
13
13
|
const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
|
|
14
14
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
15
15
|
const source_tracking_1 = require("@salesforce/source-tracking");
|
|
16
|
+
const kit_1 = require("@salesforce/kit");
|
|
16
17
|
const flags_1 = require("../../utils/flags");
|
|
17
18
|
const output_1 = require("../../utils/output");
|
|
18
19
|
const project_1 = require("../../utils/project");
|
|
@@ -21,6 +22,7 @@ core_1.Messages.importMessagesDirectory(__dirname);
|
|
|
21
22
|
const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'retrieve.metadata');
|
|
22
23
|
const mdTransferMessages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'metadata.transfer');
|
|
23
24
|
class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
|
|
25
|
+
// eslint-disable-next-line complexity
|
|
24
26
|
async run() {
|
|
25
27
|
const { flags } = await this.parse(RetrieveMetadata);
|
|
26
28
|
this.spinner.start(messages.getMessage('spinner.start'));
|
|
@@ -39,14 +41,17 @@ class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
|
|
|
39
41
|
apiversion: flags['api-version'],
|
|
40
42
|
sourcepath: flags['source-dir'],
|
|
41
43
|
packagenames: flags['package-name'],
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
44
|
+
...(flags.manifest
|
|
45
|
+
? {
|
|
46
|
+
manifest: {
|
|
47
|
+
manifestPath: flags.manifest,
|
|
48
|
+
directoryPaths: await (0, project_1.getPackageDirs)(),
|
|
49
|
+
},
|
|
50
|
+
}
|
|
51
|
+
: {}),
|
|
52
|
+
...(flags.metadata
|
|
53
|
+
? { metadata: { metadataEntries: flags.metadata, directoryPaths: await (0, project_1.getPackageDirs)() } }
|
|
54
|
+
: {}),
|
|
50
55
|
}),
|
|
51
56
|
fileResponsesFromDelete: [],
|
|
52
57
|
};
|
|
@@ -57,20 +62,22 @@ class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
|
|
|
57
62
|
this.spinner.status = messages.getMessage('spinner.sending', [
|
|
58
63
|
componentSetFromNonDeletes.sourceApiVersion ?? componentSetFromNonDeletes.apiVersion,
|
|
59
64
|
]);
|
|
65
|
+
const zipFileName = flags['zip-file-name'] ?? flags_1.DEFAULT_ZIP_FILE_NAME;
|
|
60
66
|
const retrieveOpts = {
|
|
61
|
-
usernameOrConnection: flags['target-org'].getUsername(),
|
|
67
|
+
usernameOrConnection: flags['target-org'].getUsername() ?? flags['target-org'].getConnection(flags['api-version']),
|
|
62
68
|
merge: true,
|
|
63
69
|
output: this.project.getDefaultPackage().fullPath,
|
|
64
70
|
packageOptions: flags['package-name'],
|
|
65
71
|
format,
|
|
72
|
+
...(format === 'metadata'
|
|
73
|
+
? {
|
|
74
|
+
singlePackage: flags['single-package'],
|
|
75
|
+
unzip: flags.unzip,
|
|
76
|
+
zipFileName,
|
|
77
|
+
output: flags['target-metadata-dir'],
|
|
78
|
+
}
|
|
79
|
+
: {}),
|
|
66
80
|
};
|
|
67
|
-
const zipFileName = flags['zip-file-name'] ?? 'unpackaged.zip';
|
|
68
|
-
if (format === 'metadata') {
|
|
69
|
-
retrieveOpts.singlePackage = flags['single-package'];
|
|
70
|
-
retrieveOpts.unzip = flags.unzip;
|
|
71
|
-
retrieveOpts.zipFileName = zipFileName;
|
|
72
|
-
retrieveOpts.output = flags['target-metadata-dir'];
|
|
73
|
-
}
|
|
74
81
|
const retrieve = await componentSetFromNonDeletes.retrieve(retrieveOpts);
|
|
75
82
|
this.spinner.status = messages.getMessage('spinner.polling');
|
|
76
83
|
retrieve.onUpdate((data) => {
|
|
@@ -78,7 +85,7 @@ class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
|
|
|
78
85
|
});
|
|
79
86
|
// any thing else should stop the progress bar
|
|
80
87
|
retrieve.onFinish((data) => this.spinner.stop(mdTransferMessages.getMessage(data.response.status)));
|
|
81
|
-
retrieve.onCancel((data) => this.spinner.stop(mdTransferMessages.getMessage(data
|
|
88
|
+
retrieve.onCancel((data) => this.spinner.stop(mdTransferMessages.getMessage(data?.status ?? 'Canceled')));
|
|
82
89
|
retrieve.onError((error) => {
|
|
83
90
|
this.spinner.stop(error.name);
|
|
84
91
|
throw error;
|
|
@@ -86,9 +93,14 @@ class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
|
|
|
86
93
|
await retrieve.start();
|
|
87
94
|
const result = await retrieve.pollStatus(500, flags.wait.seconds);
|
|
88
95
|
this.spinner.stop();
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
96
|
+
// reference the flag instead of `foramt` so we get correct type
|
|
97
|
+
const formatter = flags['target-metadata-dir']
|
|
98
|
+
? new output_1.MetadataRetrieveResultFormatter(result, {
|
|
99
|
+
'target-metadata-dir': flags['target-metadata-dir'],
|
|
100
|
+
'zip-file-name': zipFileName,
|
|
101
|
+
unzip: flags.unzip,
|
|
102
|
+
})
|
|
103
|
+
: new output_1.RetrieveResultFormatter(result, flags['package-name'], fileResponsesFromDelete);
|
|
92
104
|
if (!this.jsonEnabled()) {
|
|
93
105
|
if (result.response.status === 'Succeeded') {
|
|
94
106
|
await formatter.display();
|
|
@@ -99,7 +111,9 @@ class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
|
|
|
99
111
|
}
|
|
100
112
|
if (format === 'metadata' && flags.unzip) {
|
|
101
113
|
try {
|
|
102
|
-
await (0, promises_1.rm)((0, path_1.resolve)((0, path_1.join)(flags['target-metadata-dir'],
|
|
114
|
+
await (0, promises_1.rm)((0, path_1.resolve)((0, path_1.join)(flags['target-metadata-dir'] ?? '', flags['zip-file-name'])), {
|
|
115
|
+
recursive: true,
|
|
116
|
+
});
|
|
103
117
|
}
|
|
104
118
|
catch (e) {
|
|
105
119
|
// do nothing
|
|
@@ -185,10 +199,12 @@ RetrieveMetadata.flags = {
|
|
|
185
199
|
char: 'o',
|
|
186
200
|
summary: messages.getMessage('flags.target-org.summary'),
|
|
187
201
|
description: messages.getMessage('flags.target-org.description'),
|
|
202
|
+
required: true,
|
|
188
203
|
}),
|
|
189
204
|
wait: sf_plugins_core_1.Flags.duration({
|
|
190
205
|
char: 'w',
|
|
191
206
|
defaultValue: 33,
|
|
207
|
+
default: kit_1.Duration.minutes(33),
|
|
192
208
|
unit: 'minutes',
|
|
193
209
|
summary: messages.getMessage('flags.wait.summary'),
|
|
194
210
|
description: messages.getMessage('flags.wait.description'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/commands/retrieve/metadata.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAEH,0CAAiC;AACjC,+BAAqC;AAErC,2CAA+F;AAC/F,+EAA6G;AAE7G,iEAA8E;AAC9E,mDAAiD;AACjD,iEAAkF;AAClF,
|
|
1
|
+
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../../src/commands/retrieve/metadata.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/deploy.d.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { Org, SfProject
|
|
1
|
+
import { Messages, Org, SfProject } from '@salesforce/core';
|
|
2
2
|
import { Duration } from '@salesforce/kit';
|
|
3
|
-
import {
|
|
3
|
+
import { Nullable } from '@salesforce/ts-types';
|
|
4
4
|
import { ComponentSet, DeployResult, MetadataApiDeploy, RequestStatus } from '@salesforce/source-deploy-retrieve';
|
|
5
5
|
import { SourceTracking } from '@salesforce/source-tracking';
|
|
6
6
|
import { API, PathInfo, TestLevel } from './types';
|
|
7
|
-
export declare
|
|
7
|
+
export declare const cacheMessages: Messages<"error.NoRecentJobId" | "error.InvalidJobId">;
|
|
8
|
+
export type DeployOptions = {
|
|
8
9
|
api: API;
|
|
9
10
|
'target-org': string;
|
|
10
11
|
'test-level': TestLevel;
|
|
@@ -25,7 +26,7 @@ export declare type DeployOptions = {
|
|
|
25
26
|
'single-package'?: boolean;
|
|
26
27
|
status?: RequestStatus;
|
|
27
28
|
};
|
|
28
|
-
export
|
|
29
|
+
export type CachedOptions = Omit<DeployOptions, 'wait'> & {
|
|
29
30
|
wait: number;
|
|
30
31
|
};
|
|
31
32
|
export declare function validateTests(testLevel: TestLevel, tests: Nullable<string[]>): boolean;
|
|
@@ -33,7 +34,7 @@ export declare function resolveApi(): Promise<API>;
|
|
|
33
34
|
export declare function buildComponentSet(opts: Partial<DeployOptions>, stl?: SourceTracking): Promise<ComponentSet>;
|
|
34
35
|
export declare function executeDeploy(opts: Partial<DeployOptions>, project?: SfProject, id?: string): Promise<{
|
|
35
36
|
deploy: MetadataApiDeploy;
|
|
36
|
-
componentSet
|
|
37
|
+
componentSet?: ComponentSet;
|
|
37
38
|
}>;
|
|
38
39
|
export declare function cancelDeploy(opts: Partial<DeployOptions>, id: string): Promise<DeployResult>;
|
|
39
40
|
export declare function cancelDeployAsync(opts: Partial<DeployOptions>, id: string): Promise<{
|
|
@@ -41,14 +42,4 @@ export declare function cancelDeployAsync(opts: Partial<DeployOptions>, id: stri
|
|
|
41
42
|
}>;
|
|
42
43
|
export declare function poll(org: Org, id: string, wait: Duration, componentSet: ComponentSet): Promise<DeployResult>;
|
|
43
44
|
export declare function determineExitCode(result: DeployResult, async?: boolean): number;
|
|
44
|
-
export declare
|
|
45
|
-
export declare class DeployCache extends TTLConfig<TTLConfig.Options, CachedOptions> {
|
|
46
|
-
static getFileName(): string;
|
|
47
|
-
static getDefaultOptions(): TTLConfig.Options;
|
|
48
|
-
static set(key: string, value: Partial<CachedOptions>): Promise<void>;
|
|
49
|
-
static unset(key: string): Promise<void>;
|
|
50
|
-
static update(key: string, obj: JsonMap): Promise<void>;
|
|
51
|
-
resolveLatest(useMostRecent: boolean, key: Nullable<string>, throwOnNotFound?: boolean): string;
|
|
52
|
-
resolveLongId(jobId: string): string;
|
|
53
|
-
get(jobId: string): TTLConfig.Entry<CachedOptions>;
|
|
54
|
-
}
|
|
45
|
+
export declare const isNotResumable: (status?: RequestStatus) => boolean;
|
package/lib/utils/deploy.js
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
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.isNotResumable = exports.determineExitCode = exports.poll = exports.cancelDeployAsync = exports.cancelDeploy = exports.executeDeploy = exports.buildComponentSet = exports.resolveApi = exports.validateTests = exports.cacheMessages = void 0;
|
|
10
10
|
const core_1 = require("@salesforce/core");
|
|
11
11
|
const kit_1 = require("@salesforce/kit");
|
|
12
12
|
const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
|
|
@@ -15,8 +15,9 @@ const configMeta_1 = require("../configMeta");
|
|
|
15
15
|
const project_1 = require("./project");
|
|
16
16
|
const types_1 = require("./types");
|
|
17
17
|
const errorCodes_1 = require("./errorCodes");
|
|
18
|
+
const deployCache_1 = require("./deployCache");
|
|
18
19
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
19
|
-
|
|
20
|
+
exports.cacheMessages = core_1.Messages.load('@salesforce/plugin-deploy-retrieve', 'cache', [
|
|
20
21
|
'error.NoRecentJobId',
|
|
21
22
|
'error.InvalidJobId',
|
|
22
23
|
]);
|
|
@@ -54,25 +55,26 @@ async function buildComponentSet(opts, stl) {
|
|
|
54
55
|
apiversion: opts['api-version'],
|
|
55
56
|
sourceapiversion: await (0, project_1.getSourceApiVersion)(),
|
|
56
57
|
sourcepath: opts['source-dir'],
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
58
|
+
...(opts.manifest
|
|
59
|
+
? {
|
|
60
|
+
manifest: {
|
|
61
|
+
manifestPath: opts.manifest,
|
|
62
|
+
directoryPaths: await (0, project_1.getPackageDirs)(),
|
|
63
|
+
},
|
|
64
|
+
}
|
|
65
|
+
: {}),
|
|
66
|
+
...(opts.metadata ? { metadata: { metadataEntries: opts.metadata, directoryPaths: await (0, project_1.getPackageDirs)() } } : {}),
|
|
65
67
|
});
|
|
66
68
|
}
|
|
67
69
|
exports.buildComponentSet = buildComponentSet;
|
|
68
70
|
async function executeDeploy(opts, project, id) {
|
|
69
71
|
project ?? (project = await core_1.SfProject.resolve());
|
|
70
72
|
const apiOptions = {
|
|
71
|
-
checkOnly: opts['dry-run']
|
|
72
|
-
ignoreWarnings: opts['ignore-warnings']
|
|
73
|
-
rest: opts.api ===
|
|
73
|
+
checkOnly: opts['dry-run'] ?? false,
|
|
74
|
+
ignoreWarnings: opts['ignore-warnings'] ?? false,
|
|
75
|
+
rest: opts.api === 'REST',
|
|
74
76
|
rollbackOnError: !opts['ignore-errors'] || false,
|
|
75
|
-
runTests: opts.tests
|
|
77
|
+
runTests: opts.tests ?? [],
|
|
76
78
|
testLevel: opts['test-level'],
|
|
77
79
|
};
|
|
78
80
|
let deploy;
|
|
@@ -96,7 +98,7 @@ async function executeDeploy(opts, project, id) {
|
|
|
96
98
|
deploy = new source_deploy_retrieve_1.MetadataApiDeploy({
|
|
97
99
|
[key]: opts['metadata-dir'].path,
|
|
98
100
|
usernameOrConnection,
|
|
99
|
-
apiOptions: { ...apiOptions, singlePackage: opts['single-package']
|
|
101
|
+
apiOptions: { ...apiOptions, singlePackage: opts['single-package'] ?? false },
|
|
100
102
|
});
|
|
101
103
|
await deploy.start();
|
|
102
104
|
}
|
|
@@ -112,23 +114,26 @@ async function executeDeploy(opts, project, id) {
|
|
|
112
114
|
usernameOrConnection,
|
|
113
115
|
apiOptions,
|
|
114
116
|
});
|
|
117
|
+
await deployCache_1.DeployCache.set(deploy.id, { ...opts, wait: opts.wait?.minutes ?? 33 });
|
|
115
118
|
}
|
|
116
|
-
await DeployCache.set(deploy.id, { ...opts, wait: opts.wait?.minutes ?? 33 });
|
|
119
|
+
await deployCache_1.DeployCache.set(deploy.id, { ...opts, wait: opts.wait?.minutes ?? 33 });
|
|
117
120
|
return { deploy, componentSet };
|
|
118
121
|
}
|
|
119
122
|
exports.executeDeploy = executeDeploy;
|
|
120
123
|
async function cancelDeploy(opts, id) {
|
|
121
124
|
const org = await core_1.Org.create({ aliasOrUsername: opts['target-org'] });
|
|
122
|
-
const
|
|
125
|
+
const usernameOrConnection = org.getUsername() ?? org.getConnection();
|
|
126
|
+
const deploy = new source_deploy_retrieve_1.MetadataApiDeploy({ usernameOrConnection, id });
|
|
123
127
|
const componentSet = await buildComponentSet({ ...opts });
|
|
124
|
-
await DeployCache.set(deploy.id, { ...opts, wait: opts.wait?.minutes ?? 33 });
|
|
128
|
+
await deployCache_1.DeployCache.set(deploy.id, { ...opts, wait: opts.wait?.minutes ?? 33 });
|
|
125
129
|
await deploy.cancel();
|
|
126
|
-
return poll(org, deploy.id, opts.wait, componentSet);
|
|
130
|
+
return poll(org, deploy.id, opts.wait ?? kit_1.Duration.minutes(33), componentSet);
|
|
127
131
|
}
|
|
128
132
|
exports.cancelDeploy = cancelDeploy;
|
|
129
133
|
async function cancelDeployAsync(opts, id) {
|
|
130
134
|
const org = await core_1.Org.create({ aliasOrUsername: opts['target-org'] });
|
|
131
|
-
const
|
|
135
|
+
const usernameOrConnection = org.getUsername() ?? org.getConnection();
|
|
136
|
+
const deploy = new source_deploy_retrieve_1.MetadataApiDeploy({ usernameOrConnection, id });
|
|
132
137
|
await deploy.cancel();
|
|
133
138
|
return { id: deploy.id };
|
|
134
139
|
}
|
|
@@ -158,69 +163,10 @@ function determineExitCode(result, async = false) {
|
|
|
158
163
|
if (async) {
|
|
159
164
|
return result.response.status === source_deploy_retrieve_1.RequestStatus.Succeeded ? 0 : 1;
|
|
160
165
|
}
|
|
161
|
-
return errorCodes_1.DEPLOY_STATUS_CODES.get(result.response.status);
|
|
166
|
+
return errorCodes_1.DEPLOY_STATUS_CODES.get(result.response.status) ?? 1;
|
|
162
167
|
}
|
|
163
168
|
exports.determineExitCode = determineExitCode;
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
source_deploy_retrieve_1.RequestStatus.Succeeded,
|
|
167
|
-
source_deploy_retrieve_1.RequestStatus.Failed,
|
|
168
|
-
source_deploy_retrieve_1.RequestStatus.SucceededPartial,
|
|
169
|
-
source_deploy_retrieve_1.RequestStatus.Canceled,
|
|
170
|
-
].includes(status);
|
|
171
|
-
}
|
|
169
|
+
const isNotResumable = (status) => status !== undefined &&
|
|
170
|
+
[source_deploy_retrieve_1.RequestStatus.Succeeded, source_deploy_retrieve_1.RequestStatus.Failed, source_deploy_retrieve_1.RequestStatus.SucceededPartial, source_deploy_retrieve_1.RequestStatus.Canceled].includes(status);
|
|
172
171
|
exports.isNotResumable = isNotResumable;
|
|
173
|
-
class DeployCache extends core_1.TTLConfig {
|
|
174
|
-
static getFileName() {
|
|
175
|
-
return 'deploy-cache.json';
|
|
176
|
-
}
|
|
177
|
-
static getDefaultOptions() {
|
|
178
|
-
return {
|
|
179
|
-
isGlobal: false,
|
|
180
|
-
isState: true,
|
|
181
|
-
filename: DeployCache.getFileName(),
|
|
182
|
-
stateFolder: core_1.Global.SF_STATE_FOLDER,
|
|
183
|
-
ttl: kit_1.Duration.days(3),
|
|
184
|
-
};
|
|
185
|
-
}
|
|
186
|
-
static async set(key, value) {
|
|
187
|
-
const cache = await DeployCache.create();
|
|
188
|
-
cache.set(key, value);
|
|
189
|
-
await cache.write();
|
|
190
|
-
}
|
|
191
|
-
static async unset(key) {
|
|
192
|
-
const cache = await DeployCache.create();
|
|
193
|
-
cache.unset(key);
|
|
194
|
-
await cache.write();
|
|
195
|
-
}
|
|
196
|
-
static async update(key, obj) {
|
|
197
|
-
const cache = await DeployCache.create();
|
|
198
|
-
cache.update(key, obj);
|
|
199
|
-
await cache.write();
|
|
200
|
-
}
|
|
201
|
-
resolveLatest(useMostRecent, key, throwOnNotFound = true) {
|
|
202
|
-
const jobId = this.resolveLongId(useMostRecent ? this.getLatestKey() : key);
|
|
203
|
-
if (!jobId && useMostRecent)
|
|
204
|
-
throw cacheMessages.createError('error.NoRecentJobId');
|
|
205
|
-
if (throwOnNotFound && !this.has(jobId)) {
|
|
206
|
-
throw cacheMessages.createError('error.InvalidJobId', [jobId]);
|
|
207
|
-
}
|
|
208
|
-
return jobId;
|
|
209
|
-
}
|
|
210
|
-
resolveLongId(jobId) {
|
|
211
|
-
if (jobId.length === 18) {
|
|
212
|
-
return jobId;
|
|
213
|
-
}
|
|
214
|
-
else if (jobId.length === 15) {
|
|
215
|
-
return this.keys().find((k) => k.startsWith(jobId));
|
|
216
|
-
}
|
|
217
|
-
else {
|
|
218
|
-
throw cacheMessages.createError('error.InvalidJobId', [jobId]);
|
|
219
|
-
}
|
|
220
|
-
}
|
|
221
|
-
get(jobId) {
|
|
222
|
-
return super.get(this.resolveLongId(jobId));
|
|
223
|
-
}
|
|
224
|
-
}
|
|
225
|
-
exports.DeployCache = DeployCache;
|
|
226
172
|
//# sourceMappingURL=deploy.js.map
|
package/lib/utils/deploy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/utils/deploy.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../src/utils/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { TTLConfig } from '@salesforce/core';
|
|
2
|
+
import { JsonMap } from '@salesforce/ts-types';
|
|
3
|
+
import { CachedOptions } from './deploy';
|
|
4
|
+
export declare class DeployCache extends TTLConfig<TTLConfig.Options, CachedOptions> {
|
|
5
|
+
static getFileName(): string;
|
|
6
|
+
static getDefaultOptions(): TTLConfig.Options;
|
|
7
|
+
static set(key: string, value: Partial<CachedOptions>): Promise<void>;
|
|
8
|
+
static unset(key: string): Promise<void>;
|
|
9
|
+
static update(key: string, obj: JsonMap): Promise<void>;
|
|
10
|
+
resolveLatest(useMostRecent: boolean, key: string | undefined, throwOnNotFound?: boolean): string;
|
|
11
|
+
resolveLongId(jobId: string): string;
|
|
12
|
+
get(jobId: string): TTLConfig.Entry<CachedOptions>;
|
|
13
|
+
}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DeployCache = void 0;
|
|
4
|
+
/*
|
|
5
|
+
* Copyright (c) 2020, salesforce.com, inc.
|
|
6
|
+
* All rights reserved.
|
|
7
|
+
* Licensed under the BSD 3-Clause license.
|
|
8
|
+
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
9
|
+
*/
|
|
10
|
+
const core_1 = require("@salesforce/core");
|
|
11
|
+
const kit_1 = require("@salesforce/kit");
|
|
12
|
+
const deploy_1 = require("./deploy");
|
|
13
|
+
class DeployCache extends core_1.TTLConfig {
|
|
14
|
+
static getFileName() {
|
|
15
|
+
return 'deploy-cache.json';
|
|
16
|
+
}
|
|
17
|
+
static getDefaultOptions() {
|
|
18
|
+
return {
|
|
19
|
+
isGlobal: false,
|
|
20
|
+
isState: true,
|
|
21
|
+
filename: DeployCache.getFileName(),
|
|
22
|
+
stateFolder: core_1.Global.SF_STATE_FOLDER,
|
|
23
|
+
ttl: kit_1.Duration.days(3),
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
static async set(key, value) {
|
|
27
|
+
const cache = await DeployCache.create();
|
|
28
|
+
cache.set(key, value);
|
|
29
|
+
await cache.write();
|
|
30
|
+
}
|
|
31
|
+
static async unset(key) {
|
|
32
|
+
const cache = await DeployCache.create();
|
|
33
|
+
cache.unset(key);
|
|
34
|
+
await cache.write();
|
|
35
|
+
}
|
|
36
|
+
static async update(key, obj) {
|
|
37
|
+
const cache = await DeployCache.create();
|
|
38
|
+
cache.update(key, obj);
|
|
39
|
+
await cache.write();
|
|
40
|
+
}
|
|
41
|
+
resolveLatest(useMostRecent, key, throwOnNotFound = true) {
|
|
42
|
+
const keyFromLatest = useMostRecent ? this.getLatestKey() : key;
|
|
43
|
+
if (!keyFromLatest)
|
|
44
|
+
throw deploy_1.cacheMessages.createError('error.NoRecentJobId');
|
|
45
|
+
const jobId = this.resolveLongId(keyFromLatest);
|
|
46
|
+
if (throwOnNotFound && !this.has(jobId)) {
|
|
47
|
+
throw deploy_1.cacheMessages.createError('error.InvalidJobId', [jobId]);
|
|
48
|
+
}
|
|
49
|
+
return jobId;
|
|
50
|
+
}
|
|
51
|
+
resolveLongId(jobId) {
|
|
52
|
+
if (jobId.length === 18) {
|
|
53
|
+
return jobId;
|
|
54
|
+
}
|
|
55
|
+
else if (jobId.length === 15) {
|
|
56
|
+
const match = this.keys().find((k) => k.startsWith(jobId));
|
|
57
|
+
if (match) {
|
|
58
|
+
return match;
|
|
59
|
+
}
|
|
60
|
+
throw deploy_1.cacheMessages.createError('error.InvalidJobId', [jobId]);
|
|
61
|
+
}
|
|
62
|
+
else {
|
|
63
|
+
throw deploy_1.cacheMessages.createError('error.InvalidJobId', [jobId]);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
get(jobId) {
|
|
67
|
+
return super.get(this.resolveLongId(jobId));
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
exports.DeployCache = DeployCache;
|
|
71
|
+
//# sourceMappingURL=deployCache.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deployCache.js","sourceRoot":"","sources":["../../src/utils/deployCache.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAAqD;AACrD,yCAA2C;AAE3C,qCAAwD;AAExD,MAAa,WAAY,SAAQ,gBAA2C;IACnE,MAAM,CAAC,WAAW;QACvB,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAEM,MAAM,CAAC,iBAAiB;QAC7B,OAAO;YACL,QAAQ,EAAE,KAAK;YACf,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,WAAW,CAAC,WAAW,EAAE;YACnC,WAAW,EAAE,aAAM,CAAC,eAAe;YACnC,GAAG,EAAE,cAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;SACtB,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,KAA6B;QAChE,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,CAAC;QACzC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACtB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAW;QACnC,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,CAAC;QACzC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAW,EAAE,GAAY;QAClD,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,MAAM,EAAE,CAAC;QACzC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACvB,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;IACtB,CAAC;IAEM,aAAa,CAAC,aAAsB,EAAE,GAAuB,EAAE,eAAe,GAAG,IAAI;QAC1F,MAAM,aAAa,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;QAChE,IAAI,CAAC,aAAa;YAAE,MAAM,sBAAa,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC;QAE3E,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;QAEhD,IAAI,eAAe,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACvC,MAAM,sBAAa,CAAC,WAAW,CAAC,oBAAoB,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;SAChE;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEM,aAAa,CAAC,KAAa;QAChC,IAAI,KAAK,CAAC,MAAM,KAAK,EAAE,EAAE;YACvB,OAAO,KAAK,CAAC;SACd;aAAM,IAAI,KAAK,CAAC,MAAM,KAAK,EAAE,EAAE;YAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;YAC3D,IAAI,KAAK,EAAE;gBACT,OAAO,KAAK,CAAC;aACd;YACD,MAAM,sBAAa,CAAC,WAAW,CAAC,oBAAoB,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;SAChE;aAAM;YACL,MAAM,sBAAa,CAAC,WAAW,CAAC,oBAAoB,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;SAChE;IACH,CAAC;IAEM,GAAG,CAAC,KAAa;QACtB,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9C,CAAC;CACF;AA/DD,kCA+DC"}
|
package/lib/utils/flags.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { PathInfo, TestLevel } from './types';
|
|
2
|
+
export declare const DEFAULT_ZIP_FILE_NAME = "unpackaged.zip";
|
|
2
3
|
/**
|
|
3
4
|
* Flag value is a directory path that may or may not exist. If it doesn't exist, then it will be created.
|
|
4
5
|
*/
|
|
@@ -8,7 +9,7 @@ export declare const testLevelFlag: import("@oclif/core/lib/interfaces").Definit
|
|
|
8
9
|
* Flag value could either be a file path or a directory path.
|
|
9
10
|
*/
|
|
10
11
|
export declare const fileOrDirFlag: import("@oclif/core/lib/interfaces").Definition<PathInfo, {
|
|
11
|
-
exists?: boolean;
|
|
12
|
+
exists?: boolean | undefined;
|
|
12
13
|
}>;
|
|
13
14
|
/**
|
|
14
15
|
* Flag value is the name of a zip file that defaults to 'unpackaged.zip'.
|
package/lib/utils/flags.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.zipFileFlag = exports.fileOrDirFlag = exports.testLevelFlag = exports.ensuredDirFlag = void 0;
|
|
3
|
+
exports.zipFileFlag = exports.fileOrDirFlag = exports.testLevelFlag = exports.ensuredDirFlag = exports.DEFAULT_ZIP_FILE_NAME = void 0;
|
|
4
4
|
/*
|
|
5
5
|
* Copyright (c) 2022, salesforce.com, inc.
|
|
6
6
|
* All rights reserved.
|
|
@@ -32,8 +32,8 @@ const parsePathInfo = async (input, opts) => {
|
|
|
32
32
|
* Ensures that the specified directory exists. If it does not, it is created.
|
|
33
33
|
*/
|
|
34
34
|
async function ensureDirectoryPath(path) {
|
|
35
|
-
const trimmedPath = path
|
|
36
|
-
const resolvedPath = trimmedPath?.length ? (0, path_1.resolve)(trimmedPath) :
|
|
35
|
+
const trimmedPath = path.trim();
|
|
36
|
+
const resolvedPath = trimmedPath?.length ? (0, path_1.resolve)(trimmedPath) : '';
|
|
37
37
|
try {
|
|
38
38
|
const stats = await fs.promises.stat(resolvedPath);
|
|
39
39
|
const isDir = stats.isDirectory();
|
|
@@ -53,12 +53,13 @@ async function ensureDirectoryPath(path) {
|
|
|
53
53
|
return resolvedPath;
|
|
54
54
|
}
|
|
55
55
|
function resolveZipFileName(zipFileName) {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
zipFileName += '.zip';
|
|
56
|
+
if (!zipFileName) {
|
|
57
|
+
return exports.DEFAULT_ZIP_FILE_NAME;
|
|
59
58
|
}
|
|
60
|
-
|
|
59
|
+
// If no file extension was provided append, '.zip'
|
|
60
|
+
return !(0, path_1.extname)(zipFileName) ? (zipFileName += '.zip') : zipFileName;
|
|
61
61
|
}
|
|
62
|
+
exports.DEFAULT_ZIP_FILE_NAME = 'unpackaged.zip';
|
|
62
63
|
/**
|
|
63
64
|
* Flag value is a directory path that may or may not exist. If it doesn't exist, then it will be created.
|
|
64
65
|
*/
|
package/lib/utils/flags.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flags.js","sourceRoot":"","sources":["../../src/utils/flags.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yBAAyB;AACzB,+BAAwC;AACxC,sCAAoC;AACpC,2CAA4C;AAC5C,mCAA8C;AAE9C,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,IAAI,CAAC,oCAAoC,EAAE,YAAY,EAAE;IACjF,uBAAuB;IACvB,yBAAyB;IACzB,gCAAgC;CACjC,CAAC,CAAC;AAEH,MAAM,aAAa,GAAG,KAAK,EAAE,KAAa,EAAE,IAA0B,EAAqB,EAAE;IAC3F,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;QACxC,MAAM,QAAQ,CAAC,WAAW,CAAC,uBAAuB,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,UAAU,CAAC,gCAAgC,CAAC,CAAC,CAAC,CAAC;KACrH;IAED,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAE3C,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE;QACtB,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;KAC3C;IAED,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AACvC,CAAC,CAAC;AAMF;;GAEG;AACH,KAAK,UAAU,mBAAmB,CAAC,IAAY;IAC7C,MAAM,WAAW,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"flags.js","sourceRoot":"","sources":["../../src/utils/flags.ts"],"names":[],"mappings":"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"}
|