Bump version used for upgrade test

Author: carlesarnal

app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java

@@ -286,7 +286,7 @@ private void applyUpgrader(Handle handle, String cname) {
             @SuppressWarnings("unchecked")
             Class<IDbUpgrader> upgraderClass = (Class<IDbUpgrader>) Class.forName(cname);
             IDbUpgrader upgrader = upgraderClass.getConstructor().newInstance();
-            upgrader.upgrade(this, handle);
+            upgrader.upgrade( handle);
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

app/src/main/java/io/apicurio/registry/storage/impl/sql/IDbUpgrader.java

@@ -16,7 +16,6 @@
 
 package io.apicurio.registry.storage.impl.sql;
 
-import io.apicurio.registry.storage.RegistryStorage;
 import io.apicurio.registry.storage.impl.sql.jdb.Handle;
 
 /**
@@ -35,6 +34,4 @@ public interface IDbUpgrader {
      * @param registryStorage
      * @param dbHandle
      */
-    public void upgrade(RegistryStorage registryStorage, Handle dbHandle) throws Exception;
-
 }

app/src/main/java/io/apicurio/registry/storage/impl/sql/upgrader/AvroCanonicalHashUpgrader.java

@@ -1 +1 @@
-15
+14

app/src/main/resources/io/apicurio/registry/storage/impl/sql/db-version

@@ -4,7 +4,7 @@
 
 CREATE TABLE apicurio (prop_name VARCHAR(255) NOT NULL, prop_value VARCHAR(255));
 ALTER TABLE apicurio ADD PRIMARY KEY (prop_name);
-INSERT INTO apicurio (prop_name, prop_value) VALUES ('db_version', 15);
+INSERT INTO apicurio (prop_name, prop_value) VALUES ('db_version', 14);
 
 CREATE TABLE sequences (tenantId VARCHAR(128) NOT NULL, name VARCHAR(32) NOT NULL, seq_value BIGINT NOT NULL);
 ALTER TABLE sequences ADD PRIMARY KEY (tenantId, name);

app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl

@@ -4,7 +4,7 @@
 
 CREATE TABLE apicurio (prop_name VARCHAR(255) NOT NULL, prop_value VARCHAR(255));
 ALTER TABLE apicurio ADD PRIMARY KEY (prop_name);
-INSERT INTO apicurio (prop_name, prop_value) VALUES ('db_version', 15);
+INSERT INTO apicurio (prop_name, prop_value) VALUES ('db_version', 14);
 
 CREATE TABLE sequences (tenantId VARCHAR(128) NOT NULL, name VARCHAR(32) NOT NULL, value BIGINT NOT NULL);
 ALTER TABLE sequences ADD PRIMARY KEY (tenantId, name);

app/src/main/resources/io/apicurio/registry/storage/impl/sql/mssql.ddl

@@ -4,7 +4,7 @@
 
 CREATE TABLE apicurio (prop_name VARCHAR(255) NOT NULL, prop_value VARCHAR(255));
 ALTER TABLE apicurio ADD PRIMARY KEY (prop_name);
-INSERT INTO apicurio (prop_name, prop_value) VALUES ('db_version', 15);
+INSERT INTO apicurio (prop_name, prop_value) VALUES ('db_version', 14);
 
 CREATE TABLE sequences (tenantId VARCHAR(128) NOT NULL, name VARCHAR(32) NOT NULL, value BIGINT NOT NULL);
 ALTER TABLE sequences ADD PRIMARY KEY (tenantId, name);

app/src/main/resources/io/apicurio/registry/storage/impl/sql/mysql.ddl

@@ -4,7 +4,7 @@
 
 CREATE TABLE apicurio (prop_name VARCHAR(255) NOT NULL, prop_value VARCHAR(255));
 ALTER TABLE apicurio ADD PRIMARY KEY (prop_name);
