mirror of
https://github.com/google/nomulus.git
synced 2025-05-13 16:07:15 +02:00
Set KmsKeyring as the default Keyring
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=161113761
This commit is contained in:
parent
0013312f5c
commit
1f25a862e6
4 changed files with 2 additions and 4 deletions
|
@ -16,9 +16,7 @@ package google.registry.keyring.kms;
|
||||||
|
|
||||||
import dagger.Module;
|
import dagger.Module;
|
||||||
import dagger.Provides;
|
import dagger.Provides;
|
||||||
|
|
||||||
import google.registry.keyring.api.Keyring;
|
import google.registry.keyring.api.Keyring;
|
||||||
|
|
||||||
import javax.inject.Singleton;
|
import javax.inject.Singleton;
|
||||||
|
|
||||||
/** Dagger module for {@link Keyring} */
|
/** Dagger module for {@link Keyring} */
|
||||||
|
@ -27,7 +25,6 @@ public final class KeyringModule {
|
||||||
|
|
||||||
@Provides
|
@Provides
|
||||||
@Singleton
|
@Singleton
|
||||||
// TODO(b/35810650): return kmsKeyring directly once comparison period is over.
|
|
||||||
public static Keyring provideKeyring(KmsKeyring kmsKeyring) {
|
public static Keyring provideKeyring(KmsKeyring kmsKeyring) {
|
||||||
return kmsKeyring;
|
return kmsKeyring;
|
||||||
}
|
}
|
||||||
|
|
|
@ -385,6 +385,7 @@ public class Registry extends ImmutableObject implements Buildable {
|
||||||
TimedTransitionProperty<Money, BillingCostTransition> eapFeeSchedule =
|
TimedTransitionProperty<Money, BillingCostTransition> eapFeeSchedule =
|
||||||
TimedTransitionProperty.forMapify(DEFAULT_EAP_BILLING_COST, BillingCostTransition.class);
|
TimedTransitionProperty.forMapify(DEFAULT_EAP_BILLING_COST, BillingCostTransition.class);
|
||||||
|
|
||||||
|
/** Marksdb LORDN service username (password is stored in Keyring) */
|
||||||
String lordnUsername;
|
String lordnUsername;
|
||||||
|
|
||||||
/** The end of the claims period (at or after this time, claims no longer applies). */
|
/** The end of the claims period (at or after this time, claims no longer applies). */
|
||||||
|
|
|
@ -35,6 +35,7 @@ import java.util.concurrent.ExecutionException;
|
||||||
@Entity
|
@Entity
|
||||||
@Unindex
|
@Unindex
|
||||||
@NotBackedUp(reason = Reason.AUTO_GENERATED)
|
@NotBackedUp(reason = Reason.AUTO_GENERATED)
|
||||||
|
// TODO(b/27427316): Replace this with an entry in KMSKeyring
|
||||||
public class ServerSecret extends CrossTldSingleton {
|
public class ServerSecret extends CrossTldSingleton {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -20,7 +20,6 @@ java_library(
|
||||||
"//java/google/registry/request",
|
"//java/google/registry/request",
|
||||||
"//java/google/registry/request:modules",
|
"//java/google/registry/request:modules",
|
||||||
"//java/google/registry/request/auth",
|
"//java/google/registry/request/auth",
|
||||||
"//java/google/registry/security",
|
|
||||||
"//java/google/registry/ui",
|
"//java/google/registry/ui",
|
||||||
"//java/google/registry/ui/server/registrar",
|
"//java/google/registry/ui/server/registrar",
|
||||||
"//java/google/registry/util",
|
"//java/google/registry/util",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue