From 9abcbadd9316d3017a4573bc195f44e15b5a0dfb Mon Sep 17 00:00:00 2001 From: Xiaohan Song Date: Mon, 26 Sep 2022 13:05:21 -0500 Subject: [PATCH] Data plane needs gcp secret hydrator and persistence for replication activity (#17149) * use prototype for jwt signature because we need a new one * add comments on why using provider and prototype: * secret hydrator fix for data plane * style fix --- .../workers/config/SecretPersistenceBeanFactory.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/airbyte-workers/src/main/java/io/airbyte/workers/config/SecretPersistenceBeanFactory.java b/airbyte-workers/src/main/java/io/airbyte/workers/config/SecretPersistenceBeanFactory.java index 625b69f7e0acc..2943a5166ed99 100644 --- a/airbyte-workers/src/main/java/io/airbyte/workers/config/SecretPersistenceBeanFactory.java +++ b/airbyte-workers/src/main/java/io/airbyte/workers/config/SecretPersistenceBeanFactory.java @@ -6,7 +6,6 @@ import io.airbyte.config.persistence.split_secrets.GoogleSecretManagerPersistence; import io.airbyte.config.persistence.split_secrets.LocalTestingSecretPersistence; -import io.airbyte.config.persistence.split_secrets.NoOpSecretsHydrator; import io.airbyte.config.persistence.split_secrets.RealSecretsHydrator; import io.airbyte.config.persistence.split_secrets.SecretPersistence; import io.airbyte.config.persistence.split_secrets.SecretsHydrator; @@ -52,8 +51,6 @@ public SecretPersistence localTestingSecretPersistence(@Named("configDatabase") @Singleton @Requires(property = "airbyte.secret.persistence", pattern = "(?i)^google_secret_manager$") - @Requires(property = "airbyte.worker.plane", - pattern = "(?i)^(?!data_plane).*") @Named("secretPersistence") public SecretPersistence googleSecretPersistence(@Value("${airbyte.secret.store.gcp.credentials}") final String credentials, @Value("${airbyte.secret.store.gcp.project-id}") final String projectId) { @@ -73,17 +70,8 @@ public SecretPersistence vaultSecretPersistence(@Value("${airbyte.secret.store.v } @Singleton - @Requires(property = "airbyte.worker.plane", - pattern = "(?i)^(?!data_plane).*") public SecretsHydrator secretsHydrator(@Named("secretPersistence") final SecretPersistence secretPersistence) { return new RealSecretsHydrator(secretPersistence); } - @Singleton - @Requires(property = "airbyte.worker.plane", - pattern = "(?i)^data_plane$") - public SecretsHydrator secretsHydrator() { - return new NoOpSecretsHydrator(); - } - }