-INSERT INTO apicurio (prop_name, prop_value) VALUES ('db_version', 15);
+INSERT INTO apicurio (prop_name, prop_value) VALUES ('db_version', 14);
 
 CREATE TABLE sequences (tenantId VARCHAR(128) NOT NULL, name VARCHAR(32) NOT NULL, value BIGINT NOT NULL);
 ALTER TABLE sequences ADD PRIMARY KEY (tenantId, name);

app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.ddl

@@ -32,8 +32,8 @@
 import java.util.concurrent.TimeoutException;
 
 import static io.apicurio.deployment.KubernetesTestResources.*;
-import static io.apicurio.deployment.RegistryDeploymentManager.kubernetesClient;
 import static io.apicurio.deployment.RegistryDeploymentManager.prepareTestsInfra;
+import static io.apicurio.deployment.k8s.K8sClientManager.kubernetesClient;
 
 public class KafkaSqlDeploymentManager {
 
@@ -65,12 +65,11 @@ private static void prepareKafkaDbUpgradeTests(String registryImage) throws Exce
         prepareTestsInfra(KAFKA_RESOURCES, APPLICATION_2_1_KAFKA_RESOURCES, false, null, false);
         prepareKafkaSqlMigrationData(ApicurioRegistryBaseIT.getRegistryBaseUrl());
 
-        final RollableScalableResource<Deployment> deploymentResource = kubernetesClient().apps().deployments().inNamespace(TEST_NAMESPACE).withName(APPLICATION_DEPLOYMENT);
         //Once all the data has been introduced, the old deployment is deleted.
         deleteRegistryDeployment();
 
         //The Registry version 2.3 is deployed, the version introducing artifact references.
-        prepareTestsInfra(null, APPLICATION_2_3_KAFKA_RESOURCES, false, null, false);
+        prepareTestsInfra(null, APPLICATION_2_4_KAFKA_RESOURCES, false, null, false);
         prepareKafkaSqlReferencesMigrationData(ApicurioRegistryBaseIT.getRegistryBaseUrl());
 
         //Once the references data is ready, we delete this old deployment and finally the current one is deployed.
@@ -81,9 +80,9 @@ private static void prepareKafkaDbUpgradeTests(String registryImage) throws Exce
     }
 
     private static void deleteRegistryDeployment() {
-        final RollableScalableResource<Deployment> deploymentResource = kubernetesClient.apps().deployments().inNamespace(TEST_NAMESPACE).withName(APPLICATION_DEPLOYMENT);
+        final RollableScalableResource<Deployment> deploymentResource = kubernetesClient().apps().deployments().inNamespace(TEST_NAMESPACE).withName(APPLICATION_DEPLOYMENT);
 
-        kubernetesClient.apps().deployments().inNamespace(TEST_NAMESPACE).withName(APPLICATION_DEPLOYMENT).delete();
+        kubernetesClient().apps().deployments().inNamespace(TEST_NAMESPACE).withName(APPLICATION_DEPLOYMENT).delete();
 
         //Wait for the deployment to be deleted
         CompletableFuture<List<Deployment>> deployment = deploymentResource

app/src/main/resources/io/apicurio/registry/storage/impl/sql/upgrades/15/h2.upgrade.ddl

@@ -36,10 +36,10 @@ public class KubernetesTestResources {
     protected static final String APPLICATION_KAFKA_MULTITENANT_RESOURCES = "/infra/kafka/registry-multitenant-kafka.yml";
 
     protected static final String APPLICATION_2_1_SQL_RESOURCES = "/infra/sql/registry-sql-2-1.yml";
-    protected static final String APPLICATION_2_3_SQL_RESOURCES = "/infra/sql/registry-sql-2-3.yml";
+    protected static final String APPLICATION_2_4_SQL_RESOURCES = "/infra/sql/registry-sql-2-4.yml";
 
     protected static final String APPLICATION_2_1_KAFKA_RESOURCES = "/infra/kafka/registry-kafka-2.1.yml";
-    protected static final String APPLICATION_2_3_KAFKA_RESOURCES = "/infra/kafka/registry-kafka-2.3.yml";
+    protected static final String APPLICATION_2_4_KAFKA_RESOURCES = "/infra/kafka/registry-kafka-2.4.yml";
 
     protected static final String TENANT_MANAGER_RESOURCES = "/infra/tenant-manager/tenant-manager.yml";
     protected static final String TENANT_MANAGER_DATABASE = "/infra/tenant-manager/tenant-manager-database.yml";

app/src/main/resources/io/apicurio/registry/storage/impl/sql/upgrades/15/postgresql.upgrade.ddl

@@ -44,11 +44,9 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import static io.apicurio.deployment.k8s.K8sClientManager.kubernetesClient;
-import static io.apicurio.deployment.KubernetesTestResources.*;
 import static io.apicurio.deployment.KubernetesTestResources.*;
-import static io.apicurio.deployment.RegistryDeploymentManager.kubernetesClient;
 import static io.apicurio.deployment.RegistryDeploymentManager.prepareTestsInfra;
+import static io.apicurio.deployment.k8s.K8sClientManager.kubernetesClient;
 
 public class SqlDeploymentManager {
 
@@ -82,7 +80,7 @@ private static void prepareSqlDbUpgradeTests(String registryImage) throws Except
         deleteRegistryDeployment();
 
         //The Registry version 2.3 is deployed, the version introducing artifact references.
-        prepareTestsInfra(null, APPLICATION_2_3_SQL_RESOURCES, false, null, false);
+        prepareTestsInfra(null, APPLICATION_2_4_SQL_RESOURCES, false, null, false);
         prepareSqlReferencesMigrationData();
 
         //Once the references data is ready, we delete this old deployment and finally the current one is deployed.
@@ -93,9 +91,9 @@ private static void prepareSqlDbUpgradeTests(String registryImage) throws Except
     }
 
     private static void deleteRegistryDeployment() {
-        final RollableScalableResource<Deployment> deploymentResource = kubernetesClient.apps().deployments().inNamespace(TEST_NAMESPACE).withName(APPLICATION_DEPLOYMENT);
+        final RollableScalableResource<Deployment> deploymentResource = kubernetesClient().apps().deployments().inNamespace(TEST_NAMESPACE).withName(APPLICATION_DEPLOYMENT);
 
-        kubernetesClient.apps().deployments().inNamespace(TEST_NAMESPACE).withName(APPLICATION_DEPLOYMENT).delete();
+        kubernetesClient().apps().deployments().inNamespace(TEST_NAMESPACE).withName(APPLICATION_DEPLOYMENT).delete();
 
         //Wait for the deployment to be deleted
         CompletableFuture<List<Deployment>> deployment = deploymentResource

integration-tests/src/test/java/io/apicurio/deployment/KafkaSqlDeploymentManager.java

@@ -23,7 +23,7 @@ spec:
                   fieldPath: metadata.namespace
             - name: KAFKA_BOOTSTRAP_SERVERS
               value: kafka-service:9092
-          image: quay.io/apicurio/apicurio-registry-kafkasql:2.1.2.Final
+          image: quay.io/apicurio/apicurio-registry-kafkasql:2.4.4.Final
           imagePullPolicy: Always
           livenessProbe:
             failureThreshold: 3

integration-tests/src/test/java/io/apicurio/deployment/KubernetesTestResources.java

@@ -39,7 +39,7 @@ spec:
               value: "3s"
             - name: TENANT_MANAGER_URL
               value: "http://tenant-manager-service:8585"
-          image: quay.io/apicurio/apicurio-registry-sql:2.3.0.Final
+          image: quay.io/apicurio/apicurio-registry-sql:2.4.4.Final
           imagePullPolicy: Always
           livenessProbe:
             failureThreshold: 3