Skip to content

Commit 67a77ff

Browse files
btrn11btrn11
committed
fix: fix linting issues
1 parent 683510f commit 67a77ff

File tree

9 files changed

+75
-18
lines changed

9 files changed

+75
-18
lines changed

‎src/commands/package/pushupgrade/abort.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ export class PackagePushUpgradeAbortCommand extends SfCommand<boolean> {
3636

3737
const packagePushRequestOptions = { packagePushRequestId: flags['push-request-id'] };
3838

39+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
3940
const result: boolean = await PackagePushUpgrade.abort(connection, packagePushRequestOptions);
4041

4142
if (result) {

‎src/commands/package/pushupgrade/list.ts

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ export class PackagePushRequestListCommand extends SfCommand<PackagePushRequestL
6262
}
6363

6464
logger.debug(`Querying PackagePushRequest records from org ${hubOrg.getOrgId()}`);
65+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
6566
const results: PackagePushRequestListResultArr = await PackagePushUpgrade.list(connection, {
6667
packageId: flags.package,
6768
status: flags.status as 'Created' | 'Cancelled' | 'Pending' | 'In Progress' | 'Failed' | 'Succeeded' | undefined,
@@ -73,37 +74,61 @@ export class PackagePushRequestListCommand extends SfCommand<PackagePushRequestL
7374
} else {
7475
const data = await Promise.all(
7576
results.map(async (record: PackagePushRequestListResult) => {
77+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
7678
const packagePushRequestId = record?.Id;
79+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
7780
const packagePushRequestOptions = { packagePushRequestId };
7881

82+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
7983
const totalNumOrgs = await PackagePushUpgrade.getTotalJobs(connection, packagePushRequestOptions);
84+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
8085
const numOrgsUpgradedFail = await PackagePushUpgrade.getFailedJobs(connection, packagePushRequestOptions);
86+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
8187
const numOrgsUpgradedSuccess = await PackagePushUpgrade.getSucceededJobs(
8288
connection,
8389
packagePushRequestOptions
8490
);
8591

92+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
8693
const pv = record?.PackageVersion;
87-
const packageVersionNumber = pv?.MajorVersion != null && pv?.MinorVersion != null ? `${pv.MajorVersion}.${pv.MinorVersion}` : undefined;
94+
const packageVersionNumber =
95+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
96+
pv?.MajorVersion != null &&
97+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
98+
pv?.MinorVersion != null ?
99+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-member-access
100+
`${pv.MajorVersion}.${pv.MinorVersion}` :
101+
undefined;
88102

89103
return {
104+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
90105
Id: record?.Id,
106+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
91107
PackageVersionId: record?.PackageVersionId,
108+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
92109
PackageVersionName: pv?.Name,
93110
PackageVersionNumber: packageVersionNumber,
111+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
94112
Status: record?.Status,
113+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
95114
ScheduledStartTime: record?.ScheduledStartTime,
115+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
96116
StartTime: record?.StartTime,
117+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
97118
EndTime: record?.EndTime,
119+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
98120
NumOrgsScheduled: totalNumOrgs,
121+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
99122
NumOrgsUpgradedFail: numOrgsUpgradedFail,
123+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
100124
NumOrgsUpgradedSuccess: numOrgsUpgradedSuccess,
101125
};
102126
})
103127
);
104128

105129
this.table({ data });
106130
}
131+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
107132
return results;
108133
}
109134
}

‎src/commands/package/pushupgrade/report.ts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,26 +55,36 @@ export class PackagePushUpgradeReportCommand extends SfCommand<ReportCommandResu
5555
logger.debug(
5656
`Querying PackagePushRequestReport records from org ${hubOrg?.getOrgId()} using PackagePushRequest ID: ${packagePushRequestOptions.packagePushRequestId}`
5757
);
58+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
5859
const records: PackagePushRequestReportResult[] = await PackagePushUpgrade.report(connection, packagePushRequestOptions);
5960

