(gravitino) branch main updated: [Minor] Updates to delete multiple tags in Gravitino CLI (#5666)

[jshao]

This is an automated email from the ASF dual-hosted git repository.

jshao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gravitino.git


The following commit(s) were added to refs/heads/main by this push:
     new f902f2fa9 [Minor] Updates to delete multiple tags in Gravitino CLI 
(#5666)
f902f2fa9 is described below

commit f902f2fa9a2a4edd650fc8ee804e4064b82b6550
Author: Justin Mclean <jus...@classsoftware.com>
AuthorDate: Tue Nov 26 20:38:58 2024 +1100

    [Minor] Updates to delete multiple tags in Gravitino CLI (#5666)
    
    ### What changes were proposed in this pull request?
    
    Fixed some display issues and minor improvements to code.
    
    ### Why are the changes needed?
    
    To have display messages more consistent.
    
    Fix: # N/A
    
    ### Does this PR introduce _any_ user-facing change?
    
    N/A
    ### How was this patch tested?
    
    Tested locally.
    
    ---------
    
    Co-authored-by: sunxiaojian <sunxiaojian...@163.com>
---
 .../java/org/apache/gravitino/cli/GravitinoCommandLine.java    |  4 +++-
 .../main/java/org/apache/gravitino/cli/commands/CreateTag.java |  2 +-
 .../main/java/org/apache/gravitino/cli/commands/DeleteTag.java | 10 +++-------
 .../main/java/org/apache/gravitino/cli/commands/TagEntity.java |  2 +-
 .../java/org/apache/gravitino/cli/commands/UntagEntity.java    |  8 ++++++--
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git 
a/clients/cli/src/main/java/org/apache/gravitino/cli/GravitinoCommandLine.java 
b/clients/cli/src/main/java/org/apache/gravitino/cli/GravitinoCommandLine.java
index 14e2cd20e..1cdbfaf25 100644
--- 
a/clients/cli/src/main/java/org/apache/gravitino/cli/GravitinoCommandLine.java
+++ 
b/clients/cli/src/main/java/org/apache/gravitino/cli/GravitinoCommandLine.java
@@ -370,7 +370,9 @@ public class GravitinoCommandLine extends 
TestableCommandLine {
     String metalake = name.getMetalakeName();
 
     String[] tags = line.getOptionValues(GravitinoOptions.TAG);
-    tags = tags != null ? 
Arrays.stream(tags).distinct().toArray(String[]::new) : null;
+    if (tags != null) {
+      tags = Arrays.stream(tags).distinct().toArray(String[]::new);
+    }
     if (CommandActions.DETAILS.equals(command)) {
       newTagDetails(url, ignore, metalake, getOneTag(tags)).handle();
     } else if (CommandActions.LIST.equals(command)) {
diff --git 
a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/CreateTag.java 
b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/CreateTag.java
index 004254c16..61406c000 100644
--- a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/CreateTag.java
+++ b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/CreateTag.java
@@ -75,7 +75,7 @@ public class CreateTag extends Command {
       return;
     }
 
-    System.out.println(tags[0] + " created");
+    System.out.println("Tag " + tags[0] + " created");
   }
 
   private void handleMultipleTags() {
diff --git 
a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/DeleteTag.java 
b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/DeleteTag.java
index 0db4a8976..2d930560c 100644
--- a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/DeleteTag.java
+++ b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/DeleteTag.java
@@ -90,17 +90,13 @@ public class DeleteTag extends Command {
     if (deleted.size() < tags.length) {
       List<String> remaining = Arrays.asList(tags);
       remaining.removeAll(deleted);
-      System.out.println("Tags " + String.join(",", deleted) + " not 
deleted.");
+      System.out.println("Tags " + String.join(",", remaining) + " not 
deleted.");
     }
   }
 
   private void handleOnlyOneTag() {
     boolean deleted = false;
 
-    if (!AreYouSure.really(force)) {
-      return;
-    }
-
     try {
       GravitinoClient client = buildClient(metalake);
       deleted = client.deleteTag(tags[0]);
@@ -116,9 +112,9 @@ public class DeleteTag extends Command {
     }
 
     if (deleted) {
-      System.out.println(tags[0] + " deleted.");
+      System.out.println("Tag " + tags[0] + " deleted.");
     } else {
-      System.out.println(tags[0] + " not deleted.");
+      System.out.println("Tag " + tags[0] + " not deleted.");
     }
   }
 }
diff --git 
a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/TagEntity.java 
b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/TagEntity.java
index ed474c784..b6f7c3210 100644
--- a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/TagEntity.java
+++ b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/TagEntity.java
@@ -105,6 +105,6 @@ public class TagEntity extends Command {
 
     String all = String.join(",", tagsToAdd);
 
-    System.out.println(entity + " tagged with " + all);
+    System.out.println(entity + " now tagged with " + all);
   }
 }
diff --git 
a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/UntagEntity.java 
b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/UntagEntity.java
index 77437dafc..3b9771bc8 100644
--- 
a/clients/cli/src/main/java/org/apache/gravitino/cli/commands/UntagEntity.java
+++ 
b/clients/cli/src/main/java/org/apache/gravitino/cli/commands/UntagEntity.java
@@ -109,7 +109,11 @@ public class UntagEntity extends Command {
       all = "nothing";
     }
 
-    System.out.println(
-        entity + " removed tag " + String.join(",", tags) + " now tagged with 
" + all);
+    if (tags.length > 1) {
+      System.out.println(
+          entity + " removed tags " + String.join(",", tags) + " now tagged 
with " + all);
+    } else {
+      System.out.println(entity + " removed tag " + tags[0].toString() + " now 
tagged with " + all);
+    }
   }
 }