zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-13 16:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Install DummyKeyringModule in FOSS build

Browse source 
Per discussions here:

https://groups.google.com/forum/#!topic/nomulus-discuss/ylDW2PblL60

Any use of keyring in the FOSS build would result in crashes because KMS is not configured. We should use the dummy keyring instead so that a vanilla FOSS deployment to GAE can run. Of course users would still need to configure their keyrings (and revert back to KMS keyring module) when they actually use any of the keys.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=175868399
This commit is contained in:
jianglai 2017-11-15 13:05:47 -08:00
parent 8521c69caa
commit e4c5024400
4 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
java/google/registry/module/backend/BackendComponent.java
View file

@ -25,7 +25,6 @@ import google.registry.groups.DirectoryModule;
import google.registry.groups.GroupsModule; import google.registry.groups.GroupsModule;
import google.registry.groups.GroupssettingsModule; import google.registry.groups.GroupssettingsModule;
import google.registry.keyring.api.KeyModule; import google.registry.keyring.api.KeyModule;
import google.registry.keyring.kms.KeyringModule;
import google.registry.keyring.kms.KmsModule; import google.registry.keyring.kms.KmsModule;
import google.registry.module.backend.BackendRequestComponent.BackendRequestComponentModule; import google.registry.module.backend.BackendRequestComponent.BackendRequestComponentModule;
import google.registry.monitoring.metrics.MetricReporter; import google.registry.monitoring.metrics.MetricReporter;
@ -57,6 +56,7 @@ import javax.inject.Singleton;
ConfigModule.class, ConfigModule.class,
DatastoreServiceModule.class, DatastoreServiceModule.class,
DirectoryModule.class, DirectoryModule.class,
google.registry.keyring.api.DummyKeyringModule.class,
DriveModule.class, DriveModule.class,
GcsServiceModule.class, GcsServiceModule.class,
GoogleCredentialModule.class, GoogleCredentialModule.class,
@ -65,7 +65,6 @@ import javax.inject.Singleton;
JSchModule.class, JSchModule.class,
Jackson2Module.class, Jackson2Module.class,
KeyModule.class, KeyModule.class,
KeyringModule.class,
KmsModule.class, KmsModule.class,
ModulesServiceModule.class, ModulesServiceModule.class,
NetHttpTransportModule.class, NetHttpTransportModule.class,

3
java/google/registry/module/frontend/FrontendComponent.java
View file

@ -21,7 +21,6 @@ import google.registry.config.RegistryConfig.ConfigModule;
import google.registry.flows.ServerTridProviderModule; import google.registry.flows.ServerTridProviderModule;
import google.registry.flows.custom.CustomLogicFactoryModule; import google.registry.flows.custom.CustomLogicFactoryModule;
import google.registry.keyring.api.KeyModule; import google.registry.keyring.api.KeyModule;
import google.registry.keyring.kms.KeyringModule;
import google.registry.keyring.kms.KmsModule; import google.registry.keyring.kms.KmsModule;
import google.registry.module.frontend.FrontendRequestComponent.FrontendRequestComponentModule; import google.registry.module.frontend.FrontendRequestComponent.FrontendRequestComponentModule;
import google.registry.monitoring.metrics.MetricReporter; import google.registry.monitoring.metrics.MetricReporter;
@ -50,12 +49,12 @@ import javax.inject.Singleton;
ConfigModule.class, ConfigModule.class,
ConsoleConfigModule.class, ConsoleConfigModule.class,
CustomLogicFactoryModule.class, CustomLogicFactoryModule.class,
google.registry.keyring.api.DummyKeyringModule.class,
FrontendMetricsModule.class, FrontendMetricsModule.class,
FrontendRequestComponentModule.class, FrontendRequestComponentModule.class,
GoogleCredentialModule.class, GoogleCredentialModule.class,
Jackson2Module.class, Jackson2Module.class,
KeyModule.class, KeyModule.class,
KeyringModule.class,
KmsModule.class, KmsModule.class,
ModulesServiceModule.class, ModulesServiceModule.class,
NetHttpTransportModule.class, NetHttpTransportModule.class,