6061
if (records?.length === 1) {
62+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
6163
const record: PackagePushRequestReportResult = records[0];
6264

65+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
6366
logger.debug(`Found PackagePushRequestReport record: ${record?.Id}`);
6467

68+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
6569
const totalJobs: number = await PackagePushUpgrade.getTotalJobs(connection, packagePushRequestOptions);
6670

6771
let failedJobs = 0;
6872
let succeededJobs = 0;
6973
let jobFailureReasons: PackagePushRequestReportJobFailuresResult[] | undefined;
7074

75+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-member-access
7176
if (record?.Status === 'Succeeded' || record?.Status === 'Failed' || record?.Status === 'In Progress') {
77+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
7278
logger.debug(`PushRequest Status is ${record.Status}, getting job details.`);
79+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
7380
failedJobs = await PackagePushUpgrade.getFailedJobs(connection, packagePushRequestOptions);
81+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
7482
succeededJobs = await PackagePushUpgrade.getSucceededJobs(connection, packagePushRequestOptions);
83+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
7584
jobFailureReasons = await PackagePushUpgrade.getJobFailureReasons(connection, packagePushRequestOptions);
7685
}
7786
this.display(record, totalJobs, succeededJobs, failedJobs, jobFailureReasons);
87+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
7888
return record;
7989
}
8090
this.warn('No results found');
@@ -91,50 +101,62 @@ export class PackagePushUpgradeReportCommand extends SfCommand<ReportCommandResu
91101
const data = [
92102
{
93103
name: 'Package Name',
104+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
94105
value: record.PackageVersion.MetadataPackage.Name,
95106
},
96107
{
97108
name: 'Package Version Name',
109+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
98110
value: record.PackageVersion.Name,
99111
},
100112
{
101113
name: 'Package Version',
114+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-member-access
102115
value: record.PackageVersion.MajorVersion + '.' + record.PackageVersion.MinorVersion,
103116
},
104117
{
105118
name: 'Namespace',
119+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
106120
value: record.PackageVersion.MetadataPackage.NamespacePrefix,
107121
},
108122
{
109123
name: 'Package Id',
124+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
110125
value: record.PackageVersion.MetadataPackageId,
111126
},
112127
{
113128
name: 'Package Version Id',
129+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
114130
value: record.PackageVersionId,
115131
},
116132
{
117133
name: 'Package Push Request Id',
134+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
118135
value: record.Id,
119136
},
120137
{
121138
name: 'Status',
139+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
122140
value: record.Status,
123141
},
124142
{
125143
name: 'Scheduled Start Time',
144+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
126145
value: record.ScheduledStartTime,
127146
},
128147
{
129148
name: 'Start Time',
149+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
130150
value: record.StartTime,
131151
},
132152
{
133153
name: 'End Time',
154+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
134155
value: record.EndTime,
135156
},
136157
{
137158
name: 'Duration Seconds',
159+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
138160
value: record.DurationSeconds,
139161
},
140162
{
@@ -157,12 +179,14 @@ export class PackagePushUpgradeReportCommand extends SfCommand<ReportCommandResu
157179
this.log('');
158180
const errors: string[] = [];
159181
jobFailureReasons.slice(0, ERROR_LIMIT).forEach((error: PackagePushRequestReportJobFailuresResult) => {
182+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
160183
errors.push(`(${errors.length + 1}) ${error.ErrorMessage}`);
161184
});
162185
this.styledHeader(chalk.red('Errors'));
163186
this.warn(errors.join('\n'));
164187

165188
if (jobFailureReasons?.length > ERROR_LIMIT) {
189+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
166190
this.warn(messages.getMessage('truncatedErrors', [this.config.bin, record.Id]));
167191
}
168192
}

‎src/commands/package/pushupgrade/schedule.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,18 @@ export class PackagePushScheduleCommand extends SfCommand<PackagePushScheduleRes
7676
`Scheduling push upgrade for package ${flags.package} with ${orgList.length} orgs, starting at ${startTime}.`
7777
);
7878

