simplify postgres base images

remove mentions of the debian release (alpine, bullseye), using latest instead.
airbytehq · Dec 8, 2023 · be6585d · be6585d
1 parent dccd48a
commit be6585d
Show file tree

Hide file tree

Showing 23 changed files with 26 additions and 26 deletions.
diff --git a/...airbyte/integration_tests/sources/AbstractPostgresSourceSSLCertificateAcceptanceTest.java b/...airbyte/integration_tests/sources/AbstractPostgresSourceSSLCertificateAcceptanceTest.java
@@ -41,7 +41,7 @@ protected FeatureFlags featureFlags() {
 
   @Override
   protected void setupEnvironment(final TestDestinationEnv environment) throws Exception {
-    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, ContainerModifier.CERT)
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16, ContainerModifier.CERT)
         .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
@@ -86,7 +86,7 @@ protected FeatureFlags featureFlags() {
   // requiring data to already be in place.
   @Override
   protected void setupEnvironment(final TestDestinationEnv environment) throws Exception {
-    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, ContainerModifier.NETWORK);
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16, ContainerModifier.NETWORK);
     bastion.initAndStartBastion(testdb.getContainer().getNetwork());
     populateDatabaseTestData();
   }

diff --git a/.../integration_tests/sources/CDCPostgresSourceCaCertificateSslAcceptanceLegacyCtidTest.java b/.../integration_tests/sources/CDCPostgresSourceCaCertificateSslAcceptanceLegacyCtidTest.java
@@ -10,7 +10,7 @@ public class CDCPostgresSourceCaCertificateSslAcceptanceLegacyCtidTest extends C
 
   @Override
   protected BaseImage getServerImage() {
-    return BaseImage.POSTGRES_12_BULLSEYE;
+    return BaseImage.POSTGRES_12;
   }
 
 }
diff --git a/...io/airbyte/integration_tests/sources/CDCPostgresSourceCaCertificateSslAcceptanceTest.java b/...io/airbyte/integration_tests/sources/CDCPostgresSourceCaCertificateSslAcceptanceTest.java
@@ -20,7 +20,7 @@ public Map<Object, Object> getCertificateConfiguration() {
 
   @Override
   protected BaseImage getServerImage() {
-    return BaseImage.POSTGRES_16_BULLSEYE;
+    return BaseImage.POSTGRES_16;
   }
 
 }
diff --git a/.../airbyte/integration_tests/sources/CDCPostgresSourceFullCertificateSslAcceptanceTest.java b/.../airbyte/integration_tests/sources/CDCPostgresSourceFullCertificateSslAcceptanceTest.java
@@ -24,7 +24,7 @@ public Map<Object, Object> getCertificateConfiguration() {
 
   @Override
   protected BaseImage getServerImage() {
-    return BaseImage.POSTGRES_16_BULLSEYE;
+    return BaseImage.POSTGRES_16;
   }
 
 }
diff --git a/...ns/io/airbyte/integration_tests/sources/CdcInitialSnapshotPostgresSourceDatatypeTest.java b/...ns/io/airbyte/integration_tests/sources/CdcInitialSnapshotPostgresSourceDatatypeTest.java
@@ -25,7 +25,7 @@ protected FeatureFlags featureFlags() {
 
   @Override
   protected Database setupDatabase() throws Exception {
-    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, ContainerModifier.CONF)
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16, ContainerModifier.CONF)
         .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
@@ -10,7 +10,7 @@ public class CdcPostgresSourceAcceptanceLegacyCtidTest extends CdcPostgresSource
 
   @Override
   protected BaseImage getServerImage() {
-    return BaseImage.POSTGRES_12_BULLSEYE;
+    return BaseImage.POSTGRES_12;
   }
 
 }
