Merge branch 'select-latest-extension-by-default' into 'main'

feat: possibly choose the latest version of the extension

See merge request ongresinc/stackgres!1661

Author: teoincontatto

stackgres-k8s/src/common/src/main/java/io/stackgres/common/StackGresUtil.java

@@ -29,6 +29,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -699,4 +700,18 @@ static String getImageNameWithTag(
             : containerRegistry + "/" + imageName + ":" + imageTag;
   }
 
+  static String sortableVersion(String version) {
+    final String[] versionParts = version.split("\\.", -1);
+    return IntStream.range(0, 5)
+        .mapToObj(i -> zeroPad(i < versionParts.length ? versionParts[i] : "", 10))
+        .collect(Collectors.joining());
+  }
+
+  static String zeroPad(String string, int totalLength) {
+    string = string.substring(0, Math.min(string.length(), 10));
+    return IntStream.range(0, totalLength - string.length())
+        .mapToObj(i -> "0")
+        .collect(Collectors.joining()) + string;
+  }
+
 }

stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/ExtensionMetadataManager.java

@@ -17,9 +17,11 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.stackgres.common.CdiUtil;
+import io.stackgres.common.StackGresUtil;
 import io.stackgres.common.WebClientFactory;
 import io.stackgres.common.WebClientFactory.WebClient;
 import io.stackgres.common.crd.sgcluster.StackGresCluster;
@@ -90,7 +92,7 @@ public List<StackGresExtensionMetadata> getExtensionsSameMajorBuild(
         .ofNullable(getExtensionsMetadata().indexSameMajorBuilds
             .get(StackGresExtensionIndexSameMajorBuild
                 .fromClusterExtension(cluster, extension, detectOs)))
-        .map(this::extractLatestVersions)
+        .map(this::extractLatestBuildVersions)
         .orElse(List.of());
   }
 
@@ -106,11 +108,19 @@ public List<StackGresExtensionMetadata> getExtensionsAnyVersion(
         .ofNullable(getExtensionsMetadata().indexAnyVersions
             .get(StackGresExtensionIndexAnyVersion
                 .fromClusterExtension(cluster, extension, detectOs)))
-        .map(this::extractLatestVersions)
-        .orElse(List.of());
+        .map(this::extractLatestBuildVersions)
+        .stream()
+        .flatMap(List::stream)
+        .sorted(Comparator.comparing(
+            Function.<StackGresExtensionMetadata>identity()
+            .andThen(StackGresExtensionMetadata::getVersion)
+            .andThen(StackGresExtensionVersion::getVersion)
+            .andThen(StackGresUtil::sortableVersion))
+            .reversed())
+        .toList();
   }
 
-  private List<StackGresExtensionMetadata> extractLatestVersions(
+  private List<StackGresExtensionMetadata> extractLatestBuildVersions(
       List<StackGresExtensionMetadata> list) {
     return Seq.seq(list)
         .map(e -> Tuple.tuple(e.getVersion().getVersion(), e.getMajorBuild(), e))

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/AbstractExtensionsMutator.java

@@ -204,7 +204,7 @@ private Optional<StackGresClusterInstalledExtension> findToInstallExtension(
         .or(() -> Optional.of(getExtensionMetadataManager()
             .getExtensionsAnyVersion(cluster, extension, false))
             .stream()
-            .filter(list -> list.size() == 1)
+            .filter(list -> list.size() >= 1)
             .flatMap(List::stream)
             .filter(foundExtension -> foundExtension
                 .getTarget().getPostgresVersion().contains("."))
@@ -218,7 +218,7 @@ private Optional<StackGresClusterInstalledExtension> findToInstallExtension(
                 .groupBy(Function.<StackGresExtensionMetadata>identity()
                     .andThen(StackGresExtensionMetadata::getVersion)
                     .andThen(StackGresExtensionVersion::getVersion))
-                .size() == 1)
+                .size() >= 1)
             .map(List::stream)
             .flatMap(Stream::findFirst))
         .map(extensionMetadata -> ExtensionUtil.getInstalledExtension(

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/AbstractExtensionsValidator.java

@@ -7,6 +7,7 @@
 
 import static io.stackgres.common.StackGresUtil.getPostgresFlavorComponent;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -17,6 +18,7 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.stackgres.common.ErrorType;
 import io.stackgres.common.ExtensionTuple;
+import io.stackgres.common.StackGresUtil;
 import io.stackgres.common.crd.sgcluster.StackGresCluster;
 import io.stackgres.common.crd.sgcluster.StackGresClusterExtension;
 import io.stackgres.common.crd.sgcluster.StackGresClusterExtensionBuilder;
@@ -164,8 +166,12 @@ private String getMissingExtensionsMessage(
       Map<String, List<String>> candidateExtensionVersions) {
     return Seq.seq(missingExtensions)
         .map(missingExtension -> {
-          final Set<String> availableVersions =
-              Set.copyOf(candidateExtensionVersions.get(missingExtension.extensionName()));
+          final List<String> availableVersions =
+              Set.copyOf(candidateExtensionVersions.get(missingExtension.extensionName()))
+              .stream()
+              .sorted(Comparator.comparing(StackGresUtil::sortableVersion)
+                  .reversed())
+              .toList();
           if (!availableVersions.isEmpty()) {
             return missingExtension.extensionName()
                 + missingExtension.extensionVersion().map(v -> " " + v).orElse("")