fix(calendar): clear CI lint issues in alias PR

Author: salmonumbrella

internal/cmd/calendar_alias_test.go

@@ -26,31 +26,31 @@ func TestCalendarAliasSetListUnset_JSON(t *testing.T) {
 
 	// set
 	_ = captureStdout(t, func() {
-		if err := runKong(t, &CalendarAliasSetCmd{}, []string{"family", "3656f8abc123@group.calendar.google.com"}, ctx, &RootFlags{}); err != nil {
-			t.Fatalf("set: %v", err)
+		if runErr := runKong(t, &CalendarAliasSetCmd{}, []string{"family", "3656f8abc123@group.calendar.google.com"}, ctx, &RootFlags{}); runErr != nil {
+			t.Fatalf("set: %v", runErr)
 		}
 	})
 
 	// list
 	out := captureStdout(t, func() {
-		if err := runKong(t, &CalendarAliasListCmd{}, []string{}, ctx, &RootFlags{}); err != nil {
-			t.Fatalf("list: %v", err)
+		if runErr := runKong(t, &CalendarAliasListCmd{}, []string{}, ctx, &RootFlags{}); runErr != nil {
+			t.Fatalf("list: %v", runErr)
 		}
 	})
 	var listResp struct {
 		Aliases map[string]string `json:"aliases"`
 	}
-	if err := json.Unmarshal([]byte(out), &listResp); err != nil {
-		t.Fatalf("list json: %v", err)
+	if unmarshalErr := json.Unmarshal([]byte(out), &listResp); unmarshalErr != nil {
+		t.Fatalf("list json: %v", unmarshalErr)
 	}
 	if listResp.Aliases["family"] != "3656f8abc123@group.calendar.google.com" {
 		t.Fatalf("unexpected aliases: %#v", listResp.Aliases)
 	}
 
 	// unset
 	_ = captureStdout(t, func() {
-		if err := runKong(t, &CalendarAliasUnsetCmd{}, []string{"family"}, ctx, &RootFlags{}); err != nil {
-			t.Fatalf("unset: %v", err)
+		if runErr := runKong(t, &CalendarAliasUnsetCmd{}, []string{"family"}, ctx, &RootFlags{}); runErr != nil {
+			t.Fatalf("unset: %v", runErr)
 		}
 	})
 

internal/cmd/calendar_propose_time.go

@@ -53,15 +53,15 @@ func (c *CalendarProposeTimeCmd) Run(ctx context.Context, flags *RootFlags) erro
 	proposeURL := "https://calendar.google.com/calendar/u/0/r/proposetime/" + encoded
 
 	// Avoid touching auth/keyring and avoid mutating the event in dry-run mode.
-	if err := dryRunExit(ctx, flags, "calendar.propose_time", map[string]any{
+	if dryRunErr := dryRunExit(ctx, flags, "calendar.propose_time", map[string]any{
 		"calendar_id": calendarID,
 		"event_id":    eventID,
 		"propose_url": proposeURL,
 		"open":        c.Open,
 		"decline":     decline,
 		"comment":     strings.TrimSpace(c.Comment),
-	}); err != nil {
-		return err
+	}); dryRunErr != nil {
+		return dryRunErr
 	}
 
 	account, err := requireAccount(flags)

internal/cmd/calendar_respond.go

@@ -47,13 +47,13 @@ func (c *CalendarRespondCmd) Run(ctx context.Context, flags *RootFlags) error {
 		return fmt.Errorf("invalid status %q; must be one of: %s", status, strings.Join(validStatuses, ", "))
 	}
 
-	if err := dryRunExit(ctx, flags, "calendar.respond", map[string]any{
+	if dryRunErr := dryRunExit(ctx, flags, "calendar.respond", map[string]any{
 		"calendar_id": calendarID,
 		"event_id":    eventID,
 		"status":      status,
 		"comment":     strings.TrimSpace(c.Comment),
-	}); err != nil {
-		return err
+	}); dryRunErr != nil {
+		return dryRunErr
 	}
 
 	account, err := requireAccount(flags)

internal/cmd/calendar_search.go

@@ -32,7 +32,7 @@ func (c *CalendarSearchCmd) Run(ctx context.Context, flags *RootFlags) error {
 
 	calendarID := c.CalendarID
 	if calendarID == "" {
-		calendarID = "primary"
+		calendarID = primaryCalendarID
 	} else {
 		resolved, resolveErr := resolveCalendarAliasID(calendarID)
 		if resolveErr != nil {

internal/cmd/calendar_time.go

@@ -44,10 +44,11 @@ func (c *CalendarTimeCmd) Run(ctx context.Context, flags *RootFlags) error {
 			return err
 		}
 
-		calendarID, resolveErr := resolveCalendarID(ctx, svc, calendarID)
+		resolvedCalendarID, resolveErr := resolveCalendarID(ctx, svc, calendarID)
 		if resolveErr != nil {
 			return resolveErr
 		}
+		calendarID = resolvedCalendarID
 		tz, loc, err = getCalendarLocation(ctx, svc, calendarID)
 		if err != nil {
 			return err

internal/config/calendar_aliases.go

@@ -39,6 +39,7 @@ func ResolveCalendarID(calendarID string) (string, error) {
 	if err != nil {
 		return "", err
 	}
+
 	if ok {
 		return resolved, nil
 	}

internal/config/calendar_aliases_test.go

@@ -52,6 +52,7 @@ func TestResolveCalendarID(t *testing.T) {
 	if err != nil {
 		t.Fatalf("resolve empty: %v", err)
 	}
+
 	if resolved != "primary" {
 		t.Fatalf("expected primary for empty, got %q", resolved)
 	}
@@ -61,19 +62,21 @@ func TestResolveCalendarID(t *testing.T) {
 	if err != nil {
 		t.Fatalf("resolve non-alias: %v", err)
 	}
+
 	if resolved != "some-calendar-id@group.calendar.google.com" {
 		t.Fatalf("expected unchanged, got %q", resolved)
 	}
 
 	// Set alias and resolve
-	if err := SetCalendarAlias("work", "work-calendar@group.calendar.google.com"); err != nil {
-		t.Fatalf("set alias: %v", err)
+	if setErr := SetCalendarAlias("work", "work-calendar@group.calendar.google.com"); setErr != nil {
+		t.Fatalf("set alias: %v", setErr)
 	}
 
 	resolved, err = ResolveCalendarID("work")
 	if err != nil {
 		t.Fatalf("resolve alias: %v", err)
 	}
+
 	if resolved != "work-calendar@group.calendar.google.com" {
 		t.Fatalf("expected resolved alias, got %q", resolved)
 	}
@@ -83,6 +86,7 @@ func TestResolveCalendarID(t *testing.T) {
 	if err != nil {
 		t.Fatalf("resolve uppercase alias: %v", err)
 	}
+
 	if resolved != "work-calendar@group.calendar.google.com" {
 		t.Fatalf("expected resolved alias for uppercase, got %q", resolved)
 	}