zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-06-26 14:24:55 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove jdbcUrl config for nomulus tool (#330)

Browse source
This commit is contained in:
Shicong Huang 2019-11-05 10:33:53 -05:00 • committed by GitHub
parent 82dcc88f9c
commit b179b084af
3 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/src/main/java/google/registry/config/RegistryConfig.java
View file

@ -1296,12 +1296,6 @@ public final class RegistryConfig {
return config.registryTool.clientSecret; return config.registryTool.clientSecret;
} }
@Provides
@Config("toolsCloudSqlJdbcUrl")
public static String providesToolsCloudSqlJdbcUrl(RegistryConfigSettings config) {
return config.registryTool.jdbcUrl;
}
@Provides @Provides
@Config("toolsCloudSqlUsername") @Config("toolsCloudSqlUsername")
public static String providesToolsCloudSqlUsername(RegistryConfigSettings config) { public static String providesToolsCloudSqlUsername(RegistryConfigSettings config) {

1
core/src/main/java/google/registry/config/RegistryConfigSettings.java
View file

@ -213,7 +213,6 @@ public class RegistryConfigSettings {
public static class RegistryTool { public static class RegistryTool {
public String clientId; public String clientId;
public String clientSecret; public String clientSecret;
public String jdbcUrl;
public String username; public String username;
} }
} }

2
core/src/main/java/google/registry/config/files/default-config.yaml
View file

@ -422,6 +422,4 @@ registryTool:
clientId: YOUR_CLIENT_ID clientId: YOUR_CLIENT_ID
# OAuth client secret used by the tool. # OAuth client secret used by the tool.
clientSecret: YOUR_CLIENT_SECRET clientSecret: YOUR_CLIENT_SECRET
# Nomulus tool uses a different jdbc url and user to connect to Cloud SQL
jdbcUrl: jdbc:postgresql://localhost/tool
username: toolusername username: toolusername