Skip to content

Commit c9384ed

Browse files
cgardenscgardens
committed
clean up
1 parent d86f1ab commit c9384ed

File tree

14 files changed

+25
-51
lines changed

14 files changed

+25
-51
lines changed

‎airbyte-bootloader/src/main/java/io/airbyte/bootloader/BootloaderApp.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import io.airbyte.config.persistence.DatabaseConfigPersistence;
2424
import io.airbyte.config.persistence.SecretsRepositoryReader;
2525
import io.airbyte.config.persistence.SecretsRepositoryWriter;
26-
import io.airbyte.config.persistence.split_secrets.JsonSecretsProcessor;
2726
import io.airbyte.config.persistence.split_secrets.SecretPersistence;
2827
import io.airbyte.config.persistence.split_secrets.SecretsHydrator;
2928
import io.airbyte.db.Database;
@@ -195,11 +194,7 @@ private static Database getConfigDatabase(final DSLContext dslContext) throws IO
195194
}
196195

197196
private static ConfigPersistence getConfigPersistence(final Database configDatabase) throws IOException {
198-
final JsonSecretsProcessor jsonSecretsProcessor = JsonSecretsProcessor.builder()
199-
.copySecrets(true)
200-
.build();
201-
202-
return DatabaseConfigPersistence.createWithValidation(configDatabase, jsonSecretsProcessor);
197+
return DatabaseConfigPersistence.createWithValidation(configDatabase);
203198
}
204199

