From 9c6bb46a5f1ac650b9e9a989b7bd8323c844278d Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 25 Jul 2023 13:58:57 -0400
Subject: [PATCH 01/25] add bats test

---
 solr/packaging/test/test_create_collection.bats | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/solr/packaging/test/test_create_collection.bats b/solr/packaging/test/test_create_collection.bats
index ff776609378..e283a9d00d7 100644
--- a/solr/packaging/test/test_create_collection.bats
+++ b/solr/packaging/test/test_create_collection.bats
@@ -41,13 +41,20 @@ teardown() {
 @test "create collection" {
   run solr create -c COLL_NAME
   assert_output --partial "Created collection 'COLL_NAME'"
-  assert_output --partial "assuming solrUrl is http://localhost:8983/solr"
+  assert_output --partial "assuming solrUrl is http://localhost:8983"
 }
 
 @test "create collection using solrUrl" {
   run solr create -c COLL_NAME -solrUrl http://localhost:8983/solr
   assert_output --partial "Created collection 'COLL_NAME'"  
-  refute_output --partial "assuming solrUrl is http://localhost:8983/solr"
+  refute_output --partial "assuming solrUrl is http://localhost:8983"
+}
+
+@test "create collection using legacy solrUrl" {
+  run solr create -c COLL_NAME -solrUrl http://localhost:8983
+  assert_output --partial "Created collection 'COLL_NAME'"  
+  assert_output --partial "The solrUrl parameter should only point to the root of Solr."  
+  refute_output --partial "assuming solrUrl is http://localhost:8983"
 }
 
 @test "create collection using Zookeeper" {

From 48adb632c17fea0e4691861fc14e8e89831a3b26 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 25 Jul 2023 16:01:02 -0400
Subject: [PATCH 02/25] AssertionFailureException is only used by the
 AssertTool, not shared Exception

---
 solr/core/src/java/org/apache/solr/cli/AssertTool.java | 10 ++++++++--
 solr/core/src/java/org/apache/solr/cli/SolrCLI.java    |  6 ------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/AssertTool.java b/solr/core/src/java/org/apache/solr/cli/AssertTool.java
index 014b19d123a..7036d75f831 100644
--- a/solr/core/src/java/org/apache/solr/cli/AssertTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/AssertTool.java
@@ -348,11 +348,11 @@ public static String userForDir(Path pathToDir) {
     }
   }
 
-  private static int exitOrException(String msg) throws SolrCLI.AssertionFailureException {
+  private static int exitOrException(String msg) throws AssertionFailureException {
     if (useExitCode) {
       return 1;
     } else {
-      throw new SolrCLI.AssertionFailureException(message != null ? message : msg);
+      throw new AssertionFailureException(message != null ? message : msg);
     }
   }
 
@@ -374,4 +374,10 @@ private static boolean runningSolrIsCloud(String url) throws Exception {
       return SolrCLI.isCloudMode(client);
     }
   }
+
+  public static class AssertionFailureException extends Exception {
+    public AssertionFailureException(String message) {
+      super(message);
+    }
+  }
 }
diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index e6ff82d21d4..38f92948c74 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -569,10 +569,4 @@ public static boolean isCloudMode(SolrClient solrClient) throws SolrServerExcept
         solrClient.request(new GenericSolrRequest(SolrRequest.METHOD.GET, SYSTEM_INFO_PATH));
     return "solrcloud".equals(systemInfo.get("mode"));
   }
-
-  public static class AssertionFailureException extends Exception {
-    public AssertionFailureException(String message) {
-      super(message);
-    }
-  }
 }

From 42279c4c2e754d352af180ef286cc2d065a333d4 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 25 Jul 2023 16:10:55 -0400
Subject: [PATCH 03/25] Add testing for resolving a solr url.

---
 .../src/java/org/apache/solr/cli/SolrCLI.java | 13 +++++++++++
 ...olrCliUptimeTest.java => SolrCLITest.java} | 22 ++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 rename solr/core/src/test/org/apache/solr/cli/{SolrCliUptimeTest.java => SolrCLITest.java} (60%)

diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index 38f92948c74..55f9aeab929 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -383,6 +383,10 @@ public static boolean exceptionIsAuthRelated(Exception exc) {
   }
 
   public static SolrClient getSolrClient(String solrUrl) {
+    // today we require all urls to end in /solr, however in the future we will need to support the /api url end point instead.
+    if (solrUrl.indexOf("/solr") == 0){
+      solrUrl = solrUrl + "/solr";
+    }
     return new Http2SolrClient.Builder(solrUrl).withMaxConnectionsPerHost(32).build();
   }
 
@@ -476,6 +480,15 @@ public static String resolveSolrUrl(CommandLine cli) throws Exception {
         }
       }
     }
+    else {
+      if (solrUrl.indexOf("/solr") > -1) { // warn users on the old legacy http://localhost:8983/solr pattern for Solr urls.
+        solrUrl = solrUrl.substring(0, solrUrl.indexOf("/solr"));
+        CLIO.out("The solrUrl parameter only needs to only point to the root of Solr (" + solrUrl + ").");
+      }
+      if (solrUrl.endsWith("/")){
+        solrUrl = solrUrl.substring(0,solrUrl.length()-1);
+      }
+    }
     return solrUrl;
   }
 
diff --git a/solr/core/src/test/org/apache/solr/cli/SolrCliUptimeTest.java b/solr/core/src/test/org/apache/solr/cli/SolrCLITest.java
similarity index 60%
rename from solr/core/src/test/org/apache/solr/cli/SolrCliUptimeTest.java
rename to solr/core/src/test/org/apache/solr/cli/SolrCLITest.java
index 4589ea539ef..edb1157f34d 100644
--- a/solr/core/src/test/org/apache/solr/cli/SolrCliUptimeTest.java
+++ b/solr/core/src/test/org/apache/solr/cli/SolrCLITest.java
@@ -16,10 +16,30 @@
  */
 package org.apache.solr.cli;
 
+import org.apache.commons.cli.CommandLine;
 import org.apache.solr.SolrTestCase;
 import org.junit.Test;
 
