Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Data plane needs gcp secret hydrator and persistence for replication activity #17149

Merged
merged 7 commits into from
Sep 26, 2022
Merged

Data plane needs gcp secret hydrator and persistence for replication activity #17149

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e59e55e
use prototype for jwt signature because we need a new one
xiaohansong Sep 15, 2022
2bf3b7c
Merge branch 'master' into xiaohan/prototype
xiaohansong Sep 16, 2022
d7ec7f7
Merge remote-tracking branch 'origin/master' into xiaohan/prototype
xiaohansong Sep 16, 2022
fb75984
add comments on why using provider and prototype:
xiaohansong Sep 21, 2022
4728f9b
secret hydrator fix for data plane
xiaohansong Sep 23, 2022
a6b8dc4
Merge remote-tracking branch 'origin/master' into xiaohan/prototype
xiaohansong Sep 23, 2022
2b54c1a
style fix
xiaohansong Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions airbyte-workers/src/main/java/io/airbyte/workers/config/SecretPersistenceBeanFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,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) {
Expand All @@ -73,17 +71,7 @@ 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();
}

}