diff --git a/...te/integrations/io/airbyte/integration_tests/sources/CdcPostgresSourceAcceptanceTest.java b/...te/integrations/io/airbyte/integration_tests/sources/CdcPostgresSourceAcceptanceTest.java
@@ -171,7 +171,7 @@ private void verifyFieldNotExist(final List<AirbyteRecordMessage> records, final
   }
 
   protected BaseImage getServerImage() {
-    return BaseImage.POSTGRES_16_BULLSEYE;
+    return BaseImage.POSTGRES_16;
   }
 
 }
diff --git a/...tegrations/io/airbyte/integration_tests/sources/CdcWalLogsPostgresSourceDatatypeTest.java b/...tegrations/io/airbyte/integration_tests/sources/CdcWalLogsPostgresSourceDatatypeTest.java
@@ -73,7 +73,7 @@ protected FeatureFlags featureFlags() {
 
   @Override
   protected Database setupDatabase() {
-    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, ContainerModifier.CONF)
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16, ContainerModifier.CONF)
         .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
@@ -51,7 +51,7 @@ protected FeatureFlags featureFlags() {
 
   @Override
   protected void setupEnvironment(final TestDestinationEnv environment) throws Exception {
-    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, ContainerModifier.CERT);
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16, ContainerModifier.CERT);
     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
@@ -10,7 +10,7 @@ public class PostgresSourceAcceptanceLegacyCtidTest extends PostgresSourceAccept
 
   @Override
   protected BaseImage getServerImage() {
-    return BaseImage.POSTGRES_12_BULLSEYE;
+    return BaseImage.POSTGRES_12;
   }
 
 }
diff --git a/...rbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceAcceptanceTest.java b/...rbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceAcceptanceTest.java
@@ -202,7 +202,7 @@ private ConfiguredAirbyteCatalog getLimitPermissionConfiguredCatalog() {
   }
 
   protected BaseImage getServerImage() {
-    return BaseImage.POSTGRES_16_BULLSEYE;
+    return BaseImage.POSTGRES_16;
   }
 
 }
diff --git a/...airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceDatatypeTest.java b/...airbyte/integrations/io/airbyte/integration_tests/sources/PostgresSourceDatatypeTest.java
@@ -22,7 +22,7 @@ protected FeatureFlags featureFlags() {
 
   @Override
   protected Database setupDatabase() throws SQLException {
-    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, ContainerModifier.CONF)
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16, ContainerModifier.CONF)
         .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
@@ -47,7 +47,7 @@ protected FeatureFlags featureFlags() {
 
   @Override
   protected void setupEnvironment(final TestDestinationEnv environment) throws Exception {
-    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_12_BULLSEYE)
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_12)
         .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
@@ -891,7 +891,7 @@ protected void compareTargetPositionFromTheRecordsWithTargetPostionGeneratedBefo
   }
 
   protected static BaseImage getServerImage() {
-    return BaseImage.POSTGRES_16_BULLSEYE;
+    return BaseImage.POSTGRES_16;
   }
 
 }
diff --git a/.../test/java/io/airbyte/integrations/source/postgres/CloudDeploymentPostgresSourceTest.java b/.../test/java/io/airbyte/integrations/source/postgres/CloudDeploymentPostgresSourceTest.java
@@ -38,7 +38,7 @@ public class CloudDeploymentPostgresSourceTest {
 
   @BeforeAll
   static void setupContainers() {
-    DB_NO_SSL_WITH_NETWORK = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, ContainerModifier.NETWORK);
+    DB_NO_SSL_WITH_NETWORK = PostgresTestDatabase.in(BaseImage.POSTGRES_16, ContainerModifier.NETWORK);
     NETWORK_NO_SSL = DB_NO_SSL_WITH_NETWORK.getContainer().getNetwork();
     BASTION_NO_SSL = new SshBastionContainer();
     BASTION_NO_SSL.initAndStartBastion(NETWORK_NO_SSL);

diff --git a/...test/java/io/airbyte/integrations/source/postgres/PostgresCdcGetPublicizedTablesTest.java b/...test/java/io/airbyte/integrations/source/postgres/PostgresCdcGetPublicizedTablesTest.java
@@ -28,7 +28,7 @@ class PostgresCdcGetPublicizedTablesTest {
 
   @BeforeEach
   void setup() {
-    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, ContainerModifier.CONF)
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16, ContainerModifier.CONF)
         .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
@@ -90,7 +90,7 @@ protected PostgresSource source() {
 
   @Override
   protected PostgresTestDatabase createTestDatabase() {
-    return PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE);
+    return PostgresTestDatabase.in(BaseImage.POSTGRES_16);
   }
 
   @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
@@ -35,7 +35,7 @@ class PostgresSourceOperationsTest {
 
   @BeforeEach
   public void init() {
-    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, ContainerModifier.CONF);
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16, ContainerModifier.CONF);
   }
 
   @AfterEach

