Skip to content

fix(contacts): guard --from-file against all conflicting flags #439

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

Open
klodr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(contacts): guard --from-file against all conflicting flags #439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion internal/cmd/contacts_crud.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,10 @@ func (c *ContactsUpdateCmd) Run(ctx context.Context, kctx *kong.Context, flags *
}

if strings.TrimSpace(c.FromFile) != "" {
if flagProvided(kctx, "given") || flagProvided(kctx, "family") || flagProvided(kctx, "email") || flagProvided(kctx, "phone") || flagProvided(kctx, "birthday") || flagProvided(kctx, "notes") || flagProvided(kctx, "relation") {
if flagProvided(kctx, "given") || flagProvided(kctx, "family") || flagProvided(kctx, "email") || flagProvided(kctx, "phone") ||
flagProvided(kctx, "org") || flagProvided(kctx, "title") || flagProvided(kctx, "url") ||
flagProvided(kctx, "note") || flagProvided(kctx, "address") || flagProvided(kctx, "custom") ||
flagProvided(kctx, "birthday") || flagProvided(kctx, "notes") || flagProvided(kctx, "relation") {
return usage("can't combine --from-file with other update flags")
}
return c.updateFromJSON(ctx, svc, resourceName, u)
Expand Down
23 changes: 22 additions & 1 deletion internal/cmd/contacts_update_json_more_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,29 @@ func TestContactsUpdate_FromFile_CantCombineWithFlags(t *testing.T) {
}
_ = tmp.Close()

// Previously covered: --email
err = runKong(t, &ContactsUpdateCmd{}, []string{"people/c1", "--from-file", tmp.Name(), "--email", "x@example.com"}, context.Background(), &RootFlags{Account: "a@b.com"})
if err == nil || !strings.Contains(err.Error(), "can't combine --from-file") {
t.Fatalf("expected combine error, got %v", err)
t.Fatalf("expected combine error for --email, got %v", err)
}

// Flags that were previously missing from the conflict guard: org, title, url, note, address, custom
conflictCases := []struct {
name string
extra []string
}{
{"org", []string{"--org", "Acme"}},
{"title", []string{"--title", "CEO"}},
{"url", []string{"--url", "https://example.com"}},
{"note", []string{"--note", "some note"}},
{"address", []string{"--address", "123 Main St"}},
{"custom", []string{"--custom", "key=value"}},
}
for _, tc := range conflictCases {
args := append([]string{"people/c1", "--from-file", tmp.Name()}, tc.extra...)
runErr := runKong(t, &ContactsUpdateCmd{}, args, context.Background(), &RootFlags{Account: "a@b.com"})
if runErr == nil || !strings.Contains(runErr.Error(), "can't combine --from-file") {
t.Fatalf("expected combine error for --%s, got %v", tc.name, runErr)
}
}
}