Skip to content

chore: contacts & events commands should use cobra for flag constraints #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
notnmeyer merged 2 commits into from
May 8, 2026
Merged

chore: contacts & events commands should use cobra for flag constraints #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd4dcf2
contacts
notnmeyer May 8, 2026
42b410f
events
notnmeyer May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions cmd/contacts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@ var contactsFindCmd = &cobra.Command{
email, _ := cmd.Flags().GetString("email")
userID, _ := cmd.Flags().GetString("user-id")

if (email == "") == (userID == "") {
return fmt.Errorf("exactly one of --email or --user-id is required")
}

cfg, err := loadConfig()
if err != nil {
return err
Expand Down Expand Up @@ -221,10 +217,6 @@ var contactsUpdateCmd = &cobra.Command{
email, _ := cmd.Flags().GetString("email")
userID, _ := cmd.Flags().GetString("user-id")

if email == "" && userID == "" {
return fmt.Errorf("at least one of --email or --user-id is required")
}

cfg, err := loadConfig()
if err != nil {
return err
Expand Down Expand Up @@ -269,10 +261,6 @@ var contactsDeleteCmd = &cobra.Command{
email, _ := cmd.Flags().GetString("email")
userID, _ := cmd.Flags().GetString("user-id")

if (email == "") == (userID == "") {
return fmt.Errorf("exactly one of --email or --user-id is required")
}

cfg, err := loadConfig()
if err != nil {
return err
Expand Down Expand Up @@ -323,6 +311,8 @@ func formatCustomValue(v any) string {
func init() {
contactsFindCmd.Flags().StringP("email", "e", "", "Contact email address")
contactsFindCmd.Flags().StringP("user-id", "u", "", "Contact user ID")
contactsFindCmd.MarkFlagsOneRequired("email", "user-id")
contactsFindCmd.MarkFlagsMutuallyExclusive("email", "user-id")
contactsCmd.AddCommand(contactsFindCmd)

contactsCreateCmd.Flags().StringP("email", "e", "", "Contact email address")
Expand All @@ -335,10 +325,13 @@ func init() {
contactsUpdateCmd.Flags().StringP("email", "e", "", "Contact email address")
contactsUpdateCmd.Flags().StringP("user-id", "u", "", "User ID")
addContactFieldFlags(contactsUpdateCmd)
contactsUpdateCmd.MarkFlagsOneRequired("email", "user-id")
contactsCmd.AddCommand(contactsUpdateCmd)

contactsDeleteCmd.Flags().StringP("email", "e", "", "Contact email address")
contactsDeleteCmd.Flags().StringP("user-id", "u", "", "Contact user ID")
contactsDeleteCmd.MarkFlagsOneRequired("email", "user-id")
contactsDeleteCmd.MarkFlagsMutuallyExclusive("email", "user-id")
contactsCmd.AddCommand(contactsDeleteCmd)

rootCmd.AddCommand(contactsCmd)
Expand Down
12 changes: 4 additions & 8 deletions cmd/contacts_suppression.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ var contactsSuppressionCheckCmd = &cobra.Command{
email, _ := cmd.Flags().GetString("email")
userID, _ := cmd.Flags().GetString("user-id")

if (email == "") == (userID == "") {
return fmt.Errorf("exactly one of --email or --user-id is required")
}

cfg, err := loadConfig()
if err != nil {
return err
Expand Down Expand Up @@ -68,10 +64,6 @@ var contactsSuppressionRemoveCmd = &cobra.Command{
email, _ := cmd.Flags().GetString("email")
userID, _ := cmd.Flags().GetString("user-id")

if (email == "") == (userID == "") {
return fmt.Errorf("exactly one of --email or --user-id is required")
}

cfg, err := loadConfig()
if err != nil {
return err
Expand All @@ -95,10 +87,14 @@ var contactsSuppressionRemoveCmd = &cobra.Command{
func init() {
contactsSuppressionCheckCmd.Flags().StringP("email", "e", "", "Contact email address")
contactsSuppressionCheckCmd.Flags().StringP("user-id", "u", "", "Contact user ID")
contactsSuppressionCheckCmd.MarkFlagsOneRequired("email", "user-id")
contactsSuppressionCheckCmd.MarkFlagsMutuallyExclusive("email", "user-id")
contactsSuppressionCmd.AddCommand(contactsSuppressionCheckCmd)

contactsSuppressionRemoveCmd.Flags().StringP("email", "e", "", "Contact email address")
contactsSuppressionRemoveCmd.Flags().StringP("user-id", "u", "", "Contact user ID")
contactsSuppressionRemoveCmd.MarkFlagsOneRequired("email", "user-id")
contactsSuppressionRemoveCmd.MarkFlagsMutuallyExclusive("email", "user-id")
contactsSuppressionCmd.AddCommand(contactsSuppressionRemoveCmd)

contactsCmd.AddCommand(contactsSuppressionCmd)
Expand Down
4 changes: 1 addition & 3 deletions cmd/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ func eventsSendRunE(cmd *cobra.Command, args []string) error {

email, _ := cmd.Flags().GetString("email")
userID, _ := cmd.Flags().GetString("user-id")
if email == "" && userID == "" {
return fmt.Errorf("at least one of --email or --user-id is required")
}

eventName := args[0]
idempotencyKey, _ := cmd.Flags().GetString("idempotency-key")
Expand Down Expand Up @@ -123,6 +120,7 @@ func addEventsSendFlags(cmd *cobra.Command) {

func init() {
addEventsSendFlags(eventsSendCmd)
eventsSendCmd.MarkFlagsOneRequired("email", "user-id")
eventsCmd.AddCommand(eventsSendCmd)
rootCmd.AddCommand(eventsCmd)
}