Fix admin -A -ff when all results fit on one page

* Fix `admin -A -ff` when all results fit on one page

`cld admin resources -A -ff public_id` returned every field when the
first response had no cursor. `handle_auto_pagination` returned before
it applied the filter. Without `-A`, `-ff` was ignored with no message.

- Apply the field filter to each list in a single-page response.
- Log a warning when `-ff` is given without `-A`.
- State in the `-ff` help text that it requires `-A`.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* Keep lists without the requested fields in a single-page -ff result

On a single page, -ff filtered every list in the response. A list with
none of the requested fields, such as versions, became [{}]. Now the CLI
filters a list only when one or more of its items has a requested field.

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Author: TalLevAmi

cloudinary_cli/core/admin.py

@@ -21,7 +21,7 @@
 @option("-O", "--optional_parameter_parsed", multiple=True, nargs=2,
         help="Pass an optional parameter and parse its value as JSON or a boolean. e.g. -O context '{\"alt\": \"cat\"}'")
 @option("-A", "--auto_paginate", is_flag=True, help="Will auto paginate Admin API calls.", default=False)
-@option("-ff", "--filter_fields", multiple=True, help="Filter fields to return when using auto pagination.")
+@option("-ff", "--filter_fields", multiple=True, help="Filter fields to return. Requires -A/--auto_paginate.")
 @option("-F", "--force", is_flag=True,
         help="Skip confirmations for auto pagination and destructive bulk API methods.")
 @option("-ls", "--ls", is_flag=True, help="List all available methods in the Admin API.")

cloudinary_cli/utils/api_utils.py

@@ -14,7 +14,7 @@
                                              populate_duplicate_name)
 from cloudinary_cli.utils.json_utils import print_json, write_json_to_file
 from cloudinary_cli.utils.utils import log_exception, confirm_action, get_command_params, merge_responses, \
-    normalize_list_params, ConfigurationError, print_api_help, duplicate_values, should_dump_responses
+    normalize_list_params, ConfigurationError, print_api_help, duplicate_values, should_dump_responses, whitelist_keys
 import re
 from cloudinary.utils import is_remote_url
 
@@ -391,6 +391,8 @@ def handle_api_command(
 
     if auto_paginate:
         res = handle_auto_pagination(res, func, args, kwargs, force, filter_fields)
+    elif filter_fields:
+        logger.warning("-ff/--filter_fields has no effect without -A/--auto_paginate.")
 
     if return_data:
         return res
@@ -404,7 +406,17 @@ def handle_api_command(
 def handle_auto_pagination(res, func, args, kwargs, force, filter_fields):
     cursor_field = _cursor_fields.get(func.__name__, "next_cursor")
 
+    fields_to_keep = []
+    if filter_fields:
+        fields_to_keep = normalize_list_params(filter_fields)
+
     if cursor_field not in res:
+        # A single page: the pagination field is unknown, so filter only the lists that have a requested field.
+        for key, value in res.items():
+            if isinstance(value, list) and any(isinstance(item, dict) and item.keys() & set(fields_to_keep)
+                                               for item in value):
+                res[key] = whitelist_keys(value, fields_to_keep)
+
         return res
 
     if not force:
@@ -417,10 +429,6 @@ def handle_auto_pagination(res, func, args, kwargs, force, filter_fields):
         else:
             logger.info("Continuing. You may use the -F flag to force auto_pagination.")
 
-    fields_to_keep = []
-    if filter_fields:
-        fields_to_keep = normalize_list_params(filter_fields)
-
     kwargs['max_results'] = PAGINATION_MAX_RESULTS
 
     all_results = res

test/test_cli_api.py

@@ -6,7 +6,7 @@
 from click.testing import CliRunner
 
 from cloudinary_cli.cli import cli
-from test.helper_test import api_response_mock, uploader_response_mock, URLLIB3_REQUEST, \
+from test.helper_test import api_response_mock, uploader_response_mock, http_response_mock, URLLIB3_REQUEST, \
     CONFIG_PRESENT, REQUIRES_CONFIG
 
 API_MOCK_RESPONSE = api_response_mock()
@@ -134,3 +134,40 @@ def test_admin_resources_read_with_force_no_prompt(self, http_mock, confirm_mock
         self.assertEqual(0, result.exit_code, result.output)
         self.assertFalse(confirm_mock.called, "Read commands must not prompt regardless of --force")
         self.assertTrue(http_mock.called)
+
+
+class TestAdminFilterFields(unittest.TestCase):
+    runner = CliRunner()
+
+    @unittest.skipUnless(CONFIG_PRESENT, REQUIRES_CONFIG)
+    @patch(URLLIB3_REQUEST)
+    def test_admin_filter_fields_single_page(self, http_mock):
+        http_mock.return_value = http_response_mock(
+            '{"resources": [{"public_id": "p1", "bytes": 1}, {"public_id": "p2", "bytes": 2}]}',
+            {"x-featureratelimit-remaining": '0'})
+        result = self.runner.invoke(cli, ['admin', 'resources', '-A', '-ff', 'public_id'])
+
+        self.assertEqual(0, result.exit_code, result.output)
+        self.assertIn('"public_id": "p1"', result.output)
+        self.assertNotIn('"bytes"', result.output)
+
+    @unittest.skipUnless(CONFIG_PRESENT, REQUIRES_CONFIG)
+    @patch(URLLIB3_REQUEST)
+    def test_admin_filter_fields_without_auto_paginate_warns(self, http_mock):
+        http_mock.return_value = API_MOCK_RESPONSE
+        result = self.runner.invoke(cli, ['admin', 'resources', '-ff', 'public_id'])
+
+        self.assertEqual(0, result.exit_code, result.output)
+        self.assertIn('-ff/--filter_fields has no effect without -A/--auto_paginate', result.output)
+
+    @unittest.skipUnless(CONFIG_PRESENT, REQUIRES_CONFIG)
+    @patch(URLLIB3_REQUEST)
+    def test_admin_filter_fields_single_page_keeps_other_lists(self, http_mock):
+        http_mock.return_value = http_response_mock(
+            '{"derived": [{"id": "d1", "bytes": 1}], "versions": [{"version_id": "v1", "size": 2}]}',
+            {"x-featureratelimit-remaining": '0'})
+        result = self.runner.invoke(cli, ['admin', 'resource', 'sample', '-A', '-ff', 'id'])
+
+        self.assertEqual(0, result.exit_code, result.output)
+        self.assertNotIn('"bytes"', result.output)
+        self.assertIn('"version_id": "v1"', result.output)