fix(core): obligations commands id and fqn flag exclusivity (#731)

Closes #728

Author: jakedoublev

cmd/policy/obligations.go

@@ -67,9 +67,6 @@ func policyGetObligation(cmd *cobra.Command, args []string) {
 	id := c.Flags.GetOptionalID("id")
 	fqn := c.Flags.GetOptionalString("fqn")
 
-	cmd.MarkFlagsOneRequired("id", "fqn")
-	cmd.MarkFlagsMutuallyExclusive("id", "fqn")
-
 	obl, err := h.GetObligation(cmd.Context(), id, fqn)
 	if err != nil {
 		identifier := fmt.Sprintf("id: %s", id)
@@ -168,9 +165,6 @@ func policyDeleteObligation(cmd *cobra.Command, args []string) {
 	id := c.Flags.GetOptionalID("id")
 	fqn := c.Flags.GetOptionalString("fqn")
 
-	cmd.MarkFlagsOneRequired("id", "fqn")
-	cmd.MarkFlagsMutuallyExclusive("id", "fqn")
-
 	force := c.Flags.GetRequiredBool("force")
 	ctx := cmd.Context()
 
@@ -252,9 +246,6 @@ func policyGetObligationValue(cmd *cobra.Command, args []string) {
 	id := c.Flags.GetOptionalID("id")
 	fqn := c.Flags.GetOptionalString("fqn")
 
-	cmd.MarkFlagsOneRequired("id", "fqn")
-	cmd.MarkFlagsMutuallyExclusive("id", "fqn")
-
 	value, err := h.GetObligationValue(cmd.Context(), id, fqn)
 	if err != nil {
 		identifier := fmt.Sprintf("id: %s", id)
@@ -329,9 +320,6 @@ func policyDeleteObligationValue(cmd *cobra.Command, args []string) {
 	id := c.Flags.GetOptionalID("id")
 	fqn := c.Flags.GetOptionalString("fqn")
 
-	cmd.MarkFlagsOneRequired("id", "fqn")
-	cmd.MarkFlagsMutuallyExclusive("id", "fqn")
-
 	force := c.Flags.GetOptionalBool("force")
 	ctx := cmd.Context()
 
@@ -525,6 +513,8 @@ func initObligationsCommands() {
 		getDoc.GetDocFlag("fqn").Default,
 		getDoc.GetDocFlag("fqn").Description,
 	)
+	getDoc.MarkFlagsMutuallyExclusive("id", "fqn")
+	getDoc.MarkFlagsOneRequired("id", "fqn")
 
 	listDoc := man.Docs.GetCommand("policy/obligations/list",
 		man.WithRun(policyListObligations),
@@ -598,6 +588,8 @@ func initObligationsCommands() {
 		false,
 		deleteDoc.GetDocFlag("force").Description,
 	)
+	deleteDoc.MarkFlagsMutuallyExclusive("id", "fqn")
+	deleteDoc.MarkFlagsOneRequired("id", "fqn")
 
 	// Obligation Values commands
 
@@ -616,6 +608,8 @@ func initObligationsCommands() {
 		getValueDoc.GetDocFlag("fqn").Default,
 		getValueDoc.GetDocFlag("fqn").Description,
 	)
+	getValueDoc.MarkFlagsMutuallyExclusive("id", "fqn")
+	getValueDoc.MarkFlagsOneRequired("id", "fqn")
 
 	createValueDoc := man.Docs.GetCommand("policy/obligations/values/create",
 		man.WithRun(policyCreateObligationValue),
@@ -682,6 +676,8 @@ func initObligationsCommands() {
 		false,
 		deleteValueDoc.GetDocFlag("force").Description,
 	)
+	deleteValueDoc.MarkFlagsMutuallyExclusive("id", "fqn")
+	deleteValueDoc.MarkFlagsOneRequired("id", "fqn")
 
 	// Obligation Triggers commands
 	createTriggerDoc := man.Docs.GetCommand("policy/obligations/triggers/create",

e2e/obligations.bats

@@ -375,11 +375,19 @@ teardown_file() {
 @test "Get an obligation - Bad" {
   run_otdfctl_obl get
     assert_failure
-    assert_output --partial "one of id, fqn must be set [message.oneof]"
+    assert_output --partial "Error: at least one of the flags in the group"
+    assert_output --partial "id"
+    assert_output --partial "fqn"
 
   run_otdfctl_obl get --id 'not_a_uuid'
     assert_failure
     assert_output --partial "must be a valid UUID"
+  
+  run_otdfctl_obl get --id '08db7417-bd97-4455-b308-7d9e94e43440' --fqn 'https://example.com/obl/example'
+    assert_failure
+    assert_output --partial "Error: if any flags in the group"
+    assert_output --partial "id"
+    assert_output --partial "fqn"
 }
 
 @test "List obligations" {
@@ -447,12 +455,21 @@ teardown_file() {
   # no id
   run_otdfctl_obl delete
     assert_failure
-    assert_output --partial "one of id, fqn must be set [message.oneof]"
+    assert_output --partial "Error: at least one of the flags in the group"
+    assert_output --partial "id"
+    assert_output --partial "fqn"
 
   # invalid id
   run_otdfctl_obl delete --id 'not_a_uuid'
     assert_failure
     assert_output --partial "must be a valid UUID"
+
+  # id and fqn exclusive
+  run_otdfctl_obl delete --id '08db7417-bd97-4455-b308-7d9e94e43440' --fqn 'https://example.com/obl/example'
+    assert_failure
+    assert_output --partial "Error: if any flags in the group"
+    assert_output --partial "id"
+    assert_output --partial "fqn"
 }
 
 # Tests for obligation values
@@ -656,7 +673,9 @@ EOF
 @test "Get an obligation value - Bad" {
   run_otdfctl_obl_values get
     assert_failure
-    assert_output --partial "one of id, fqn must be set [message.oneof]"
+    assert_output --partial "Error: at least one of the flags in the group"
+    assert_output --partial "id"
+    assert_output --partial "fqn"
 
   # invalid id
   run_otdfctl_obl_values get --id 'not_a_uuid'
@@ -667,6 +686,13 @@ EOF
   run_otdfctl_obl_values get --fqn 'not_a_fqn'
     assert_failure
     assert_output --partial "must be a valid URI"
+
+  # id and fqn exclusive
+  run_otdfctl_obl_values get --id '08db7417-bd97-4455-b308-7d9e94e43440' --fqn 'https://example.com/obl/example/value/value1'
+    assert_failure
+    assert_output --partial "Error: if any flags in the group"
+    assert_output --partial "id"
+    assert_output --partial "fqn"
 }
 
 @test "Update obligation values" {
@@ -784,12 +810,21 @@ EOF
   # no id
   run_otdfctl_obl_values delete
     assert_failure
-    assert_output --partial "one of id, fqn must be set [message.oneof]"
+    assert_output --partial "Error: at least one of the flags in the group"
+    assert_output --partial "id"
+    assert_output --partial "fqn"
 
   # invalid id
   run_otdfctl_obl_values delete --id 'not_a_uuid'
     assert_failure
     assert_output --partial "must be a valid UUID"
+
+  # id and fqn exclusive
+  run_otdfctl_obl_values delete --id '08db7417-bd97-4455-b308-7d9e94e43440' --fqn 'https://example.com/obl/example/value/value1'
+    assert_failure
+    assert_output --partial "Error: if any flags in the group"
+    assert_output --partial "id"
+    assert_output --partial "fqn"
 }
 
 # Tests for obligation triggers