Merge pull request #898 from planetlabs/search-update-890

change search-update name/filter options/parameters to match search UI

Author: jreiberkyle

planet/cli/data.py

@@ -476,20 +476,28 @@ async def search_delete(ctx, search_id):
 @translate_exceptions
 @coro
 @click.argument('search_id')
-@click.argument('name')
 @click.argument("item_types",
                 type=types.CommaSeparatedString(),
                 callback=check_item_types)
-@click.argument('filter', type=types.JSON())
+@click.option(
+    '--filter',
+    type=types.JSON(),
+    required=True,
+    help="""Filter to apply to search. Can be a json string, filename,
+         or '-' for stdin.""")
+@click.option('--name',
+              type=str,
+              required=True,
+              help='Name of the saved search.')
 @click.option('--daily-email',
               is_flag=True,
               help='Send a daily email when new results are added.')
 @pretty
 async def search_update(ctx,
                         search_id,
-                        name,
                         item_types,
                         filter,
+                        name,
                         daily_email,
                         pretty):
     """Update a saved search with the given search request.
@@ -499,9 +507,9 @@ async def search_update(ctx,
     """
     async with data_client(ctx) as cl:
         items = await cl.update_search(search_id,
-                                       name,
                                        item_types,
                                        filter,
+                                       name,
                                        daily_email)
         echo_json(items, pretty)
 

tests/integration/test_data_cli.py

@@ -906,9 +906,9 @@ def test_search_update_success(invoke,
     result = invoke([
         'search-update',
         search_id,
-        name,
         item_types,
-        json.dumps(search_filter)
+        f'--filter={json.dumps(search_filter)}',
+        f'--name={name}'
     ])
 
     assert not result.exception
@@ -927,9 +927,9 @@ def test_search_update_fail(invoke, search_id, search_filter):
     result = invoke([
         'search-update',
         search_id,
-        name,
         item_types,
-        json.dumps(search_filter)
+        f'--filter={json.dumps(search_filter)}',
+        f'--name={name}'
     ])
 
     assert result.output.startswith("Error")