Merge branch '2933-failed-to-change-the-shard-clusters-count-if-restore-a-sharded-cluster-from-a-backup' into 'main'

Resolve "Failed to change the shard clusters count if restore a sharded cluster from a backup" and "Controller fails with error when pgbouncer instance is not configured properly or unavailable"

Closes #2933 and #2905

See merge request ongresinc/stackgres!1663

Author: teoincontatto

stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/PgBouncerAuthFileReconciliator.java

@@ -98,7 +98,7 @@ public void updatePgbouncerUsersInAuthFile(ClusterContext context)
     Collection<String> users = getPoolingConfigUserNames(context);
     var postgresCredentials = PostgresUtil.getPostgresCredentials(context, secretFinder);
     final String usersSection = extractAuthFileSectionForUsers(
-        postgresCredentials.username(), postgresCredentials.password(), users);
+        postgresCredentials.username(), users);
     try (
         InputStream originalInputStream = fileSystemHandler.newInputStream(
             ORIGINAL_AUTH_FILE_PATH);
@@ -128,15 +128,14 @@ private Collection<String> getPoolingConfigUserNames(ClusterContext context) {
   @SuppressWarnings("null")
   private String extractAuthFileSectionForUsers(
       String postgresUser,
-      String postgresPassword,
       Collection<String> users)
       throws SQLException {
     List<String> authFileUsersLines = new ArrayList<>();
-    try (Connection connection = postgresConnectionManager.getConnection(
-        "localhost", EnvoyUtil.PG_PORT,
+    try (Connection connection = postgresConnectionManager.getUnixConnection(
+        ClusterPath.PG_RUN_PATH.path(), EnvoyUtil.PG_PORT,
         SUPERUSER_DATABASE,
         postgresUser,
-        postgresPassword);
+        "");
         PreparedStatement statement = connection.prepareStatement(
             SELECT_PGBOUNCER_USERS_FROM_PG_SHADOW)) {
       statement.setArray(1, connection.createArrayOf(

stackgres-k8s/src/cluster-controller/src/test/java/io/stackgres/cluster/controller/PgBouncerAuthFileReconciliatorTest.java

@@ -104,7 +104,7 @@ void testReconciliationWithoutUsers_authFileIsUpdated() throws Exception {
         .thenReturn(Optional.of(poolingConfig));
     when(secretFinder.findByNameAndNamespace(any(), any()))
         .thenReturn(Optional.of(secret));
-    when(postgresConnectionManager.getConnection(any(), anyInt(), any(), any(), any()))
+    when(postgresConnectionManager.getUnixConnection(any(), anyInt(), any(), any(), any()))
         .thenReturn(connection);
     when(connection.prepareStatement(any()))
         .thenReturn(preparedStatement);
@@ -124,7 +124,7 @@ void testReconciliationWithoutUsers_authFileIsUpdated() throws Exception {
     reconciliator.updatePgbouncerUsersInAuthFile(context);
     verify(fileSystemHandler, times(1)).copyOrReplace(any(Path.class), any());
     verify(fileSystemHandler, times(1)).copyOrReplace(any(InputStream.class), any());
-    verify(postgresConnectionManager, times(1)).getConnection(any(), anyInt(), any(), any(), any());
+    verify(postgresConnectionManager, times(1)).getUnixConnection(any(), anyInt(), any(), any(), any());
     verify(resultSet, times(1)).next();
     assertEquals("user0\n\n\n", authFileContent.join());
   }
@@ -152,7 +152,7 @@ void testReconciliationWithUsers_authFileIsUpdated() throws Exception {
         .thenReturn(Optional.of(poolingConfig));
     when(secretFinder.findByNameAndNamespace(any(), any()))
         .thenReturn(Optional.of(secret));
-    when(postgresConnectionManager.getConnection(any(), anyInt(), any(), any(), any()))
+    when(postgresConnectionManager.getUnixConnection(any(), anyInt(), any(), any(), any()))
         .thenReturn(connection);
     when(connection.prepareStatement(any()))
         .thenReturn(preparedStatement);
@@ -176,7 +176,7 @@ void testReconciliationWithUsers_authFileIsUpdated() throws Exception {
     reconciliator.updatePgbouncerUsersInAuthFile(context);
     verify(fileSystemHandler, times(1)).copyOrReplace(any(Path.class), any());
     verify(fileSystemHandler, times(1)).copyOrReplace(any(InputStream.class), any());
-    verify(postgresConnectionManager, times(1)).getConnection(any(), anyInt(), any(), any(), any());
+    verify(postgresConnectionManager, times(1)).getUnixConnection(any(), anyInt(), any(), any(), any());
     verify(resultSet, times(3)).next();
     verify(resultSet, times(2)).getString(eq(1));
     assertEquals("user0\n\nuser1\nuser2\n", authFileContent.join());

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/StackGresShardedClusterForUtil.java

@@ -377,7 +377,8 @@ void setInitialData(
         && initialData.getRestore().getFromBackup().getName() != null
         && cluster.getStatus() != null
         && cluster.getStatus().getSgBackups() != null
-        && !cluster.getStatus().getSgBackups().isEmpty()) {
+        && !cluster.getStatus().getSgBackups().isEmpty()
+        && index < cluster.getStatus().getSgBackups().size()) {
       var fromBackup = initialData
           .getRestore().getFromBackup();
       var restoreFromBackupBuilder = new StackGresClusterRestoreFromBackupBuilder()