Skip to content

Commit 5439e24

Browse files
btrn11btrn11
committed
fix: update schema
1 parent cf2425f commit 5439e24

6 files changed

Lines changed: 234 additions & 4 deletions

File tree

‎schemas/package-push__upgrade-abort.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"$schema": "http://json-schema.org/draft-07/schema#",
3+
"$ref": "#/definitions/PackagePushUpgradeAbortResult",
4+
"definitions": {
5+
"PackagePushUpgradeAbortResult": {
6+
"type": "object",
7+
"properties": {
8+
"success": {
9+
"type": "boolean"
10+
}
11+
},
12+
"required": [
13+
"success"
14+
],
15+
"additionalProperties": false
16+
}
17+
}
18+
}

‎schemas/package-push__upgrade-list.json‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"$schema": "http://json-schema.org/draft-07/schema#",
3+
"$ref": "#/definitions/PackagePushRequestListResultArr",
4+
"definitions": {
5+
"PackagePushRequestListResultArr": {
6+
"type": "array",
7+
"items": {
8+
"$ref": "#/definitions/PackagePushRequestListResult"
9+
}
10+
},
11+
"PackagePushRequestListResult": {
12+
"type": "object",
13+
"properties": {
14+
"Id": {
15+
"type": "string"
16+
},
17+
"PackageVersionId": {
18+
"type": "string"
19+
},
20+
"PackageVersion": {
21+
"type": "object",
22+
"properties": {
23+
"Name": {
24+
"type": "string"
25+
},
26+
"MajorVersion": {
27+
"type": "string"
28+
},
29+
"MinorVersion": {
30+
"type": "string"
31+
}
32+
},
33+
"required": [
34+
"Name",
35+
"MajorVersion",
36+
"MinorVersion"
37+
],
38+
"additionalProperties": false
39+
},
40+
"Status": {
41+
"type": "string"
42+
},
43+
"ScheduledStartTime": {
44+
"type": "string"
45+
},
46+
"StartTime": {
47+
"type": "string"
48+
},
49+
"EndTime": {
50+
"type": "string"
51+
},
52+
"OrgsScheduled": {
53+
"type": "number"
54+
},
55+
"OrgsUpgradeSucceeded": {
56+
"type": "number"
57+
},
58+
"OrgsUpgradeFailed": {
59+
"type": "number"
60+
}
61+
},
62+
"required": [
63+
"Id",
64+
"PackageVersionId",
65+
"PackageVersion",
66+
"Status",
67+
"ScheduledStartTime",
68+
"StartTime",
69+
"EndTime",
70+
"OrgsScheduled",
71+
"OrgsUpgradeSucceeded",
72+
"OrgsUpgradeFailed"
73+
],
74+
"additionalProperties": false
75+
}
76+
}
77+
}

