fixup! Omit scm-username annotation from the PAT secret

eclipse-che · Jul 20, 2023 · ea736d1 · ea736d1
1 parent 6a1daa4
commit ea736d1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/...g/eclipse/che/api/factory/server/scm/kubernetes/KubernetesPersonalAccessTokenManager.java b/...g/eclipse/che/api/factory/server/scm/kubernetes/KubernetesPersonalAccessTokenManager.java
@@ -196,7 +196,7 @@ private Optional<PersonalAccessToken> doGetPersonalAccessToken(
             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/...lipse/che/api/factory/server/scm/kubernetes/KubernetesPersonalAccessTokenManagerTest.java b/...lipse/che/api/factory/server/scm/kubernetes/KubernetesPersonalAccessTokenManagerTest.java
@@ -96,7 +96,7 @@ public void shouldTrimBlankCharsInToken() throws Exception {
     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<String, String> data =
@@ -163,7 +163,7 @@ public void testGetTokenFromNamespace() throws Exception {
     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<String, String> data1 =
@@ -217,7 +217,7 @@ public void shouldGetTokenFromASecretWithSCMUsername() throws Exception {
     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<String, String> data =
@@ -260,7 +260,7 @@ public void shouldGetTokenFromASecretWithoutSCMUsername() throws Exception {
     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<String, String> data =
@@ -297,7 +297,7 @@ public void testGetTokenFromNamespaceWithTrailingSlashMismatch() throws Exceptio
     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<String, String> data1 =
@@ -345,7 +345,7 @@ public void shouldDeleteInvalidTokensOnGet() throws Exception {
     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 void shouldReturnFirstValidToken() throws Exception {
     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<String>)
                 invocation -> {

diff --git a/...y/src/main/java/org/eclipse/che/api/factory/server/scm/ScmPersonalAccessTokenFetcher.java b/...y/src/main/java/org/eclipse/che/api/factory/server/scm/ScmPersonalAccessTokenFetcher.java
@@ -57,7 +57,7 @@ public PersonalAccessToken fetchPersonalAccessToken(Subject cheUser, String scmS
    * Iterate over the Set<PersonalAccessTokenFetcher> 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 boolean isValid(PersonalAccessToken personalAccessToken)
    * 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<Pair<Boolean, String>> isValid = fetcher.isValid(params);