Skip to content

Commit 5f6cc49

Browse files
committed
modify filter query parameter IsLatestVersion and IsAbsoluteVersion to include eq true to resolve Artifactory issue
1 parent 3e23ecb commit 5f6cc49

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

src/code/V2ServerAPICalls.cs

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ public override FindResults FindName(string packageName, bool includePrerelease,
355355
filterBuilder.AddCriterion($"Id eq '{packageName}'");
356356
}
357357

358-
filterBuilder.AddCriterion(includePrerelease ? "IsAbsoluteLatestVersion" : "IsLatestVersion");
358+
filterBuilder.AddCriterion(includePrerelease ? "IsAbsoluteLatestVersion eq true" : "IsLatestVersion eq true");
359359
if (type != ResourceType.None) {
360360
filterBuilder.AddCriterion(GetTypeFilterForRequest(type));
361361
}
@@ -424,7 +424,7 @@ public override FindResults FindNameWithTag(string packageName, string[] tags, b
424424
filterBuilder.AddCriterion($"Id eq '{packageName}'");
425425
}
426426

427-
filterBuilder.AddCriterion(includePrerelease ? "IsAbsoluteLatestVersion" : "IsLatestVersion");
427+
filterBuilder.AddCriterion(includePrerelease ? "IsAbsoluteLatestVersion eq true" : "IsLatestVersion eq true");
428428
if (type != ResourceType.None) {
429429
filterBuilder.AddCriterion(GetTypeFilterForRequest(type));
430430
}
@@ -649,6 +649,10 @@ public override FindResults FindVersion(string packageName, string version, Reso
649649
if (!_isJFrogRepo) {
650650
filterBuilder.AddCriterion($"Id eq '{packageName}'");
651651
}
652+
else
653+
{
654+
655+
}
652656

653657
filterBuilder.AddCriterion($"NormalizedVersion eq '{version}'");
654658
if (type != ResourceType.None) {
@@ -919,9 +923,9 @@ private string FindAllFromTypeEndPoint(bool includePrerelease, bool isSearchingM
919923

920924
if (includePrerelease) {
921925
queryBuilder.AdditionalParameters["includePrerelease"] = "true";
922-
filterBuilder.AddCriterion("IsAbsoluteLatestVersion");
926+
filterBuilder.AddCriterion("IsAbsoluteLatestVersion eq true");
923927
} else {
924-
filterBuilder.AddCriterion("IsLatestVersion");
928+
filterBuilder.AddCriterion("IsLatestVersion eq true");
925929
}
926930
var requestUrlV2 = $"{Repository.Uri}{typeEndpoint}/Search()?{queryBuilder.BuildQueryString()}";
927931
return HttpRequestCall(requestUrlV2, out errRecord);
@@ -959,9 +963,9 @@ private string FindTagFromEndpoint(string[] tags, bool includePrerelease, bool i
959963

960964
if (includePrerelease) {
961965
queryBuilder.AdditionalParameters["includePrerelease"] = "true";
962-
filterBuilder.AddCriterion("IsAbsoluteLatestVersion");
966+
filterBuilder.AddCriterion("IsAbsoluteLatestVersion eq true");
963967
} else {
964-
filterBuilder.AddCriterion("IsLatestVersion");
968+
filterBuilder.AddCriterion("IsLatestVersion eq true");
965969
}
966970

967971
filterBuilder.AddCriterion($"substringof('PS{(isSearchingModule ? "Module" : "Script")}', Tags) eq true");
@@ -996,9 +1000,9 @@ private string FindCommandOrDscResource(string[] tags, bool includePrerelease, b
9961000

9971001
if (includePrerelease) {
9981002
queryBuilder.AdditionalParameters["includePrerelease"] = "true";
999-
filterBuilder.AddCriterion("IsAbsoluteLatestVersion");
1003+
filterBuilder.AddCriterion("IsAbsoluteLatestVersion eq true");
10001004
} else {
1001-
filterBuilder.AddCriterion("IsLatestVersion");
1005+
filterBuilder.AddCriterion("IsLatestVersion eq true");
10021006
}
10031007

10041008

@@ -1038,12 +1042,11 @@ private string FindNameGlobbing(string packageName, ResourceType type, bool incl
10381042

10391043
if (includePrerelease) {
10401044
queryBuilder.AdditionalParameters["includePrerelease"] = "true";
1041-
filterBuilder.AddCriterion("IsAbsoluteLatestVersion");
1045+
filterBuilder.AddCriterion("IsAbsoluteLatestVersion eq true");
10421046
} else {
1043-
filterBuilder.AddCriterion("IsLatestVersion");
1047+
filterBuilder.AddCriterion("IsLatestVersion eq true");
10441048
}
10451049

1046-
10471050
var names = packageName.Split(new char[] {'*'}, StringSplitOptions.RemoveEmptyEntries);
10481051

10491052
if (names.Length == 0)
@@ -1133,12 +1136,11 @@ private string FindNameGlobbingWithTag(string packageName, string[] tags, Resour
11331136

11341137
if (includePrerelease) {
11351138
queryBuilder.AdditionalParameters["includePrerelease"] = "true";
1136-
filterBuilder.AddCriterion("IsAbsoluteLatestVersion");
1139+
filterBuilder.AddCriterion("IsAbsoluteLatestVersion eq true");
11371140
} else {
1138-
filterBuilder.AddCriterion("IsLatestVersion");
1141+
filterBuilder.AddCriterion("IsLatestVersion eq true");
11391142
}
11401143

1141-
11421144
var names = packageName.Split(new char[] {'*'}, StringSplitOptions.RemoveEmptyEntries);
11431145

11441146
if (!_isPSGalleryRepo)

0 commit comments

Comments
 (0)