From d62e2f143f89fdda3ec0e60e627149373249ffd8 Mon Sep 17 00:00:00 2001
From: Igor Vinokur <ivinokur@redhat.com>
Date: Tue, 20 Jun 2023 12:19:12 +0300
Subject: [PATCH] fixup! Provision git credentiols secrets on workspace start

---
 .../KubernetesPersonalAccessTokenManager.java |  1 -
 .../CredentialsSecretConfigurator.java        | 19 ++++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/infrastructures/infrastructure-factory/src/main/java/org/eclipse/che/api/factory/server/scm/kubernetes/KubernetesPersonalAccessTokenManager.java b/infrastructures/infrastructure-factory/src/main/java/org/eclipse/che/api/factory/server/scm/kubernetes/KubernetesPersonalAccessTokenManager.java
index 03db981112..497123d3c5 100644
--- a/infrastructures/infrastructure-factory/src/main/java/org/eclipse/che/api/factory/server/scm/kubernetes/KubernetesPersonalAccessTokenManager.java
+++ b/infrastructures/infrastructure-factory/src/main/java/org/eclipse/che/api/factory/server/scm/kubernetes/KubernetesPersonalAccessTokenManager.java
@@ -153,7 +153,6 @@ public class KubernetesPersonalAccessTokenManager implements PersonalAccessToken
           UnsatisfiedScmPreconditionException {
     Subject subject = EnvironmentContext.getCurrent().getSubject();
     Optional<PersonalAccessToken> tokenOptional = get(subject, scmServerUrl);
-    PersonalAccessToken personalAccessToken;
     if (tokenOptional.isPresent()) {
       return tokenOptional.get();
     } else {
diff --git a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/CredentialsSecretConfigurator.java b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/CredentialsSecretConfigurator.java
index bf724b4720..016df5eeef 100644
--- a/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/CredentialsSecretConfigurator.java
+++ b/infrastructures/kubernetes/src/main/java/org/eclipse/che/workspace/infrastructure/kubernetes/namespace/configurator/CredentialsSecretConfigurator.java
@@ -15,7 +15,6 @@ import com.google.common.collect.ImmutableMap;
 import io.fabric8.kubernetes.api.model.Secret;
 import java.util.Base64;
 import java.util.Map;
-import java.util.Optional;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.eclipse.che.api.factory.server.scm.PersonalAccessTokenManager;
@@ -58,17 +57,19 @@ public class CredentialsSecretConfigurator implements NamespaceConfigurator {
   public void configure(NamespaceResolutionContext namespaceResolutionContext, String namespaceName)
       throws InfrastructureException {
     var client = cheServerKubernetesClientFactory.create();
-    Optional<Secret> mergedCredentialsSecret =
-        client.secrets().inNamespace(namespaceName).list().getItems().stream()
-            .filter(s -> s.getMetadata().getName().equals(MERGED_GIT_CREDENTIALS_SECRET_NAME))
-            .findAny();
+    Secret mergedCredentialsSecret =
+        client
+            .secrets()
+            .inNamespace(namespaceName)
+            .withName(MERGED_GIT_CREDENTIALS_SECRET_NAME)
+            .get();
 
     client.secrets().inNamespace(namespaceName).withLabels(SEARCH_LABELS).list().getItems().stream()
         .filter(
             s ->
-                mergedCredentialsSecret.isEmpty()
-                    || !getCredentialsData(mergedCredentialsSecret.get(), "credentials")
-                        .contains(getCredentialsData(s, "token")))
+                mergedCredentialsSecret == null
+                    || !getSecretData(mergedCredentialsSecret, "credentials")
+                        .contains(getSecretData(s, "token")))
         .forEach(
             s -> {
               try {
@@ -83,7 +84,7 @@ public class CredentialsSecretConfigurator implements NamespaceConfigurator {
             });
   }
 
-  private String getCredentialsData(Secret secret, String key) {
+  private String getSecretData(Secret secret, String key) {
     return new String(Base64.getDecoder().decode(secret.getData().get(key).getBytes()));
   }
 }