Client: Enforce DID requirement for content list/history rucio#7674

Author: voetberg

lib/rucio/cli/did.py

@@ -117,7 +117,7 @@ def content():
 
 
 @content.command("history")
-@click.argument("dids", nargs=-1)
+@click.argument("dids", nargs=-1, required=True)
 @click.pass_context
 def content_history(ctx, dids):
     """List the content history of a collection-type DID"""
@@ -146,7 +146,7 @@ def content_remove(ctx, dids, from_did):
 
 
 @content.command("list")
-@click.argument("dids", nargs=-1)
+@click.argument("dids", nargs=-1, required=True)
 @click.option("--short", is_flag=True, default=False, help="Just dump the list of DIDs.")
 @click.pass_context
 def content_list_(ctx, dids, short):

tests/test_cli_client_structure.py

@@ -314,6 +314,15 @@ def test_did_content(root_account, rucio_client):
     assert "ERROR" not in err
     assert dataset in out
 
+    # Verify dids are required for list/history is enforced
+    cmd = "rucio did content list"
+    exitcode, out, err = execute(cmd)
+    assert exitcode == 2
+
+    cmd = "rucio did content history"
+    exitcode, out, err = execute(cmd)
+    assert exitcode == 2
+
     execute(f"rucio did content remove {scope}:{dataset} --from-did {scope}:{container}")
 
     cmd = f"rucio did content history {scope}:{container}"