3
java/google/registry/module/tools/ToolsComponent.java
View file

@ -24,7 +24,6 @@ import google.registry.groups.DirectoryModule;
import google.registry.groups.GroupsModule; import google.registry.groups.GroupsModule;
import google.registry.groups.GroupssettingsModule; import google.registry.groups.GroupssettingsModule;
import google.registry.keyring.api.KeyModule; import google.registry.keyring.api.KeyModule;
import google.registry.keyring.kms.KeyringModule;
import google.registry.keyring.kms.KmsModule; import google.registry.keyring.kms.KmsModule;
import google.registry.module.tools.ToolsRequestComponent.ToolsRequestComponentModule; import google.registry.module.tools.ToolsRequestComponent.ToolsRequestComponentModule;
import google.registry.request.Modules.AppIdentityCredentialModule; import google.registry.request.Modules.AppIdentityCredentialModule;
@ -51,6 +50,7 @@ import javax.inject.Singleton;
CustomLogicFactoryModule.class, CustomLogicFactoryModule.class,
DatastoreServiceModule.class, DatastoreServiceModule.class,
DirectoryModule.class, DirectoryModule.class,
google.registry.keyring.api.DummyKeyringModule.class,
DriveModule.class, DriveModule.class,
GcsServiceModule.class, GcsServiceModule.class,
GoogleCredentialModule.class, GoogleCredentialModule.class,
@ -58,7 +58,6 @@ import javax.inject.Singleton;
GroupssettingsModule.class, GroupssettingsModule.class,
Jackson2Module.class, Jackson2Module.class,
KeyModule.class, KeyModule.class,
KeyringModule.class,
KmsModule.class, KmsModule.class,
ModulesServiceModule.class, ModulesServiceModule.class,
NetHttpTransportModule.class, NetHttpTransportModule.class,

3
java/google/registry/tools/RegistryToolComponent.java
View file

@ -20,7 +20,6 @@ import google.registry.dns.writer.VoidDnsWriterModule;
import google.registry.dns.writer.clouddns.CloudDnsWriterModule; import google.registry.dns.writer.clouddns.CloudDnsWriterModule;
import google.registry.dns.writer.dnsupdate.DnsUpdateWriterModule; import google.registry.dns.writer.dnsupdate.DnsUpdateWriterModule;
import google.registry.keyring.api.KeyModule; import google.registry.keyring.api.KeyModule;
import google.registry.keyring.kms.KeyringModule;
import google.registry.keyring.kms.KmsModule; import google.registry.keyring.kms.KmsModule;
import google.registry.rde.RdeModule; import google.registry.rde.RdeModule;
import google.registry.request.Modules.AppIdentityCredentialModule; import google.registry.request.Modules.AppIdentityCredentialModule;
@ -52,6 +51,7 @@ import javax.inject.Singleton;
AuthModule.class, AuthModule.class,
ConfigModule.class, ConfigModule.class,
DatastoreServiceModule.class, DatastoreServiceModule.class,
google.registry.keyring.api.DummyKeyringModule.class,
CloudDnsWriterModule.class, CloudDnsWriterModule.class,
DefaultRequestFactoryModule.class, DefaultRequestFactoryModule.class,
DefaultRequestFactoryModule.RequestFactoryModule.class, DefaultRequestFactoryModule.RequestFactoryModule.class,
@ -59,7 +59,6 @@ import javax.inject.Singleton;
GoogleCredentialModule.class, GoogleCredentialModule.class,
Jackson2Module.class, Jackson2Module.class,
KeyModule.class, KeyModule.class,
KeyringModule.class,
KmsModule.class, KmsModule.class,
ModulesServiceModule.class, ModulesServiceModule.class,
RdeModule.class, RdeModule.class,