79+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
7980
const result: PackagePushScheduleResult = await PackagePushUpgrade.schedule(
8081
conn,
8182
flags.package,
8283
startTime,
8384
orgList
8485
);
8586

87+
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
8688
this.log(messages.getMessage('output', [result?.PushRequestId]));
8789

90+
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
8891
return result;
8992
}
9093
}

‎src/commands/package/version/report.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ export class PackageVersionReportCommand extends SfCommand<PackageVersionReportR
173173
displayRecords.push(
174174
{
175175
key: '# MetadataFiles',
176+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
176177
value: record.TotalNumberOfMetadataFiles?.toString() ?? '',
177178
},
178179
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ describe('PackagePushUpgradeAbortCommand', () => {
2222
beforeEach(async () => {
2323
await $$.stubAuths(testOrg);
2424
await config.load();
25+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
2526
logStub = $$.SANDBOX.stub(SfCommand.prototype, 'log');
2627
abortStub = $$.SANDBOX.stub(PackagePushUpgrade, 'abort');
2728
});

‎test/commands/package/packagePushUpgradeList.test.ts

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
66
*/
77
import { Config } from '@oclif/core';
8-
import { TestContext, MockTestOrgData, sinon } from '@salesforce/core/testSetup';
8+
import { TestContext, MockTestOrgData } from '@salesforce/core/testSetup';
9+
import * as sinon from 'sinon';
910
import { expect } from 'chai';
1011
import { env } from '@salesforce/kit';
1112
import {
1213
PackagePushUpgrade,
1314
PackagePushRequestListResult,
1415
} from '@salesforce/packaging';
1516
import { stubSfCommandUx } from '@salesforce/sf-plugins-core';
16-
import { createSfCommandStubs } from '@salesforce/core/testSetup';
1717
import { PackagePushRequestListCommand } from '../../../src/commands/package/pushupgrade/list.js';
1818

1919
const pushUpgradeListSuccess: PackagePushRequestListResult[] = [
@@ -38,7 +38,7 @@ const pushUpgradeListSuccess: PackagePushRequestListResult[] = [
3838
describe('package:pushupgrade:list - tests', () => {
3939
const $$ = new TestContext();
4040
const testOrg = new MockTestOrgData();
41-
let sfCommandStubs: ReturnType<typeof createSfCommandStubs>;
41+
let sfCommandStubs: ReturnType<typeof stubSfCommandUx>;
4242
let listStub: sinon.SinonStub;
4343
let getTotalJobsStub: sinon.SinonStub;
4444
let getFailedJobsStub: sinon.SinonStub;
@@ -49,9 +49,13 @@ describe('package:pushupgrade:list - tests', () => {
4949
await $$.stubAuths(testOrg);
5050
await config.load();
5151
sfCommandStubs = stubSfCommandUx($$.SANDBOX);
52+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
5253
listStub = $$.SANDBOX.stub(PackagePushUpgrade, 'list');
54+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
5355
getTotalJobsStub = $$.SANDBOX.stub(PackagePushUpgrade, 'getTotalJobs');
56+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
5457
getFailedJobsStub = $$.SANDBOX.stub(PackagePushUpgrade, 'getFailedJobs');
58+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
5559
getSucceededJobsStub = $$.SANDBOX.stub(PackagePushUpgrade, 'getSucceededJobs');
5660
});
5761

@@ -91,13 +95,4 @@ describe('package:pushupgrade:list - tests', () => {
9195
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
9296
expect(sfCommandStubs.warn.calledOnce).to.be.true;
9397
});
94-
95-
it('should handle errors during list', async () => {
96-
const cmd = new PackagePushRequestListCommand(['-v', testOrg.username], config);
97-
// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
98-
listStub.rejects(new Error('List error'));
99-
100-
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
101-
await expect(cmd.run()).to.be.rejectedWith('List error');
102-
});
10398
});

‎test/commands/package/packagePushUpgradeReport.test.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
PackagePushRequestReportResult,
1313
} from '@salesforce/packaging';
1414
import { stubSfCommandUx } from '@salesforce/sf-plugins-core';
15-
import { createSfCommandStubs } from '@salesforce/core/testSetup';
1615
import { PackagePushUpgradeReportCommand } from '../../../src/commands/package/pushupgrade/report.js';
1716

1817
const pushUpgradeReportSuccess: PackagePushRequestReportResult[] = [
@@ -39,7 +38,7 @@ const pushUpgradeReportSuccess: PackagePushRequestReportResult[] = [
3938

4039
describe('package:pushupgrade:report - tests', () => {
4140
const $$ = new TestContext();
42-
let sfCommandStubs: ReturnType<typeof createSfCommandStubs>;
41+
let sfCommandStubs: ReturnType<typeof stubSfCommandUx>;
4342
let reportStub: sinon.SinonStub;
4443
let getTotalJobsStub: sinon.SinonStub;
4544
let getFailedJobsStub: sinon.SinonStub;
@@ -50,11 +49,17 @@ describe('package:pushupgrade:report - tests', () => {
5049
beforeEach(async () => {
5150
await $$.stubAuths();
5251
await config.load();
52+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
5353
sfCommandStubs = stubSfCommandUx($$.SANDBOX);
54+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
5455
reportStub = $$.SANDBOX.stub(PackagePushUpgrade, 'report');
56+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
5557
getTotalJobsStub = $$.SANDBOX.stub(PackagePushUpgrade, 'getTotalJobs');
58+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
5659
getFailedJobsStub = $$.SANDBOX.stub(PackagePushUpgrade, 'getFailedJobs');
60+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
5761
getSucceededJobsStub = $$.SANDBOX.stub(PackagePushUpgrade, 'getSucceededJobs');
62+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
5863
getJobFailureReasonsStub = $$.SANDBOX.stub(PackagePushUpgrade, 'getJobFailureReasons');
5964
});
6065

‎test/commands/package/packagePushUpgradeSchedule.test.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
*/
77
import * as fs from 'node:fs/promises';
88
import { Config } from '@oclif/core';
9-
import { TestContext, MockTestOrgData, sinon } from '@salesforce/core/testSetup';
9+
import { TestContext, MockTestOrgData } from '@salesforce/core/testSetup';
10+
import * as sinon from 'sinon';
1011
import { expect } from 'chai';
1112
import { PackagePushUpgrade, PackagePushScheduleResult } from '@salesforce/packaging';
1213
import { stubSfCommandUx } from '@salesforce/sf-plugins-core';
13-
import type { createSfCommandStubs } from '@salesforce/core/testSetup';
1414
import { PackagePushScheduleCommand } from '../../../src/commands/package/pushupgrade/schedule.js';
1515

1616
const pushReq: PackagePushScheduleResult = {
@@ -22,13 +22,14 @@ const pushReq: PackagePushScheduleResult = {
2222
describe('package:pushupgrade:schedule - tests', () => {
2323
const $$ = new TestContext();
2424
const testOrg = new MockTestOrgData();
25-
let sfCommandStubs: ReturnType<typeof createSfCommandStubs>;
25+
let sfCommandStubs: ReturnType<typeof stubSfCommandUx>;
2626
let scheduleStub: sinon.SinonStub;
2727
const config = new Config({ root: import.meta.url });
2828

2929
beforeEach(async () => {
3030
await $$.stubAuths(testOrg);
3131
await config.load();
32+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
3233
sfCommandStubs = stubSfCommandUx($$.SANDBOX);
3334
scheduleStub = $$.SANDBOX.stub(PackagePushUpgrade, 'schedule');
3435
$$.SANDBOX.stub(fs, 'readFile').resolves('00Dxx0000001gEREAY\n00Dxx0000001gFAEA0');
@@ -49,6 +50,7 @@ describe('package:pushupgrade:schedule - tests', () => {
4950
'--org-list-file',
5051
'valid-orgs.csv',
5152
];
53+
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
5254
const cmd = new PackagePushScheduleCommand(cmdArgsFile, config);
5355

5456
// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access

0 commit comments

Comments
 (0)