diff --git a/java/google/registry/module/backend/BackendComponent.java b/java/google/registry/module/backend/BackendComponent.java index edd96b67d..636f58015 100644 --- a/java/google/registry/module/backend/BackendComponent.java +++ b/java/google/registry/module/backend/BackendComponent.java @@ -25,7 +25,6 @@ import google.registry.groups.DirectoryModule; import google.registry.groups.GroupsModule; import google.registry.groups.GroupssettingsModule; import google.registry.keyring.api.KeyModule; -import google.registry.keyring.kms.KeyringModule; import google.registry.keyring.kms.KmsModule; import google.registry.module.backend.BackendRequestComponent.BackendRequestComponentModule; import google.registry.monitoring.metrics.MetricReporter; @@ -57,6 +56,7 @@ import javax.inject.Singleton; ConfigModule.class, DatastoreServiceModule.class, DirectoryModule.class, + google.registry.keyring.api.DummyKeyringModule.class, DriveModule.class, GcsServiceModule.class, GoogleCredentialModule.class, @@ -65,7 +65,6 @@ import javax.inject.Singleton; JSchModule.class, Jackson2Module.class, KeyModule.class, - KeyringModule.class, KmsModule.class, ModulesServiceModule.class, NetHttpTransportModule.class, diff --git a/java/google/registry/module/frontend/FrontendComponent.java b/java/google/registry/module/frontend/FrontendComponent.java index 4bb4f2499..928c257e0 100644 --- a/java/google/registry/module/frontend/FrontendComponent.java +++ b/java/google/registry/module/frontend/FrontendComponent.java @@ -21,7 +21,6 @@ import google.registry.config.RegistryConfig.ConfigModule; import google.registry.flows.ServerTridProviderModule; import google.registry.flows.custom.CustomLogicFactoryModule; import google.registry.keyring.api.KeyModule; -import google.registry.keyring.kms.KeyringModule; import google.registry.keyring.kms.KmsModule; import google.registry.module.frontend.FrontendRequestComponent.FrontendRequestComponentModule; import google.registry.monitoring.metrics.MetricReporter; @@ -50,12 +49,12 @@ import javax.inject.Singleton; ConfigModule.class, ConsoleConfigModule.class, CustomLogicFactoryModule.class, + google.registry.keyring.api.DummyKeyringModule.class, FrontendMetricsModule.class, FrontendRequestComponentModule.class, GoogleCredentialModule.class, Jackson2Module.class, KeyModule.class, - KeyringModule.class, KmsModule.class, ModulesServiceModule.class, NetHttpTransportModule.class, diff --git a/java/google/registry/module/tools/ToolsComponent.java b/java/google/registry/module/tools/ToolsComponent.java index 7f00a22f2..6232539cf 100644 --- a/java/google/registry/module/tools/ToolsComponent.java +++ b/java/google/registry/module/tools/ToolsComponent.java @@ -24,7 +24,6 @@ import google.registry.groups.DirectoryModule; import google.registry.groups.GroupsModule; import google.registry.groups.GroupssettingsModule; import google.registry.keyring.api.KeyModule; -import google.registry.keyring.kms.KeyringModule; import google.registry.keyring.kms.KmsModule; import google.registry.module.tools.ToolsRequestComponent.ToolsRequestComponentModule; import google.registry.request.Modules.AppIdentityCredentialModule; @@ -51,6 +50,7 @@ import javax.inject.Singleton; CustomLogicFactoryModule.class, DatastoreServiceModule.class, DirectoryModule.class, + google.registry.keyring.api.DummyKeyringModule.class, DriveModule.class, GcsServiceModule.class, GoogleCredentialModule.class, @@ -58,7 +58,6 @@ import javax.inject.Singleton; GroupssettingsModule.class, Jackson2Module.class, KeyModule.class, - KeyringModule.class, KmsModule.class, ModulesServiceModule.class, NetHttpTransportModule.class, diff --git a/java/google/registry/tools/RegistryToolComponent.java b/java/google/registry/tools/RegistryToolComponent.java index bc4a54e0b..83e0d1f21 100644 --- a/java/google/registry/tools/RegistryToolComponent.java +++ b/java/google/registry/tools/RegistryToolComponent.java @@ -20,7 +20,6 @@ import google.registry.dns.writer.VoidDnsWriterModule; import google.registry.dns.writer.clouddns.CloudDnsWriterModule; import google.registry.dns.writer.dnsupdate.DnsUpdateWriterModule; import google.registry.keyring.api.KeyModule; -import google.registry.keyring.kms.KeyringModule; import google.registry.keyring.kms.KmsModule; import google.registry.rde.RdeModule; import google.registry.request.Modules.AppIdentityCredentialModule; @@ -52,6 +51,7 @@ import javax.inject.Singleton; AuthModule.class, ConfigModule.class, DatastoreServiceModule.class, + google.registry.keyring.api.DummyKeyringModule.class, CloudDnsWriterModule.class, DefaultRequestFactoryModule.class, DefaultRequestFactoryModule.RequestFactoryModule.class, @@ -59,7 +59,6 @@ import javax.inject.Singleton; GoogleCredentialModule.class, Jackson2Module.class, KeyModule.class, - KeyringModule.class, KmsModule.class, ModulesServiceModule.class, RdeModule.class,