diff --git a/internal/auth/team_db.go b/internal/auth/team_db.go index 6cd8ef0d2..29c2da8d1 100644 --- a/internal/auth/team_db.go +++ b/internal/auth/team_db.go @@ -100,9 +100,9 @@ func (db *pgdb) listTeams(ctx context.Context, organization string) ([]*Team, er return nil, err } - var items []*Team - for _, r := range result { - items = append(items, teamRow(r).toTeam()) + items := make([]*Team, len(result)) + for i, r := range result { + items[i] = teamRow(r).toTeam() } return items, nil } diff --git a/internal/auth/tfe.go b/internal/auth/tfe.go index c3a29ab76..1c72d7403 100644 --- a/internal/auth/tfe.go +++ b/internal/auth/tfe.go @@ -310,9 +310,9 @@ func (a *tfe) modifyTeamMembers(r *http.Request, action teamMembersAction) error } // convert users into a simple slice of usernames - var usernames []string - for _, u := range users { - usernames = append(usernames, u.Username) + usernames := make([]string, len(users)) + for i, u := range users { + usernames[i] = u.Username } switch action { diff --git a/internal/auth/user_db.go b/internal/auth/user_db.go index f601b180d..8db5ba4b6 100644 --- a/internal/auth/user_db.go +++ b/internal/auth/user_db.go @@ -36,9 +36,9 @@ func (db *pgdb) listUsers(ctx context.Context) ([]*User, error) { if err != nil { return nil, err } - var users []*User - for _, r := range result { - users = append(users, userRow(r).toUser()) + users := make([]*User, len(result)) + for i, r := range result { + users[i] = userRow(r).toUser() } return users, nil } @@ -48,9 +48,9 @@ func (db *pgdb) listOrganizationUsers(ctx context.Context, organization string) if err != nil { return nil, err } - var users []*User - for _, r := range result { - users = append(users, userRow(r).toUser()) + users := make([]*User, len(result)) + for i, r := range result { + users[i] = userRow(r).toUser() } return users, nil } @@ -61,9 +61,9 @@ func (db *pgdb) listTeamMembers(ctx context.Context, teamID string) ([]*User, er return nil, err } - var items []*User - for _, r := range result { - items = append(items, userRow(r).toUser()) + items := make([]*User, len(result)) + for i, r := range result { + items[i] = userRow(r).toUser() } return items, nil } diff --git a/internal/configversion/db.go b/internal/configversion/db.go index 7c9f5de7d..fe69599ec 100644 --- a/internal/configversion/db.go +++ b/internal/configversion/db.go @@ -99,11 +99,10 @@ func (db *pgdb) ListConfigurationVersions(ctx context.Context, workspaceID strin return nil, err } - var items []*ConfigurationVersion - for _, r := range rows { - items = append(items, pgRow(r).toConfigVersion()) + items := make([]*ConfigurationVersion, len(rows)) + for i, r := range rows { + items[i] = pgRow(r).toConfigVersion() } - return resource.NewPage(items, opts.PageOptions, internal.Int64(count.Int)), nil } diff --git a/internal/github/client.go b/internal/github/client.go index e308801d0..70b8e0dae 100644 --- a/internal/github/client.go +++ b/internal/github/client.go @@ -238,9 +238,9 @@ func (g *Client) ListTags(ctx context.Context, opts vcs.ListTagsOptions) ([]stri } // return tags with the format 'tags/' - var tags []string - for _, ref := range results { - tags = append(tags, strings.TrimPrefix(ref.GetRef(), "refs/")) + tags := make([]string, len(results)) + for i, ref := range results { + tags[i] = strings.TrimPrefix(ref.GetRef(), "refs/") } return tags, nil } diff --git a/internal/gitlab/client.go b/internal/gitlab/client.go index 5fbf229a2..cd3d7b00a 100644 --- a/internal/gitlab/client.go +++ b/internal/gitlab/client.go @@ -109,9 +109,9 @@ func (g *Client) ListRepositories(ctx context.Context, lopts vcs.ListRepositorie return nil, err } - var repos []string - for _, proj := range projects { - repos = append(repos, proj.PathWithNamespace) + repos := make([]string, len(projects)) + for i, proj := range projects { + repos[i] = proj.PathWithNamespace } return repos, nil } @@ -124,9 +124,9 @@ func (g *Client) ListTags(ctx context.Context, opts vcs.ListTagsOptions) ([]stri return nil, err } - var tags []string - for _, ref := range results { - tags = append(tags, fmt.Sprintf("tags/%s", ref.Name)) + tags := make([]string, len(results)) + for i, ref := range results { + tags[i] = fmt.Sprintf("tags/%s", ref.Name) } return tags, nil } diff --git a/internal/module/db.go b/internal/module/db.go index c7373aab6..57a3e12cb 100644 --- a/internal/module/db.go +++ b/internal/module/db.go @@ -58,9 +58,9 @@ func (db *pgdb) listModules(ctx context.Context, opts ListModulesOptions) ([]*Mo return nil, err } - var modules []*Module - for _, r := range rows { - modules = append(modules, moduleRow(r).toModule()) + modules := make([]*Module, len(rows)) + for i, r := range rows { + modules[i] = moduleRow(r).toModule() } return modules, nil } diff --git a/internal/module/web.go b/internal/module/web.go index 4acb67505..2bce9bafb 100644 --- a/internal/module/web.go +++ b/internal/module/web.go @@ -214,7 +214,7 @@ func (h *webHandlers) newModuleRepo(w http.ResponseWriter, r *http.Request) { h.Error(w, err.Error(), http.StatusInternalServerError) return } - var filtered []string + filtered := make([]string, 0, len(results)) for _, res := range results { _, _, err := Repo(res).Split() if err == ErrInvalidModuleRepo { diff --git a/internal/notifications/db.go b/internal/notifications/db.go index 8d8926134..51e0338cd 100644 --- a/internal/notifications/db.go +++ b/internal/notifications/db.go @@ -113,9 +113,9 @@ func (db *pgdb) list(ctx context.Context, workspaceID string) ([]*Config, error) return nil, sql.Error(err) } - var configs []*Config - for _, row := range results { - configs = append(configs, pgresult(row).toNotificationConfiguration()) + configs := make([]*Config, len(results)) + for i, row := range results { + configs[i] = pgresult(row).toNotificationConfiguration() } return configs, nil } @@ -126,9 +126,9 @@ func (db *pgdb) listAll(ctx context.Context) ([]*Config, error) { return nil, sql.Error(err) } - var configs []*Config - for _, row := range results { - configs = append(configs, pgresult(row).toNotificationConfiguration()) + configs := make([]*Config, len(results)) + for i, row := range results { + configs[i] = pgresult(row).toNotificationConfiguration() } return configs, nil } diff --git a/internal/organization/db.go b/internal/organization/db.go index 01071fb69..2aefb9b86 100644 --- a/internal/organization/db.go +++ b/internal/organization/db.go @@ -108,11 +108,10 @@ func (db *pgdb) list(ctx context.Context, opts dbListOptions) (*resource.Page[*O return nil, err } - var items []*Organization - for _, r := range rows { - items = append(items, row(r).toOrganization()) + items := make([]*Organization, len(rows)) + for i, r := range rows { + items[i] = row(r).toOrganization() } - return resource.NewPage(items, opts.PageOptions, internal.Int64(count.Int)), nil } diff --git a/internal/run/db.go b/internal/run/db.go index 51bb35f2f..9091f46b3 100644 --- a/internal/run/db.go +++ b/internal/run/db.go @@ -362,11 +362,10 @@ func (db *pgdb) ListRuns(ctx context.Context, opts ListOptions) (*resource.Page[ return nil, err } - var items []*Run - for _, r := range rows { - items = append(items, pgresult(r).toRun()) + items := make([]*Run, len(rows)) + for i, r := range rows { + items[i] = pgresult(r).toRun() } - return resource.NewPage(items, opts.PageOptions, internal.Int64(count.Int)), nil } diff --git a/internal/state/db.go b/internal/state/db.go index cca71d57d..9025876ac 100644 --- a/internal/state/db.go +++ b/internal/state/db.go @@ -124,11 +124,10 @@ func (db *pgdb) listVersions(ctx context.Context, workspaceID string, opts resou return nil, err } - var items []*Version - for _, r := range rows { - items = append(items, pgRow(r).toVersion()) + items := make([]*Version, len(rows)) + for i, r := range rows { + items[i] = pgRow(r).toVersion() } - return resource.NewPage(items, opts, internal.Int64(count.Int)), nil } diff --git a/internal/tokens/db.go b/internal/tokens/db.go index 94225479a..431658e4b 100644 --- a/internal/tokens/db.go +++ b/internal/tokens/db.go @@ -42,14 +42,14 @@ func (db *pgdb) listUserTokens(ctx context.Context, username string) ([]*UserTok if err != nil { return nil, err } - var tokens []*UserToken - for _, row := range result { - tokens = append(tokens, &UserToken{ + tokens := make([]*UserToken, len(result)) + for i, row := range result { + tokens[i] = &UserToken{ ID: row.TokenID.String, CreatedAt: row.CreatedAt.Time.UTC(), Description: row.Description.String, Username: row.Username.String, - }) + } } return tokens, nil } @@ -202,11 +202,11 @@ func (db *pgdb) listAgentTokens(ctx context.Context, organization string) ([]*Ag if err != nil { return nil, sql.Error(err) } - var unmarshalled []*AgentToken - for _, r := range rows { - unmarshalled = append(unmarshalled, agentTokenRow(r).toAgentToken()) + tokens := make([]*AgentToken, len(rows)) + for i, r := range rows { + tokens[i] = agentTokenRow(r).toAgentToken() } - return unmarshalled, nil + return tokens, nil } func (db *pgdb) deleteAgentToken(ctx context.Context, id string) error { diff --git a/internal/vcsprovider/db.go b/internal/vcsprovider/db.go index e42f68d72..e0cd7add4 100644 --- a/internal/vcsprovider/db.go +++ b/internal/vcsprovider/db.go @@ -116,13 +116,13 @@ func (db *pgdb) list(ctx context.Context) ([]*VCSProvider, error) { if err != nil { return nil, sql.Error(err) } - var providers []*VCSProvider - for _, r := range rows { + providers := make([]*VCSProvider, len(rows)) + for i, r := range rows { provider, err := db.toProvider(ctx, pgrow(r)) if err != nil { return nil, err } - providers = append(providers, provider) + providers[i] = provider } return providers, nil } @@ -132,13 +132,13 @@ func (db *pgdb) listByOrganization(ctx context.Context, organization string) ([] if err != nil { return nil, sql.Error(err) } - var providers []*VCSProvider - for _, r := range rows { + providers := make([]*VCSProvider, len(rows)) + for i, r := range rows { provider, err := db.toProvider(ctx, pgrow(r)) if err != nil { return nil, err } - providers = append(providers, provider) + providers[i] = provider } return providers, nil } @@ -150,13 +150,13 @@ func (db *pgdb) listByGithubAppInstall(ctx context.Context, installID int64) ([] if err != nil { return nil, sql.Error(err) } - var providers []*VCSProvider - for _, r := range rows { + providers := make([]*VCSProvider, len(rows)) + for i, r := range rows { provider, err := db.toProvider(ctx, pgrow(r)) if err != nil { return nil, err } - providers = append(providers, provider) + providers[i] = provider } return providers, nil } diff --git a/internal/workspace/db.go b/internal/workspace/db.go index 4d359187c..a4ee0be1a 100644 --- a/internal/workspace/db.go +++ b/internal/workspace/db.go @@ -251,15 +251,14 @@ func (db *pgdb) list(ctx context.Context, opts ListOptions) (*resource.Page[*Wor return nil, err } - var items []*Workspace - for _, r := range rows { + items := make([]*Workspace, len(rows)) + for i, r := range rows { ws, err := pgresult(r).toWorkspace() if err != nil { return nil, err } - items = append(items, ws) + items[i] = ws } - return resource.NewPage(items, opts.PageOptions, internal.Int64(count.Int)), nil } @@ -270,15 +269,14 @@ func (db *pgdb) listByConnection(ctx context.Context, vcsProviderID, repoPath st return nil, err } - var items []*Workspace - for _, r := range rows { + items := make([]*Workspace, len(rows)) + for i, r := range rows { ws, err := pgresult(r).toWorkspace() if err != nil { return nil, err } - items = append(items, ws) + items[i] = ws } - return items, nil } @@ -305,13 +303,13 @@ func (db *pgdb) listByUsername(ctx context.Context, username string, organizatio return nil, err } - var items []*Workspace - for _, r := range rows { + items := make([]*Workspace, len(rows)) + for i, r := range rows { ws, err := pgresult(r).toWorkspace() if err != nil { return nil, err } - items = append(items, ws) + items[i] = ws } return resource.NewPage(items, opts, internal.Int64(count.Int)), nil diff --git a/internal/workspace/tag.go b/internal/workspace/tag.go index 22042677e..95e29058c 100644 --- a/internal/workspace/tag.go +++ b/internal/workspace/tag.go @@ -37,12 +37,12 @@ func (s TagSpec) Valid() error { func (specs TagSpecs) LogValue() slog.Value { var ( - ids []string - names []string + ids = make([]string, len(specs)) + names = make([]string, len(specs)) ) - for _, s := range specs { - ids = append(ids, s.ID) - names = append(names, s.Name) + for i, s := range specs { + ids[i] = s.ID + names[i] = s.Name } return slog.GroupValue( slog.Any("ids", ids), diff --git a/internal/workspace/tag_db.go b/internal/workspace/tag_db.go index b93843cd6..9f4c7d23c 100644 --- a/internal/workspace/tag_db.go +++ b/internal/workspace/tag_db.go @@ -53,11 +53,10 @@ func (db *pgdb) listTags(ctx context.Context, organization string, opts ListTags return nil, sql.Error(err) } - var items []*Tag - for _, r := range rows { - items = append(items, tagresult(r).toTag()) + items := make([]*Tag, len(rows)) + for i, r := range rows { + items[i] = tagresult(r).toTag() } - return resource.NewPage(items, opts.PageOptions, internal.Int64(count.Int)), nil } @@ -140,10 +139,9 @@ func (db *pgdb) listWorkspaceTags(ctx context.Context, workspaceID string, opts return nil, sql.Error(err) } - var items []*Tag - for _, r := range rows { - items = append(items, tagresult(r).toTag()) + items := make([]*Tag, len(rows)) + for i, r := range rows { + items[i] = tagresult(r).toTag() } - return resource.NewPage(items, opts.PageOptions, internal.Int64(count.Int)), nil } diff --git a/internal/workspace/tag_tfe.go b/internal/workspace/tag_tfe.go index e75065fab..49b8d1f76 100644 --- a/internal/workspace/tag_tfe.go +++ b/internal/workspace/tag_tfe.go @@ -69,9 +69,9 @@ func (a *tfe) deleteTags(w http.ResponseWriter, r *http.Request) { tfeapi.Error(w, err) return } - var tagIDs []string - for _, p := range params { - tagIDs = append(tagIDs, p.ID) + tagIDs := make([]string, len(params)) + for i, p := range params { + tagIDs[i] = p.ID } if err := a.DeleteTags(r.Context(), org, tagIDs); err != nil { @@ -93,9 +93,9 @@ func (a *tfe) tagWorkspaces(w http.ResponseWriter, r *http.Request) { tfeapi.Error(w, err) return } - var workspaceIDs []string - for _, p := range params { - workspaceIDs = append(workspaceIDs, p.ID) + workspaceIDs := make([]string, len(params)) + for i, p := range params { + workspaceIDs[i] = p.ID } if err := a.TagWorkspaces(r.Context(), tagID, workspaceIDs); err != nil {