Use new enforced position of -z flag in solr zk, fixes #66 (#68)

Author: rfay

README.md

@@ -158,7 +158,7 @@ The `solr` command line client is available as a `ddev` command:
 ddev solr
 ```
 
-The `zk` command is usually executed as `solr zk -z <HOST>:<PORT>`. To ease its
+The `zk` command is usually executed as `solr zk <subcommand> -z <HOST>:<PORT>`. To ease its
 usage a convenient `ddev` command exists that uses preconfigured connection
 settings. So the `-z` option can be omitted:
 

commands/solr/solr-zk

@@ -1,8 +1,12 @@
 #!/usr/bin/env bash
 
 ## #ddev-generated: If you want to edit and own this file, remove this line.
-## Description: Run Solr ZooKeeper inside the solr container
-## Usage: solr-zk
-## Example: "ddev solr-zk"
+## Description: Run Solr ZooKeeper commands inside the solr container (Solr 8+)
+## Usage: solr-zk [zk-subcommand] [args]
+## Examples:
+##   ddev solr-zk ls /
+##   ddev solr-zk upconfig -n myconfig -d /path/to/configset
+##   ddev solr-zk downconfig -n myconfig -d ./outdir
+##   ddev solr-zk cp -r file:/local/conf zk:/configs/myconfig
 
-solr zk -z localhost:9983 "$@"
+exec solr zk "$@" -z localhost:9983

tests/test.bats

@@ -75,13 +75,13 @@ health_checks() {
   run curl -sfI http://${PROJNAME}.ddev.site:8983
   assert_success
   assert_output --partial "HTTP/1.1 302"
-  assert_output --partial "Location: http://${PROJNAME}.ddev.site:8983/solr/"
+  assert_output --regexp "Location: (http://${PROJNAME}\\.ddev\\.site:8983)?/solr/"
 
   # Make sure the solr admin UI via HTTPS from outside is redirected to HTTPS /solr/
   run curl -sfI https://${PROJNAME}.ddev.site:8943
   assert_success
   assert_output --partial "HTTP/2 302"
-  assert_output --partial "location: https://${PROJNAME}.ddev.site:8943/solr/"
+  assert_output --regexp "[Ll]ocation: (https://${PROJNAME}\\.ddev\\.site:8943)?/solr/"
 
   # Make sure the solr admin UI is working from outside
   run curl -sfL https://${PROJNAME}.ddev.site:8943
@@ -102,6 +102,11 @@ health_checks() {
   DDEV_DEBUG=true run ddev solr-admin
   assert_success
   assert_output --partial "FULLURL https://${PROJNAME}.ddev.site:8943"
+
+  # `ddev solr-zk` should work
+  run ddev solr-zk ls /
+  assert_success
+  assert_output --partial "security.json"
 }
 
 teardown() {
@@ -162,3 +167,35 @@ teardown() {
 
   health_checks
 }
+
+@test "install from directory Solr 9" {
+  set -eu -o pipefail
+
+  echo "⚡ Setting Solr base image to Solr 9" >&3
+  run ddev dotenv set .ddev/.env.solr --solr-base-image "solr:9"
+  assert_success
+  assert_file_exist .ddev/.env.solr
+
+  echo "# ddev add-on get ${DIR} with project ${PROJNAME} in $(pwd)" >&3
+  run ddev add-on get "${DIR}"
+  assert_success
+
+  run ddev restart -y
+  assert_success
+
+  echo "🔍 Retrieving Solr version..." >&3
+  echo $(ddev solr --version) >&3
+  SOLR_VERSION=$(ddev solr --version | grep -oE '9\.[0-9]+\.[0-9]+' || { printf "❌ Failed to get Solr version\n" >&2; exit 1; })
+
+  echo "🔍 Retrieved Solr version: '$SOLR_VERSION'" >&3
+
+  # Validate that the version starts with 9.x.x
+  if ! [[ $SOLR_VERSION =~ ^9\.[0-9]+\.[0-9]+$ ]]; then
+    echo "❌ Expected version matching '9.x.x' but got '$SOLR_VERSION'" >&2
+    exit 1
+  fi
+
+  echo "✅ Solr 9.x.x version check passed!" >&3
+
+  health_checks
+}