zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-07-26 04:28:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove unused fields in config (#2051)

Browse source
This commit is contained in:
Lai Jiang 2023-06-08 15:54:20 -04:00 • committed by GitHub
parent 798a6ffc74
commit cf0486a5d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,7 +98,6 @@ public class RegistryConfigSettings {
public String tmchCaMode; public String tmchCaMode;
public String tmchCrlUrl; public String tmchCrlUrl;
public String tmchMarksDbUrl; public String tmchMarksDbUrl;
public String checkApiServletClientId;
public String registryAdminClientId; public String registryAdminClientId;
public String premiumTermsExportDisclaimer; public String premiumTermsExportDisclaimer;
public String reservedTermsExportDisclaimer; public String reservedTermsExportDisclaimer;
@ -212,14 +211,6 @@ public class RegistryConfigSettings {
/** Configuration for keyrings (used to store secrets outside of source). */ /** Configuration for keyrings (used to store secrets outside of source). */
public static class Keyring { public static class Keyring {
public String activeKeyring; public String activeKeyring;
// TODO(b/257276342): Remove after config files in nomulus-internal are updated.
public Kms kms;
}
/** Configuration for Cloud KMS. */
public static class Kms {
public String keyringName;
public String projectId;
} }
/** Configuration options for the registry tool. */ /** Configuration options for the registry tool. */

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

@ -96,10 +96,6 @@ registryPolicy:
# URL for the MarksDB registry interface. # URL for the MarksDB registry interface.
tmchMarksDbUrl: https://test-ry.marksdb.org tmchMarksDbUrl: https://test-ry.marksdb.org
# Registry’s operations registrar, used for front-end availability/premium
# domain checks.
checkApiServletClientId: TheRegistrar
# The registry admin's registrar. Admins are granted permission to log in # The registry admin's registrar. Admins are granted permission to log in
# using this registrar automatically if they are not associated with any # using this registrar automatically if they are not associated with any
# registrar # registrar
@ -456,16 +452,6 @@ keyring:
# for Cloud SecretManager. # for Cloud SecretManager.
activeKeyring: Dummy activeKeyring: Dummy
# Configuration options specific to Google Cloud KMS.
kms:
# GCP project containing the KMS keyring. Should only be used for KMS in
# order to keep a simple locked down IAM configuration.
projectId: registry-kms-project-id
# The name to use for the Cloud KMS KeyRing which will store encryption keys
# for Nomulus secrets.
keyringName: nomulus
# 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.