Skip to content

Commit 87b5502

Browse files
dawson-david-salesforcedawson-david-salesforce
committed
style: added Bundle to list class
1 parent 6dfa18c commit 87b5502

File tree

6 files changed

+183
-71
lines changed

6 files changed

+183
-71
lines changed

‎messages/bundle_version_create.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Waiting for bundle version creation to complete. %s minutes remaining. Current s
3838

3939
# bundleVersionCreateFinalStatus
4040

41-
Bundle version creation completed with status: %s
41+
Package Bundle version creation completed with status: %s
4242

4343
# multipleErrors
4444

@@ -54,11 +54,11 @@ Creating bundle version...
5454

5555
# packageVersionCreateFinalStatus
5656

57-
Package version creation completed with status: %s
57+
Package Bundle version creation completed with status: %s
5858

5959
# packageVersionCreatePerformingValidations
6060

61-
Performing validations on the package version...
61+
Performing validations on the package bundle version...
6262

6363
# bundleVersionCreateSuccess
6464

‎schemas/package-bundle-version-create-list.json

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
{
2+
"$schema": "http://json-schema.org/draft-07/schema#",
3+
"$ref": "#/definitions/PackageBundleVersionCreateRequestResults",
4+
"definitions": {
5+
"PackageBundleVersionCreateRequestResults": {
6+
"type": "array",
7+
"items": {
8+
"$ref": "#/definitions/BundleSObjects.PackageBundleVersionCreateRequestResult"
9+
}
10+
},
11+
"BundleSObjects.PackageBundleVersionCreateRequestResult": {
12+
"type": "object",
13+
"additionalProperties": false,
14+
"properties": {
15+
"Id": {
16+
"type": "string"
17+
},
18+
"PackageBundleVersionId": {
19+
"type": "string"
20+
},
21+
"RequestStatus": {
22+
"$ref": "#/definitions/BundleSObjects.PkgBundleVersionCreateReqStatus"
23+
},
24+
"CreatedDate": {
25+
"type": "string"
26+
},
27+
"CreatedById": {
28+
"type": "string"
29+
},
30+
"Error": {
31+
"type": "array",
32+
"items": {
33+
"type": "string"
34+
}
35+
},
36+
"PackageBundleId": {
37+
"type": "string"
38+
},
39+
"VersionName": {
40+
"type": "string"
41+
},
42+
"MajorVersion": {
43+
"type": "string"
44+
},
45+
"MinorVersion": {
46+
"type": "string"
47+
},
48+
"BundleVersionComponents": {
49+
"type": "string"
50+
},
51+
"Ancestor": {
52+
"type": ["string", "null"]
53+
}
54+
},
55+
"required": [
56+
"BundleVersionComponents",
57+
"CreatedById",
58+
"CreatedDate",
59+
"Id",
60+
"MajorVersion",
61+
"MinorVersion",
62+
"PackageBundleId",
63+
"PackageBundleVersionId",
64+
"RequestStatus",
65+
"VersionName"
66+
]
67+
},
68+
"BundleSObjects.PkgBundleVersionCreateReqStatus": {
69+
"type": "string",
70+
"enum": ["Queued", "Success", "Error"]
71+
}
72+
}
73+
}

‎schemas/package-version-create-list.json

