fix(lint): resolve contacts lints and format execute tests

Author: salmonumbrella

internal/cmd/contacts.go

@@ -177,13 +177,6 @@ func primaryOrganization(p *people.Person) (name, title string) {
 	return p.Organizations[0].Name, p.Organizations[0].Title
 }
 
-func primaryURL(p *people.Person) string {
-	if p == nil || len(p.Urls) == 0 || p.Urls[0] == nil {
-		return ""
-	}
-	return p.Urls[0].Value
-}
-
 func allURLs(p *people.Person) []string {
 	if p == nil || len(p.Urls) == 0 {
 		return nil

internal/cmd/contacts_crud.go

@@ -166,11 +166,12 @@ func (c *ContactsGetCmd) Run(ctx context.Context, flags *RootFlags) error {
 		u.Out().Printf("birthday\t%s", bd)
 	}
 	if org, title := primaryOrganization(p); org != "" || title != "" {
-		if org != "" && title != "" {
+		switch {
+		case org != "" && title != "":
 			u.Out().Printf("organization\t%s (%s)", org, title)
-		} else if org != "" {
+		case org != "":
 			u.Out().Printf("organization\t%s", org)
-		} else {
+		default:
 			u.Out().Printf("title\t%s", title)
 		}
 	}
@@ -448,11 +449,11 @@ func (c *ContactsUpdateCmd) Run(ctx context.Context, kctx *kong.Context, flags *
 		updateFields = append(updateFields, "biographies")
 	}
 	if wantCustom {
-		userDefined, clear, parseErr := parseCustomUserDefined(c.Custom, true)
+		userDefined, clearAll, parseErr := parseCustomUserDefined(c.Custom, true)
 		if parseErr != nil {
 			return usage(parseErr.Error())
 		}
-		if clear {
+		if clearAll {
 			existing.UserDefined = nil
 		} else {
 			existing.UserDefined = userDefined

internal/cmd/contacts_helpers_test.go

@@ -109,11 +109,11 @@ func TestParseCustomUserDefined_InvalidInput(t *testing.T) {
 }
 
 func TestParseCustomUserDefined_ValidInput(t *testing.T) {
-	fields, clear, err := parseCustomUserDefined([]string{"team=devops", " repo = gog"}, false)
+	fields, clearAll, err := parseCustomUserDefined([]string{"team=devops", " repo = gog"}, false)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	if clear {
+	if clearAll {
 		t.Fatalf("did not expect clear")
 	}
 	if len(fields) != 2 || fields[0].Key != "team" || fields[0].Value != "devops" || fields[1].Key != "repo" || fields[1].Value != "gog" {
@@ -122,11 +122,11 @@ func TestParseCustomUserDefined_ValidInput(t *testing.T) {
 }
 
 func TestParseCustomUserDefined_ClearAll(t *testing.T) {
-	fields, clear, err := parseCustomUserDefined([]string{""}, true)
+	fields, clearAll, err := parseCustomUserDefined([]string{""}, true)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	if !clear {
+	if !clearAll {
 		t.Fatalf("expected clear")
 	}
 	if len(fields) != 0 {

internal/cmd/execute_drive_more_commands_test.go

@@ -147,11 +147,11 @@ func TestExecute_DriveMoreCommands_JSON(t *testing.T) {
 				t.Fatalf("move: %v", err)
 			}
 		})
-			_ = captureStdout(t, func() {
-				if err := Execute([]string{"--json", "--force", "--account", "a@b.com", "drive", "share", "id1", "--anyone", "--role", "reader"}); err != nil {
-					t.Fatalf("share: %v", err)
-				}
-			})
+		_ = captureStdout(t, func() {
+			if err := Execute([]string{"--json", "--force", "--account", "a@b.com", "drive", "share", "id1", "--anyone", "--role", "reader"}); err != nil {
+				t.Fatalf("share: %v", err)
+			}
+		})
 		_ = captureStdout(t, func() {
 			if err := Execute([]string{"--json", "--account", "a@b.com", "drive", "permissions", "id1"}); err != nil {
 				t.Fatalf("permissions: %v", err)
@@ -292,9 +292,9 @@ func TestExecute_DriveMoreCommands_Text(t *testing.T) {
 			if err := Execute([]string{"--account", "a@b.com", "drive", "move", "id1", "--parent", "np"}); err != nil {
 				t.Fatalf("move: %v", err)
 			}
-				if err := Execute([]string{"--force", "--account", "a@b.com", "drive", "share", "id1", "--anyone", "--role", "reader"}); err != nil {
-					t.Fatalf("share: %v", err)
-				}
+			if err := Execute([]string{"--force", "--account", "a@b.com", "drive", "share", "id1", "--anyone", "--role", "reader"}); err != nil {
+				t.Fatalf("share: %v", err)
+			}
 			if err := Execute([]string{"--account", "a@b.com", "drive", "permissions", "id1"}); err != nil {
 				t.Fatalf("permissions: %v", err)
 			}

internal/cmd/execute_gmail_settings_more_commands_test.go

@@ -216,11 +216,11 @@ func TestExecute_GmailSettingsMoreCommands_JSON(t *testing.T) {
 				t.Fatalf("delegates get: %v", err)
 			}
 		})
-			_ = captureStdout(t, func() {
-				if err := Execute([]string{"--json", "--force", "--account", "a@b.com", "gmail", "delegates", "add", "d@b.com"}); err != nil {
-					t.Fatalf("delegates add: %v", err)
-				}
-			})
+		_ = captureStdout(t, func() {
+			if err := Execute([]string{"--json", "--force", "--account", "a@b.com", "gmail", "delegates", "add", "d@b.com"}); err != nil {
+				t.Fatalf("delegates add: %v", err)
+			}
+		})
 		_ = captureStdout(t, func() {
 			if err := Execute([]string{"--json", "--force", "--account", "a@b.com", "gmail", "delegates", "remove", "d@b.com"}); err != nil {
 				t.Fatalf("delegates remove: %v", err)