Skip to content

Commit

Permalink
Fix keyring in BEAM pipeline (#2632)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
weiminyu authored Jan 9, 2025
1 parent 1cbbc66 commit c2030e5
Showing 1 changed file with 9 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import google.registry.config.RegistryConfig.Config;
import google.registry.keyring.KeyringModule;
import google.registry.keyring.api.DummyKeyringModule;
import google.registry.keyring.secretmanager.SecretManagerKeyringModule;
import google.registry.persistence.transaction.CloudSqlCredentialSupplier;
import google.registry.persistence.transaction.JpaTransactionManager;
import google.registry.persistence.transaction.JpaTransactionManagerImpl;
Expand Down Expand Up @@ -66,7 +67,14 @@
import org.hibernate.cfg.Environment;

/** Dagger module class for the persistence layer. */
@Module(includes = {KeyringModule.class, SecretManagerModule.class, DummyKeyringModule.class})
// TODO(b/388835696): Use SecreteManagerKeyring in all environments and drop the `includes` below.
@Module(
includes = {
KeyringModule.class,
SecretManagerModule.class,
DummyKeyringModule.class,
SecretManagerKeyringModule.class
})
public abstract class PersistenceModule {

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

0 comments on commit c2030e5

Please sign in to comment.