fix: when useIamRole is true operator may fail due to secret not found

Author: teoincontatto

stackgres-k8s/e2e/utils/operator

@@ -1002,7 +1002,7 @@ get_operator_images_pre_1_18_0_alpha1() {
   echo "${CLUSTER_CONTROLLER_IMAGE_NAME%:*}:$VERSION"
   echo "${STREAM_IMAGE_NAME%:*}:$VERSION-jvm"
   echo "${ADMINUI_IMAGE_NAME%:*}:$VERSION"
-  echo "${PGLAMBDA_JAVASCRIPT_IMAGE_NAME%:*}:${NATIVE_TAG}-javascript"
+  echo "${PGLAMBDA_JAVASCRIPT_IMAGE_NAME%:*}:${VERSION}-javascript"
 }
 
 get_operator_images_pre_1_14_0_alpha1() {

stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupEnvVarFactory.java

@@ -152,16 +152,18 @@ private ImmutableMap<String, String> getBackupSecrets(
     return Seq.of(
         Optional.of(storage)
         .map(BackupStorage::getS3)
-        .map(awsConf -> Seq.of(
-            getSecretEntry("AWS_ACCESS_KEY_ID",
-                awsConf.getAwsCredentials().getSecretKeySelectors().getAccessKeyId(),
-                secrets),
-            getSecretEntry("AWS_SECRET_ACCESS_KEY",
-                awsConf.getAwsCredentials()
-                    .getSecretKeySelectors().getSecretAccessKey(), secrets))
-            .filter(Predicate.not(entry -> Optional.of(awsConf.getAwsCredentials())
+        .map(awsConf -> Optional.of(true)
+            .filter(Predicate.not(ignored -> Optional.of(awsConf.getAwsCredentials())
                 .map(AwsCredentials::getUseIamRole)
-                .orElse(false)))),
+                .orElse(false)))
+             .stream()
+             .flatMap(ignored -> Seq.of(
+                 getSecretEntry("AWS_ACCESS_KEY_ID",
+                     awsConf.getAwsCredentials().getSecretKeySelectors().getAccessKeyId(),
+                     secrets),
+                 getSecretEntry("AWS_SECRET_ACCESS_KEY",
+                     awsConf.getAwsCredentials()
+                     .getSecretKeySelectors().getSecretAccessKey(), secrets)))),
         Optional.of(storage)
         .map(BackupStorage::getS3Compatible)
         .map(awsConf -> Seq.of(