tidy

Author: benbroadaway

agent/src/main/java/com/walmartlabs/concord/agent/AgentAuthTokenProvider.java

@@ -40,10 +40,7 @@ public class AgentAuthTokenProvider implements AuthTokenProvider {
     public AgentAuthTokenProvider(GitHubAppInstallation githubProvider,
                                   OauthTokenProvider oauthTokenProvider) {
 
-        this.authTokenProviders = List.of(
-                githubProvider,
-                oauthTokenProvider
-        );
+        this.authTokenProviders = List.of(githubProvider, oauthTokenProvider);
     }
 
     @Override
@@ -53,9 +50,9 @@ public boolean supports(URI repo, @Nullable Secret secret) {
     }
 
     public Optional<ExternalAuthToken> getToken(URI repo, @Nullable Secret secret) {
-        for (var k : authTokenProviders) {
-            if (k.supports(repo, secret)) {
-                return k.getToken(repo, secret);
+        for (var tokenProvider : authTokenProviders) {
+            if (tokenProvider.supports(repo, secret)) {
+                return tokenProvider.getToken(repo, secret);
             }
         }
 

agent/src/main/java/com/walmartlabs/concord/agent/RepositoryManager.java

@@ -34,7 +34,6 @@
 import javax.inject.Inject;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.Arrays;
 import java.util.List;
 
 public class RepositoryManager {
@@ -58,7 +57,6 @@ public RepositoryManager(SecretClient secretClient,
         this.gitCfg = gitCfg;
 
         GitClientConfiguration clientCfg = GitClientConfiguration.builder()
-                .oauthToken(gitCfg.getOauthToken())
                 .defaultOperationTimeout(gitCfg.getDefaultOperationTimeout())
                 .fetchTimeout(gitCfg.getFetchTimeout())
                 .httpLowSpeedLimit(gitCfg.getHttpLowSpeedLimit())

common/src/main/java/com/walmartlabs/concord/common/AuthTokenProvider.java

@@ -61,10 +61,8 @@ default URI addUserInfoToUri(URI repo, @Nullable Secret secret) {
                         return new URI(repo.getScheme(), userInfo, repo.getHost(),
                                 repo.getPort(), repo.getPath(), repo.getQuery(), repo.getFragment());
                     } catch (URISyntaxException e) {
-                        // TODO add log?
+                        return null;
                     }
-
-                    return null;
                 })
                 .orElse(repo);
     }

common/src/main/java/com/walmartlabs/concord/common/cfg/MappingAuthConfig.java

@@ -26,6 +26,11 @@
 import java.net.URI;
 import java.util.regex.Pattern;
 
+/**
+ * Configuration for mapping Git repository URLs to an authentication method.
+ * Mapping is based on regex matching (see {@link #urlPattern()}) against the
+ * repository URL.
+ */
 public interface MappingAuthConfig {
 
     /**

repository/src/main/java/com/walmartlabs/concord/repository/GitClientConfiguration.java

@@ -38,9 +38,6 @@ public interface GitClientConfiguration {
 
     Optional<String> oauthUrlPattern();
 
-    @Nullable
-    List<String> authorizedGitHosts();
-
     @Value.Default
     default Set<String> allowedSchemes() {
         return Set.of("https", "http", "ssh", "classpath");

server/impl/src/main/java/com/walmartlabs/concord/server/repository/RepositoryManager.java

@@ -39,7 +39,6 @@
 import javax.inject.Inject;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
@@ -68,9 +67,6 @@ public RepositoryManager(ObjectMapper objectMapper,
                              AuthTokenProvider authProvider) throws IOException {
 
         GitClientConfiguration gitCliCfg = GitClientConfiguration.builder()
-                .oauthToken(gitCfg.getOauthToken()) // TODO remove? authProvider should have the same info now
-                .oauthUsername(gitCfg.getOauthUsername())
-                .oauthUrlPattern(gitCfg.getOauthUrlPattern())
                 .defaultOperationTimeout(gitCfg.getDefaultOperationTimeout())
                 .fetchTimeout(gitCfg.getFetchTimeout())
                 .httpLowSpeedLimit(gitCfg.getHttpLowSpeedLimit())

server/impl/src/main/java/com/walmartlabs/concord/server/repository/ServerAuthTokenProvider.java

@@ -43,7 +43,7 @@ public class ServerAuthTokenProvider implements AuthTokenProvider {
 
     @Inject
     public ServerAuthTokenProvider(GitHubAppInstallation githubProvider,
-                                   AuthTokenProvider.OauthTokenProvider oauthTokenProvider,
+                                   OauthTokenProvider oauthTokenProvider,
                                    MetricRegistry metricRegistry) {
         this.authTokenProviders = List.of(githubProvider, oauthTokenProvider);
 
@@ -58,9 +58,9 @@ public boolean supports(URI repo, @Nullable Secret secret) {
 
     @WithTimer
     public Optional<ExternalAuthToken> getToken(URI repo, @Nullable Secret secret) {
-        for (var k : authTokenProviders) {
-            if (k.supports(repo, secret)) {
-                return k.getToken(repo, secret);
+        for (var tokenProvider : authTokenProviders) {
+            if (tokenProvider.supports(repo, secret)) {
+                return tokenProvider.getToken(repo, secret);
             }
         }