Skip to content

Commit 914bc19

Browse files
committed
fix: api version filter for new field
1 parent 22c0830 commit 914bc19

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

src/package/packageVersionCreateRequest.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ export function getQuery(connection: Connection): string {
2424
'SELECT Id, Status, Package2Id, Package2.Name, Package2VersionId, Package2Version.SubscriberPackageVersionId, Package2Version.HasPassedCodeCoverageCheck,Package2Version.CodeCoverage, Tag, Branch, ' +
2525
'Package2Version.MajorVersion, Package2Version.MinorVersion, Package2Version.PatchVersion, Package2Version.BuildNumber, ' +
2626
'CreatedDate, Package2Version.HasMetadataRemoved, CreatedById, IsConversionRequest, Package2Version.ConvertedFromVersionId ' +
27-
(Number(connection.version) > 60.0 ? ', AsyncValidation, Package2Version.TotalNumberOfMetadataFiles ' : '') +
27+
(Number(connection.version) > 60.0 ? ', AsyncValidation ' : '') +
28+
(Number(connection.version) > 63.0 ? ', Package2Version.TotalNumberOfMetadataFiles ' : '') +
2829
'FROM Package2VersionCreateRequest ' +
2930
'%s' + // WHERE, if applicable
3031
'ORDER BY CreatedDate desc';

src/package/packageVersionReport.ts

+12-3
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,11 @@ const defaultFields = [
4040

4141
let verboseFields = ['SubscriberPackageVersion.Dependencies', 'CodeCoveragePercentages'];
4242

43-
// Add Fields here that are only available for api versions higher than v60.0
44-
const default61Fields = ['ValidatedAsync', 'TotalNumberOfMetadataFiles'];
43+
// Ensure we only include the async validation property for api version of v60.0 or higher.
44+
const default61Fields = ['ValidatedAsync'];
45+
46+
// Add fields here that are available only api version of v64.0 or higher.
47+
const deafult64Fields = ['TotalNumberOfMetadataFiles'];
4548

4649
const verbose61Fields = ['EndToEndBuildDurationInSeconds'];
4750

@@ -57,7 +60,13 @@ const getLogger = (): Logger => {
5760

5861
function constructQuery(connectionVersion: number, verbose: boolean): string {
5962
// Ensure we only include the async validation property for api version of v60.0 or higher.
60-
let queryFields = connectionVersion > 60 ? [...defaultFields, ...default61Fields] : defaultFields;
63+
// TotalNumberOfMetadataFiles is included as query field for api version of v64.0 or higher.
64+
let queryFields =
65+
connectionVersion > 63
66+
? [...defaultFields, ...default61Fields, ...deafult64Fields]
67+
: connectionVersion > 60
68+
? [...defaultFields, ...default61Fields]
69+
: defaultFields;
6170
verboseFields = connectionVersion > 60 ? [...verboseFields, ...verbose61Fields] : verboseFields;
6271
if (verbose) {
6372
queryFields = [...queryFields, ...verboseFields];

0 commit comments

Comments
 (0)