Bug fixes and improved testing

.github/workflows/build-test-and-lint.yml

@@ -119,7 +119,7 @@ jobs:
         run: |
           sleep 10
           echo '::group::Executing a script inside the docker container';
-          docker compose -f docker/docker-compose.yml exec solr solr-ingest-all 2>&1
+          docker compose -f docker/docker-compose.yml exec solr solr-ingest-examples 2>&1
           echo '::endgroup::';
 
       - name: Run cargo test

.vscode/launch.json

@@ -174,6 +174,48 @@
             "args": [],
             "cwd": "${workspaceFolder}"
         },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Solr-tests",
+            "cargo": {
+                "args": [
+                    "test",
+                    "--no-run",
+                    "--bin=solrcopy",
+                    "--package=solrcopy",
+                    "--features",
+                    "testsolr",
+                ],
+                "filter": {
+                    "name": "solrcopy",
+                    "kind": "bin"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "testcase",
+            "cargo": {
+                "args": [
+                    "test",
+                    "--no-run",
+                    "--bin=solrcopy",
+                    "--package=solrcopy",
+                    "--features",
+                    "testsolr",
+                ],
+                "filter": {
+                    "name": "${input:testcase}",
+                    "kind": "test"
+                }
+            },
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        },
         {
             "type": "lldb",
             "request": "launch",
@@ -201,6 +243,11 @@
             "type": "promptString",
             "description": "Enter the arguments to be passed to program running:"
         },
+        {
+            "id": "testcase",
+            "type": "promptString",
+            "description": "Enter the name of the test case/function to run/debug:"
+        },
         {
             "id": "folder",
             "type": "pickString",
@@ -228,6 +275,20 @@
             "description": "Enter the SOLR URL:",
             "default": "http://localhost:8983/solr"
         },
+        {
+            "id": "core",
+            "type": "pickString",
+            "description": "What Solr core do you want to use?",
+            "options": [
+                "demo",
+                "films",
+                "films2",
+                "target",
+                "testing",
+                "testing2",
+            ],
+            "default": "demo"
+        },
         {
             "id": "query",
             "type": "promptString",

.vscode/settings.json

@@ -44,6 +44,8 @@
     "testing.coverageToolbarEnabled": true,
     // Show the Test Explorer view.
     "rust-analyzer.testExplorer": true,
+    "rust-analyzer.cargo.features": [ "testsolr" ],
+    "rust-analyzer.check.features": [ "testsolr" ],
     "[rust]": {
         "editor.defaultFormatter": "rust-lang.rust-analyzer"
     },

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "solrcopy"
-version = "0.8.1"
+version = "0.9.0"
 edition = "2024"
-rust-version = "1.85.1"
+rust-version = "1.88"
 
 authors = ["Juarez Rudsatz <juarezr@gmail.com>"]
 description = "Command line tool useful for migration, transformations, backup, and restore of documents stored inside cores of Apache Solr"
@@ -31,11 +31,11 @@ exclude = [
 clap = { version = "4.5.*", features = ["derive", "env", "color"] }
 clap_complete = "4.5.*"
 clap_mangen = "0.2.*"
-regex = "1.11.*"
+regex = "1.12.*"
 url = "2.5.*"
 lazy_static = "1.5.*"
-ureq = { version = "3.1.*", features = ["rustls", "charset", "cookies", "brotli", "socks-proxy"] }
-zip = { version = "5.*",  features = ["deflate", "time"] }
+ureq = { version = "3.2.*", features = ["rustls", "charset", "cookies", "brotli", "socks-proxy"] }
+zip = { version = "8.*",  features = ["deflate", "deflate64", "time"] }
 indicatif = "^0.18"
 chrono = "^0.4.*"
 glob = "0.3.*"
@@ -45,6 +45,7 @@ crossbeam-channel = "0.5.*"
 crossbeam-utils = "0.8.*"
 ctrlc = { version = "3.5.*", features = ["termination"] }
 dotenvy = "0.15.*"
+serde_json = "1.*"
 
 # standard crate data is left out
 [dev-dependencies]

Makefile.toml

@@ -50,6 +50,14 @@ dependencies = ["test-basic", "test-docker"]
 
 #region Docker
 
+[env]
+#? Choose the Solr image tag to use in the docker container passing TAG like:
+## cargo make --env TAG=9-slim test
+TAG="slim"
+#? Choose the Solr run mode: standalone, cloud, precreate, demo, testing
+## cargo make --env MODE=cloud test
+MODE="testing"
+
 [tasks.compose-up]
 category = "Test"
 description = "Runs the command `docker compose up` to create a container running Solr for use in testing"
@@ -83,7 +91,7 @@ args = [
     "./docker/docker-compose.yml",
     "exec",
     "solr",
-    "solr-ingest-all",
+    "solr-ingest-examples",
 ]
 
 #endregion Docker
@@ -96,7 +104,7 @@ description = "Runs tests that do not require a Solr container"
 command = "cargo"
 args = ["test"]
 
-[tasks.test-start]
+[tasks.test-begin]
 category = "Test"
 description = "Setup a local Solr container and ingest some documents allowing to run tests manually after"
 dependencies = ["compose-up", "compose-ingest"]
@@ -106,7 +114,7 @@ category = "Test"
 description = "Cleanup the local Solr container after testing"
 dependencies = ["compose-down"]
 
-[tasks.test-solr]
+[tasks.test-full]
 category = "Test"
 description = "Runs tests against an existing local solr server"
 command = "cargo"
@@ -117,8 +125,8 @@ category = "Test"
 description = "Setup a local Solr container, ingest some documents, run all tests, and cleanup the container"
 private = true
 run_task = { name = [
-    "test-start",
-    "test-solr",
+    "test-begin",
+    "test-full",
 ], fork = true, cleanup_task = "compose-down" }
 
 #endregion Test
@@ -151,9 +159,9 @@ args = ["llvm-cov", "--all-features", "--html", "--output-dir", "target/coverage
 
 [tasks.coverage]
 category = "Test Coverage"
-description = "Setu Solr container, generate a coverage report, and cleanup"
+description = "Setup Solr container, generate a coverage report, and cleanup"
 run_task = { name = [
-    "test-start",
+    "test-begin",
     "coverage-full",
 ], fork = true, cleanup_task = "compose-down" }
 

README.md

@@ -389,7 +389,7 @@ Please also [check all available tasks](#available-tasks).
 # This command creates the container with a solr server with two cores: 'demo' and 'target'
 $ docker compose -f docker/docker-compose.yml up -d
 # Run this command to insert some data into the cores
-$ docker compose exec solr solr-ingest-all
+$ docker compose exec solr solr-ingest-examples
 # Run this command to test backup
 $ cargo run -- backup --url http://localhost:8983/solr --core demo --dir $PWD
 # Run this command to test restoring the backukp data into a existing empty core

docker/configuration/.gitignore

@@ -0,0 +1,2 @@
+## Ignore all files in the volume directory
+*