Merge branch 'main' into whitesource

Signed-off-by: Andre Kurait <[email protected]>
peternied · Jun 25, 2024 · 312f1f3 · 312f1f3
2 parents 7bd886f + 641bbe2
commit 312f1f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...Solution/src/main/docker/migrationConsole/lib/console_link/console_link/logic/clusters.py b/...Solution/src/main/docker/migrationConsole/lib/console_link/console_link/logic/clusters.py
@@ -14,7 +14,7 @@ class ConnectionResult:
 
 def cat_indices(cluster: Cluster, as_json=False):
     as_json_suffix = "?format=json" if as_json else "?v"
-    cat_indices_path = f"/_cat/indices{as_json_suffix}"
+    cat_indices_path = f"/_cat/indices/_all{as_json_suffix}"
     r = cluster.call_api(cat_indices_path)
     return r.json() if as_json else r.content
 

diff --git a/...apture/dockerSolution/src/main/docker/migrationConsole/lib/console_link/tests/test_cli.py b/...apture/dockerSolution/src/main/docker/migrationConsole/lib/console_link/tests/test_cli.py
@@ -154,10 +154,10 @@ def test_cli_snapshot_status(runner, env, mocker):
 
 def test_cli_cat_indices_e2e(runner, env):
     with requests_mock.Mocker() as rm:
-        rm.get(f"{env.source_cluster.endpoint}/_cat/indices",
+        rm.get(f"{env.source_cluster.endpoint}/_cat/indices/_all",
                status_code=200,
                text=source_cat_indices)
-        rm.get(f"{env.target_cluster.endpoint}/_cat/indices",
+        rm.get(f"{env.target_cluster.endpoint}/_cat/indices/_all",
                status_code=200,
                text=target_cat_indices)
         result = runner.invoke(cli, ['--config-file', str(VALID_SERVICES_YAML), 'clusters', 'cat-indices'],