Simple refactoring on editing Kafka custom resource during KRaft migr…

…ation tests (#10546) Signed-off-by: Paolo Patierno <[email protected]>
strimzi · Sep 6, 2024 · 27f0453 · 27f0453
1 parent 8243ea4
commit 27f0453
Showing 1 changed file with 5 additions and 20 deletions.
diff --git a/...r/src/test/java/io/strimzi/operator/cluster/operator/assembly/KRaftMigrationMockTest.java b/...r/src/test/java/io/strimzi/operator/cluster/operator/assembly/KRaftMigrationMockTest.java
@@ -210,10 +210,7 @@ public void testFullMigration(VertxTestContext context) {
                 })))
                 // 2nd reconcile, Kafka custom resource updated with the strimzi.io/kraft: migration annotation
                 .compose(i -> {
-                    Kafka kafkaWithMigrationAnno = kafkaWithKRaftAnno(
-                            Crds.kafkaOperation(client).inNamespace(namespace).withName(CLUSTER_NAME).get(), "migration"
-                    );
-                    Crds.kafkaOperation(client).inNamespace(namespace).resource(kafkaWithMigrationAnno).update();
+                    Crds.kafkaOperation(client).inNamespace(namespace).withName(CLUSTER_NAME).edit(k -> kafkaWithKRaftAnno(k, "migration"));
                     return Future.succeededFuture();
                 })
                 .compose(v -> operator.reconcile(new Reconciliation("test-trigger", Kafka.RESOURCE_KIND, namespace, CLUSTER_NAME)))
@@ -275,10 +272,7 @@ public void testFullMigration(VertxTestContext context) {
                 })))
                 // 6th reconcile, Kafka custom resource updated with the strimzi.io/kraft: enabled annotation and in post-migration
                 .compose(i -> {
-                    Kafka kafkaWithEnabledAnno = kafkaWithKRaftAnno(
-                            Crds.kafkaOperation(client).inNamespace(namespace).withName(CLUSTER_NAME).get(), "enabled"
-                    );
-                    Crds.kafkaOperation(client).inNamespace(namespace).resource(kafkaWithEnabledAnno).update();
+                    Crds.kafkaOperation(client).inNamespace(namespace).withName(CLUSTER_NAME).edit(k -> kafkaWithKRaftAnno(k, "enabled"));
                     return Future.succeededFuture();
                 })
                 .compose(v -> operator.reconcile(new Reconciliation("test-trigger", Kafka.RESOURCE_KIND, namespace, CLUSTER_NAME)))
@@ -330,10 +324,7 @@ public void testRollbackMigration(VertxTestContext context) {
                 })))
                 // 2nd reconcile, Kafka custom resource updated with the strimzi.io/kraft: migration annotation
                 .compose(i -> {
-                    Kafka kafkaWithMigrationAnno = kafkaWithKRaftAnno(
-                            Crds.kafkaOperation(client).inNamespace(namespace).withName(CLUSTER_NAME).get(), "migration"
-                    );
-                    Crds.kafkaOperation(client).inNamespace(namespace).resource(kafkaWithMigrationAnno).update();
+                    Crds.kafkaOperation(client).inNamespace(namespace).withName(CLUSTER_NAME).edit(k -> kafkaWithKRaftAnno(k, "migration"));
                     return Future.succeededFuture();
                 })
                 .compose(v -> operator.reconcile(new Reconciliation("test-trigger", Kafka.RESOURCE_KIND, namespace, CLUSTER_NAME)))
@@ -361,10 +352,7 @@ public void testRollbackMigration(VertxTestContext context) {
                 })))
                 // 6th reconcile, Kafka custom resource updated with the strimzi.io/kraft: rollback annotation and in post-migration
                 .compose(i -> {
-                    Kafka kafkaWithRollbackAnno = kafkaWithKRaftAnno(
-                            Crds.kafkaOperation(client).inNamespace(namespace).withName(CLUSTER_NAME).get(), "rollback"
-                    );
-                    Crds.kafkaOperation(client).inNamespace(namespace).resource(kafkaWithRollbackAnno).update();
+                    Crds.kafkaOperation(client).inNamespace(namespace).withName(CLUSTER_NAME).edit(k -> kafkaWithKRaftAnno(k, "rollback"));
                     return Future.succeededFuture();
                 })
                 .compose(v -> operator.reconcile(new Reconciliation("test-trigger", Kafka.RESOURCE_KIND, namespace, CLUSTER_NAME)))
@@ -387,10 +375,7 @@ public void testRollbackMigration(VertxTestContext context) {
                 })))
                 // 7th reconcile, Kafka custom resource updated with the strimzi.io/kraft: disabled annotation and in dual-writing
                 .compose(i -> {
-                    Kafka kafkaWithDisabledAnno = kafkaWithKRaftAnno(
-                            Crds.kafkaOperation(client).inNamespace(namespace).withName(CLUSTER_NAME).get(), "disabled"
-                    );
-                    Crds.kafkaOperation(client).inNamespace(namespace).resource(kafkaWithDisabledAnno).update();
+                    Crds.kafkaOperation(client).inNamespace(namespace).withName(CLUSTER_NAME).edit(k -> kafkaWithKRaftAnno(k, "disabled"));
                     return Future.succeededFuture();
                 })
                 .compose(v -> operator.reconcile(new Reconciliation("test-trigger", Kafka.RESOURCE_KIND, namespace, CLUSTER_NAME)))