Lines changed: 95 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,108 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
3-
"$ref": "#/definitions/PackageBundleVersionCreateRequestResults",
3+
"$ref": "#/definitions/CreateListCommandResult",
44
"definitions": {
5-
"PackageBundleVersionCreateRequestResults": {
5+
"CreateListCommandResult": {
66
"type": "array",
77
"items": {
8-
"$ref": "#/definitions/BundleSObjects.PackageBundleVersionCreateRequestResult"
9-
}
10-
},
11-
"BundleSObjects.PackageBundleVersionCreateRequestResult": {
12-
"type": "object",
13-
"additionalProperties": false,
14-
"properties": {
15-
"Id": {
16-
"type": "string"
17-
},
18-
"PackageBundleVersionId": {
19-
"type": "string"
20-
},
21-
"RequestStatus": {
22-
"$ref": "#/definitions/BundleSObjects.PkgBundleVersionCreateReqStatus"
23-
},
24-
"CreatedDate": {
25-
"type": "string"
26-
},
27-
"CreatedById": {
28-
"type": "string"
29-
},
30-
"Error": {
31-
"type": "array",
32-
"items": {
8+
"type": "object",
9+
"additionalProperties": false,
10+
"properties": {
11+
"VersionName": {
12+
"type": "string"
13+
},
14+
"VersionNumber": {
15+
"type": ["string", "null"]
16+
},
17+
"Id": {
18+
"type": "string"
19+
},
20+
"Status": {
21+
"$ref": "#/definitions/PackagingSObjects.Package2VersionStatus"
22+
},
23+
"Package2Id": {
24+
"type": "string"
25+
},
26+
"Package2Name": {
27+
"type": ["string", "null"]
28+
},
29+
"Package2VersionId": {
30+
"type": "string"
31+
},
32+
"SubscriberPackageVersionId": {
33+
"type": ["string", "null"]
34+
},
35+
"Tag": {
3336
"type": "string"
37+
},
38+
"Branch": {
39+
"type": "string"
40+
},
41+
"Error": {
42+
"type": "array",
43+
"items": {}
44+
},
45+
"CreatedDate": {
46+
"type": "string"
47+
},
48+
"HasMetadataRemoved": {
49+
"type": ["boolean", "null"]
50+
},
51+
"HasPassedCodeCoverageCheck": {
52+
"type": ["boolean", "null"]
53+
},
54+
"CodeCoverage": {
55+
"type": ["number", "null"]
56+
},
57+
"CreatedBy": {
58+
"type": "string"
59+
},
60+
"ConvertedFromVersionId": {
61+
"type": ["string", "null"]
62+
},
63+
"TotalNumberOfMetadataFiles": {
64+
"type": ["number", "null"]
65+
},
66+
"TotalSizeOfMetadataFiles": {
67+
"type": ["number", "null"]
3468
}
3569
},
36-
"PackageBundleId": {
37-
"type": "string"
38-
},
39-
"VersionName": {
40-
"type": "string"
41-
},
42-
"MajorVersion": {
43-
"type": "string"
44-
},
45-
"MinorVersion": {
46-
"type": "string"
47-
},
48-
"BundleVersionComponents": {
49-
"type": "string"
50-
},
51-
"Ancestor": {
52-
"type": ["string", "null"]
53-
}
54-
},
55-
"required": [
56-
"BundleVersionComponents",
57-
"CreatedById",
58-
"CreatedDate",
59-
"Id",
60-
"MajorVersion",
61-
"MinorVersion",
62-
"PackageBundleId",
63-
"PackageBundleVersionId",
64-
"RequestStatus",
65-
"VersionName"
66-
]
70+
"required": [
71+
"Branch",
72+
"CodeCoverage",
73+
"ConvertedFromVersionId",
74+
"CreatedBy",
75+
"CreatedDate",
76+
"Error",
77+
"HasMetadataRemoved",
78+
"HasPassedCodeCoverageCheck",
79+
"Id",
80+
"Package2Id",
81+
"Package2Name",
82+
"Package2VersionId",
83+
"Status",
84+
"SubscriberPackageVersionId",
85+
"Tag",
86+
"TotalNumberOfMetadataFiles",
87+
"TotalSizeOfMetadataFiles",
88+
"VersionNumber"
89+
]
90+
}
6791
},
68-
"BundleSObjects.PkgBundleVersionCreateReqStatus": {
92+
"PackagingSObjects.Package2VersionStatus": {
6993
"type": "string",
70-
"enum": ["Queued", "Success", "Error"]
94+
"enum": [
95+
"Queued",
96+
"InProgress",
97+
"Success",
98+
"Error",
99+
"Initializing",
100+
"VerifyingFeaturesAndSettings",
101+
"VerifyingDependencies",
102+
"VerifyingMetadata",
103+
"FinalizingPackageVersion",
104+
"PerformingValidations"
105+
]
71106
}
72107
}
73108
}

‎src/commands/package/bundle/version/create/list.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const messages = Messages.loadMessages('@salesforce/plugin-packaging', 'bundle_v
2222
type Status = BundleSObjects.PkgBundleVersionCreateReqStatus;
2323
export type PackageBundleVersionCreateRequestResults = BundleSObjects.PackageBundleVersionCreateRequestResult[];
2424

25-
export class PackageVersionCreateListCommand extends SfCommand<PackageBundleVersionCreateRequestResults> {
25+
export class PackageBundleVersionCreateListCommand extends SfCommand<PackageBundleVersionCreateRequestResults> {
2626
public static readonly summary = messages.getMessage('summary');
2727
public static readonly description = messages.getMessage('description');
2828
public static readonly examples = messages.getMessages('examples');
@@ -59,7 +59,7 @@ export class PackageVersionCreateListCommand extends SfCommand<PackageBundleVers
5959
private connection!: Connection;
6060

6161
public async run(): Promise<PackageBundleVersionCreateRequestResults> {
62-
const { flags } = await this.parse(PackageVersionCreateListCommand);
62+
const { flags } = await this.parse(PackageBundleVersionCreateListCommand);
6363
this.connection = flags['target-dev-hub'].getConnection(flags['api-version']);
6464
let results = await PackageBundleVersionCreate.getCreateStatuses(
6565
this.connection,
@@ -95,7 +95,11 @@ export class PackageVersionCreateListCommand extends SfCommand<PackageBundleVers
9595
: {}),
9696
}));
9797

98-
this.table({ data, overflow: 'wrap', title: chalk.blue(`Package Version Create Requests [${results.length}]`) });
98+
this.table({
99+
data,
100+
overflow: 'wrap',
101+
title: chalk.blue(`Package Bundle Version Create Requests [${results.length}]`),
102+
});
99103
}
100104

101105
return results;

‎test/commands/bundle/bundleVersionCreateList.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { expect } from 'chai';
1010
import { PackageBundleVersionCreate } from '@salesforce/packaging';
1111
import { stubSfCommandUx } from '@salesforce/sf-plugins-core';
1212
import sinon from 'sinon';
13-
import { PackageVersionCreateListCommand } from '../../../src/commands/package/bundle/version/create/list.js';
13+
import { PackageBundleVersionCreateListCommand } from '../../../src/commands/package/bundle/version/create/list.js';
1414

1515
describe('bundle:version:create:list - tests', () => {
1616
const $$ = new TestContext();
@@ -32,7 +32,7 @@ describe('bundle:version:create:list - tests', () => {
3232
});
3333

3434
it('should list bundle version create requests', async () => {
35-
const cmd = new PackageVersionCreateListCommand(['--target-dev-hub', testOrg.username], config);
35+
const cmd = new PackageBundleVersionCreateListCommand(['--target-dev-hub', testOrg.username], config);
3636

3737
const mockResults = [
3838
{
@@ -55,7 +55,7 @@ describe('bundle:version:create:list - tests', () => {
5555
});
5656

5757
it('should show warning when no results found', async () => {
58-
const cmd = new PackageVersionCreateListCommand(['--target-dev-hub', testOrg.username], config);
58+
const cmd = new PackageBundleVersionCreateListCommand(['--target-dev-hub', testOrg.username], config);
5959

6060
getCreateStatusesStub.resolves([]);
6161

@@ -67,7 +67,7 @@ describe('bundle:version:create:list - tests', () => {
6767
});
6868

6969
it('should throw error when target-dev-hub flag is missing', async () => {
70-
const cmd = new PackageVersionCreateListCommand([], config);
70+
const cmd = new PackageBundleVersionCreateListCommand([], config);
7171

7272
try {
7373
await cmd.run();

‎test/commands/bundle/packageBundleVersionCreate.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ describe('package:bundle:version:create - tests', () => {
174174
});
175175
expect(warnStub.callCount).to.equal(0);
176176
expect(logStub.callCount).to.equal(2);
177-
expect(logStub.args[0]).to.deep.equal(['Bundle version creation completed with status: Success']);
177+
expect(logStub.args[0]).to.deep.equal(['Package Bundle version creation completed with status: Success']);
178178
expect(logStub.args[1]).to.deep.equal(['Successfully created bundle version for bundle 08c3i000000fylgAAA']);
179179
});
180180

0 commit comments

Comments
 (0)