Skip to content

Commit f7dcaa0

Browse files
benbroadawaybenbroadaway
committed
less confusing name ExternalTokenAuth -> MappingAuthConfig
1 parent c710eb1 commit f7dcaa0

File tree

19 files changed

+86
-86
lines changed

19 files changed

+86
-86
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import com.walmartlabs.concord.client2.SystemApi;
2727
import com.walmartlabs.concord.common.AuthTokenProvider;
2828
import com.walmartlabs.concord.common.ExternalAuthToken;
29-
import com.walmartlabs.concord.common.cfg.ExternalTokenAuth;
29+
import com.walmartlabs.concord.common.cfg.MappingAuthConfig;
3030
import com.walmartlabs.concord.github.appinstallation.GitHubAppInstallation;
3131
import com.walmartlabs.concord.sdk.Secret;
3232

@@ -75,7 +75,7 @@ public static class ConcordServerTokenProvider implements AuthTokenProvider {
7575
private static final String CFG_URL_PATTERN = "externalTokenProvider.urlPattern";
7676

7777
private final SystemApi systemApi;
78-
private final ExternalTokenAuth.ConcordServerAuth auth;
78+
private final MappingAuthConfig.ConcordServerAuthConfig auth;
7979

8080
@Inject
8181
public ConcordServerTokenProvider(ApiClientFactory apiClientFactory, Config config) {
@@ -88,14 +88,14 @@ public ConcordServerTokenProvider(ApiClientFactory apiClientFactory, Config conf
8888
}
8989
}
9090

91-
private static ExternalTokenAuth.ConcordServerAuth initAuth(Config config) {
91+
private static MappingAuthConfig.ConcordServerAuthConfig initAuth(Config config) {
9292
if (!config.hasPath(CFG_ENABLED) || !config.getBoolean(CFG_ENABLED)) {
9393
return null;
9494
}
9595

9696
return config.hasPath(CFG_URL_PATTERN)
97-
? ExternalTokenAuth.ConcordServerAuth.builder()
98-
.urlPattern(ExternalTokenAuth.assertBaseUrlPattern(config.getString(CFG_URL_PATTERN)))
97+
? MappingAuthConfig.ConcordServerAuthConfig.builder()
98+
.urlPattern(MappingAuthConfig.assertBaseUrlPattern(config.getString(CFG_URL_PATTERN)))
9999
.build()
100100
: null;
101101
}

‎agent/src/main/java/com/walmartlabs/concord/agent/cfg/GitConfiguration.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222

2323
import com.typesafe.config.Config;
24-
import com.walmartlabs.concord.common.cfg.ExternalTokenAuth;
24+
import com.walmartlabs.concord.common.cfg.MappingAuthConfig;
2525
import com.walmartlabs.concord.common.cfg.OauthTokenConfig;
2626

2727
import javax.inject.Inject;
@@ -119,7 +119,7 @@ public boolean isSkip() {
119119

120120
public List<String> getAllowedSchemes() { return allowedSchemes; }
121121

122-
public List<ExternalTokenAuth> getSystemAuth() {
122+
public List<MappingAuthConfig> getSystemAuth() {
123123
return authConfigs.stream()
124124
.map(o -> {
125125
AuthSource type = AuthSource.valueOf(o.getString("type").toUpperCase());
@@ -138,7 +138,7 @@ enum AuthSource {
138138
}
139139

140140
public interface AuthConfig {
141-
ExternalTokenAuth toGitAuth();
141+
MappingAuthConfig toGitAuth();
142142
}
143143

144144
public record OauthConfig(String urlPattern, String token) implements AuthConfig {
@@ -151,9 +151,9 @@ static OauthConfig from(Config cfg) {
151151
}
152152

153153
@Override
154-
public ExternalTokenAuth.Oauth toGitAuth() {
155-
return ExternalTokenAuth.Oauth.builder()
156-
.urlPattern(ExternalTokenAuth.assertBaseUrlPattern(this.urlPattern()))
154+
public MappingAuthConfig.OauthAuthConfig toGitAuth() {
155+
return MappingAuthConfig.OauthAuthConfig.builder()
156+
.urlPattern(MappingAuthConfig.assertBaseUrlPattern(this.urlPattern()))
157157
.token(this.token())
158158
.build();
159159
}

‎agent/src/main/java/com/walmartlabs/concord/agent/cfg/GitHubConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* =====
2121
*/
2222

23-
import com.walmartlabs.concord.common.cfg.ExternalTokenAuth;
23+
import com.walmartlabs.concord.common.cfg.MappingAuthConfig;
2424
import com.walmartlabs.concord.github.appinstallation.cfg.GitHubAppInstallationConfig;
2525

2626
import javax.inject.Inject;
@@ -46,7 +46,7 @@ public GitHubConfiguration(com.typesafe.config.Config config) {
4646
}
4747

4848
@Override
49-
public List<ExternalTokenAuth> getAuthConfigs() {
49+
public List<MappingAuthConfig> getAuthConfigs() {
5050
return appInstallation.getAuthConfigs();
5151
}
5252

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* =====
2121
*/
2222

23-
import com.walmartlabs.concord.common.cfg.ExternalTokenAuth;
23+
import com.walmartlabs.concord.common.cfg.MappingAuthConfig;
2424
import com.walmartlabs.concord.common.cfg.OauthTokenConfig;
2525
import com.walmartlabs.concord.common.secret.BinaryDataSecret;
2626
import com.walmartlabs.concord.sdk.Secret;
@@ -71,7 +71,7 @@ default URI addUserInfoToUri(URI repo, @Nullable Secret secret) {
7171
@SuppressWarnings("ClassCanBeRecord")
7272
class OauthTokenProvider implements AuthTokenProvider {
7373

74-
private final List<ExternalTokenAuth> authConfigs;
74+
private final List<MappingAuthConfig> authConfigs;
7575

7676
@Inject
7777
public OauthTokenProvider(OauthTokenConfig config) {
@@ -87,8 +87,8 @@ public boolean supports(URI repo, @Nullable Secret secret) {
8787
public Optional<ExternalAuthToken> getToken(URI repo, @Nullable Secret secret) {
8888
return authConfigs.stream()
8989
.filter(auth -> auth.canHandle(repo))
90-
.filter(ExternalTokenAuth.Oauth.class::isInstance)
91-
.map(ExternalTokenAuth.Oauth.class::cast)
90+
.filter(MappingAuthConfig.OauthAuthConfig.class::isInstance)
91+
.map(MappingAuthConfig.OauthAuthConfig.class::cast)
9292
.findFirst()
9393
.map(auth -> ExternalAuthToken.StaticToken.builder()
9494
.token(auth.token())
@@ -115,17 +115,17 @@ private boolean systemSupports(URI repoUri) {
115115
return authConfigs.stream().anyMatch(auth -> auth.canHandle(repoUri));
116116
}
117117

118-
private static List<ExternalTokenAuth> toConfigList(OauthTokenConfig config) {
118+
private static List<MappingAuthConfig> toConfigList(OauthTokenConfig config) {
119119
var token = config.getOauthToken().orElse(null);
120120

121121
if (token == null || token.isBlank() && config.getSystemAuth().isEmpty()) {
122122
return config.getSystemAuth();
123123
}
124124

125-
return List.of(ExternalTokenAuth.Oauth.builder()
125+
return List.of(MappingAuthConfig.OauthAuthConfig.builder()
126126
.token(token)
127127
.username(config.getOauthUsername())
128-
.urlPattern(ExternalTokenAuth.assertBaseUrlPattern(config.getOauthUrlPattern().orElse(".*")))// for backwards compat with git.oauth
128+
.urlPattern(MappingAuthConfig.assertBaseUrlPattern(config.getOauthUrlPattern().orElse(".*")))// for backwards compat with git.oauth
129129
.build());
130130
}
131131
}

‎common/src/main/java/com/walmartlabs/concord/common/cfg/ExternalTokenAuth.java‎ renamed to ‎common/src/main/java/com/walmartlabs/concord/common/cfg/MappingAuthConfig.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.util.Optional;
2727
import java.util.regex.Pattern;
2828

29-
public interface ExternalTokenAuth {
29+
public interface MappingAuthConfig {
3030

3131
/** Regex matching the host, optional port and path of a Git repository URL. */
3232
Pattern urlPattern();
@@ -39,7 +39,7 @@ public interface ExternalTokenAuth {
3939
Optional<String> username();
4040

4141
/**
42-
* For compatibility with a {@link ExternalTokenAuth} instance, a URI must match the
42+
* For compatibility with a {@link MappingAuthConfig} instance, a URI must match the
4343
* {@link #urlPattern()} regex. The regex may match against the path to support
4444
* either a Git host behind a reverse proxy or restricting the auth to specific
4545
* org/repo patterns.
@@ -61,19 +61,19 @@ static Pattern assertBaseUrlPattern(String pattern) {
6161

6262
@Value.Immutable
6363
@Value.Style(jdkOnly = true)
64-
interface Oauth extends ExternalTokenAuth {
64+
interface OauthAuthConfig extends MappingAuthConfig {
6565
String token();
6666

67-
static ImmutableOauth.Builder builder() {
68-
return ImmutableOauth.builder();
67+
static ImmutableOauthAuthConfig.Builder builder() {
68+
return ImmutableOauthAuthConfig.builder();
6969
}
7070
}
7171

7272
@Value.Immutable
7373
@Value.Style(jdkOnly = true)
74-
interface ConcordServerAuth extends ExternalTokenAuth {
75-
static ImmutableConcordServerAuth.Builder builder() {
76-
return ImmutableConcordServerAuth.builder();
74+
interface ConcordServerAuthConfig extends MappingAuthConfig {
75+
static ImmutableConcordServerAuthConfig.Builder builder() {
76+
return ImmutableConcordServerAuthConfig.builder();
7777
}
7878
}
7979

‎common/src/main/java/com/walmartlabs/concord/common/cfg/OauthTokenConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ public interface OauthTokenConfig {
3131

3232
Optional<String> getOauthUrlPattern();
3333

34-
List<ExternalTokenAuth> getSystemAuth();
34+
List<MappingAuthConfig> getSystemAuth();
3535

3636
}

‎common/src/test/java/com/walmartlabs/concord/common/AuthTokenProviderTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* =====
2121
*/
2222

23-
import com.walmartlabs.concord.common.cfg.ExternalTokenAuth;
23+
import com.walmartlabs.concord.common.cfg.MappingAuthConfig;
2424
import com.walmartlabs.concord.common.cfg.OauthTokenConfig;
2525
import com.walmartlabs.concord.common.secret.BinaryDataSecret;
2626
import com.walmartlabs.concord.common.secret.UsernamePassword;
@@ -59,7 +59,7 @@ class AuthTokenProviderTest {
5959
UsernamePassword usernamePassword;
6060

6161
@Mock
62-
ExternalTokenAuth.Oauth oauth;
62+
MappingAuthConfig.OauthAuthConfig oauth;
6363

6464
@Mock
6565
TestOauthTokenConfig oauthTokenConfig;

‎github-app-installation/src/main/java/com/walmartlabs/concord/github/appinstallation/AccessTokenProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public AccessTokenProvider(GitHubAppInstallationConfig cfg,
7373
this.httpClientSupplier = httpClientSupplier;
7474
}
7575

76-
ExternalAuthToken getRepoInstallationToken(AppInstallationAuth app, String orgRepo) throws GitHubAppException {
76+
ExternalAuthToken getRepoInstallationToken(GitHubAppAuthConfig app, String orgRepo) throws GitHubAppException {
7777
try {
7878
var jwt = generateJWT(app);
7979
var accessTokenUrl = getAccessTokenUrl(app.apiUrl(), orgRepo, jwt);
@@ -132,7 +132,7 @@ private ExternalAuthToken createAccessToken(String accessTokenUrl, String jwt) {
132132
});
133133
}
134134

135-
private static String generateJWT(AppInstallationAuth auth) throws JOSEException {
135+
private static String generateJWT(GitHubAppAuthConfig auth) throws JOSEException {
136136
var pk = auth.privateKey();
137137
var rsaJWK = JWK.parseFromPEMEncodedObjects(pk).toRSAKey();
138138

‎github-app-installation/src/main/java/com/walmartlabs/concord/github/appinstallation/AppInstallationAuth.java‎ renamed to ‎github-app-installation/src/main/java/com/walmartlabs/concord/github/appinstallation/GitHubAppAuthConfig.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
*/
2222

2323
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
24-
import com.walmartlabs.concord.common.cfg.ExternalTokenAuth;
24+
import com.walmartlabs.concord.common.cfg.MappingAuthConfig;
2525
import org.immutables.value.Value;
2626

2727
@Value.Immutable
2828
@Value.Style(jdkOnly = true)
29-
@JsonDeserialize(as = ImmutableAppInstallationAuth.class)
30-
public interface AppInstallationAuth extends ExternalTokenAuth {
29+
@JsonDeserialize(as = ImmutableGitHubAppAuthConfig.class)
30+
public interface GitHubAppAuthConfig extends MappingAuthConfig {
3131

3232
@Value.Default
3333
default String apiUrl() {
@@ -46,8 +46,8 @@ default void checkUrlPattern() {
4646
}
4747
}
4848

49-
static ImmutableAppInstallationAuth.Builder builder() {
50-
return ImmutableAppInstallationAuth.builder();
49+
static ImmutableGitHubAppAuthConfig.Builder builder() {
50+
return ImmutableGitHubAppAuthConfig.builder();
5151
}
5252

5353
}

‎github-app-installation/src/main/java/com/walmartlabs/concord/github/appinstallation/GitHubAppInstallation.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import com.google.common.util.concurrent.UncheckedExecutionException;
2929
import com.walmartlabs.concord.common.AuthTokenProvider;
3030
import com.walmartlabs.concord.common.ExternalAuthToken;
31-
import com.walmartlabs.concord.common.cfg.ExternalTokenAuth;
31+
import com.walmartlabs.concord.common.cfg.MappingAuthConfig;
3232
import com.walmartlabs.concord.common.secret.BinaryDataSecret;
3333
import com.walmartlabs.concord.github.appinstallation.cfg.GitHubAppInstallationConfig;
3434
import com.walmartlabs.concord.github.appinstallation.exception.GitHubAppException;
@@ -130,14 +130,14 @@ private Optional<ExternalAuthToken> fetchToken(URI repo, @Nullable Secret secret
130130
.filter(auth -> auth.canHandle(repo))
131131
.findFirst()
132132
.map(auth -> {
133-
if (auth instanceof ExternalTokenAuth.Oauth tokenAuth) {
133+
if (auth instanceof MappingAuthConfig.OauthAuthConfig tokenAuth) {
134134
return GitHubInstallationToken.builder()
135135
.token(tokenAuth.token())
136136
.username(tokenAuth.username().orElse(null))
137137
.build();
138138
}
139139

140-
if (auth instanceof AppInstallationAuth app) {
140+
if (auth instanceof GitHubAppAuthConfig app) {
141141
return getTokenFromAppInstall(app, repo);
142142
}
143143

@@ -190,7 +190,7 @@ private ExternalAuthToken fromBinaryData(URI repo, BinaryDataSecret bds) {
190190
.build();
191191
}
192192

193-
private ExternalAuthToken getTokenFromAppInstall(AppInstallationAuth app, URI repo) {
193+
private ExternalAuthToken getTokenFromAppInstall(GitHubAppAuthConfig app, URI repo) {
194194
log.info("getTokenFromAppInstall ['{}', '{}']", app.apiUrl(), repo);
195195

196196
try {

0 commit comments

Comments
 (0)