Skip to content

Commit 9383e75

Browse files
authored
Sort chart versions (#626)
1 parent ac02154 commit 9383e75

1 file changed

Lines changed: 12 additions & 1 deletion

File tree

onyxia-api/src/main/java/fr/insee/onyxia/api/dao/universe/CatalogLoader.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
import java.io.InputStream;
1919
import java.util.*;
2020
import java.util.stream.Collectors;
21-
import okhttp3.*;
21+
import okhttp3.CacheControl;
22+
import okhttp3.Credentials;
23+
import okhttp3.OkHttpClient;
24+
import okhttp3.Request;
2225
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
2326
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
2427
import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
@@ -117,6 +120,7 @@ private void updateHelmRepository(CatalogWrapper cw) {
117120
repository.getEntries().values().parallelStream()
118121
.forEach(
119122
charts -> {
123+
sortChartsListByVersion(charts, cw);
120124
epurateChartsList(charts, cw);
121125
refreshChartsList(charts, cw);
122126
});
@@ -148,6 +152,13 @@ private InputStream fetchResource(
148152
}
149153
}
150154

155+
private void sortChartsListByVersion(List<Chart> charts, CatalogWrapper cw) {
156+
charts.sort(
157+
Comparator.comparing(
158+
chart -> Version.tryParse(chart.getVersion()).orElse(Version.of(0, 0, 0)),
159+
Comparator.reverseOrder()));
160+
}
161+
151162
private void epurateChartsList(List<Chart> charts, CatalogWrapper cw) {
152163
if (cw.getMultipleServicesMode() == CatalogWrapper.MultipleServicesMode.ALL) {
153164
return;

0 commit comments

Comments
 (0)