control-service: allow delete-all-secrets command (#2523)

Fix a bug which prevents the delete-all-secrets cli command to work. Signed-off-by: Dako Dakov <[email protected]>
vmware · Aug 7, 2023 · ec50067 · ec50067
1 parent a4bce83
commit ec50067
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 23 deletions.
diff --git a/...ation-test/java/com/vmware/taurus/secrets/service/vault/TestVaultJobSecretsServiceIT.java b/...ation-test/java/com/vmware/taurus/secrets/service/vault/TestVaultJobSecretsServiceIT.java
@@ -71,6 +71,18 @@ public void testSetDataJobSecrets() throws Exception {
     Assertions.assertEquals(secrets, readResult);
   }
 
+  @Test
+  public void testSetEmptyDataJobSecrets() throws Exception {
+    Map<String, Object> temp = new HashMap<>();
+
+    Map<String, Object> secrets = Collections.unmodifiableMap(temp);
+
+    vaultJobSecretService.updateJobSecrets("testJob2", secrets);
+
+    Map<String, Object> readResult = vaultJobSecretService.readJobSecrets("testJob2");
+    Assertions.assertEquals(secrets, readResult);
+  }
+
   @Test
   void testUpdateJobSecretsLimit() throws JsonProcessingException {
     Map<String, Object> temp = new HashMap<>();

diff --git a/...service/src/main/java/com/vmware/taurus/secrets/service/vault/VaultJobSecretsService.java b/...service/src/main/java/com/vmware/taurus/secrets/service/vault/VaultJobSecretsService.java
@@ -45,7 +45,6 @@ public VaultJobSecretsService(VaultOperations vaultOperations) {
   public void updateJobSecrets(String jobName, Map<String, Object> secrets) {
 
     checkJobName(jobName);
-    checkJobSecretsMap(jobName, secrets);
 
     Versioned<VaultJobSecrets> readResponse =
         vaultOperations.opsForVersionedKeyValue(SECRET).get(jobName, VaultJobSecrets.class);
@@ -102,10 +101,4 @@ private void checkJobName(String jobName) {
       throw new DataJobSecretsException(jobName, "Data Job Name cannot be blank");
     }
   }
-
-  private void checkJobSecretsMap(String jobName, Map<String, Object> secrets) {
-    if (secrets == null || secrets.isEmpty()) {
-      throw new DataJobSecretsException(jobName, "Secrets parameter cannot be null or empty");
-    }
-  }
 }
diff --git a/...rol_service/src/test/java/com/vmware/taurus/secrets/vault/VaultJobSecretsServiceTest.java b/...rol_service/src/test/java/com/vmware/taurus/secrets/vault/VaultJobSecretsServiceTest.java
@@ -105,7 +105,6 @@ void testUpdateJobSecretsNulls() throws JsonProcessingException {
     String blankJobName = " ";
     String nullJobName = null;
     Map<String, Object> secrets = new HashMap<>();
-    Map<String, Object> nullSecrets = new HashMap<>();
 
     Throwable t =
         assertThrows(
@@ -120,20 +119,5 @@ void testUpdateJobSecretsNulls() throws JsonProcessingException {
             () -> secretsService.updateJobSecrets(nullJobName, secrets));
 
     Assert.assertThat(t.getMessage(), CoreMatchers.containsString("Data Job Name cannot be blank"));
-
-    t =
-        assertThrowsExactly(
-            DataJobSecretsException.class, () -> secretsService.updateJobSecrets(jobName, secrets));
-
-    Assert.assertThat(
-        t.getMessage(), CoreMatchers.containsString("Secrets parameter cannot be null or empty"));
-
-    t =
-        assertThrowsExactly(
-            DataJobSecretsException.class,
-            () -> secretsService.updateJobSecrets(jobName, nullSecrets));
-
-    Assert.assertThat(
-        t.getMessage(), CoreMatchers.containsString("Secrets parameter cannot be null or empty"));
   }
 }