File tree Expand file tree Collapse file tree 3 files changed +0
-18
lines changed
core/src/main/java/google/registry/config Expand file tree Collapse file tree 3 files changed +0
-18
lines changed Original file line number Diff line number Diff line change @@ -1099,12 +1099,6 @@ public static String provideGreetingServerId(RegistryConfigSettings config) {
10991099 return config .registryPolicy .greetingServerId ;
11001100 }
11011101
1102- @ Provides
1103- @ Config ("activeKeyring" )
1104- public static String provideKeyring (RegistryConfigSettings config ) {
1105- return config .keyring .activeKeyring ;
1106- }
1107-
11081102 @ Provides
11091103 @ Config ("customLogicFactoryClass" )
11101104 public static String provideCustomLogicFactoryClass (RegistryConfigSettings config ) {
Original file line number Diff line number Diff line change @@ -37,7 +37,6 @@ public class RegistryConfigSettings {
3737 public Monitoring monitoring ;
3838 public Misc misc ;
3939 public Beam beam ;
40- public Keyring keyring ;
4140 public RegistryTool registryTool ;
4241 public SslCertificateValidation sslCertificateValidation ;
4342 public ContactHistory contactHistory ;
@@ -214,12 +213,6 @@ public static class Misc {
214213 public int transientFailureRetries ;
215214 }
216215
217- /** Configuration for keyrings (used to store secrets outside of source). */
218- // TODO(b/388835696): remove section after updating config files.
219- public static class Keyring {
220- public String activeKeyring ;
221- }
222-
223216 /** Configuration options for the registry tool. */
224217 public static class RegistryTool {
225218 public String clientId ;
Original file line number Diff line number Diff line change @@ -488,11 +488,6 @@ beam:
488488 initialWorkerCount : 24
489489 stagingBucketUrl : gcs-bucket-with-staged-templates
490490
491- keyring :
492- # The name of the active keyring, either "Dummy" or "CSM". The latter stands
493- # for Cloud SecretManager.
494- activeKeyring : Dummy
495-
496491# Configuration options relevant to the "nomulus" registry tool.
497492registryTool :
498493 # OAuth client ID used by the tool.
You can’t perform that action at this time.
0 commit comments