Automated Commit - Formatting Changes

airbytehq · Dec 3, 2023 · e291199 · e291199
1 parent dd78b56
commit e291199
Show file tree

Hide file tree

Showing 26 changed files with 70 additions and 68 deletions.
diff --git a/...ions/io/airbyte/integration_tests/sources/AbstractCdcPostgresSourceSslAcceptanceTest.java b/...ions/io/airbyte/integration_tests/sources/AbstractCdcPostgresSourceSslAcceptanceTest.java
@@ -7,7 +7,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import io.airbyte.cdk.integrations.standardtest.source.TestDestinationEnv;
 import io.airbyte.integrations.source.postgres.PostgresTestDatabase;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import java.util.Map;
 
 public abstract class AbstractCdcPostgresSourceSslAcceptanceTest extends CdcPostgresSourceAcceptanceTest {
@@ -34,7 +34,7 @@ protected JsonNode getConfig() {
         .build();
   }
 
-  protected abstract PostgresBaseImage getServerImage();
+  protected abstract BaseImage getServerImage();
 
   public abstract Map<Object, Object> getCertificateConfiguration();
 

diff --git a/...airbyte/integration_tests/sources/AbstractPostgresSourceSSLCertificateAcceptanceTest.java b/...airbyte/integration_tests/sources/AbstractPostgresSourceSSLCertificateAcceptanceTest.java
@@ -11,7 +11,7 @@
 import io.airbyte.commons.features.FeatureFlagsWrapper;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.integrations.source.postgres.PostgresTestDatabase;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaType;
 import io.airbyte.protocol.models.v0.CatalogHelpers;
@@ -40,7 +40,7 @@ protected FeatureFlags featureFlags() {
 
   @Override
   protected void setupEnvironment(final TestDestinationEnv environment) throws Exception {
-    testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withCert")
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withCert")
         .with("CREATE TABLE id_and_name(id INTEGER, name VARCHAR(200));")
         .with("INSERT INTO id_and_name (id, name) VALUES (1,'picard'),  (2, 'crusher'), (3, 'vash');")
         .with("CREATE TABLE starships(id INTEGER, name VARCHAR(200));")

diff --git a/...rations/io/airbyte/integration_tests/sources/AbstractSshPostgresSourceAcceptanceTest.java b/...rations/io/airbyte/integration_tests/sources/AbstractSshPostgresSourceAcceptanceTest.java
@@ -18,7 +18,7 @@
 import io.airbyte.commons.functional.CheckedFunction;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.integrations.source.postgres.PostgresTestDatabase;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaType;
 import io.airbyte.protocol.models.v0.CatalogHelpers;
@@ -85,7 +85,7 @@ protected FeatureFlags featureFlags() {
   // requiring data to already be in place.
   @Override
   protected void setupEnvironment(final TestDestinationEnv environment) throws Exception {
-    testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withNetwork");
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withNetwork");
     bastion.initAndStartBastion(testdb.getContainer().getNetwork());
     populateDatabaseTestData();
   }

diff --git a/.../integration_tests/sources/CDCPostgresSourceCaCertificateSslAcceptanceLegacyCtidTest.java b/.../integration_tests/sources/CDCPostgresSourceCaCertificateSslAcceptanceLegacyCtidTest.java
@@ -4,13 +4,13 @@
 
 package io.airbyte.integrations.io.airbyte.integration_tests.sources;
 
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 
 public class CDCPostgresSourceCaCertificateSslAcceptanceLegacyCtidTest extends CDCPostgresSourceCaCertificateSslAcceptanceTest {
 
   @Override
-  protected PostgresBaseImage getServerImage() {
-    return PostgresBaseImage.POSTGRES_12_BULLSEYE;
+  protected BaseImage getServerImage() {
+    return BaseImage.POSTGRES_12_BULLSEYE;
   }
 
 }
diff --git a/...io/airbyte/integration_tests/sources/CDCPostgresSourceCaCertificateSslAcceptanceTest.java b/...io/airbyte/integration_tests/sources/CDCPostgresSourceCaCertificateSslAcceptanceTest.java
@@ -5,7 +5,7 @@
 package io.airbyte.integrations.io.airbyte.integration_tests.sources;
 
 import com.google.common.collect.ImmutableMap;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import java.util.Map;
 
 public class CDCPostgresSourceCaCertificateSslAcceptanceTest extends AbstractCdcPostgresSourceSslAcceptanceTest {
@@ -19,8 +19,8 @@ public Map<Object, Object> getCertificateConfiguration() {
   }
 
   @Override
-  protected PostgresBaseImage getServerImage() {
-    return PostgresBaseImage.POSTGRES_16_BULLSEYE;
+  protected BaseImage getServerImage() {
+    return BaseImage.POSTGRES_16_BULLSEYE;
   }
 
 }
diff --git a/.../airbyte/integration_tests/sources/CDCPostgresSourceFullCertificateSslAcceptanceTest.java b/.../airbyte/integration_tests/sources/CDCPostgresSourceFullCertificateSslAcceptanceTest.java
@@ -5,7 +5,7 @@
 package io.airbyte.integrations.io.airbyte.integration_tests.sources;
 
 import com.google.common.collect.ImmutableMap;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import java.util.Map;
 
 public class CDCPostgresSourceFullCertificateSslAcceptanceTest extends AbstractCdcPostgresSourceSslAcceptanceTest {
@@ -23,8 +23,8 @@ public Map<Object, Object> getCertificateConfiguration() {
   }
 
   @Override
-  protected PostgresBaseImage getServerImage() {
-    return PostgresBaseImage.POSTGRES_16_BULLSEYE;
+  protected BaseImage getServerImage() {
+    return BaseImage.POSTGRES_16_BULLSEYE;
   }
 
 }
diff --git a/...ns/io/airbyte/integration_tests/sources/CdcInitialSnapshotPostgresSourceDatatypeTest.java b/...ns/io/airbyte/integration_tests/sources/CdcInitialSnapshotPostgresSourceDatatypeTest.java
@@ -10,7 +10,7 @@
 import io.airbyte.commons.features.FeatureFlags;
 import io.airbyte.commons.features.FeatureFlagsWrapper;
 import io.airbyte.integrations.source.postgres.PostgresTestDatabase;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import io.airbyte.protocol.models.JsonSchemaType;
 
 public class CdcInitialSnapshotPostgresSourceDatatypeTest extends AbstractPostgresSourceDatatypeTest {
@@ -24,7 +24,7 @@ protected FeatureFlags featureFlags() {
 
   @Override
   protected Database setupDatabase() throws Exception {
-    testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withConf")
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withConf")
         .with("CREATE EXTENSION hstore;")
         .with("CREATE SCHEMA TEST;")
         .with("CREATE TYPE mood AS ENUM ('sad', 'ok', 'happy');")

diff --git a/...tions/io/airbyte/integration_tests/sources/CdcPostgresSourceAcceptanceLegacyCtidTest.java b/...tions/io/airbyte/integration_tests/sources/CdcPostgresSourceAcceptanceLegacyCtidTest.java
@@ -4,13 +4,13 @@
 
 package io.airbyte.integrations.io.airbyte.integration_tests.sources;
 
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 
 public class CdcPostgresSourceAcceptanceLegacyCtidTest extends CdcPostgresSourceAcceptanceTest {
 
   @Override
-  protected PostgresBaseImage getServerImage() {
-    return PostgresBaseImage.POSTGRES_12_BULLSEYE;
+  protected BaseImage getServerImage() {
+    return BaseImage.POSTGRES_12_BULLSEYE;
   }
 
 }
diff --git a/...te/integrations/io/airbyte/integration_tests/sources/CdcPostgresSourceAcceptanceTest.java b/...te/integrations/io/airbyte/integration_tests/sources/CdcPostgresSourceAcceptanceTest.java
@@ -14,7 +14,7 @@
 import io.airbyte.commons.features.FeatureFlagsWrapper;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.integrations.source.postgres.PostgresTestDatabase;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaType;
 import io.airbyte.protocol.models.v0.AirbyteMessage;
@@ -169,8 +169,8 @@ private void verifyFieldNotExist(final List<AirbyteRecordMessage> records, final
         .isEmpty(), "Records contain unselected columns [%s:%s]".formatted(stream, field));
   }
 
-  protected PostgresBaseImage getServerImage() {
-    return PostgresBaseImage.POSTGRES_16_BULLSEYE;
+  protected BaseImage getServerImage() {
+    return BaseImage.POSTGRES_16_BULLSEYE;
   }
 
 }
diff --git a/...tegrations/io/airbyte/integration_tests/sources/CdcWalLogsPostgresSourceDatatypeTest.java b/...tegrations/io/airbyte/integration_tests/sources/CdcWalLogsPostgresSourceDatatypeTest.java
@@ -11,7 +11,7 @@
 import io.airbyte.commons.features.FeatureFlagsWrapper;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.integrations.source.postgres.PostgresTestDatabase;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import io.airbyte.protocol.models.JsonSchemaType;
 import io.airbyte.protocol.models.v0.AirbyteMessage;
 import io.airbyte.protocol.models.v0.AirbyteStateMessage;
@@ -72,7 +72,7 @@ protected FeatureFlags featureFlags() {
 
   @Override
   protected Database setupDatabase() {
-    testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withConf")
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withConf")
         .with("CREATE EXTENSION hstore;")
         .with("CREATE SCHEMA TEST;")
         .with("CREATE TYPE mood AS ENUM ('sad', 'ok', 'happy');")

diff --git a/...ons/io/airbyte/integration_tests/sources/CloudDeploymentPostgresSourceAcceptanceTest.java b/...ons/io/airbyte/integration_tests/sources/CloudDeploymentPostgresSourceAcceptanceTest.java
@@ -16,7 +16,7 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.commons.resources.MoreResources;
 import io.airbyte.integrations.source.postgres.PostgresTestDatabase;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaType;
 import io.airbyte.protocol.models.v0.CatalogHelpers;
@@ -50,7 +50,7 @@ protected FeatureFlags featureFlags() {
 
   @Override
   protected void setupEnvironment(final TestDestinationEnv environment) throws Exception {
-    testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withCert");
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withCert");
     testdb.query(ctx -> {
       ctx.fetch("CREATE TABLE id_and_name(id INTEGER, name VARCHAR(200));");
       ctx.fetch("INSERT INTO id_and_name (id, name) VALUES (1,'picard'),  (2, 'crusher'), (3, 'vash');");

diff --git a/...grations/io/airbyte/integration_tests/sources/PostgresSourceAcceptanceLegacyCtidTest.java b/...grations/io/airbyte/integration_tests/sources/PostgresSourceAcceptanceLegacyCtidTest.java
@@ -4,13 +4,13 @@
 
 package io.airbyte.integrations.io.airbyte.integration_tests.sources;
 
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 
 public class PostgresSourceAcceptanceLegacyCtidTest extends PostgresSourceAcceptanceTest {
 
   @Override
-  protected PostgresBaseImage getServerImage() {
-    return PostgresBaseImage.POSTGRES_12_BULLSEYE;
+  protected BaseImage getServerImage() {
+    return BaseImage.POSTGRES_12_BULLSEYE;
   }
 
 }
diff --git a/...rbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceAcceptanceTest.java b/...rbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceAcceptanceTest.java
@@ -16,7 +16,7 @@
 import io.airbyte.commons.features.FeatureFlagsWrapper;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.integrations.source.postgres.PostgresTestDatabase;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaType;
 import io.airbyte.protocol.models.v0.AirbyteCatalog;
@@ -201,8 +201,8 @@ private ConfiguredAirbyteCatalog getLimitPermissionConfiguredCatalog() {
                 .withSupportedSyncModes(Lists.newArrayList(SyncMode.FULL_REFRESH, SyncMode.INCREMENTAL)))));
   }
 
-  protected PostgresBaseImage getServerImage() {
-    return PostgresBaseImage.POSTGRES_16_BULLSEYE;
+  protected BaseImage getServerImage() {
+    return BaseImage.POSTGRES_16_BULLSEYE;
   }
 
 }
diff --git a/...airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceDatatypeTest.java b/...airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceDatatypeTest.java
@@ -9,7 +9,7 @@
 import io.airbyte.commons.features.FeatureFlags;
 import io.airbyte.commons.features.FeatureFlagsWrapper;
 import io.airbyte.integrations.source.postgres.PostgresTestDatabase;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import java.sql.SQLException;
 
 public class PostgresSourceDatatypeTest extends AbstractPostgresSourceDatatypeTest {
@@ -21,7 +21,7 @@ protected FeatureFlags featureFlags() {
 
   @Override
   protected Database setupDatabase() throws SQLException {
-    testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withConf")
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withConf")
         .with("CREATE SCHEMA %S;", SCHEMA_NAME)
         .with("CREATE TYPE mood AS ENUM ('sad', 'ok', 'happy');")
         .with("CREATE TYPE inventory_item AS (name text, supplier_id integer, price numeric);")

diff --git a/...e/integrations/io/airbyte/integration_tests/sources/XminPostgresSourceAcceptanceTest.java b/...e/integrations/io/airbyte/integration_tests/sources/XminPostgresSourceAcceptanceTest.java
@@ -11,7 +11,7 @@
 import io.airbyte.commons.features.FeatureFlagsWrapper;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.integrations.source.postgres.PostgresTestDatabase;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaType;
 import io.airbyte.protocol.models.v0.CatalogHelpers;
@@ -47,7 +47,7 @@ protected FeatureFlags featureFlags() {
 
   @Override
   protected void setupEnvironment(final TestDestinationEnv environment) throws Exception {
-    testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_12_BULLSEYE)
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_12_BULLSEYE)
         .with("CREATE TABLE id_and_name(id INTEGER, name VARCHAR(200));")
         .with("INSERT INTO id_and_name (id, name) VALUES (1,'picard'),  (2, 'crusher'), (3, 'vash');")
         .with("CREATE TABLE starships(id INTEGER, name VARCHAR(200));")

diff --git a/...postgres/src/test/java/io/airbyte/integrations/source/postgres/CdcPostgresSourceTest.java b/...postgres/src/test/java/io/airbyte/integrations/source/postgres/CdcPostgresSourceTest.java
@@ -40,7 +40,7 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.commons.util.AutoCloseableIterator;
 import io.airbyte.commons.util.AutoCloseableIterators;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaType;
 import io.airbyte.protocol.models.v0.AirbyteCatalog;
@@ -889,8 +889,8 @@ protected void compareTargetPositionFromTheRecordsWithTargetPostionGeneratedBefo
     assertTrue(extractPosition(record.getData()).targetLsn.compareTo(((PostgresCdcTargetPosition) targetPosition).targetLsn) >= 0);
   }
 
-  protected static PostgresBaseImage getServerImage() {
-    return PostgresBaseImage.POSTGRES_16_BULLSEYE;
+  protected static BaseImage getServerImage() {
+    return BaseImage.POSTGRES_16_BULLSEYE;
   }
 
 }
diff --git a/.../test/java/io/airbyte/integrations/source/postgres/CloudDeploymentPostgresSourceTest.java b/.../test/java/io/airbyte/integrations/source/postgres/CloudDeploymentPostgresSourceTest.java
@@ -19,7 +19,7 @@
 import io.airbyte.commons.features.EnvVariableFeatureFlags;
 import io.airbyte.commons.features.FeatureFlagsWrapper;
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import io.airbyte.protocol.models.v0.AirbyteConnectionStatus;
 import java.util.List;
 import java.util.Map;
@@ -37,14 +37,14 @@ public class CloudDeploymentPostgresSourceTest {
 
   @BeforeAll
   static void setupContainers() {
-    DB_NO_SSL_WITH_NETWORK = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withNetwork");
+    DB_NO_SSL_WITH_NETWORK = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withNetwork");
     NETWORK_NO_SSL = DB_NO_SSL_WITH_NETWORK.getContainer().getNetwork();
     BASTION_NO_SSL = new SshBastionContainer();
     BASTION_NO_SSL.initAndStartBastion(NETWORK_NO_SSL);
 
-    DB_WITH_SSL = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_SSL_DEV, "withSSL");
+    DB_WITH_SSL = PostgresTestDatabase.in(BaseImage.POSTGRES_SSL_DEV, "withSSL");
 
-    DB_WITH_SSL_WITH_NETWORK = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_SSL_DEV, "withSSL", "withNetwork");
+    DB_WITH_SSL_WITH_NETWORK = PostgresTestDatabase.in(BaseImage.POSTGRES_SSL_DEV, "withSSL", "withNetwork");
     NETWORK_WITH_SSL = DB_WITH_SSL_WITH_NETWORK.getContainer().getNetwork();
     BASTION_WITH_SSL = new SshBastionContainer();
     BASTION_WITH_SSL.initAndStartBastion(NETWORK_WITH_SSL);

diff --git a/...test/java/io/airbyte/integrations/source/postgres/PostgresCdcGetPublicizedTablesTest.java b/...test/java/io/airbyte/integrations/source/postgres/PostgresCdcGetPublicizedTablesTest.java
@@ -9,7 +9,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import io.airbyte.cdk.db.jdbc.DefaultJdbcDatabase;
 import io.airbyte.cdk.db.jdbc.JdbcDatabase;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import io.airbyte.protocol.models.v0.AirbyteStreamNameNamespacePair;
 import java.sql.SQLException;
 import java.util.Set;
@@ -27,7 +27,7 @@ class PostgresCdcGetPublicizedTablesTest {
 
   @BeforeEach
   void setup() {
-    testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withConf")
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withConf")
         .with("create table table_1 (id serial primary key, text_column text);")
         .with("create table table_2 (id serial primary key, text_column text);")
         .with("create table table_irrelevant (id serial primary key, text_column text);")

diff --git a/...c/test/java/io/airbyte/integrations/source/postgres/PostgresJdbcSourceAcceptanceTest.java b/...c/test/java/io/airbyte/integrations/source/postgres/PostgresJdbcSourceAcceptanceTest.java
@@ -25,7 +25,7 @@
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.commons.resources.MoreResources;
 import io.airbyte.commons.util.MoreIterators;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import io.airbyte.integrations.source.postgres.internal.models.CursorBasedStatus;
 import io.airbyte.integrations.source.postgres.internal.models.InternalModels.StateType;
 import io.airbyte.protocol.models.Field;
@@ -90,7 +90,7 @@ protected PostgresSource source() {
 
   @Override
   protected PostgresTestDatabase createTestDatabase() {
-    return PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE);
+    return PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE);
   }
 
   @Override

diff --git a/...s/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceOperationsTest.java b/...s/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceOperationsTest.java
@@ -12,7 +12,7 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.airbyte.cdk.db.jdbc.DateTimeConverter;
 import io.airbyte.commons.json.Jsons;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -34,7 +34,7 @@ class PostgresSourceOperationsTest {
 
   @BeforeEach
   public void init() {
-    testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_16_BULLSEYE, "withConf");
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, "withConf");
   }
 
   @AfterEach

diff --git a/...postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceSSLTest.java b/...postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceSSLTest.java
@@ -19,7 +19,7 @@
 import io.airbyte.cdk.db.jdbc.JdbcUtils;
 import io.airbyte.commons.json.Jsons;
 import io.airbyte.commons.util.MoreIterators;
-import io.airbyte.integrations.source.postgres.PostgresTestDatabase.PostgresBaseImage;
+import io.airbyte.integrations.source.postgres.PostgresTestDatabase.BaseImage;
 import io.airbyte.protocol.models.Field;
 import io.airbyte.protocol.models.JsonSchemaType;
 import io.airbyte.protocol.models.v0.AirbyteCatalog;
@@ -77,7 +77,7 @@ class PostgresSourceSSLTest {
 
   @BeforeEach
   void setup() throws Exception {
-    testdb = PostgresTestDatabase.in(PostgresBaseImage.POSTGRES_SSL_DEV, "withSSL")
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_SSL_DEV, "withSSL")
         .with("CREATE TABLE id_and_name(id NUMERIC(20, 10) NOT NULL, name VARCHAR(200) NOT NULL, power double precision NOT NULL, PRIMARY KEY (id));")
         .with("CREATE INDEX i1 ON id_and_name (id);")
         .with("INSERT INTO id_and_name (id, name, power) VALUES (1,'goku', 'Infinity'),  (2, 'vegeta', 9000.1), ('NaN', 'piccolo', '-Infinity');")