diff --git a/...ce-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceTest.java b/...ce-postgres/src/test/java/io/airbyte/integrations/source/postgres/PostgresSourceTest.java
@@ -137,7 +137,7 @@ class PostgresSourceTest {
 
   @BeforeEach
   void setup() {
-    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE)
+    testdb = PostgresTestDatabase.in(BaseImage.POSTGRES_16)
         .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');")
@@ -225,7 +225,7 @@ public void testCanReadTablesAndColumnsWithDoubleQuotes() throws Exception {
   public void testCanReadUtf8() throws Exception {
     // force the db server to start with sql_ascii encoding to verify the source can read UTF8 even when
     // default settings are in another encoding
-    try (final var asciiTestDB = PostgresTestDatabase.in(BaseImage.POSTGRES_16_BULLSEYE, ContainerModifier.ASCII)
+    try (final var asciiTestDB = PostgresTestDatabase.in(BaseImage.POSTGRES_16, ContainerModifier.ASCII)
         .with("CREATE TABLE id_and_name(id INTEGER, name VARCHAR(200));")
         .with("INSERT INTO id_and_name (id, name) VALUES (1,E'\\u2013 someutfstring'),  (2, E'\\u2215');")) {
       final var config = asciiTestDB.testConfigBuilder().withSchemas(SCHEMA_NAME).withoutSsl().build();

diff --git a/...ostgres/src/test/java/io/airbyte/integrations/source/postgres/XminPostgresSourceTest.java b/...ostgres/src/test/java/io/airbyte/integrations/source/postgres/XminPostgresSourceTest.java
@@ -92,7 +92,7 @@ class XminPostgresSourceTest {
   protected PostgresTestDatabase testdb;
 
   protected BaseImage getDatabaseImage() {
-    return BaseImage.POSTGRES_12_BULLSEYE;
+    return BaseImage.POSTGRES_12;
   }
 
   @BeforeEach

diff --git a/...est/java/io/airbyte/integrations/source/postgres/XminPostgresWithOldServerSourceTest.java b/...est/java/io/airbyte/integrations/source/postgres/XminPostgresWithOldServerSourceTest.java
@@ -27,7 +27,7 @@ public class XminPostgresWithOldServerSourceTest extends XminPostgresSourceTest
 
   @Override
   protected BaseImage getDatabaseImage() {
-    return BaseImage.POSTGRES_9_ALPINE;
+    return BaseImage.POSTGRES_9;
   }
 
   @Test

diff --git a/...s/src/testFixtures/java/io/airbyte/integrations/source/postgres/PostgresTestDatabase.java b/...s/src/testFixtures/java/io/airbyte/integrations/source/postgres/PostgresTestDatabase.java
@@ -21,9 +21,9 @@ public class PostgresTestDatabase extends
 
   public static enum BaseImage {
 
-    POSTGRES_16_BULLSEYE("postgres:16-bullseye"),
-    POSTGRES_12_BULLSEYE("postgres:12-bullseye"),
-    POSTGRES_9_ALPINE("postgres:9-alpine"),
+    POSTGRES_16("postgres:16-bullseye"),
+    POSTGRES_12("postgres:12-bullseye"),
+    POSTGRES_9("postgres:9-alpine"),
     POSTGRES_SSL_DEV("marcosmarxm/postgres-ssl:dev");
 
     private final String reference;