[cli] add logic to reject ipv4 and snapshots options together

canonical · Sep 29, 2023 · 1868102 · 1868102
1 parent 83c6be3
commit 1868102
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/client/cli/cmd/list.cpp b/src/client/cli/cmd/list.cpp
@@ -91,6 +91,12 @@ mp::ParseCode cmd::List::parse_args(mp::ArgParser* parser)
         return ParseCode::CommandLineError;
     }
 
+    if (parser->isSet(snapshotsOption) && parser->isSet(noIpv4Option))
+    {
+        cerr << "IP addresses are not applicable in conjunction with listing snapshots\n";
+        return ParseCode::CommandLineError;
+    }
+
     request.set_snapshots(parser->isSet(snapshotsOption));
     request.set_request_ipv4(!parser->isSet(noIpv4Option));
 

diff --git a/tests/test_cli_client.cpp b/tests/test_cli_client.cpp
@@ -1808,6 +1808,11 @@ TEST_F(Client, list_cmd_no_ipv4_ok)
     EXPECT_THAT(send_command({"list", "--no-ipv4"}), Eq(mp::ReturnCode::Ok));
 }
 
+TEST_F(Client, listCmdFailsWithIpv4AndSnapshots)
+{
+    EXPECT_THAT(send_command({"list", "--no-ipv4", "--snapshots"}), Eq(mp::ReturnCode::CommandLineError));
+}
+
 // mount cli tests
 // Note: mpt::test_data_path() returns an absolute path
 TEST_F(Client, mount_cmd_good_absolute_source_path)