changed TopicValidator on backend side

allegro · Jan 31, 2025 · 1b9a044 · 1b9a044
1 parent f562677
commit 1b9a044
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/...rc/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidator.java b/...rc/main/java/pl/allegro/tech/hermes/management/domain/topic/validator/TopicValidator.java
@@ -82,11 +82,11 @@ public void ensureUpdatedTopicIsValid(Topic updated, Topic previous, RequestUser
     checkOwner(updated);
     checkTopicLabels(updated);
 
-    if ((previous.isFallbackToRemoteDatacenterEnabled()
-            != updated.isFallbackToRemoteDatacenterEnabled())
+    if (previous.isFallbackToRemoteDatacenterEnabled()
+        && !updated.isFallbackToRemoteDatacenterEnabled()
         && !modifiedBy.isAdmin()) {
       throw new TopicValidationException(
-          "User is not allowed to update fallback to remote datacenter for this topic");
+          "User is not allowed to disable fallback to remote datacenter for this topic");
     }
 
     if (!previous.getChaos().equals(updated.getChaos()) && !modifiedBy.isAdmin()) {

diff --git a/...tionTest/java/pl/allegro/tech/hermes/integrationtests/management/TopicManagementTest.java b/...tionTest/java/pl/allegro/tech/hermes/integrationtests/management/TopicManagementTest.java
@@ -823,7 +823,7 @@ public void shouldAllowAdminUserCreateTopicWithNonDefaultFallbackToRemoteDatacen
   }
 
   @Test
-  public void shouldNotAllowNonAdminUserToChangeFallbackToRemoteDatacenter() {
+  public void shouldNotAllowNonAdminUserToDisableFallbackToRemoteDatacenter() {
     // given
     Topic topic =
         hermes
@@ -840,11 +840,32 @@ public void shouldNotAllowNonAdminUserToChangeFallbackToRemoteDatacenter() {
     // then
     response.expectStatus().isBadRequest();
     assertThat(response.expectBody(String.class).returnResult().getResponseBody())
-        .contains("User is not allowed to update fallback to remote datacenter for this topic");
+        .contains("User is not allowed to disable fallback to remote datacenter for this topic");
   }
 
   @Test
-  public void shouldAllowAdminUserToChangeFallbackToRemoteDatacenter() {
+  public void shouldAllowNonAdminUserToEnableFallbackToRemoteDatacenter() {
+    // given
+    Topic topic =
+            hermes
+                    .initHelper()
+                    .createTopic(topicWithRandomName().build());
+    TestSecurityProvider.setUserIsAdmin(false);
+    PatchData patchData =
+            PatchData.from(ImmutableMap.of("fallbackToRemoteDatacenterEnabled", false));
+
+    // when
+    WebTestClient.ResponseSpec response =
+            hermes.api().updateTopic(topic.getQualifiedName(), patchData);
+
+    // then
+    response.expectStatus().isBadRequest();
+    assertThat(response.expectBody(String.class).returnResult().getResponseBody())
+            .contains("User is not allowed to disable fallback to remote datacenter for this topic");
+  }
+
+  @Test
+  public void shouldAllowAdminUserToDisableFallbackToRemoteDatacenter() {
     // given
     Topic topic =
         hermes