mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-01-03 19:54:18 +00:00
Code Issues Releases Wiki Activity

Clean up keyring bindings (#2640)

Browse Source 
Remove the config file's `keyring` section and the binding in java code.
This commit is contained in:
Weimin Yu
2025-01-14 17:06:05 -05:00
committed by GitHub
parent e4ee63b8f3
commit 4cfcc60655
3 changed files with 0 additions and 18 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

@@ -1099,12 +1099,6 @@ public final class RegistryConfig {
return config.registryPolicy.greetingServerId; return config.registryPolicy.greetingServerId;
} }
@Provides
@Config("activeKeyring")
public static String provideKeyring(RegistryConfigSettings config) {
return config.keyring.activeKeyring;
}
@Provides @Provides
@Config("customLogicFactoryClass") @Config("customLogicFactoryClass")
public static String provideCustomLogicFactoryClass(RegistryConfigSettings config) { public static String provideCustomLogicFactoryClass(RegistryConfigSettings config) {

7
core/src/main/java/google/registry/config/RegistryConfigSettings.java
View File

@@ -37,7 +37,6 @@ public class RegistryConfigSettings {
public Monitoring monitoring; public Monitoring monitoring;
public Misc misc; public Misc misc;
public Beam beam; public Beam beam;
public Keyring keyring;
public RegistryTool registryTool; public RegistryTool registryTool;
public SslCertificateValidation sslCertificateValidation; public SslCertificateValidation sslCertificateValidation;
public ContactHistory contactHistory; public ContactHistory contactHistory;
@@ -214,12 +213,6 @@ public class RegistryConfigSettings {
public int transientFailureRetries; public int transientFailureRetries;
} }
/** Configuration for keyrings (used to store secrets outside of source). */
// TODO(b/388835696): remove section after updating config files.
public static class Keyring {
public String activeKeyring;
}
/** Configuration options for the registry tool. */ /** Configuration options for the registry tool. */
public static class RegistryTool { public static class RegistryTool {
public String clientId; public String clientId;

5
core/src/main/java/google/registry/config/files/default-config.yaml
View File

@@ -488,11 +488,6 @@ beam:
initialWorkerCount: 24 initialWorkerCount: 24
stagingBucketUrl: gcs-bucket-with-staged-templates stagingBucketUrl: gcs-bucket-with-staged-templates
keyring:
# The name of the active keyring, either "Dummy" or "CSM". The latter stands
# for Cloud SecretManager.
activeKeyring: Dummy
# Configuration options relevant to the "nomulus" registry tool. # Configuration options relevant to the "nomulus" registry tool.
registryTool: registryTool:
# OAuth client ID used by the tool. # OAuth client ID used by the tool.