diff --git a/internal/infrastructure/staterpc/access_client.go b/internal/infrastructure/staterpc/access_client.go index 5e4ae977d..9a938ecb9 100644 --- a/internal/infrastructure/staterpc/access_client.go +++ b/internal/infrastructure/staterpc/access_client.go @@ -25,16 +25,14 @@ func (c *Client) PrincipalFor(ctx context.Context, id identity.IdentityID) (acce return access.Principal{}, unmapError(err) } value := r.GetPrincipal() - memberships := make([]org.Membership, len(value.GetMemberships())) - for i := range value.GetMemberships() { - m := value.GetMemberships()[i] - memberships[i] = org.Membership{ + memberships := mapValues(value.GetMemberships(), func(m *pb.PrincipalMembership) org.Membership { + return org.Membership{ IdentityID: id, OrgID: org.OrgID(m.GetOrgId()), WorkspaceID: org.WorkspaceID(m.GetWorkspaceId()), Role: org.Role(m.GetRole()), } - } + }) return access.Principal{ IdentityID: identity.IdentityID(value.GetIdentityId()), Org: org.OrgID(value.GetOrgId()), @@ -47,11 +45,7 @@ func (c *Client) ListPolicies(ctx context.Context) ([]access.Policy, error) { if err != nil { return nil, unmapError(err) } - out := make([]access.Policy, len(r.Policies)) - for i := range r.Policies { - out[i] = accessPolicyValue(r.Policies[i]) - } - return out, nil + return mapValues(r.Policies, accessPolicyValue), nil } func (c *Client) PutPolicy(ctx context.Context, p access.Policy) (int64, error) { diff --git a/internal/infrastructure/staterpc/client.go b/internal/infrastructure/staterpc/client.go index 6bf72276d..95176b968 100644 --- a/internal/infrastructure/staterpc/client.go +++ b/internal/infrastructure/staterpc/client.go @@ -83,11 +83,7 @@ func (c *Client) ActiveTasksByOrigin(ctx context.Context, origin string) ([]*tas if err != nil { return nil, unmapError(err) } - out := make([]*task.Task, 0, len(r.Tasks)) - for _, t := range r.Tasks { - out = append(out, taskValue(t)) - } - return out, nil + return mapValues(r.Tasks, taskValue), nil } func (c *Client) EnqueueChatTask(ctx context.Context, owner, repo, title, body, wf, identity, origin string, inputs map[string]any) (*task.Task, error) { @@ -289,7 +285,7 @@ func (c *Client) OpenPRs(ctx context.Context) ([]task.Task, error) { if err != nil { return nil, unmapError(err) } - return derefTasks(r.Tasks), nil + return mapValues(r.Tasks, func(t *pb.Task) task.Task { return *taskValue(t) }), nil } func (c *Client) ClearTerminalTasks(ctx context.Context) (int64, error) { @@ -314,7 +310,7 @@ func (c *Client) TasksPage(ctx context.Context, page storecontract.TaskPage) ([] if err != nil { return nil, unmapError(err) } - return derefTasks(r.Tasks), nil + return mapValues(r.Tasks, func(t *pb.Task) task.Task { return *taskValue(t) }), nil } func (c *Client) StatusCounts(ctx context.Context) (map[string]int, error) { @@ -855,14 +851,3 @@ func (c *Client) PutHarnessSecret(ctx context.Context, s harnesssecret.Secret) e _, err := c.client.PutHarnessSecret(ctx, &pb.PutHarnessSecretRequest{Secret: harnessSecretProto(s)}) return unmapError(err) } - -func derefTasks(in []*pb.Task) []task.Task { - if in == nil { - return nil - } - out := make([]task.Task, len(in)) - for i, t := range in { - out[i] = *taskValue(t) - } - return out -}