From ea736d1b21ebc608b390db9e2ce29db6377e2840 Mon Sep 17 00:00:00 2001 From: Igor Vinokur Date: Thu, 20 Jul 2023 15:57:00 +0300 Subject: [PATCH] fixup! Omit scm-username annotation from the PAT secret --- .../KubernetesPersonalAccessTokenManager.java | 2 +- .../KubernetesPersonalAccessTokenManagerTest.java | 14 +++++++------- .../server/scm/ScmPersonalAccessTokenFetcher.java | 4 ++-- 3 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 fb71b293ae..e6a22a18e3 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 @@ -196,7 +196,7 @@ public class KubernetesPersonalAccessTokenManager implements PersonalAccessToken String tokenId = annotations.get(ANNOTATION_SCM_PERSONAL_ACCESS_TOKEN_ID); String organization = annotations.get(ANNOTATION_SCM_ORGANIZATION); String scmUsername = - scmPersonalAccessTokenFetcher.isValid( + scmPersonalAccessTokenFetcher.getScmUsername( new PersonalAccessTokenParams( trimmedUrl, providerName, tokenId, token, organization)); if (!isNullOrEmpty(scmUsername)) { diff --git a/infrastructures/infrastructure-factory/src/test/java/org/eclipse/che/api/factory/server/scm/kubernetes/KubernetesPersonalAccessTokenManagerTest.java b/infrastructures/infrastructure-factory/src/test/java/org/eclipse/che/api/factory/server/scm/kubernetes/KubernetesPersonalAccessTokenManagerTest.java index 9bb6915db6..24539f197b 100644 --- a/infrastructures/infrastructure-factory/src/test/java/org/eclipse/che/api/factory/server/scm/kubernetes/KubernetesPersonalAccessTokenManagerTest.java +++ b/infrastructures/infrastructure-factory/src/test/java/org/eclipse/che/api/factory/server/scm/kubernetes/KubernetesPersonalAccessTokenManagerTest.java @@ -96,7 +96,7 @@ public class KubernetesPersonalAccessTokenManagerTest { KubernetesSecrets secrets = Mockito.mock(KubernetesSecrets.class); when(namespaceFactory.access(eq(null), eq(meta.getName()))).thenReturn(kubernetesnamespace); when(kubernetesnamespace.secrets()).thenReturn(secrets); - when(scmPersonalAccessTokenFetcher.isValid(any(PersonalAccessTokenParams.class))) + when(scmPersonalAccessTokenFetcher.getScmUsername(any(PersonalAccessTokenParams.class))) .thenReturn("user"); Map data = @@ -163,7 +163,7 @@ public class KubernetesPersonalAccessTokenManagerTest { KubernetesSecrets secrets = Mockito.mock(KubernetesSecrets.class); when(namespaceFactory.access(eq(null), eq(meta.getName()))).thenReturn(kubernetesnamespace); when(kubernetesnamespace.secrets()).thenReturn(secrets); - when(scmPersonalAccessTokenFetcher.isValid(any(PersonalAccessTokenParams.class))) + when(scmPersonalAccessTokenFetcher.getScmUsername(any(PersonalAccessTokenParams.class))) .thenReturn("user"); Map data1 = @@ -217,7 +217,7 @@ public class KubernetesPersonalAccessTokenManagerTest { KubernetesSecrets secrets = Mockito.mock(KubernetesSecrets.class); when(namespaceFactory.access(eq(null), eq(meta.getName()))).thenReturn(kubernetesnamespace); when(kubernetesnamespace.secrets()).thenReturn(secrets); - when(scmPersonalAccessTokenFetcher.isValid(any(PersonalAccessTokenParams.class))) + when(scmPersonalAccessTokenFetcher.getScmUsername(any(PersonalAccessTokenParams.class))) .thenReturn("user"); Map data = @@ -260,7 +260,7 @@ public class KubernetesPersonalAccessTokenManagerTest { KubernetesSecrets secrets = Mockito.mock(KubernetesSecrets.class); when(namespaceFactory.access(eq(null), eq(meta.getName()))).thenReturn(kubernetesnamespace); when(kubernetesnamespace.secrets()).thenReturn(secrets); - when(scmPersonalAccessTokenFetcher.isValid(any(PersonalAccessTokenParams.class))) + when(scmPersonalAccessTokenFetcher.getScmUsername(any(PersonalAccessTokenParams.class))) .thenReturn("user"); Map data = @@ -297,7 +297,7 @@ public class KubernetesPersonalAccessTokenManagerTest { KubernetesSecrets secrets = Mockito.mock(KubernetesSecrets.class); when(namespaceFactory.access(eq(null), eq(meta.getName()))).thenReturn(kubernetesnamespace); when(kubernetesnamespace.secrets()).thenReturn(secrets); - when(scmPersonalAccessTokenFetcher.isValid(any(PersonalAccessTokenParams.class))) + when(scmPersonalAccessTokenFetcher.getScmUsername(any(PersonalAccessTokenParams.class))) .thenReturn("user"); Map data1 = @@ -345,7 +345,7 @@ public class KubernetesPersonalAccessTokenManagerTest { KubernetesSecrets secrets = Mockito.mock(KubernetesSecrets.class); when(namespaceFactory.access(eq(null), eq(meta.getName()))).thenReturn(kubernetesnamespace); when(kubernetesnamespace.secrets()).thenReturn(secrets); - when(scmPersonalAccessTokenFetcher.isValid(any(PersonalAccessTokenParams.class))) + when(scmPersonalAccessTokenFetcher.getScmUsername(any(PersonalAccessTokenParams.class))) .thenReturn(null); when(cheServerKubernetesClientFactory.create()).thenReturn(kubeClient); when(kubeClient.secrets()).thenReturn(secretsMixedOperation); @@ -377,7 +377,7 @@ public class KubernetesPersonalAccessTokenManagerTest { KubernetesSecrets secrets = Mockito.mock(KubernetesSecrets.class); when(namespaceFactory.access(eq(null), eq(meta.getName()))).thenReturn(kubernetesnamespace); when(kubernetesnamespace.secrets()).thenReturn(secrets); - when(scmPersonalAccessTokenFetcher.isValid(any(PersonalAccessTokenParams.class))) + when(scmPersonalAccessTokenFetcher.getScmUsername(any(PersonalAccessTokenParams.class))) .thenAnswer( (Answer) invocation -> { diff --git a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/scm/ScmPersonalAccessTokenFetcher.java b/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/scm/ScmPersonalAccessTokenFetcher.java index 9527e4dc0c..1f4fe1d060 100644 --- a/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/scm/ScmPersonalAccessTokenFetcher.java +++ b/wsmaster/che-core-api-factory/src/main/java/org/eclipse/che/api/factory/server/scm/ScmPersonalAccessTokenFetcher.java @@ -57,7 +57,7 @@ public class ScmPersonalAccessTokenFetcher { * Iterate over the Set declared in container and sequentially invoke * {@link PersonalAccessTokenFetcher#isValid(PersonalAccessToken)} method. * - * @deprecated use {@link #isValid(PersonalAccessTokenParams)} instead. + * @deprecated use {@link #getScmUsername(PersonalAccessTokenParams)} instead. * @throws UnknownScmProviderException - if none of PersonalAccessTokenFetchers return a * meaningful result. */ @@ -82,7 +82,7 @@ public class ScmPersonalAccessTokenFetcher { * fetchers return an scm username, return it. Otherwise, return null. */ @Nullable - public String isValid(PersonalAccessTokenParams params) + public String getScmUsername(PersonalAccessTokenParams params) throws UnknownScmProviderException, ScmUnauthorizedException, ScmCommunicationException { for (PersonalAccessTokenFetcher fetcher : personalAccessTokenFetchers) { Optional> isValid = fetcher.isValid(params);