diff --git a/core/src/main/java/google/registry/config/RegistryConfigSettings.java b/core/src/main/java/google/registry/config/RegistryConfigSettings.java index d191e307a..cd8d9aa9e 100644 --- a/core/src/main/java/google/registry/config/RegistryConfigSettings.java +++ b/core/src/main/java/google/registry/config/RegistryConfigSettings.java @@ -98,7 +98,6 @@ public class RegistryConfigSettings { public String tmchCaMode; public String tmchCrlUrl; public String tmchMarksDbUrl; - public String checkApiServletClientId; public String registryAdminClientId; public String premiumTermsExportDisclaimer; public String reservedTermsExportDisclaimer; @@ -212,14 +211,6 @@ public class RegistryConfigSettings { /** Configuration for keyrings (used to store secrets outside of source). */ public static class Keyring { 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. */ diff --git a/core/src/main/java/google/registry/config/files/default-config.yaml b/core/src/main/java/google/registry/config/files/default-config.yaml index 3d5107b11..ae6b38955 100644 --- a/core/src/main/java/google/registry/config/files/default-config.yaml +++ b/core/src/main/java/google/registry/config/files/default-config.yaml @@ -96,10 +96,6 @@ registryPolicy: # URL for the MarksDB registry interface. 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 # using this registrar automatically if they are not associated with any # registrar @@ -456,16 +452,6 @@ keyring: # for Cloud SecretManager. 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. registryTool: # OAuth client Id used by the tool.