-public class SolrCliUptimeTest extends SolrTestCase {
+import static org.apache.solr.cli.SolrCLI.parseCmdLine;
+
+public class SolrCLITest extends SolrTestCase {
+  @Test
+  public void testResolveSolrUrl() throws Exception {
+    Tool testTool = new CreateTool();
+
+    String[] args = new String[] { "create", "-c","test", "-solrUrl", "http://localhost:8983/solr"};
+    CommandLine cli = parseCmdLine(testTool.getName(), args, testTool.getOptions());
+    assertEquals(SolrCLI.resolveSolrUrl(cli),"http://localhost:8983");
+
+    args = new String[] { "create", "-c","test", "-solrUrl", "http://localhost:8983"};
+    cli = parseCmdLine(testTool.getName(), args, testTool.getOptions());
+    assertEquals(SolrCLI.resolveSolrUrl(cli),"http://localhost:8983");
+
+    args = new String[] { "create", "-c","test", "-solrUrl", "http://localhost:8983/"};
+    cli = parseCmdLine(testTool.getName(), args, testTool.getOptions());
+    assertEquals(SolrCLI.resolveSolrUrl(cli),"http://localhost:8983");
+  }
+
   @Test
   public void testUptime() {
     assertEquals("?", SolrCLI.uptime(0));

From cd63cca24b6d9f710155dc6ac4cc20315187be6f Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 25 Jul 2023 17:16:45 -0400
Subject: [PATCH 04/25] simplify test

---
 .../src/java/org/apache/solr/cli/SolrCLI.java | 44 +++++++++++++------
 .../test/org/apache/solr/cli/SolrCLITest.java | 21 ++-------
 2 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index 55f9aeab929..b4e6edd1979 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -383,8 +383,9 @@ public static boolean exceptionIsAuthRelated(Exception exc) {
   }
 
   public static SolrClient getSolrClient(String solrUrl) {
-    // today we require all urls to end in /solr, however in the future we will need to support the /api url end point instead.
-    if (solrUrl.indexOf("/solr") == 0){
+    // today we require all urls to end in /solr, however in the future we will need to support the
+    // /api url end point instead.
+    if (!solrUrl.endsWith(("/solr"))) {
       solrUrl = solrUrl + "/solr";
     }
     return new Http2SolrClient.Builder(solrUrl).withMaxConnectionsPerHost(32).build();
@@ -449,8 +450,31 @@ private static void printHelp() {
     print("Pass -help or -h after any COMMAND to see command-specific usage information,");
     print("such as:    ./solr start -help or ./solr stop -h");
   }
+
   /**
-   * Get the base URL of a live Solr instance from either the solrUrl command-line option from
+   * Strips off the end of solrUrl any /solr when a legacy solrUrl like http://localhost:8983/solr
+   * is used, and warns those users. In the future we'll have url's with /api as well.
+   *
+   * @param solrUrl with /solr stripped off.
+   * @return the truncated if need solrUrl.
+   */
+  public static String resolveSolrUrl(String solrUrl) {
+    if (solrUrl != null) {
+      if (solrUrl.indexOf("/solr") > -1) { //
+        solrUrl = solrUrl.substring(0, solrUrl.indexOf("/solr"));
+        CLIO.out(
+            "The solrUrl parameter only needs to only point to the root of Solr ("
+                + solrUrl
+                + ").");
+      }
+      if (solrUrl.endsWith("/")) {
+        solrUrl = solrUrl.substring(0, solrUrl.length() - 1);
+      }
+    }
+    return solrUrl;
+  }
+  /**
+   * Get the base URL of a live Solr instance from either the solrUrl command-line option or from
    * ZooKeeper.
    */
   public static String resolveSolrUrl(CommandLine cli) throws Exception {
@@ -479,15 +503,8 @@ public static String resolveSolrUrl(CommandLine cli) throws Exception {
           solrUrl = ZkStateReader.from(cloudSolrClient).getBaseUrlForNodeName(firstLiveNode);
         }
       }
-    }
-    else {
-      if (solrUrl.indexOf("/solr") > -1) { // warn users on the old legacy http://localhost:8983/solr pattern for Solr urls.
-        solrUrl = solrUrl.substring(0, solrUrl.indexOf("/solr"));
-        CLIO.out("The solrUrl parameter only needs to only point to the root of Solr (" + solrUrl + ").");
-      }
-      if (solrUrl.endsWith("/")){
-        solrUrl = solrUrl.substring(0,solrUrl.length()-1);
-      }
+    } else {
+      solrUrl = resolveSolrUrl(solrUrl);
     }
     return solrUrl;
   }
@@ -502,7 +519,6 @@ public static String getZkHost(CommandLine cli) throws Exception {
       return zkHost;
     }
 
-    // find it using the localPort
     String solrUrl = cli.getOptionValue("solrUrl");
     if (solrUrl == null) {
       solrUrl = DEFAULT_SOLR_URL;
@@ -511,6 +527,8 @@ public static String getZkHost(CommandLine cli) throws Exception {
               "Neither -zkHost or -solrUrl parameters provided so assuming solrUrl is "
                   + DEFAULT_SOLR_URL
                   + ".");
+    } else {
+      solrUrl = resolveSolrUrl(solrUrl);
     }
 
     try (var solrClient = getSolrClient(solrUrl)) {
diff --git a/solr/core/src/test/org/apache/solr/cli/SolrCLITest.java b/solr/core/src/test/org/apache/solr/cli/SolrCLITest.java
index edb1157f34d..a0e0b4aac32 100644
--- a/solr/core/src/test/org/apache/solr/cli/SolrCLITest.java
+++ b/solr/core/src/test/org/apache/solr/cli/SolrCLITest.java
@@ -16,28 +16,15 @@
  */
 package org.apache.solr.cli;
 
-import org.apache.commons.cli.CommandLine;
 import org.apache.solr.SolrTestCase;
 import org.junit.Test;
 
-import static org.apache.solr.cli.SolrCLI.parseCmdLine;
-
 public class SolrCLITest extends SolrTestCase {
   @Test
-  public void testResolveSolrUrl() throws Exception {
-    Tool testTool = new CreateTool();
-
-    String[] args = new String[] { "create", "-c","test", "-solrUrl", "http://localhost:8983/solr"};
-    CommandLine cli = parseCmdLine(testTool.getName(), args, testTool.getOptions());
-    assertEquals(SolrCLI.resolveSolrUrl(cli),"http://localhost:8983");
-
-    args = new String[] { "create", "-c","test", "-solrUrl", "http://localhost:8983"};
-    cli = parseCmdLine(testTool.getName(), args, testTool.getOptions());
-    assertEquals(SolrCLI.resolveSolrUrl(cli),"http://localhost:8983");
-
-    args = new String[] { "create", "-c","test", "-solrUrl", "http://localhost:8983/"};
-    cli = parseCmdLine(testTool.getName(), args, testTool.getOptions());
-    assertEquals(SolrCLI.resolveSolrUrl(cli),"http://localhost:8983");
+  public void testResolveSolrUrl() {
+    assertEquals(SolrCLI.resolveSolrUrl("http://localhost:8983/solr"), "http://localhost:8983");
+    assertEquals(SolrCLI.resolveSolrUrl("http://localhost:8983"), "http://localhost:8983");
+    assertEquals(SolrCLI.resolveSolrUrl("http://localhost:8983/"), "http://localhost:8983");
   }
 
   @Test

From ade359a328b86c041cb71403b2300e9fafe56722 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 25 Jul 2023 17:17:04 -0400
Subject: [PATCH 05/25] change up some of the urls.

---
 .../java/org/apache/solr/cli/AssertTool.java  |  7 +++---
 solr/packaging/test/test_assert.bats          | 22 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/AssertTool.java b/solr/core/src/java/org/apache/solr/cli/AssertTool.java
index 7036d75f831..21414145b5d 100644
--- a/solr/core/src/java/org/apache/solr/cli/AssertTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/AssertTool.java
@@ -29,7 +29,6 @@
 import org.apache.commons.cli.Option;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.apache.solr.client.solrj.request.HealthCheckRequest;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.util.NamedList;
@@ -198,10 +197,10 @@ protected int runAssert(CommandLine cli) throws Exception {
       ret += assertSolrNotRunning(cli.getOptionValue("S"));
     }
     if (cli.hasOption("c")) {
-      ret += assertSolrRunningInCloudMode(cli.getOptionValue("c"));
+      ret += assertSolrRunningInCloudMode(SolrCLI.resolveSolrUrl(cli.getOptionValue("c")));
     }
     if (cli.hasOption("C")) {
-      ret += assertSolrNotRunningInCloudMode(cli.getOptionValue("C"));
+      ret += assertSolrNotRunningInCloudMode(SolrCLI.resolveSolrUrl(cli.getOptionValue("C")));
     }
     return ret;
   }
@@ -370,7 +369,7 @@ private static boolean isSolrRunningOn(String url) throws Exception {
   }
 
   private static boolean runningSolrIsCloud(String url) throws Exception {
-    try (final SolrClient client = new Http2SolrClient.Builder(url).build()) {
+    try (final SolrClient client = SolrCLI.getSolrClient(url)) {
       return SolrCLI.isCloudMode(client);
     }
   }
diff --git a/solr/packaging/test/test_assert.bats b/solr/packaging/test/test_assert.bats
index 991774add01..3fe126a99ce 100644
--- a/solr/packaging/test/test_assert.bats
+++ b/solr/packaging/test/test_assert.bats
@@ -30,24 +30,26 @@ teardown() {
 
 @test "assert for non cloud mode" {
   run solr start
-  
+
   run solr assert --not-cloud http://localhost:8983/solr
+  assert_output --partial "The solrUrl parameter only needs to only point to the root of Solr (http://localhost:8983)."
   refute_output --partial "ERROR"
-  
-  run solr assert --cloud http://localhost:8983/solr
+
+  run solr assert --cloud http://localhost:8983
   assert_output --partial "ERROR: Solr is not running in cloud mode"
-  
+
   run ! solr assert --cloud http://localhost:8983/solr -e
 }
 
 @test "assert for cloud mode" {
-  run solr start -c 
-  
-  run solr assert --cloud http://localhost:8983/solr
+  run solr start -c
+
+  run solr assert --cloud http://localhost:8983
   refute_output --partial "ERROR"
-  
+
   run solr assert --not-cloud http://localhost:8983/solr
+  assert_output --partial "The solrUrl parameter only needs to only point to the root of Solr (http://localhost:8983)."
   assert_output --partial "ERROR: Solr is not running in standalone mode"
-  
-  run ! solr assert --not-cloud http://localhost:8983/solr -e
+
+  run ! solr assert --not-cloud http://localhost:8983 -e
 }

From e5513eaec84d36943bdb158501fa9e40ce3220e3 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 25 Jul 2023 17:17:43 -0400
Subject: [PATCH 06/25] changes to not need /solr, but allow it...

---
 .../src/java/org/apache/solr/cli/CreateTool.java   |  2 +-
 .../org/apache/solr/cli/HealthcheckToolTest.java   | 14 ++++++++++++++
 solr/packaging/test/test_create_collection.bats    | 10 +++++-----
 solr/packaging/test/test_delete_collection.bats    |  8 ++++++++
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/CreateTool.java b/solr/core/src/java/org/apache/solr/cli/CreateTool.java
index e30a30f40bd..fd284196719 100644
--- a/solr/core/src/java/org/apache/solr/cli/CreateTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/CreateTool.java
@@ -117,7 +117,7 @@ public List<Option> getOptions() {
   @Override
   public void runImpl(CommandLine cli) throws Exception {
     SolrCLI.raiseLogLevelUnlessVerbose(cli);
-    String solrUrl = cli.getOptionValue("solrUrl", SolrCLI.DEFAULT_SOLR_URL);
+    String solrUrl = SolrCLI.resolveSolrUrl(cli);
 
     try (var solrClient = SolrCLI.getSolrClient(solrUrl)) {
       if (SolrCLI.isCloudMode(solrClient)) {
diff --git a/solr/core/src/test/org/apache/solr/cli/HealthcheckToolTest.java b/solr/core/src/test/org/apache/solr/cli/HealthcheckToolTest.java
index fd9a4a0c230..a7d8e7150eb 100644
--- a/solr/core/src/test/org/apache/solr/cli/HealthcheckToolTest.java
+++ b/solr/core/src/test/org/apache/solr/cli/HealthcheckToolTest.java
@@ -65,6 +65,20 @@ public void testHealthcheckWithSolrUrlParameter() throws Exception {
     assertEquals(0, runTool(args));
   }
 
+  @Test
+  public void testHealthcheckWithSolrRootUrlParameter() throws Exception {
+
+    Set<String> liveNodes = cluster.getSolrClient().getClusterState().getLiveNodes();
+    String firstLiveNode = liveNodes.iterator().next();
+    String solrUrl =
+        ZkStateReader.from(cluster.getSolrClient()).getBaseUrlForNodeName(firstLiveNode);
+
+    solrUrl = solrUrl.substring(0, solrUrl.indexOf("/solr"));
+
+    String[] args = new String[] {"healthcheck", "-c", "bob", "-solrUrl", solrUrl};
+    assertEquals(0, runTool(args));
+  }
+
   private int runTool(String[] args) throws Exception {
     Tool tool = findTool(args);
     assertTrue(tool instanceof HealthcheckTool);
diff --git a/solr/packaging/test/test_create_collection.bats b/solr/packaging/test/test_create_collection.bats
index e283a9d00d7..40604f70016 100644
--- a/solr/packaging/test/test_create_collection.bats
+++ b/solr/packaging/test/test_create_collection.bats
@@ -45,15 +45,15 @@ teardown() {
 }
 
 @test "create collection using solrUrl" {
-  run solr create -c COLL_NAME -solrUrl http://localhost:8983/solr
-  assert_output --partial "Created collection 'COLL_NAME'"  
+  run solr create -c COLL_NAME -solrUrl http://localhost:8983
+  assert_output --partial "Created collection 'COLL_NAME'"
   refute_output --partial "assuming solrUrl is http://localhost:8983"
 }
 
 @test "create collection using legacy solrUrl" {
-  run solr create -c COLL_NAME -solrUrl http://localhost:8983
-  assert_output --partial "Created collection 'COLL_NAME'"  
-  assert_output --partial "The solrUrl parameter should only point to the root of Solr."  
+  run solr create -c COLL_NAME -solrUrl http://localhost:8983/solr
+  assert_output --partial "Created collection 'COLL_NAME'"
+  assert_output --partial "The solrUrl parameter only needs to only point to the root of Solr (http://localhost:8983)."
   refute_output --partial "assuming solrUrl is http://localhost:8983"
 }
 
diff --git a/solr/packaging/test/test_delete_collection.bats b/solr/packaging/test/test_delete_collection.bats
index 6e71d1b52ea..bbef50dce10 100644
--- a/solr/packaging/test/test_delete_collection.bats
+++ b/solr/packaging/test/test_delete_collection.bats
@@ -46,6 +46,14 @@ teardown() {
   refute collection_exists "COLL_NAME"
 }
 
+@test "can delete collections with solrUrl" {
+  solr create -c "COLL_NAME"
+  assert collection_exists "COLL_NAME"
+
+  solr delete -c "COLL_NAME" -solrUrl http://localhost:8983
+  refute collection_exists "COLL_NAME"
+}
+
 @test "collection delete also deletes zk config" {
   solr create -c "COLL_NAME"
   assert config_exists "COLL_NAME"

From 174b815b6711bd37e30e8e6951d8a273c7dc97fe Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 25 Jul 2023 17:17:55 -0400
Subject: [PATCH 07/25] reuse existing options..

---
 solr/core/src/java/org/apache/solr/cli/AuthTool.java | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/AuthTool.java b/solr/core/src/java/org/apache/solr/cli/AuthTool.java
index 8d43af55fdb..a502fa77cef 100644
--- a/solr/core/src/java/org/apache/solr/cli/AuthTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/AuthTool.java
@@ -111,12 +111,8 @@ public List<Option> getOptions() {
             .desc(
                 "This is where any authentication related configuration files, if any, would be placed.")
             .build(),
-        Option.builder("solrUrl").argName("solrUrl").hasArg().desc("Solr URL.").build(),
-        Option.builder("zkHost")
-            .argName("zkHost")
-            .hasArg()
-            .desc("ZooKeeper host to connect to.")
-            .build(),
+        SolrCLI.OPTION_SOLRURL,
+        SolrCLI.OPTION_ZKHOST,
         SolrCLI.OPTION_VERBOSE);
   }
 

From f9de312de202f19870bd56fb940328b175d26826 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 25 Jul 2023 18:11:59 -0400
Subject: [PATCH 08/25] Time to change the default ;-)

---
 solr/core/src/java/org/apache/solr/cli/SolrCLI.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index b4e6edd1979..04a3ed1de26 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -75,7 +75,7 @@ public class SolrCLI implements CLIO {
       TimeUnit.NANOSECONDS.convert(1, TimeUnit.MINUTES);
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-  public static final String DEFAULT_SOLR_URL = "http://localhost:8983/solr";
+  public static final String DEFAULT_SOLR_URL = "http://localhost:8983";
   public static final String ZK_HOST = "localhost:9983";
 
   public static final Option OPTION_ZKHOST =

From 5216d50394cb53cef36ab25a56cacae318cb429e Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 25 Jul 2023 18:12:12 -0400
Subject: [PATCH 09/25] follow pattern of other tools...

---
 .../java/org/apache/solr/cli/ExportTool.java  | 69 +++++++++----------
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/ExportTool.java b/solr/core/src/java/org/apache/solr/cli/ExportTool.java
index c14550fbcd5..2568a9029f9 100644
--- a/solr/core/src/java/org/apache/solr/cli/ExportTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/ExportTool.java
@@ -94,7 +94,39 @@ public String getName() {
 
   @Override
   public List<Option> getOptions() {
-    return OPTIONS;
+    return  List.of(
+            Option.builder("url")
+                    .hasArg()
+                    .required()
+                    .desc("Address of the collection, example http://localhost:8983/solr/gettingstarted.")
+                    .build(),
+            Option.builder("out")
+                    .hasArg()
+                    .required(false)
+                    .desc(
+                            "Path to output the exported data, and optionally the file name, defaults to 'collection-name'.")
+                    .build(),
+            Option.builder("format")
+                    .hasArg()
+                    .required(false)
+                    .desc("Output format for exported docs (json, jsonl or javabin), defaulting to json.")
+                    .build(),
+            Option.builder("compress").required(false).desc("Compress the output.").build(),
+            Option.builder("limit")
+                    .hasArg()
+                    .required(false)
+                    .desc("Maximum number of docs to download. Default is 100, use -1 for all docs.")
+                    .build(),
+            Option.builder("query")
+                    .hasArg()
+                    .required(false)
+                    .desc("A custom query, default is '*:*'.")
+                    .build(),
+            Option.builder("fields")
+                    .hasArg()
+                    .required(false)
+                    .desc("Comma separated list of fields to export. By default all fields are fetched.")
+                    .build());
   }
 
   public abstract static class Info {
@@ -230,41 +262,6 @@ void accept(SolrDocument document) throws IOException {
     void end() throws IOException {}
   }
 
-  private static final List<Option> OPTIONS =
-      List.of(
-          Option.builder("url")
-              .hasArg()
-              .required()
-              .desc("Address of the collection, example http://localhost:8983/solr/gettingstarted.")
-              .build(),
-          Option.builder("out")
-              .hasArg()
-              .required(false)
-              .desc(
-                  "Path to output the exported data, and optionally the file name, defaults to 'collection-name'.")
-              .build(),
-          Option.builder("format")
-              .hasArg()
-              .required(false)
-              .desc("Output format for exported docs (json, jsonl or javabin), defaulting to json.")
-              .build(),
-          Option.builder("compress").required(false).desc("Compress the output.").build(),
-          Option.builder("limit")
-              .hasArg()
-              .required(false)
-              .desc("Maximum number of docs to download. Default is 100, use -1 for all docs.")
-              .build(),
-          Option.builder("query")
-              .hasArg()
-              .required(false)
-              .desc("A custom query, default is '*:*'.")
-              .build(),
-          Option.builder("fields")
-              .hasArg()
-              .required(false)
-              .desc("Comma separated list of fields to export. By default all fields are fetched.")
-              .build());
-
   static class JsonWithLinesSink extends DocsSink {
     private final CharArr charArr = new CharArr(1024 * 2);
     JSONWriter jsonWriter = new JSONWriter(charArr, -1);

From 4da518fe25f8c3b7e49658f4e5264047c9001638 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 25 Jul 2023 18:12:26 -0400
Subject: [PATCH 10/25] be able to handle urls with and without the /solr

---
 solr/core/src/java/org/apache/solr/cli/ConfigTool.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/ConfigTool.java b/solr/core/src/java/org/apache/solr/cli/ConfigTool.java
index e7a4012e263..6986d430630 100644
--- a/solr/core/src/java/org/apache/solr/cli/ConfigTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/ConfigTool.java
@@ -109,7 +109,7 @@ public void runImpl(CommandLine cli) throws Exception {
     echo("\nPOSTing request to Config API: " + solrUrl + updatePath);
     echo(jsonBody);
 
-    try (SolrClient solrClient = new Http2SolrClient.Builder(solrUrl).build()) {
+    try (SolrClient solrClient = SolrCLI.getSolrClient(solrUrl)) {
       NamedList<Object> result = SolrCLI.postJsonToSolr(solrClient, updatePath, jsonBody);
       Integer statusCode = (Integer) result.findRecursive("responseHeader", "status");
       if (statusCode == 0) {

From 695121f914728f5fde14c867b0a8e9d5a030bb84 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 25 Jul 2023 18:12:34 -0400
Subject: [PATCH 11/25] and update the test!

---
 solr/packaging/test/test_config.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/packaging/test/test_config.bats b/solr/packaging/test/test_config.bats
index b30ff762f0a..b96ffc06a90 100644
--- a/solr/packaging/test/test_config.bats
+++ b/solr/packaging/test/test_config.bats
@@ -50,5 +50,5 @@ teardown() {
 
   run solr config -c COLL_NAME -property updateHandler.autoCommit.maxDocs -value 100
   assert_output --partial "Successfully set-property updateHandler.autoCommit.maxDocs to 100"
-  assert_output --partial "assuming solrUrl is http://localhost:8983/solr"
+  assert_output --partial "assuming solrUrl is http://localhost:8983."
 }

From 1f82eb98786379b1221f9acd08d6271a02ca4c1e Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Thu, 27 Jul 2023 09:34:00 -0400
Subject: [PATCH 12/25] lint

---
 solr/core/src/java/org/apache/solr/cli/ConfigTool.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/ConfigTool.java b/solr/core/src/java/org/apache/solr/cli/ConfigTool.java
index 6986d430630..d063300c7c8 100644
--- a/solr/core/src/java/org/apache/solr/cli/ConfigTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/ConfigTool.java
@@ -24,7 +24,6 @@
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.apache.solr.common.util.NamedList;
 import org.noggit.CharArr;
 import org.noggit.JSONWriter;

From 7294d9239761cd7573e823ca43d1444ca4c701b2 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Thu, 27 Jul 2023 09:38:14 -0400
Subject: [PATCH 13/25] better informational message

---
 solr/core/src/java/org/apache/solr/cli/SolrCLI.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index 04a3ed1de26..421bcc47770 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -461,11 +461,9 @@ private static void printHelp() {
   public static String resolveSolrUrl(String solrUrl) {
     if (solrUrl != null) {
       if (solrUrl.indexOf("/solr") > -1) { //
-        solrUrl = solrUrl.substring(0, solrUrl.indexOf("/solr"));
-        CLIO.out(
-            "The solrUrl parameter only needs to only point to the root of Solr ("
-                + solrUrl
-                + ").");
+        String newSolrUrl = solrUrl.substring(0, solrUrl.indexOf("/solr"));
+        CLIO.out("'solrUrl' needn't include Solr's context-root (e.g. \"/solr\"); correcting from [" + solrUrl + "] to [" + newSolrUrl + "]");
+        solrUrl = newSolrUrl;
       }
       if (solrUrl.endsWith("/")) {
         solrUrl = solrUrl.substring(0, solrUrl.length() - 1);

From d65936c87b5f931432db7d279cb962aa9fab10d3 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Thu, 27 Jul 2023 09:42:55 -0400
Subject: [PATCH 14/25] more lint

---
 .../java/org/apache/solr/cli/ExportTool.java  | 66 +++++++++----------
 .../src/java/org/apache/solr/cli/SolrCLI.java |  7 +-
 2 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/ExportTool.java b/solr/core/src/java/org/apache/solr/cli/ExportTool.java
index 2568a9029f9..9ea5435e071 100644
--- a/solr/core/src/java/org/apache/solr/cli/ExportTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/ExportTool.java
@@ -94,39 +94,39 @@ public String getName() {
 
   @Override
   public List<Option> getOptions() {
-    return  List.of(
-            Option.builder("url")
-                    .hasArg()
-                    .required()
-                    .desc("Address of the collection, example http://localhost:8983/solr/gettingstarted.")
-                    .build(),
-            Option.builder("out")
-                    .hasArg()
-                    .required(false)
-                    .desc(
-                            "Path to output the exported data, and optionally the file name, defaults to 'collection-name'.")
-                    .build(),
-            Option.builder("format")
-                    .hasArg()
-                    .required(false)
-                    .desc("Output format for exported docs (json, jsonl or javabin), defaulting to json.")
-                    .build(),
-            Option.builder("compress").required(false).desc("Compress the output.").build(),
-            Option.builder("limit")
-                    .hasArg()
-                    .required(false)
-                    .desc("Maximum number of docs to download. Default is 100, use -1 for all docs.")
-                    .build(),
-            Option.builder("query")
-                    .hasArg()
-                    .required(false)
-                    .desc("A custom query, default is '*:*'.")
-                    .build(),
-            Option.builder("fields")
-                    .hasArg()
-                    .required(false)
-                    .desc("Comma separated list of fields to export. By default all fields are fetched.")
-                    .build());
+    return List.of(
+        Option.builder("url")
+            .hasArg()
+            .required()
+            .desc("Address of the collection, example http://localhost:8983/solr/gettingstarted.")
+            .build(),
+        Option.builder("out")
+            .hasArg()
+            .required(false)
+            .desc(
+                "Path to output the exported data, and optionally the file name, defaults to 'collection-name'.")
+            .build(),
+        Option.builder("format")
+            .hasArg()
+            .required(false)
+            .desc("Output format for exported docs (json, jsonl or javabin), defaulting to json.")
+            .build(),
+        Option.builder("compress").required(false).desc("Compress the output.").build(),
+        Option.builder("limit")
+            .hasArg()
+            .required(false)
+            .desc("Maximum number of docs to download. Default is 100, use -1 for all docs.")
+            .build(),
+        Option.builder("query")
+            .hasArg()
+            .required(false)
+            .desc("A custom query, default is '*:*'.")
+            .build(),
+        Option.builder("fields")
+            .hasArg()
+            .required(false)
+            .desc("Comma separated list of fields to export. By default all fields are fetched.")
+            .build());
   }
 
   public abstract static class Info {
diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index 421bcc47770..db081a9a9b2 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -462,7 +462,12 @@ public static String resolveSolrUrl(String solrUrl) {
     if (solrUrl != null) {
       if (solrUrl.indexOf("/solr") > -1) { //
         String newSolrUrl = solrUrl.substring(0, solrUrl.indexOf("/solr"));
-        CLIO.out("'solrUrl' needn't include Solr's context-root (e.g. \"/solr\"); correcting from [" + solrUrl + "] to [" + newSolrUrl + "]");
+        CLIO.out(
+            "'solrUrl' needn't include Solr's context-root (e.g. \"/solr\"); correcting from ["
+                + solrUrl
+                + "] to ["
+                + newSolrUrl
+                + "]");
         solrUrl = newSolrUrl;
       }
       if (solrUrl.endsWith("/")) {

From fcae5a658d2f4dd726b78d41d7de3107a247037e Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Thu, 27 Jul 2023 16:28:09 -0400
Subject: [PATCH 15/25] Disable the variability of the hostContext to get
 SolrCloudExampleTest to pass

---
 .../org/apache/solr/BaseDistributedSearchTestCase.java     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
index ff3b8a17c8c..6c7f7d988b8 100644
--- a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
@@ -141,7 +141,9 @@ public static void initHostContext() {
     // Jetty freaks out and returns 404's when the context uses escapes
 
     StringBuilder hostContext = new StringBuilder("/");
-    if (random().nextBoolean()) {
+    //if (random().nextBoolean()) {
+    // nocommit
+    if (false) {
       // half the time we use the root context, the other half...
 
       // Remember: randomSimpleString might be the empty string
@@ -193,7 +195,8 @@ private static String getHostContextSuitableForServletContext() {
     if (ctx == null || ctx.isEmpty()) ctx = "/solr";
     if (ctx.endsWith("/")) ctx = ctx.substring(0, ctx.length() - 1);
     if (!ctx.startsWith("/")) ctx = "/" + ctx;
-    return ctx;
+    //return ctx;
+    return "/solr";
   }
 
   /**

From d46aedd5c5fc8a64b713ee8b1ef12d2951d3f210 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Sun, 6 Aug 2023 12:31:32 -0400
Subject: [PATCH 16/25] update asserts to match new warning message

---
 solr/packaging/test/test_assert.bats            | 4 ++--
 solr/packaging/test/test_create_collection.bats | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/solr/packaging/test/test_assert.bats b/solr/packaging/test/test_assert.bats
index 3fe126a99ce..b59716293b5 100644
--- a/solr/packaging/test/test_assert.bats
+++ b/solr/packaging/test/test_assert.bats
@@ -32,7 +32,7 @@ teardown() {
   run solr start
 
   run solr assert --not-cloud http://localhost:8983/solr
-  assert_output --partial "The solrUrl parameter only needs to only point to the root of Solr (http://localhost:8983)."
+  assert_output --partial "'solrUrl' needn't include Solr's context-root"
   refute_output --partial "ERROR"
 
   run solr assert --cloud http://localhost:8983
@@ -48,7 +48,7 @@ teardown() {
   refute_output --partial "ERROR"
 
   run solr assert --not-cloud http://localhost:8983/solr
-  assert_output --partial "The solrUrl parameter only needs to only point to the root of Solr (http://localhost:8983)."
+  assert_output --partial "'solrUrl' needn't include Solr's context-root"
   assert_output --partial "ERROR: Solr is not running in standalone mode"
 
   run ! solr assert --not-cloud http://localhost:8983 -e
diff --git a/solr/packaging/test/test_create_collection.bats b/solr/packaging/test/test_create_collection.bats
index 40604f70016..4b83b7ccaae 100644
--- a/solr/packaging/test/test_create_collection.bats
+++ b/solr/packaging/test/test_create_collection.bats
@@ -53,7 +53,7 @@ teardown() {
 @test "create collection using legacy solrUrl" {
   run solr create -c COLL_NAME -solrUrl http://localhost:8983/solr
   assert_output --partial "Created collection 'COLL_NAME'"
-  assert_output --partial "The solrUrl parameter only needs to only point to the root of Solr (http://localhost:8983)."
+  assert_output --partial "'solrUrl' needn't include Solr's context-root"
   refute_output --partial "assuming solrUrl is http://localhost:8983"
 }
 

From b0194ece05a6779c871f81c54afa8566103e7056 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Sun, 6 Aug 2023 13:10:04 -0400
Subject: [PATCH 17/25] descriptions are sentences

---
 solr/core/src/java/org/apache/solr/cli/SolrCLI.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index 784d071e26e..34106b5e762 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -86,7 +86,8 @@ public class SolrCLI implements CLIO {
           .required(false)
           .desc(
               "Zookeeper connection string; unnecessary if ZK_HOST is defined in solr.in.sh; otherwise, defaults to "
-                  + ZK_HOST)
+                  + ZK_HOST
+                  + '.')
           .longOpt("zkHost")
           .build();
   public static final Option OPTION_SOLRURL =
@@ -96,7 +97,8 @@ public class SolrCLI implements CLIO {
           .required(false)
           .desc(
               "Base Solr URL, which can be used to determine the zkHost if that's not known; defaults to: "
-                  + DEFAULT_SOLR_URL)
+                  + DEFAULT_SOLR_URL
+                  + '.')
           .build();
   public static final Option OPTION_VERBOSE =
       Option.builder("verbose").required(false).desc("Enable more verbose command output.").build();

From 63253b2a1edb0ca64fcabddd7e6bebecb9e98f1e Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Sun, 6 Aug 2023 13:11:10 -0400
Subject: [PATCH 18/25] Now that solrUrl dont require a /solr, we can simplify
 some logic

---
 .../java/org/apache/solr/cli/PackageTool.java | 23 ++++---------------
 .../solr/packagemanager/PackageManager.java   | 10 ++++----
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/PackageTool.java b/solr/core/src/java/org/apache/solr/cli/PackageTool.java
index 6a8714ddb10..8a76800c93d 100644
--- a/solr/core/src/java/org/apache/solr/cli/PackageTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/PackageTool.java
@@ -60,8 +60,6 @@ public String getName() {
     return "package";
   }
 
-  public static String solrUrl = null;
-  public static String solrBaseUrl = null;
   public PackageManager packageManager;
   public RepositoryManager repositoryManager;
 
@@ -79,10 +77,7 @@ public void runImpl(CommandLine cli) throws Exception {
         printHelp();
         return;
       }
-
-      solrUrl = cli.getOptionValues("solrUrl")[cli.getOptionValues("solrUrl").length - 1];
-      solrBaseUrl = solrUrl.replaceAll("/solr$", ""); // strip out ending "/solr"
-      log.info("Solr url:{}, solr base url: {}", solrUrl, solrBaseUrl);
+      String solrUrl = SolrCLI.resolveSolrUrl(cli);
       String zkHost = SolrCLI.getZkHost(cli);
       if (zkHost == null) {
         throw new SolrException(ErrorCode.INVALID_STATE, "Package manager runs only in SolrCloud");
@@ -90,8 +85,8 @@ public void runImpl(CommandLine cli) throws Exception {
 
       log.info("ZK: {}", zkHost);
 
-      try (SolrClient solrClient = new Http2SolrClient.Builder(solrBaseUrl).build()) {
-        packageManager = new PackageManager(solrClient, solrBaseUrl, zkHost);
+      try (SolrClient solrClient = new Http2SolrClient.Builder(solrUrl).build()) {
+        packageManager = new PackageManager(solrClient, solrUrl, zkHost);
         try {
           repositoryManager = new RepositoryManager(solrClient, packageManager);
 
@@ -242,7 +237,7 @@ public void runImpl(CommandLine cli) throws Exception {
 
     } catch (Exception ex) {
       // We need to print this since SolrCLI drops the stack trace in favour
-      // of brevity. Package tool should surely print full stacktraces!
+      // of brevity. Package tool should surely print the full stacktrace!
       ex.printStackTrace();
       throw ex;
     }
@@ -314,15 +309,7 @@ private Pair<String, String> parsePackageVersion(String arg) {
   @Override
   public List<Option> getOptions() {
     return List.of(
-        Option.builder("solrUrl")
-            .argName("URL")
-            .hasArg()
-            .required(true)
-            .desc(
-                "Address of the Solr Web application, defaults to: "
-                    + SolrCLI.DEFAULT_SOLR_URL
-                    + '.')
-            .build(),
+        SolrCLI.OPTION_SOLRURL,
         Option.builder("collections")
             .argName("COLLECTIONS")
             .hasArg()
diff --git a/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java b/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java
index 5554d0dd022..beefd88653d 100644
--- a/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java
+++ b/solr/core/src/java/org/apache/solr/packagemanager/PackageManager.java
@@ -69,7 +69,7 @@
 /** Handles most of the management of packages that are already installed in Solr. */
 public class PackageManager implements Closeable {
 
-  final String solrBaseUrl;
+  final String solrUrl;
   final SolrClient solrClient;
   final SolrZkClient zkClient;
 
@@ -77,8 +77,8 @@ public class PackageManager implements Closeable {
 
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-  public PackageManager(SolrClient solrClient, String solrBaseUrl, String zkHost) {
-    this.solrBaseUrl = solrBaseUrl;
+  public PackageManager(SolrClient solrClient, String solrUrl, String zkHost) {
+    this.solrUrl = solrUrl;
     this.solrClient = solrClient;
     this.zkClient =
         new SolrZkClient.Builder()
@@ -760,7 +760,7 @@ public boolean verify(
                   plugin.name);
           String path =
               PackageUtils.resolve(cmd.path, pkg.parameterDefaults, overridesMap, systemParams);
-          PackageUtils.printGreen("Executing " + solrBaseUrl + path + " for cluster level plugin");
+          PackageUtils.printGreen("Executing " + solrUrl + path + " for cluster level plugin");
 
           if ("GET".equalsIgnoreCase(cmd.method)) {
             String response =
@@ -811,7 +811,7 @@ public boolean verify(
                 PackageUtils.resolve(
                     cmd.path, pkg.parameterDefaults, collectionParameterOverrides, systemParams);
             PackageUtils.printGreen(
-                "Executing " + solrBaseUrl + path + " for collection:" + collection);
+                "Executing " + solrUrl + path + " for collection:" + collection);
 
             if ("GET".equalsIgnoreCase(cmd.method)) {
               String response =

From 449cc46e01cacb8ecc49ac05834439c386d71acd Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Sun, 6 Aug 2023 13:24:56 -0400
Subject: [PATCH 19/25] convert more to using short url

---
 solr/core/src/java/org/apache/solr/cli/DeleteTool.java | 2 +-
 solr/core/src/java/org/apache/solr/cli/StatusTool.java | 2 +-
 solr/packaging/test/test_status.bats                   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/DeleteTool.java b/solr/core/src/java/org/apache/solr/cli/DeleteTool.java
index 8d80e029c1c..63c89397b08 100644
--- a/solr/core/src/java/org/apache/solr/cli/DeleteTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/DeleteTool.java
@@ -88,7 +88,7 @@ public List<Option> getOptions() {
   @Override
   public void runImpl(CommandLine cli) throws Exception {
     SolrCLI.raiseLogLevelUnlessVerbose(cli);
-    String solrUrl = cli.getOptionValue("solrUrl", SolrCLI.DEFAULT_SOLR_URL);
+    String solrUrl = SolrCLI.resolveSolrUrl(cli);
 
     try (var solrClient = SolrCLI.getSolrClient(solrUrl)) {
       if (SolrCLI.isCloudMode(solrClient)) {
diff --git a/solr/core/src/java/org/apache/solr/cli/StatusTool.java b/solr/core/src/java/org/apache/solr/cli/StatusTool.java
index 349804ca7d0..284c27442b1 100644
--- a/solr/core/src/java/org/apache/solr/cli/StatusTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/StatusTool.java
@@ -92,7 +92,7 @@ public void runImpl(CommandLine cli) throws Exception {
     }
 
     int maxWaitSecs = Integer.parseInt(cli.getOptionValue("maxWaitSecs", "0"));
-    String solrUrl = cli.getOptionValue("solrUrl");
+    String solrUrl = SolrCLI.resolveSolrUrl(cli);
     if (maxWaitSecs > 0) {
       int solrPort = (new URL(solrUrl)).getPort();
       echo("Waiting up to " + maxWaitSecs + " seconds to see Solr running on port " + solrPort);
diff --git a/solr/packaging/test/test_status.bats b/solr/packaging/test/test_status.bats
index 64885dc7f52..9f6e9f9bdbc 100644
--- a/solr/packaging/test/test_status.bats
+++ b/solr/packaging/test/test_status.bats
@@ -43,6 +43,7 @@ teardown() {
 @test "status shell script ignores passed in -solrUrl cli parameter from user" {
   solr start
   run solr status -solrUrl http://localhost:9999/solr
+  assert_output --partial "'solrUrl' needn't include Solr's context-root"
   assert_output --partial "Found 1 Solr nodes:"
   assert_output --partial "running on port 8983"
 }

From aaa00b6ec76c890aed508b571674e1888ab6bea2 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Sun, 6 Aug 2023 15:45:07 -0400
Subject: [PATCH 20/25] fix pathing issues

---
 solr/core/src/java/org/apache/solr/cli/RunExampleTool.java | 4 +++-
 solr/core/src/java/org/apache/solr/cli/SolrCLI.java        | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java b/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
index 41ddffc0507..80dcdb41c72 100644
--- a/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
@@ -400,7 +400,7 @@ protected void runExample(CommandLine cli, String exampleName) throws Exception
                 + "        }\n");
 
         File filmsJsonFile = new File(exampleDir, "films/films.json");
-        String updateUrl = String.format(Locale.ROOT, "%s/%s/update/json", solrUrl, collectionName);
+        String updateUrl = String.format(Locale.ROOT, "%s/%s/update", solrUrl, collectionName);
         echo("Indexing films example docs from " + filmsJsonFile.getAbsolutePath());
         String[] args =
             new String[] {
@@ -410,6 +410,8 @@ protected void runExample(CommandLine cli, String exampleName) throws Exception
               updateUrl,
               "-type",
               "application/json",
+              "-filetypes",
+              "json",
               exampleDir.toString()
             };
         PostTool postTool = new PostTool();
diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index 34106b5e762..80a494499e1 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -386,7 +386,9 @@ public static boolean exceptionIsAuthRelated(Exception exc) {
   public static SolrClient getSolrClient(String solrUrl) {
     // today we require all urls to end in /solr, however in the future we will need to support the
     // /api url end point instead.
-    if (!solrUrl.endsWith(("/solr"))) {
+    // The /solr/ check is because sometimes a full url is passed in, like
+    // http://localhost:8983/solr/films_shard1_replica_n1/.
+    if (!solrUrl.endsWith("/solr") && !solrUrl.contains("/solr/")) {
       solrUrl = solrUrl + "/solr";
     }
     return new Http2SolrClient.Builder(solrUrl).withMaxConnectionsPerHost(32).build();

From e7a960c6cd7b57298a49835d466a39a1a224afdd Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 8 Aug 2023 07:12:15 -0400
Subject: [PATCH 21/25] Responding to PR feedback

---
 .../java/org/apache/solr/cli/AssertTool.java    |  4 ++--
 .../java/org/apache/solr/cli/ConfigTool.java    |  2 +-
 .../java/org/apache/solr/cli/CreateTool.java    |  2 +-
 .../java/org/apache/solr/cli/DeleteTool.java    |  2 +-
 .../java/org/apache/solr/cli/PackageTool.java   |  2 +-
 .../src/java/org/apache/solr/cli/SolrCLI.java   | 17 ++++++++---------
 .../java/org/apache/solr/cli/StatusTool.java    |  2 +-
 .../test/org/apache/solr/cli/SolrCLITest.java   |  7 ++++---
 solr/packaging/test/test_assert.bats            |  4 ++--
 solr/packaging/test/test_create_collection.bats |  2 +-
 solr/packaging/test/test_status.bats            |  2 +-
 11 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/AssertTool.java b/solr/core/src/java/org/apache/solr/cli/AssertTool.java
index 21414145b5d..9ece33ccb8d 100644
--- a/solr/core/src/java/org/apache/solr/cli/AssertTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/AssertTool.java
@@ -197,10 +197,10 @@ protected int runAssert(CommandLine cli) throws Exception {
       ret += assertSolrNotRunning(cli.getOptionValue("S"));
     }
     if (cli.hasOption("c")) {
-      ret += assertSolrRunningInCloudMode(SolrCLI.resolveSolrUrl(cli.getOptionValue("c")));
+      ret += assertSolrRunningInCloudMode(SolrCLI.normalizeSolrUrl(cli.getOptionValue("c")));
     }
     if (cli.hasOption("C")) {
-      ret += assertSolrNotRunningInCloudMode(SolrCLI.resolveSolrUrl(cli.getOptionValue("C")));
+      ret += assertSolrNotRunningInCloudMode(SolrCLI.normalizeSolrUrl(cli.getOptionValue("C")));
     }
     return ret;
   }
diff --git a/solr/core/src/java/org/apache/solr/cli/ConfigTool.java b/solr/core/src/java/org/apache/solr/cli/ConfigTool.java
index d063300c7c8..5221a28325f 100644
--- a/solr/core/src/java/org/apache/solr/cli/ConfigTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/ConfigTool.java
@@ -84,7 +84,7 @@ public List<Option> getOptions() {
 
   @Override
   public void runImpl(CommandLine cli) throws Exception {
-    String solrUrl = SolrCLI.resolveSolrUrl(cli);
+    String solrUrl = SolrCLI.normalizeSolrUrl(cli);
     String action = cli.getOptionValue("action", "set-property");
     String collection = cli.getOptionValue("name");
     String property = cli.getOptionValue("property");
diff --git a/solr/core/src/java/org/apache/solr/cli/CreateTool.java b/solr/core/src/java/org/apache/solr/cli/CreateTool.java
index fd284196719..9d2f6315469 100644
--- a/solr/core/src/java/org/apache/solr/cli/CreateTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/CreateTool.java
@@ -117,7 +117,7 @@ public List<Option> getOptions() {
   @Override
   public void runImpl(CommandLine cli) throws Exception {
     SolrCLI.raiseLogLevelUnlessVerbose(cli);
-    String solrUrl = SolrCLI.resolveSolrUrl(cli);
+    String solrUrl = SolrCLI.normalizeSolrUrl(cli);
 
     try (var solrClient = SolrCLI.getSolrClient(solrUrl)) {
       if (SolrCLI.isCloudMode(solrClient)) {
diff --git a/solr/core/src/java/org/apache/solr/cli/DeleteTool.java b/solr/core/src/java/org/apache/solr/cli/DeleteTool.java
index 63c89397b08..5e556f02017 100644
--- a/solr/core/src/java/org/apache/solr/cli/DeleteTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/DeleteTool.java
@@ -88,7 +88,7 @@ public List<Option> getOptions() {
   @Override
   public void runImpl(CommandLine cli) throws Exception {
     SolrCLI.raiseLogLevelUnlessVerbose(cli);
-    String solrUrl = SolrCLI.resolveSolrUrl(cli);
+    String solrUrl = SolrCLI.normalizeSolrUrl(cli);
 
     try (var solrClient = SolrCLI.getSolrClient(solrUrl)) {
       if (SolrCLI.isCloudMode(solrClient)) {
diff --git a/solr/core/src/java/org/apache/solr/cli/PackageTool.java b/solr/core/src/java/org/apache/solr/cli/PackageTool.java
index 8a76800c93d..97ed80e7be3 100644
--- a/solr/core/src/java/org/apache/solr/cli/PackageTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/PackageTool.java
@@ -77,7 +77,7 @@ public void runImpl(CommandLine cli) throws Exception {
         printHelp();
         return;
       }
-      String solrUrl = SolrCLI.resolveSolrUrl(cli);
+      String solrUrl = SolrCLI.normalizeSolrUrl(cli);
       String zkHost = SolrCLI.getZkHost(cli);
       if (zkHost == null) {
         throw new SolrException(ErrorCode.INVALID_STATE, "Package manager runs only in SolrCloud");
diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index 80a494499e1..846bdba92e0 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -458,19 +458,18 @@ private static void printHelp() {
    * Strips off the end of solrUrl any /solr when a legacy solrUrl like http://localhost:8983/solr
    * is used, and warns those users. In the future we'll have url's with /api as well.
    *
-   * @param solrUrl with /solr stripped off.
-   * @return the truncated if need solrUrl.
+   * @param solrUrl The user supplied url to Solr.
+   * @return the solrUrl in the format that Solr expects to see internally.
    */
-  public static String resolveSolrUrl(String solrUrl) {
+  public static String normalizeSolrUrl(String solrUrl) {
     if (solrUrl != null) {
       if (solrUrl.indexOf("/solr") > -1) { //
         String newSolrUrl = solrUrl.substring(0, solrUrl.indexOf("/solr"));
-        CLIO.out(
-            "'solrUrl' needn't include Solr's context-root (e.g. \"/solr\"); correcting from ["
+        CLIO.out("WARNING: URLs provided to this tool needn't include Solr's context-root (e.g. \"/solr\"). Such URLs are deprecated and support for them will be removed in a future release. Correcting from ["
                 + solrUrl
                 + "] to ["
                 + newSolrUrl
-                + "]");
+                + "].");
         solrUrl = newSolrUrl;
       }
       if (solrUrl.endsWith("/")) {
@@ -483,7 +482,7 @@ public static String resolveSolrUrl(String solrUrl) {
    * Get the base URL of a live Solr instance from either the solrUrl command-line option or from
    * ZooKeeper.
    */
-  public static String resolveSolrUrl(CommandLine cli) throws Exception {
+  public static String normalizeSolrUrl(CommandLine cli) throws Exception {
     String solrUrl = cli.getOptionValue("solrUrl");
     if (solrUrl == null) {
       String zkHost = cli.getOptionValue("zkHost");
@@ -510,7 +509,7 @@ public static String resolveSolrUrl(CommandLine cli) throws Exception {
         }
       }
     } else {
-      solrUrl = resolveSolrUrl(solrUrl);
+      solrUrl = normalizeSolrUrl(solrUrl);
     }
     return solrUrl;
   }
@@ -534,7 +533,7 @@ public static String getZkHost(CommandLine cli) throws Exception {
                   + DEFAULT_SOLR_URL
                   + ".");
     } else {
-      solrUrl = resolveSolrUrl(solrUrl);
+      solrUrl = normalizeSolrUrl(solrUrl);
     }
 
     try (var solrClient = getSolrClient(solrUrl)) {
diff --git a/solr/core/src/java/org/apache/solr/cli/StatusTool.java b/solr/core/src/java/org/apache/solr/cli/StatusTool.java
index 284c27442b1..cb880bddeec 100644
--- a/solr/core/src/java/org/apache/solr/cli/StatusTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/StatusTool.java
@@ -92,7 +92,7 @@ public void runImpl(CommandLine cli) throws Exception {
     }
 
     int maxWaitSecs = Integer.parseInt(cli.getOptionValue("maxWaitSecs", "0"));
-    String solrUrl = SolrCLI.resolveSolrUrl(cli);
+    String solrUrl = SolrCLI.normalizeSolrUrl(cli);
     if (maxWaitSecs > 0) {
       int solrPort = (new URL(solrUrl)).getPort();
       echo("Waiting up to " + maxWaitSecs + " seconds to see Solr running on port " + solrPort);
diff --git a/solr/core/src/test/org/apache/solr/cli/SolrCLITest.java b/solr/core/src/test/org/apache/solr/cli/SolrCLITest.java
index a0e0b4aac32..03f35246211 100644
--- a/solr/core/src/test/org/apache/solr/cli/SolrCLITest.java
+++ b/solr/core/src/test/org/apache/solr/cli/SolrCLITest.java
@@ -22,9 +22,10 @@
 public class SolrCLITest extends SolrTestCase {
   @Test
   public void testResolveSolrUrl() {
-    assertEquals(SolrCLI.resolveSolrUrl("http://localhost:8983/solr"), "http://localhost:8983");
-    assertEquals(SolrCLI.resolveSolrUrl("http://localhost:8983"), "http://localhost:8983");
-    assertEquals(SolrCLI.resolveSolrUrl("http://localhost:8983/"), "http://localhost:8983");
+    assertEquals(SolrCLI.normalizeSolrUrl("http://localhost:8983/solr"), "http://localhost:8983");
+    assertEquals(SolrCLI.normalizeSolrUrl("http://localhost:8983/solr/"), "http://localhost:8983");
+    assertEquals(SolrCLI.normalizeSolrUrl("http://localhost:8983/"), "http://localhost:8983");
+    assertEquals(SolrCLI.normalizeSolrUrl("http://localhost:8983"), "http://localhost:8983");
   }
 
   @Test
diff --git a/solr/packaging/test/test_assert.bats b/solr/packaging/test/test_assert.bats
index b59716293b5..66905a39775 100644
--- a/solr/packaging/test/test_assert.bats
+++ b/solr/packaging/test/test_assert.bats
@@ -32,7 +32,7 @@ teardown() {
   run solr start
 
   run solr assert --not-cloud http://localhost:8983/solr
-  assert_output --partial "'solrUrl' needn't include Solr's context-root"
+  assert_output --partial "needn't include Solr's context-root"
   refute_output --partial "ERROR"
 
   run solr assert --cloud http://localhost:8983
@@ -48,7 +48,7 @@ teardown() {
   refute_output --partial "ERROR"
 
   run solr assert --not-cloud http://localhost:8983/solr
-  assert_output --partial "'solrUrl' needn't include Solr's context-root"
+  assert_output --partial "needn't include Solr's context-root"
   assert_output --partial "ERROR: Solr is not running in standalone mode"
 
   run ! solr assert --not-cloud http://localhost:8983 -e
diff --git a/solr/packaging/test/test_create_collection.bats b/solr/packaging/test/test_create_collection.bats
index 4b83b7ccaae..64c90f87087 100644
--- a/solr/packaging/test/test_create_collection.bats
+++ b/solr/packaging/test/test_create_collection.bats
@@ -53,7 +53,7 @@ teardown() {
 @test "create collection using legacy solrUrl" {
   run solr create -c COLL_NAME -solrUrl http://localhost:8983/solr
   assert_output --partial "Created collection 'COLL_NAME'"
-  assert_output --partial "'solrUrl' needn't include Solr's context-root"
+  assert_output --partial "needn't include Solr's context-root"
   refute_output --partial "assuming solrUrl is http://localhost:8983"
 }
 
diff --git a/solr/packaging/test/test_status.bats b/solr/packaging/test/test_status.bats
index 9f6e9f9bdbc..292de5ca008 100644
--- a/solr/packaging/test/test_status.bats
+++ b/solr/packaging/test/test_status.bats
@@ -43,7 +43,7 @@ teardown() {
 @test "status shell script ignores passed in -solrUrl cli parameter from user" {
   solr start
   run solr status -solrUrl http://localhost:9999/solr
-  assert_output --partial "'solrUrl' needn't include Solr's context-root"
+  assert_output --partial "needn't include Solr's context-root"
   assert_output --partial "Found 1 Solr nodes:"
   assert_output --partial "running on port 8983"
 }

From 8f3290b7c58877b0ed14d449403fb7d615808445 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 8 Aug 2023 07:16:47 -0400
Subject: [PATCH 22/25] Eliminate some nesting to make code simpler to read.

---
 solr/core/src/java/org/apache/solr/cli/SolrCLI.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index 846bdba92e0..c3ddd46b85b 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -465,7 +465,8 @@ public static String normalizeSolrUrl(String solrUrl) {
     if (solrUrl != null) {
       if (solrUrl.indexOf("/solr") > -1) { //
         String newSolrUrl = solrUrl.substring(0, solrUrl.indexOf("/solr"));
-        CLIO.out("WARNING: URLs provided to this tool needn't include Solr's context-root (e.g. \"/solr\"). Such URLs are deprecated and support for them will be removed in a future release. Correcting from ["
+        CLIO.out(
+            "WARNING: URLs provided to this tool needn't include Solr's context-root (e.g. \"/solr\"). Such URLs are deprecated and support for them will be removed in a future release. Correcting from ["
                 + solrUrl
                 + "] to ["
                 + newSolrUrl
@@ -508,9 +509,8 @@ public static String normalizeSolrUrl(CommandLine cli) throws Exception {
           solrUrl = ZkStateReader.from(cloudSolrClient).getBaseUrlForNodeName(firstLiveNode);
         }
       }
-    } else {
-      solrUrl = normalizeSolrUrl(solrUrl);
     }
+    solrUrl = normalizeSolrUrl(solrUrl);
     return solrUrl;
   }
 
@@ -532,9 +532,8 @@ public static String getZkHost(CommandLine cli) throws Exception {
               "Neither -zkHost or -solrUrl parameters provided so assuming solrUrl is "
                   + DEFAULT_SOLR_URL
                   + ".");
-    } else {
-      solrUrl = normalizeSolrUrl(solrUrl);
     }
+    solrUrl = normalizeSolrUrl(solrUrl);
 
     try (var solrClient = getSolrClient(solrUrl)) {
       // hit Solr to get system info

From 8d2e695e5cfb1fa38b936637330b6b3a047eccdb Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 8 Aug 2023 07:38:28 -0400
Subject: [PATCH 23/25] Let's hide this solrUrl better from end users.

---
 .../java/org/apache/solr/cli/StatusTool.java  | 27 ++++++++++---------
 solr/packaging/test/test_help.bats            |  2 ++
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/StatusTool.java b/solr/core/src/java/org/apache/solr/cli/StatusTool.java
index cb880bddeec..546dc742f3d 100644
--- a/solr/core/src/java/org/apache/solr/cli/StatusTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/StatusTool.java
@@ -57,36 +57,37 @@ public String getName() {
     return "status";
   }
 
-  // These options are not exposed to the end user, and are
-  // used directly by the bin/solr status CLI.
+  public static final Option OPTION_MAXWAITSECS =
+      Option.builder("maxWaitSecs")
+          .argName("SECS")
+          .hasArg()
+          .required(false)
+          .desc("Wait up to the specified number of seconds to see Solr running.")
+          .build();
+
   @Override
   public List<Option> getOptions() {
     return List.of(
-        // Unlike most of the other tools, this is an internal, not end user
-        // focused setting.  Therefore, no default value is provided.
+        // The solrUrl option is not exposed to the end user, and is
+        // created by the bin/solr script and passed into this too.
         Option.builder("solrUrl")
             .argName("URL")
             .hasArg()
             .required(false)
             .desc("Property set by calling scripts, not meant for user configuration.")
             .build(),
-        Option.builder("maxWaitSecs")
-            .argName("SECS")
-            .hasArg()
-            .required(false)
-            .desc("Wait up to the specified number of seconds to see Solr running.")
-            .build());
+        OPTION_MAXWAITSECS);
   }
 
   @Override
   public void runImpl(CommandLine cli) throws Exception {
-    // Override the default help behaviour to put out a customized message that omits the internally
-    // focused Options.
+    // Override the default help behaviour to put out a customized message that only list user
+    // settable Options.
     if ((cli.getOptions().length == 0 && cli.getArgs().length == 0)
         || cli.hasOption("h")
         || cli.hasOption("help")) {
       final Options options = new Options();
-      getOptions().forEach(options::addOption);
+      options.addOption(OPTION_MAXWAITSECS);
       new HelpFormatter().printHelp("status", options);
       return;
     }
diff --git a/solr/packaging/test/test_help.bats b/solr/packaging/test/test_help.bats
index a6a8a497b36..3f929eee351 100644
--- a/solr/packaging/test/test_help.bats
+++ b/solr/packaging/test/test_help.bats
@@ -62,6 +62,8 @@ setup() {
   run solr status -help
   assert_output --partial 'usage: status'
   refute_output --partial 'ERROR'
+  # Make sure custom selection of options for status help works.
+  refute_output --partial '-solrUrl'
 }
 
 @test "healthcheck help flag prints help" {

From e55d338639ea19e5cfada3b445c87e17dcb94f4d Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 8 Aug 2023 07:47:19 -0400
Subject: [PATCH 24/25] update missing parameters in commands.

---
 .../pages/solr-control-script-reference.adoc  | 42 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc
index 12e1a4ea0f6..4897a1a2c34 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc
@@ -553,7 +553,7 @@ Name of the collection to run a healthcheck against.
 +
 [%autowidth,frame=none]
 |===
-|Optional |Default: none
+|Optional |Default: `http://localhost:8983`
 |===
 +
 Base Solr URL, which can be used in SolrCloud mode to determine the ZooKeeper connection string if that's not known.
@@ -710,6 +710,25 @@ It is possible to override this warning with the -force parameter.
 +
 *Example*: `bin/solr create -c foo -force`
 
+`-z <zkHost>` or `-zkHost <zkHost>`::
++
+[%autowidth,frame=none]
+|===
+|Optional |Default: `localhost:9983`
+|===
++
+The ZooKeeper connection string, usable in SolrCloud mode.
+Unnecessary if `ZK_HOST` is defined in `solr.in.sh` or `solr.in.cmd`.
+
+`-solrUrl <url>`::
++
+[%autowidth,frame=none]
+|===
+|Optional |Default: `http://localhost:8983`
+|===
++
+Base Solr URL, which can be used in SolrCloud mode to determine the ZooKeeper connection string if that's not known.
+
 ==== Configuration Directories and SolrCloud
 
 Before creating a collection in SolrCloud, the configuration directory used by the collection must be uploaded to ZooKeeper.
@@ -800,6 +819,25 @@ If the configuration directory is being used by another collection, then it will
 +
 Skip safety checks when deleting the configuration directory used by a collection.
 
+`-z <zkHost>` or `-zkHost <zkHost>`::
++
+[%autowidth,frame=none]
+|===
+|Optional |Default: `localhost:9983`
+|===
++
+The ZooKeeper connection string, usable in SolrCloud mode.
+Unnecessary if `ZK_HOST` is defined in `solr.in.sh` or `solr.in.cmd`.
+
+`-solrUrl <url>`::
++
+[%autowidth,frame=none]
+|===
+|Optional |Default: `http://localhost:8983`
+|===
++
+Base Solr URL, which can be used in SolrCloud mode to determine the ZooKeeper connection string if that's not known.
+
 == Authentication
 
 The `bin/solr` script allows enabling or disabling Basic Authentication, allowing you to configure authentication from the command line.
@@ -1048,7 +1086,7 @@ Unnecessary if `ZK_HOST` is defined in `solr.in.sh` or `solr.in.cmd`.
 +
 [%autowidth,frame=none]
 |===
-|Optional |Default: `http://localhost:8983/solr`
+|Optional |Default: `http://localhost:8983`
 |===
 +
 Base Solr URL, which can be used in SolrCloud mode to determine the ZooKeeper connection string if that's not known.

From 87ccab17efff7af90a78fecc334782095d94feb9 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Tue, 8 Aug 2023 08:15:39 -0400
Subject: [PATCH 25/25] track change

---
 solr/CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6266da0ace7..312c227110e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -15,6 +15,8 @@ Improvements
 
 * SOLR-16850: Notify a user if they run healthcheck against standalone Solr that it is a SolrCloud only command. (Eric Pugh)
 
+* SOLR-16800: Solr CLI commands that use -solrUrl now work with a bare url like http://localhost:8983, you no longer need to add the /solr at the end. (Eric Pugh)
+
 Optimizations
 ---------------------
 (No changes)