Update search usage to avoid "beta" APIs (#823)

* Update dependencies (via script)

Updates pinned globus-sdk and mypy to latest versions.
Also, remove explicit click dep from tox.ini, where it is stale.

* Update 'search index create|delete' to use v1 APIs

Upgrade from the /beta/ APIs to the v1 APIs, which are provided via
SDK methods in the latest release.

Because the SDK methods also come with mock data for testing, via
`globus_sdk._testing`, custom mocks for CLI testing can be removed and
replaced in this case.

setup.py

@@ -45,7 +45,7 @@ def read_readme():
     package_dir={"": "src"},
     python_requires=">=3.7",
     install_requires=[
-        "globus-sdk==3.23.0",
+        "globus-sdk==3.24.0",
         "click>=8.0.0,<9",
         "jmespath==1.0.1",
         "packaging>=17.0",

src/globus_cli/commands/search/index/create.py

@@ -14,11 +14,10 @@
 def create_command(
     *, login_manager: LoginManager, display_name: str, description: str
 ) -> None:
-    """(BETA) Create a new Index"""
-    index_doc = {"display_name": display_name, "description": description}
+    """Create a new Index"""
     search_client = login_manager.get_search_client()
     display(
-        search_client.post("/beta/index", data=index_doc),
+        search_client.create_index(display_name=display_name, description=description),
         text_mode=TextMode.text_record,
         fields=INDEX_FIELDS,
     )

src/globus_cli/commands/search/index/delete.py

@@ -9,10 +9,10 @@
 @LoginManager.requires_login("search")
 @click.argument("INDEX_ID")
 def delete_command(*, login_manager: LoginManager, index_id: str) -> None:
-    """(BETA) Delete a Search Index"""
+    """Delete a Search Index"""
     search_client = login_manager.get_search_client()
     display(
-        search_client.delete(f"/beta/index/{index_id}"),
+        search_client.delete_index(index_id),
         simple_text=f"Index {index_id} is now marked for deletion.\n"
         "It will be fully deleted after cleanup steps complete.",
     )

tests/files/api_fixtures/search.yaml

@@ -336,31 +336,6 @@ search:
         "status": "open",
         "subscription_id": null
       }
-  - path: /beta/index
-    method: POST
-    json:
-      {
-        "@datatype": "GSearchIndex",
-        "@version": "2017-09-01",
-        "creation_date": "2018-04-20 19:23:46",
-        "description": "Example index of Cookery",
-        "display_name": "example_cookery",
-        "id": "6f831ac8-4c41-4812-b383-6fb04f8b9f9f",
-        "is_trial": false,
-        "max_size_in_mb": 1,
-        "num_entries": 0,
-        "num_subjects": 0,
-        "size_in_mb": 0,
-        "status": "open",
-        "subscription_id": null
-      }
-  - path: /beta/index/6f831ac8-4c41-4812-b383-6fb04f8b9f9f
-    method: DELETE
-    json:
-      {
-        "acknowledged": true,
-        "index_id": "6f831ac8-4c41-4812-b383-6fb04f8b9f9f"
-      }
   - path: /v1/index_list
     json:
       {

tests/functional/search/test_index.py

@@ -1,4 +1,4 @@
-from globus_sdk._testing import load_response_set
+from globus_sdk._testing import load_response, load_response_set
 
 
 def test_index_list(run_line):
@@ -28,7 +28,7 @@ def test_index_show(run_line):
 
 
 def test_index_create(run_line):
-    meta = load_response_set("cli.search").metadata
+    meta = load_response("search.create_index").metadata
     index_id = meta["index_id"]
 
     run_line(
@@ -45,7 +45,7 @@ def test_index_create(run_line):
 
 
 def test_index_delete(run_line):
-    meta = load_response_set("cli.search").metadata
+    meta = load_response("search.delete_index").metadata
     index_id = meta["index_id"]
 
     run_line(

tox.ini

@@ -64,8 +64,7 @@ base_python =
    python3.11
    python3.10
 deps =
-    click
-    mypy
+    mypy==1.4.1
     types-jwt
     types-requests
     types-jmespath