‎schemas/package-push__upgrade-report.json‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
{
2+
"$schema": "http://json-schema.org/draft-07/schema#",
3+
"$ref": "#/definitions/ReportCommandResult",
4+
"definitions": {
5+
"ReportCommandResult": {
6+
"anyOf": [
7+
{
8+
"$ref": "#/definitions/PackagePushRequestReportResult"
9+
},
10+
{
11+
"type": "null"
12+
}
13+
]
14+
},
15+
"PackagePushRequestReportResult": {
16+
"type": "object",
17+
"properties": {
18+
"PackageVersion": {
19+
"type": "object",
20+
"properties": {
21+
"MetadataPackage": {
22+
"type": "object",
23+
"properties": {
24+
"Name": {
25+
"type": "string"
26+
},
27+
"NamespacePrefix": {
28+
"type": "string"
29+
}
30+
},
31+
"required": [
32+
"Name",
33+
"NamespacePrefix"
34+
],
35+
"additionalProperties": false
36+
},
37+
"MetadataPackageId": {
38+
"type": "string"
39+
},
40+
"Name": {
41+
"type": "string"
42+
},
43+
"MajorVersion": {
44+
"type": "string"
45+
},
46+
"MinorVersion": {
47+
"type": "string"
48+
}
49+
},
50+
"required": [
51+
"MetadataPackage",
52+
"MetadataPackageId",
53+
"Name",
54+
"MajorVersion",
55+
"MinorVersion"
56+
],
57+
"additionalProperties": false
58+
},
59+
"Id": {
60+
"type": "string"
61+
},
62+
"PackageVersionId": {
63+
"type": "string"
64+
},
65+
"Status": {
66+
"type": "string"
67+
},
68+
"ScheduledStartTime": {
69+
"type": [
70+
"string",
71+
"null"
72+
]
73+
},
74+
"StartTime": {
75+
"type": [
76+
"string",
77+
"null"
78+
]
79+
},
80+
"EndTime": {
81+
"type": [
82+
"string",
83+
"null"
84+
]
85+
},
86+
"DurationSeconds": {
87+
"type": [
88+
"number",
89+
"null"
90+
]
91+
}
92+
},
93+
"required": [
94+
"PackageVersion",
95+
"Id",
96+
"PackageVersionId",
97+
"Status",
98+
"ScheduledStartTime",
99+
"StartTime",
100+
"EndTime",
101+
"DurationSeconds"
102+
],
103+
"additionalProperties": false
104+
}
105+
}
106+
}

‎schemas/package-push__upgrade-schedule.json‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"$schema": "http://json-schema.org/draft-07/schema#",
3+
"$ref": "#/definitions/PackagePushScheduleResult",
4+
"definitions": {
5+
"PackagePushScheduleResult": {
6+
"type": "object",
7+
"properties": {
8+
"PushRequestId": {
9+
"type": "string"
10+
},
11+
"ScheduledStartTime": {
12+
"type": "string"
13+
},
14+
"Status": {
15+
"type": "string"
16+
}
17+
},
18+
"required": [
19+
"PushRequestId",
20+
"Status"
21+
],
22+
"additionalProperties": false
23+
}
24+
}
25+
}

‎src/commands/package/push-upgrade/abort.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ import { PackagePushUpgrade } from '@salesforce/packaging';
1111
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
1212
const messages = Messages.loadMessages('@salesforce/plugin-packaging', 'package_pushupgrade_abort');
1313

14-
export class PackagePushUpgradeAbortCommand extends SfCommand<boolean> {
14+
export interface PackagePushUpgradeAbortResult {
15+
success: boolean;
16+
}
17+
18+
export class PackagePushUpgradeAbortCommand extends SfCommand<PackagePushUpgradeAbortResult> {
1519
public static readonly summary = messages.getMessage('summary');
1620
public static readonly description = messages.getMessage('description');
1721
public static readonly examples = messages.getMessages('examples');
@@ -28,7 +32,7 @@ export class PackagePushUpgradeAbortCommand extends SfCommand<boolean> {
2832
}),
2933
};
3034

31-
public async run(): Promise<boolean> {
35+
public async run(): Promise<PackagePushUpgradeAbortResult> {
3236
const { flags } = await this.parse(PackagePushUpgradeAbortCommand);
3337
const connection = flags['target-dev-hub'].getConnection(flags['api-version']);
3438

@@ -41,6 +45,6 @@ export class PackagePushUpgradeAbortCommand extends SfCommand<boolean> {
4145
this.log(messages.getMessage('output', [flags['push-request-id']]));
4246
}
4347

44-
return result;
48+
return { success: result };
4549
}
4650
}

‎test/commands/package/packagePushUpgradeAbort.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describe('PackagePushUpgradeAbortCommand', () => {
3939
abortStub.resolves(true);
4040
const res = await cmd.run();
4141

42-
expect(res).to.be.true;
42+
expect(res.success).to.be.true;
4343
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
4444
expect(abortStub.calledOnce).to.be.true;
4545
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access

0 commit comments

Comments
 (0)