Skip to content

Commit c2030e5

Browse files
authored
Fix keyring in BEAM pipeline (#2632)
SecretManager based keyring not included in keyring bindings, resulting in runtime failure. We should simply keyring bindings. There is no use case for multiple implementations. See b/388835696.
1 parent 1cbbc66 commit c2030e5

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

core/src/main/java/google/registry/persistence/PersistenceModule.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import google.registry.config.RegistryConfig.Config;
3737
import google.registry.keyring.KeyringModule;
3838
import google.registry.keyring.api.DummyKeyringModule;
39+
import google.registry.keyring.secretmanager.SecretManagerKeyringModule;
3940
import google.registry.persistence.transaction.CloudSqlCredentialSupplier;
4041
import google.registry.persistence.transaction.JpaTransactionManager;
4142
import google.registry.persistence.transaction.JpaTransactionManagerImpl;
@@ -66,7 +67,14 @@
6667
import org.hibernate.cfg.Environment;
6768

6869
/** Dagger module class for the persistence layer. */
69-
@Module(includes = {KeyringModule.class, SecretManagerModule.class, DummyKeyringModule.class})
70+
// TODO(b/388835696): Use SecreteManagerKeyring in all environments and drop the `includes` below.
71+
@Module(
72+
includes = {
73+
KeyringModule.class,
74+
SecretManagerModule.class,
75+
DummyKeyringModule.class,
76+
SecretManagerKeyringModule.class
77+
})
7078
public abstract class PersistenceModule {
7179

7280
// This name must be the same as the one defined in persistence.xml.

0 commit comments

Comments
 (0)