openclaw/gogcli
openclaw/gogcli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix: satisfy lint after refactor

Browse Source
This commit is contained in:
Peter Steinberger 2026-05-05 08:52:50 +01:00
parent 917e4b98b4
commit c65c88304b
No known key found for this signature in database
17 changed files with 68 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/cmd/calendar_users.go
View File

@ -50,13 +50,13 @@ func (c *CalendarUsersCmd) Run(ctx context.Context, flags *RootFlags) error {
if strings.TrimSpace(pageToken) != "" {
call = call.PageToken(pageToken)
}
resp, err := call.Do()
if err != nil {
if strings.Contains(err.Error(), "accessNotConfigured") ||
strings.Contains(err.Error(), "People API has not been used") {
return nil, "", fmt.Errorf("people API is not enabled; enable it at: https://console.developers.google.com/apis/api/people.googleapis.com/overview (%w)", err)
resp, callErr := call.Do()
if callErr != nil {
if strings.Contains(callErr.Error(), "accessNotConfigured") ||
strings.Contains(callErr.Error(), "People API has not been used") {
return nil, "", fmt.Errorf("people API is not enabled; enable it at: https://console.developers.google.com/apis/api/people.googleapis.com/overview (%w)", callErr)
}
return nil, "", err
return nil, "", callErr
}
return resp.People, resp.NextPageToken, nil
}

6
internal/cmd/chat_messages.go
View File

@ -83,9 +83,9 @@ func (c *ChatMessagesListCmd) Run(ctx context.Context, flags *RootFlags) error {
if filter != "" {
call = call.Filter(filter)
}
resp, err := call.Do()
if err != nil {
return nil, "", err
resp, callErr := call.Do()
if callErr != nil {
return nil, "", callErr
}
return resp.Messages, resp.NextPageToken, nil
}

6
internal/cmd/chat_reactions.go
View File

@ -120,9 +120,9 @@ func (c *ChatMessagesReactionsListCmd) Run(ctx context.Context, flags *RootFlags
if strings.TrimSpace(pageToken) != "" {
call = call.PageToken(pageToken)
}
resp, err := call.Do()
if err != nil {
return nil, "", err
resp, callErr := call.Do()
if callErr != nil {
return nil, "", callErr
}
return resp.Reactions, resp.NextPageToken, nil
}

6
internal/cmd/chat_threads.go
View File

@ -52,9 +52,9 @@ func (c *ChatThreadsListCmd) Run(ctx context.Context, flags *RootFlags) error {
if strings.TrimSpace(pageToken) != "" {
call = call.PageToken(pageToken)
}
resp, err := call.Do()
if err != nil {
return nil, "", err
resp, callErr := call.Do()
if callErr != nil {
return nil, "", callErr
}
return resp.Messages, resp.NextPageToken, nil
}

6
internal/cmd/classroom_courses.go
View File

@ -65,9 +65,9 @@ func (c *ClassroomCoursesListCmd) Run(ctx context.Context, flags *RootFlags) err
if v := strings.TrimSpace(c.StudentID); v != "" {
call.StudentId(v)
}
resp, err := call.Do()
if err != nil {
return nil, "", wrapClassroomError(err)
resp, callErr := call.Do()
if callErr != nil {
return nil, "", wrapClassroomError(callErr)
}
return resp.Courses, resp.NextPageToken, nil
}

12
internal/cmd/classroom_guardians.go
View File

@ -51,9 +51,9 @@ func (c *ClassroomGuardiansListCmd) Run(ctx context.Context, flags *RootFlags) e
if v := strings.TrimSpace(c.Email); v != "" {
call.InvitedEmailAddress(v)
}
resp, err := call.Do()
if err != nil {
return nil, "", wrapClassroomError(err)
resp, callErr := call.Do()
if callErr != nil {
return nil, "", wrapClassroomError(callErr)
}
return resp.Guardians, resp.NextPageToken, nil
}
@ -227,9 +227,9 @@ func (c *ClassroomGuardianInvitesListCmd) Run(ctx context.Context, flags *RootFl
}
call.States(upper...)
}
resp, err := call.Do()
if err != nil {
return nil, "", wrapClassroomError(err)
resp, callErr := call.Do()
if callErr != nil {
return nil, "", wrapClassroomError(callErr)
}
return resp.GuardianInvitations, resp.NextPageToken, nil
}

6
internal/cmd/classroom_invitations.go
View File

@ -53,9 +53,9 @@ func (c *ClassroomInvitationsListCmd) Run(ctx context.Context, flags *RootFlags)
call.UserId(v)
}
resp, err := call.Do()
if err != nil {
return nil, "", wrapClassroomError(err)
resp, callErr := call.Do()
if callErr != nil {
return nil, "", wrapClassroomError(callErr)
}
return resp.Invitations, resp.NextPageToken, nil
}

14
internal/cmd/classroom_rosters.go
View File

@ -48,9 +48,9 @@ func (c *ClassroomStudentsListCmd) Run(ctx context.Context, flags *RootFlags) er
if strings.TrimSpace(pageToken) != "" {
call = call.PageToken(pageToken)
}
resp, err := call.Do()
if err != nil {
return nil, "", wrapClassroomError(err)
resp, callErr := call.Do()
if callErr != nil {
return nil, "", wrapClassroomError(callErr)
}
return resp.Students, resp.NextPageToken, nil
}
@ -269,9 +269,9 @@ func (c *ClassroomTeachersListCmd) Run(ctx context.Context, flags *RootFlags) er
if strings.TrimSpace(pageToken) != "" {
call = call.PageToken(pageToken)
}
resp, err := call.Do()
if err != nil {
return nil, "", wrapClassroomError(err)
resp, callErr := call.Do()
if callErr != nil {
return nil, "", wrapClassroomError(callErr)
}
return resp.Teachers, resp.NextPageToken, nil
}
@ -455,7 +455,7 @@ type ClassroomRosterCmd struct {
FailEmpty bool `name:"fail-empty" aliases:"non-empty,require-results" help:"Exit with code 3 if no results"`
}
//nolint:gocyclo,cyclop // command orchestration across two role paths
//nolint:cyclop // command orchestration across two role paths
func (c *ClassroomRosterCmd) Run(ctx context.Context, flags *RootFlags) error {
u := ui.FromContext(ctx)
account, err := requireAccount(flags)

6
internal/cmd/classroom_submissions.go
View File

@ -79,9 +79,9 @@ func (c *ClassroomSubmissionsListCmd) Run(ctx context.Context, flags *RootFlags)
}
}
resp, err := call.Do()
if err != nil {
return nil, "", wrapClassroomError(err)
resp, callErr := call.Do()
if callErr != nil {
return nil, "", wrapClassroomError(callErr)
}
return resp.StudentSubmissions, resp.NextPageToken, nil
}

18
internal/cmd/contacts_directory.go
View File

@ -55,9 +55,9 @@ func (c *ContactsDirectoryListCmd) Run(ctx context.Context, flags *RootFlags) er
call = call.PageToken(pageToken)
}
resp, err := call.Do()
if err != nil {
return nil, "", err
resp, callErr := call.Do()
if callErr != nil {
return nil, "", callErr
}
return resp.People, resp.NextPageToken, nil
}
@ -151,9 +151,9 @@ func (c *ContactsDirectorySearchCmd) Run(ctx context.Context, flags *RootFlags)
if strings.TrimSpace(pageToken) != "" {
call = call.PageToken(pageToken)
}
resp, err := call.Do()
if err != nil {
return nil, "", err
resp, callErr := call.Do()
if callErr != nil {
return nil, "", callErr
}
return resp.People, resp.NextPageToken, nil
}
@ -246,9 +246,9 @@ func (c *ContactsOtherListCmd) Run(ctx context.Context, flags *RootFlags) error
if strings.TrimSpace(pageToken) != "" {
call = call.PageToken(pageToken)
}
resp, err := call.Do()
if err != nil {
return nil, "", err
resp, callErr := call.Do()
if callErr != nil {
return nil, "", callErr
}
return resp.OtherContacts, resp.NextPageToken, nil
}

6
internal/cmd/gmail_history.go
View File

@ -43,9 +43,9 @@ func (c *GmailHistoryCmd) Run(ctx context.Context, flags *RootFlags) error {
if strings.TrimSpace(pageToken) != "" {
call = call.PageToken(pageToken)
}
resp, err := call.Context(ctx).Do()
if err != nil {
return nil, "", err
resp, callErr := call.Context(ctx).Do()
if callErr != nil {
return nil, "", callErr
}
historyID = formatHistoryID(resp.HistoryId)
historyIDs := collectHistoryMessageIDs(resp)

1
internal/cmd/google_service_testutil_test.go
View File

@ -43,5 +43,6 @@ func stubGoogleTestService[T any](t *testing.T, target *func(context.Context, st
orig := *target
t.Cleanup(func() { *target = orig })
//nolint:unparam // test stub must match production service constructor signature.
*target = func(context.Context, string) (*T, error) { return svc, nil }
}

12
internal/cmd/groups.go
View File

@ -60,9 +60,9 @@ func (c *GroupsListCmd) Run(ctx context.Context, flags *RootFlags) error {
if strings.TrimSpace(pageToken) != "" {
call = call.PageToken(pageToken)
}
resp, err := call.Do()
if err != nil {
return nil, "", wrapCloudIdentityError(err, account)
resp, callErr := call.Do()
if callErr != nil {
return nil, "", wrapCloudIdentityError(callErr, account)
}
return resp.Memberships, resp.NextPageToken, nil
}
@ -201,9 +201,9 @@ func (c *GroupsMembersCmd) Run(ctx context.Context, flags *RootFlags) error {
if strings.TrimSpace(pageToken) != "" {
call = call.PageToken(pageToken)
}
resp, err := call.Do()
if err != nil {
return nil, "", fmt.Errorf("failed to list members: %w", err)
resp, callErr := call.Do()
if callErr != nil {
return nil, "", fmt.Errorf("failed to list members: %w", callErr)
}
return resp.Memberships, resp.NextPageToken, nil
}

6
internal/cmd/people_profile.go
View File

@ -102,9 +102,9 @@ func (c *PeopleSearchCmd) Run(ctx context.Context, flags *RootFlags) error {
if strings.TrimSpace(pageToken) != "" {
call = call.PageToken(pageToken)
}
resp, err := call.Do()
if err != nil {
return nil, "", wrapPeopleAPIError(err)
resp, callErr := call.Do()
if callErr != nil {
return nil, "", wrapPeopleAPIError(callErr)
}
return resp.People, resp.NextPageToken, nil
}

6
internal/cmd/tasks_items.go
View File

@ -82,9 +82,9 @@ func (c *TasksListCmd) Run(ctx context.Context, flags *RootFlags) error {
call = call.UpdatedMin(strings.TrimSpace(c.UpdatedMin))
}
resp, err := call.Context(ctx).Do()
if err != nil {
return nil, "", err
resp, callErr := call.Context(ctx).Do()
if callErr != nil {
return nil, "", callErr
}
return resp.Items, resp.NextPageToken, nil
}

6
internal/cmd/tasks_lists.go
View File

@ -41,9 +41,9 @@ func (c *TasksListsListCmd) Run(ctx context.Context, flags *RootFlags) error {
if strings.TrimSpace(pageToken) != "" {
call = call.PageToken(pageToken)
}
resp, err := call.Do()
if err != nil {
return nil, "", err
resp, callErr := call.Do()
if callErr != nil {
return nil, "", callErr
}
return resp.Items, resp.NextPageToken, nil
}

3
internal/googleapi/client.go
View File

@ -54,6 +54,7 @@ func newGoogleServiceForAccount[T any](
if err != nil {
return nil, fmt.Errorf("%s options: %w", label, err)
}
return newGoogleService(ctx, label, opts, factory)
}
@ -69,6 +70,7 @@ func newGoogleServiceForScopes[T any](
if err != nil {
return nil, fmt.Errorf("%s options: %w", errorLabel, err)
}
return newGoogleService(ctx, errorLabel, opts, factory)
}
@ -82,6 +84,7 @@ func newGoogleService[T any](
if err != nil {
return nil, fmt.Errorf("create %s service: %w", label, err)
}
return svc, nil
}