205200
private static DefinitionsProvider getLocalDefinitionsProvider() throws IOException {

‎airbyte-bootloader/src/test/java/io/airbyte/bootloader/BootloaderAppTest.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import io.airbyte.config.persistence.DatabaseConfigPersistence;
3131
import io.airbyte.config.persistence.SecretsRepositoryReader;
3232
import io.airbyte.config.persistence.SecretsRepositoryWriter;
33-
import io.airbyte.config.persistence.split_secrets.JsonSecretsProcessor;
3433
import io.airbyte.config.persistence.split_secrets.LocalTestingSecretPersistence;
3534
import io.airbyte.config.persistence.split_secrets.RealSecretsHydrator;
3635
import io.airbyte.config.persistence.split_secrets.SecretPersistence;
@@ -173,10 +172,6 @@ void testBootloaderAppRunSecretMigration() throws Exception {
173172

174173
val mockedFeatureFlags = mock(FeatureFlags.class);
175174

176-
final JsonSecretsProcessor jsonSecretsProcessor = JsonSecretsProcessor.builder()
177-
.copySecrets(true)
178-
.build();
179-
180175
try (val configsDslContext = DSLContextFactory.create(configsDataSource, SQLDialect.POSTGRES);
181176
val jobsDslContext = DSLContextFactory.create(configsDataSource, SQLDialect.POSTGRES)) {
182177

@@ -186,7 +181,7 @@ void testBootloaderAppRunSecretMigration() throws Exception {
186181
val configDatabase = new ConfigsDatabaseTestProvider(configsDslContext, configsFlyway).create(false);
187182
val jobDatabase = new JobsDatabaseTestProvider(jobsDslContext, jobsFlyway).create(false);
188183

189-
val configPersistence = new DatabaseConfigPersistence(configDatabase, jsonSecretsProcessor);
184+
val configPersistence = new DatabaseConfigPersistence(configDatabase);
190185
val configRepository = new ConfigRepository(configPersistence, configDatabase);
191186
val jobsPersistence = new DefaultJobPersistence(jobDatabase);
192187

‎airbyte-config/config-persistence/src/main/java/io/airbyte/config/persistence/DatabaseConfigPersistence.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
import io.airbyte.config.State;
5151
import io.airbyte.config.WorkspaceServiceAccount;
5252
import io.airbyte.config.helpers.ScheduleHelpers;
53-
import io.airbyte.config.persistence.split_secrets.JsonSecretsProcessor;
5453
import io.airbyte.db.Database;
5554
import io.airbyte.db.ExceptionWrappingDatabase;
5655
import io.airbyte.db.instance.configs.jooq.generated.enums.ActorType;
@@ -85,27 +84,22 @@
8584
public class DatabaseConfigPersistence implements ConfigPersistence {
8685

8786
private final ExceptionWrappingDatabase database;
88-
private final JsonSecretsProcessor jsonSecretsProcessor;
8987
private static final Logger LOGGER = LoggerFactory.getLogger(DatabaseConfigPersistence.class);
9088
private static final String UNKNOWN_CONFIG_TYPE = "Unknown Config Type ";
91-
private static final String NOT_FOUND = " not found";
9289

9390
/**
9491
* Entrypoint into DatabaseConfigPersistence. Except in testing, we should never be using it without
9592
* it being decorated with validation classes.
9693
*
9794
* @param database - database where configs are stored
98-
* @param jsonSecretsProcessor - for filtering secrets in export
9995
* @return database config persistence wrapped in validation decorators
10096
*/
101-
public static ConfigPersistence createWithValidation(final Database database,
102-
final JsonSecretsProcessor jsonSecretsProcessor) {
103-
return new ValidatingConfigPersistence(new DatabaseConfigPersistence(database, jsonSecretsProcessor));
97+
public static ConfigPersistence createWithValidation(final Database database) {
98+
return new ValidatingConfigPersistence(new DatabaseConfigPersistence(database));
10499
}
105100

106-
public DatabaseConfigPersistence(final Database database, final JsonSecretsProcessor jsonSecretsProcessor) {
101+
public DatabaseConfigPersistence(final Database database) {
107102
this.database = new ExceptionWrappingDatabase(database);
108-
this.jsonSecretsProcessor = jsonSecretsProcessor;
109103
}
110104

111105
@Override

‎airbyte-config/config-persistence/src/main/java/io/airbyte/config/persistence/SecretsRepositoryReader.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ private DestinationConnection hydrateDestinationPartialConfig(final DestinationC
7474
return Jsons.clone(sourceWithPartialConfig).withConfiguration(hydratedConfig);
7575
}
7676

77+
@SuppressWarnings("unused")
7778
private void hydrateValuesIfKeyPresent(final String key, final Map<String, Stream<JsonNode>> dump) {
7879
if (dump.containsKey(key)) {
7980
final Stream<JsonNode> augmentedValue = dump.get(key).map(secretsHydrator::hydrate);

‎airbyte-config/config-persistence/src/main/java/io/airbyte/config/persistence/SecretsRepositoryWriter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ public void writeDestinationConnection(final DestinationConnection destination,
115115
* @param spec connector specification
116116
* @return partial config
117117
*/
118+
@SuppressWarnings("unused")
118119
private JsonNode statefulSplitSecrets(final UUID workspaceId, final JsonNode fullConfig, final ConnectorSpecification spec) {
119120
return splitSecretConfig(workspaceId, fullConfig, spec, longLivedSecretPersistence);
120121
}

‎airbyte-config/config-persistence/src/test/java/io/airbyte/config/persistence/ConfigRepositoryE2EReadWriteTest.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import static org.junit.jupiter.api.Assertions.assertEquals;
1313
import static org.junit.jupiter.api.Assertions.assertFalse;
1414
import static org.junit.jupiter.api.Assertions.assertTrue;
15-
import static org.mockito.Mockito.mock;
1615
import static org.mockito.Mockito.spy;
1716

1817
import io.airbyte.commons.json.Jsons;
@@ -32,7 +31,6 @@
3231
import io.airbyte.config.StandardWorkspace;
3332
import io.airbyte.config.persistence.ConfigRepository.DestinationAndDefinition;
3433
import io.airbyte.config.persistence.ConfigRepository.SourceAndDefinition;
35-
import io.airbyte.config.persistence.split_secrets.JsonSecretsProcessor;
3634
import io.airbyte.db.Database;
3735
import io.airbyte.db.factory.DSLContextFactory;
3836
import io.airbyte.db.factory.FlywayFactory;
@@ -78,7 +76,6 @@ class ConfigRepositoryE2EReadWriteTest {
7876
private Database database;
7977
private ConfigRepository configRepository;
8078
private DatabaseConfigPersistence configPersistence;
81-
private JsonSecretsProcessor jsonSecretsProcessor;
8279
private Flyway flyway;
8380
private final static String DOCKER_IMAGE_TAG = "1.2.0";
8481
private final static String CONFIG_HASH = "ConfigHash";
@@ -96,11 +93,10 @@ public static void dbSetup() {
9693
void setup() throws IOException, JsonValidationException, SQLException, DatabaseInitializationException, InterruptedException {
9794
dataSource = DatabaseConnectionHelper.createDataSource(container);
9895
dslContext = DSLContextFactory.create(dataSource, SQLDialect.POSTGRES);
99-
flyway = FlywayFactory.create(dataSource, DatabaseConfigPersistenceLoadDataTest.class.getName(), ConfigsDatabaseMigrator.DB_IDENTIFIER,
96+
flyway = FlywayFactory.create(dataSource, ConfigRepositoryE2EReadWriteTest.class.getName(), ConfigsDatabaseMigrator.DB_IDENTIFIER,
10097
ConfigsDatabaseMigrator.MIGRATION_FILE_LOCATION);
10198
database = new ConfigsDatabaseTestProvider(dslContext, flyway).create(false);
102-
jsonSecretsProcessor = mock(JsonSecretsProcessor.class);
103-
configPersistence = spy(new DatabaseConfigPersistence(database, jsonSecretsProcessor));
99+
configPersistence = spy(new DatabaseConfigPersistence(database));
104100
configRepository = spy(new ConfigRepository(configPersistence, database));
105101
final ConfigsDatabaseMigrator configsDatabaseMigrator =
106102
new ConfigsDatabaseMigrator(database, flyway);
@@ -160,8 +156,8 @@ void testWorkspaceCountConnectionsDeprecated() throws IOException {
160156

161157
@Test
162158
void testFetchActorsUsingDefinition() throws IOException {
163-
UUID destinationDefinitionId = MockData.publicDestinationDefinition().getDestinationDefinitionId();
164-
UUID sourceDefinitionId = MockData.publicSourceDefinition().getSourceDefinitionId();
159+
final UUID destinationDefinitionId = MockData.publicDestinationDefinition().getDestinationDefinitionId();
160+
final UUID sourceDefinitionId = MockData.publicSourceDefinition().getSourceDefinitionId();
165161
final List<DestinationConnection> destinationConnections = configRepository.listDestinationsForDefinition(
166162
destinationDefinitionId);
167163
final List<SourceConnection> sourceConnections = configRepository.listSourcesForDefinition(
@@ -315,7 +311,7 @@ void testListPublicSourceDefinitions() throws IOException {
315311

316312
@Test
317313
void testListWorkspaceSources() throws IOException {
318-
UUID workspaceId = MockData.standardWorkspaces().get(1).getWorkspaceId();
314+
final UUID workspaceId = MockData.standardWorkspaces().get(1).getWorkspaceId();
319315
final List<SourceConnection> expectedSources = MockData.sourceConnections().stream()
320316
.filter(source -> source.getWorkspaceId().equals(workspaceId)).collect(Collectors.toList());
321317
final List<SourceConnection> sources = configRepository.listWorkspaceSourceConnection(workspaceId);
@@ -324,7 +320,7 @@ void testListWorkspaceSources() throws IOException {
324320

325321
@Test
326322
void testListWorkspaceDestinations() throws IOException {
327-
UUID workspaceId = MockData.standardWorkspaces().get(0).getWorkspaceId();
323+
final UUID workspaceId = MockData.standardWorkspaces().get(0).getWorkspaceId();
328324
final List<DestinationConnection> expectedDestinations = MockData.destinationConnections().stream()
329325
.filter(destination -> destination.getWorkspaceId().equals(workspaceId)).collect(Collectors.toList());
330326
final List<DestinationConnection> destinations = configRepository.listWorkspaceDestinationConnection(workspaceId);

‎airbyte-config/config-persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceE2EReadWriteTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ class DatabaseConfigPersistenceE2EReadWriteTest extends BaseDatabaseConfigPersis
4747
void setup() throws Exception {
4848
dataSource = DatabaseConnectionHelper.createDataSource(container);
4949
dslContext = DSLContextFactory.create(dataSource, SQLDialect.POSTGRES);
50-
flyway = FlywayFactory.create(dataSource, DatabaseConfigPersistenceLoadDataTest.class.getName(), ConfigsDatabaseMigrator.DB_IDENTIFIER,
50+
flyway = FlywayFactory.create(dataSource, DatabaseConfigPersistenceE2EReadWriteTest.class.getName(), ConfigsDatabaseMigrator.DB_IDENTIFIER,
5151
ConfigsDatabaseMigrator.MIGRATION_FILE_LOCATION);
5252
database = new ConfigsDatabaseTestProvider(dslContext, flyway).create(false);
53-
configPersistence = spy(new DatabaseConfigPersistence(database, jsonSecretsProcessor));
53+
configPersistence = spy(new DatabaseConfigPersistence(database));
5454
final ConfigsDatabaseMigrator configsDatabaseMigrator =
5555
new ConfigsDatabaseMigrator(database, flyway);
5656
final DevDatabaseMigrator devDatabaseMigrator = new DevDatabaseMigrator(configsDatabaseMigrator);

‎airbyte-config/config-persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void setup() throws Exception {
5959
flyway = FlywayFactory.create(dataSource, DatabaseConfigPersistenceTest.class.getName(), ConfigsDatabaseMigrator.DB_IDENTIFIER,
6060
ConfigsDatabaseMigrator.MIGRATION_FILE_LOCATION);
6161
database = new ConfigsDatabaseTestProvider(dslContext, flyway).create(false);
62-
configPersistence = spy(new DatabaseConfigPersistence(database, jsonSecretsProcessor));
62+
configPersistence = spy(new DatabaseConfigPersistence(database));
6363
final ConfigsDatabaseMigrator configsDatabaseMigrator =
6464
new ConfigsDatabaseMigrator(database, flyway);
6565
final DevDatabaseMigrator devDatabaseMigrator = new DevDatabaseMigrator(configsDatabaseMigrator);

‎airbyte-config/config-persistence/src/test/java/io/airbyte/config/persistence/DatabaseConfigPersistenceUpdateConnectorDefinitionsTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,11 @@ class DatabaseConfigPersistenceUpdateConnectorDefinitionsTest extends BaseDataba
5050
public static void setup() throws Exception {
5151
dataSource = DatabaseConnectionHelper.createDataSource(container);
5252
dslContext = DSLContextFactory.create(dataSource, SQLDialect.POSTGRES);
53-
flyway = FlywayFactory.create(dataSource, DatabaseConfigPersistenceLoadDataTest.class.getName(), ConfigsDatabaseMigrator.DB_IDENTIFIER,
53+
flyway = FlywayFactory.create(dataSource, DatabaseConfigPersistenceUpdateConnectorDefinitionsTest.class.getName(),
54+
ConfigsDatabaseMigrator.DB_IDENTIFIER,
5455
ConfigsDatabaseMigrator.MIGRATION_FILE_LOCATION);
5556
database = new ConfigsDatabaseTestProvider(dslContext, flyway).create(false);
56-
configPersistence = new DatabaseConfigPersistence(database, jsonSecretsProcessor);
57+
configPersistence = new DatabaseConfigPersistence(database);
5758
final ConfigsDatabaseMigrator configsDatabaseMigrator =
5859
new ConfigsDatabaseMigrator(database, flyway);
5960
final DevDatabaseMigrator devDatabaseMigrator = new DevDatabaseMigrator(configsDatabaseMigrator);

‎airbyte-config/config-persistence/src/test/java/io/airbyte/config/persistence/StatePersistenceTest.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
package io.airbyte.config.persistence;
66

7-
import static org.mockito.Mockito.mock;
8-
97
import com.fasterxml.jackson.databind.JsonNode;
108
import io.airbyte.commons.enums.Enums;
119
import io.airbyte.commons.json.Jsons;
@@ -18,7 +16,6 @@
1816
import io.airbyte.config.State;
1917
import io.airbyte.config.StateType;
2018
import io.airbyte.config.StateWrapper;
21-
import io.airbyte.config.persistence.split_secrets.JsonSecretsProcessor;
2219
import io.airbyte.db.factory.DSLContextFactory;
2320
import io.airbyte.db.factory.FlywayFactory;
2421
import io.airbyte.db.init.DatabaseInitializationException;
@@ -530,7 +527,7 @@ void testStatePersistenceLegacyWriteConsistency() throws IOException {
530527
void beforeEach() throws DatabaseInitializationException, IOException, JsonValidationException {
531528
dataSource = DatabaseConnectionHelper.createDataSource(container);
532529
dslContext = DSLContextFactory.create(dataSource, SQLDialect.POSTGRES);
533-
flyway = FlywayFactory.create(dataSource, DatabaseConfigPersistenceLoadDataTest.class.getName(),
530+
flyway = FlywayFactory.create(dataSource, StatePersistenceTest.class.getName(),
534531
ConfigsDatabaseMigrator.DB_IDENTIFIER, ConfigsDatabaseMigrator.MIGRATION_FILE_LOCATION);
535532
database = new ConfigsDatabaseTestProvider(dslContext, flyway).create(true);
536533
setupTestData();
@@ -547,9 +544,7 @@ void afterEach() {
547544
}
548545

549546
private void setupTestData() throws JsonValidationException, IOException {
550-
configRepository = new ConfigRepository(
551-
new DatabaseConfigPersistence(database, mock(JsonSecretsProcessor.class)),
552-
database);
547+
configRepository = new ConfigRepository(new DatabaseConfigPersistence(database), database);
553548

554549
final StandardWorkspace workspace = MockData.standardWorkspaces().get(0);
555550
final StandardSourceDefinition sourceDefinition = MockData.publicSourceDefinition();

‎airbyte-config/config-persistence/src/test/java/io/airbyte/config/persistence/StreamResetPersistenceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class StreamResetPersistenceTest extends BaseDatabaseConfigPersistenceTest {
3636
public void setup() throws Exception {
3737
dataSource = DatabaseConnectionHelper.createDataSource(container);
3838
dslContext = DSLContextFactory.create(dataSource, SQLDialect.POSTGRES);
39-
flyway = FlywayFactory.create(dataSource, DatabaseConfigPersistenceLoadDataTest.class.getName(), ConfigsDatabaseMigrator.DB_IDENTIFIER,
39+
flyway = FlywayFactory.create(dataSource, StreamResetPersistenceTest.class.getName(), ConfigsDatabaseMigrator.DB_IDENTIFIER,
4040
ConfigsDatabaseMigrator.MIGRATION_FILE_LOCATION);
4141
database = new ConfigsDatabaseTestProvider(dslContext, flyway).create(false);
4242
streamResetPersistence = spy(new StreamResetPersistence(database));

‎airbyte-cron/src/main/java/io/airbyte/cron/config/DatabaseBeanFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public Flyway configFlyway(@Named("config") final FlywayConfigurationProperties
7070
@Singleton
7171
public ConfigPersistence configPersistence(@Named("configDatabase") final Database configDatabase,
7272
final JsonSecretsProcessor jsonSecretsProcessor) {
73-
return DatabaseConfigPersistence.createWithValidation(configDatabase, jsonSecretsProcessor);
73+
return DatabaseConfigPersistence.createWithValidation(configDatabase);
7474
}
7575

7676
@Singleton

‎airbyte-server/src/main/java/io/airbyte/server/ServerApp.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import io.airbyte.config.persistence.SecretsRepositoryReader;
2929
import io.airbyte.config.persistence.SecretsRepositoryWriter;
3030
import io.airbyte.config.persistence.StreamResetPersistence;
31-
import io.airbyte.config.persistence.split_secrets.JsonSecretsProcessor;
3231
import io.airbyte.config.persistence.split_secrets.SecretPersistence;
3332
import io.airbyte.config.persistence.split_secrets.SecretsHydrator;
3433
import io.airbyte.db.Database;
@@ -190,10 +189,7 @@ public static ServerRunnable getServer(final ServerFactory apiFactory,
190189

191190
LOGGER.info("Creating config repository...");
192191
final Database configsDatabase = new Database(configsDslContext);
193-
final JsonSecretsProcessor jsonSecretsProcessor = JsonSecretsProcessor.builder()
194-
.copySecrets(false)
195-
.build();
196-
final ConfigPersistence configPersistence = DatabaseConfigPersistence.createWithValidation(configsDatabase, jsonSecretsProcessor);
192+
final ConfigPersistence configPersistence = DatabaseConfigPersistence.createWithValidation(configsDatabase);
197193
final SecretsHydrator secretsHydrator = SecretPersistence.getSecretsHydrator(configsDslContext, configs);
198194
final Optional<SecretPersistence> secretPersistence = SecretPersistence.getLongLived(configsDslContext, configs);
199195
final Optional<SecretPersistence> ephemeralSecretPersistence = SecretPersistence.getEphemeral(configsDslContext, configs);

‎airbyte-workers/src/main/java/io/airbyte/workers/config/DatabaseBeanFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public Flyway jobsFlyway(@Named("jobs") final FlywayConfigurationProperties jobs
9292
@Requires(env = WorkerMode.CONTROL_PLANE)
9393
public ConfigPersistence configPersistence(@Named("configDatabase") final Database configDatabase,
9494
final JsonSecretsProcessor jsonSecretsProcessor) {
95-
return DatabaseConfigPersistence.createWithValidation(configDatabase, jsonSecretsProcessor);
95+
return DatabaseConfigPersistence.createWithValidation(configDatabase);
9696
}
9797

9898
@Singleton

0 commit comments

Comments
 (0)