[pulsar] branch master updated: set service-url required to false, service-url is not required if ena… (#9127)

[sijie]

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

sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 3e35af5  set service-url required to false, service-url is not 
required if ena… (#9127)
3e35af5 is described below

commit 3e35af5096a32a46b410a4b32c8d8722e42f4865
Author: dockerzhang <dockerzh...@apache.org>
AuthorDate: Sat Jan 9 01:35:18 2021 +0800

    set service-url required to false, service-url is not required if ena… 
(#9127)
    
    Fixes #9126
    
    ### Motivation
    there is ` --url ` required restriction for adding cluster if TLS is 
enabled, here we only need the --url-secure/--broker-url-secure params
    
    ### Modifications
    set `service-url` required to false, `service-url` is not required if 
enable TLS for pulsar cluster.
---
 .../org/apache/pulsar/admin/cli/PulsarAdminToolTest.java     | 12 ++++++++++++
 .../main/java/org/apache/pulsar/admin/cli/CmdClusters.java   |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git 
a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
 
b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
index d74184f..49126a9 100644
--- 
a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
+++ 
b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java
@@ -216,6 +216,18 @@ public class PulsarAdminToolTest {
 
         clusters.run(split("get-peer-clusters my-cluster"));
         verify(mockClusters).getPeerClusterNames("my-cluster");
+
+        // test create cluster without --url
+        clusters = new CmdClusters(admin);
+
+        clusters.run(split("create my-secure-cluster --url-secure 
https://my-service.url:4443";));
+        verify(mockClusters).createCluster("my-secure-cluster", new 
ClusterData(null, "https://my-service.url:4443";));
+
+        clusters.run(split("update my-secure-cluster --url-secure 
https://my-service.url:4443";));
+        verify(mockClusters).updateCluster("my-secure-cluster", new 
ClusterData(null, "https://my-service.url:4443";));
+
+        clusters.run(split("delete my-secure-cluster"));
+        verify(mockClusters).deleteCluster("my-secure-cluster");
     }
 
     @Test
diff --git 
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdClusters.java
 
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdClusters.java
index 2921927..32110f4 100644
--- 
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdClusters.java
+++ 
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdClusters.java
@@ -58,7 +58,7 @@ public class CmdClusters extends CmdBase {
         @Parameter(description = "cluster-name\n", required = true)
         private java.util.List<String> params;
 
-        @Parameter(names = "--url", description = "service-url", required = 
true)
+        @Parameter(names = "--url", description = "service-url", required = 
false)
         private String serviceUrl;
 
         @Parameter(names = "--url-secure", description = "service-url for 
secure connection", required = false)
@@ -89,7 +89,7 @@ public class CmdClusters extends CmdBase {
         @Parameter(description = "cluster-name\n", required = true)
         private java.util.List<String> params;
 
-        @Parameter(names = "--url", description = "service-url", required = 
true)
+        @Parameter(names = "--url", description = "service-url", required = 
false)
         private String serviceUrl;
 
         @Parameter(names = "--url-secure", description = "service-url for 
secure connection", required = false)