feat(control-plane): accept org/project names + close two API gaps · Entire
feat(control-plane): accept org/project names + close two API gaps
604cb3d→main·
toothbrush·3w ago·6 files·+446 added/-20 removed
Control-plane commands now accept an org/project name wherever they previously required the parent's ULID: repo create --project, repo list, project create --owner (org owners), and grant org/project args. A ULID is detected by shape and passed through unchanged (no extra lookup); anything else is resolved by name, with clear errors on no-match or ambiguity.
Also surfaces two existing-but-unwired API operations: - entire project list --org <name|ULID> (ListOrgProjects) - entire grant project remove --provider/--provider-user-id (RevokeProjectAccessByProvider), alongside the existing --grantee-* form
Co-Authored-By: Claude Opus 4.8 (1M context) noreply@anthropic.com
Sessions
ce3311bdc62fView transcript
Changes
6
cmd/entire/cli
Mgrant.go+91/-11
Mgrant_test.go+35
Mproject.go+33/-6
Mrepo.go+12/-3
Aresolveref.go+130
Aresolveref_test.go+145
1 unmodified line
2
3
4
5
6
7
8
90 unmodified lines
99
100
101
101
102
103
104
105
106
107
108
109
9 unmodified lines
119
120
121
117
122
123
124
125
126
127
128
129
11 unmodified lines
141
142
143
144
145
146
147
148
136
149
150
151
152
29 unmodified lines
182
183
184
185
186
187
188
189
190
191
2 unmodified lines
194
195
196
180
197
198
199
200
11 unmodified lines
212
213
214
198
215
216
217
218
219
220
221
222
4 unmodified lines
227
228
229
209
230
231
232
233
213
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
217
262
263
264
265
4 unmodified lines
270
271
272
228
229
230
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
1 unmodified line
import (
"context"
"errors"
"fmt"
"github.com/spf13/cobra"
90 unmodified lines
body.Role = coreapi.NewOptAddOrgMemberInputBodyRole(r)
}
return runCoreJSON(cmd, func(ctx context.Context, c *coreapi.Client) (any, error) {
return c.AddOrgMember(ctx, body, coreapi.AddOrgMemberParams{OrgId: args[0]})
orgID, err := resolveOrgRef(ctx, c, args[0])
if err != nil {
return nil, err
}
return c.AddOrgMember(ctx, body, coreapi.AddOrgMemberParams{OrgId: orgID})
})
},
}
9 unmodified lines
Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
return runCoreList(cmd, orgMemberColumns, orgMemberRow, func(ctx context.Context, c *coreapi.Client) ([]coreapi.Membership, error) {
out, err := c.ListOrgMembers(ctx, coreapi.ListOrgMembersParams{OrgId: args[0]})
orgID, err := resolveOrgRef(ctx, c, args[0])
if err != nil {
return nil, err
}
out, err := c.ListOrgMembers(ctx, coreapi.ListOrgMembersParams{OrgId: orgID})
if err != nil {
return nil, err
}
11 unmodified lines
Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
return runCoreJSON(cmd, func(ctx context.Context, c *coreapi.Client) (any, error) {
projID, err := resolveProjectRef(ctx, c, args[0])
if err != nil {
return nil, err
}
body := &coreapi.GrantProjectAccessInputBody{
Provider: provider,
ProviderUserId: providerUserID,
2 unmodified lines
if granteeType != "" {
body.GranteeType = coreapi.NewOptGrantProjectAccessInputBodyGranteeType(coreapi.GrantProjectAccessInputBodyGranteeType(granteeType))
}
return c.GrantProjectAccess(ctx, body, coreapi.GrantProjectAccessParams{ProjectId: args[0]})
return c.GrantProjectAccess(ctx, body, coreapi.GrantProjectAccessParams{ProjectId: projID})
})
},
}
11 unmodified lines
Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
return runCoreList(cmd, projectGrantColumns, projectGrantRow, func(ctx context.Context, c *coreapi.Client) ([]coreapi.ProjectGrant, error) {
out, err := c.ListProjectMembers(ctx, coreapi.ListProjectMembersParams{ProjectId: args[0]})
projID, err := resolveProjectRef(ctx, c, args[0])
if err != nil {
return nil, err
}
out, err := c.ListProjectMembers(ctx, coreapi.ListProjectMembersParams{ProjectId: projID})
if err != nil {
return nil, err
}
4 unmodified lines
}
func newGrantProjectRemoveCmd() *cobra.Command {
var granteeType, granteeID string
var granteeType, granteeID, provider, providerUserID string
cmd := &cobra.Command{
Use: "remove <project>",
Short: "Revoke project access from a grantee",
Args: cobra.ExactArgs(1),
Long: "Revoke a grantee's access to a project (addressed by name or ULID). " +
"Identify the grantee either by --provider/--provider-user-id (an " +
"account, e.g. github + user id) or by --grantee-type/--grantee-id (a " +
"ULID, for account/org/team grantees).",
Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
mode, err := projectGranteeMode(provider, providerUserID, granteeType, granteeID)
if err != nil {
cmd.SilenceUsage = true
return err
}
return runCore(cmd, func(ctx context.Context, c *coreapi.Client) error {
projID, err := resolveProjectRef(ctx, c, args[0])
if err != nil {
return err
}
if mode == granteeModeProvider {
if err := c.RevokeProjectAccessByProvider(ctx, coreapi.RevokeProjectAccessByProviderParams{
ProjectId: projID,
Provider: provider,
ProviderUserId: providerUserID,
}); err != nil {
return err
}
cmd.Printf("Revoked %s/%s from project %s\n", provider, providerUserID, args[0])
return nil
}
if err := c.RevokeProjectAccess(ctx, coreapi.RevokeProjectAccessParams{
ProjectId: args[0],
ProjectId: projID,
GranteeType: granteeType,
GranteeId: granteeID,
}; err != nil {
4 unmodified lines
})
}
}
cmd.Flags().StringVar(&granteeType, "grantee-type", "", "grantee kind: account, org, or team (required)")
cmd.Flags().StringVar(&granteeID, "grantee-id", "", "grantee ULID (required)")
markRequired(cmd, "grantee-type", "grantee-id")
cmd.Flags().StringVar(&granteeType, "grantee-type", "", "grantee kind: account, org, or team (with --grantee-id)")
cmd.Flags().StringVar(&granteeID, "grantee-id", "", "grantee ULID (with --grantee-type)")
cmd.Flags().StringVar(&provider, "provider", "", "identity provider, e.g. github (with --provider-user-id)")
cmd.Flags().StringVar(&providerUserID, "provider-user-id", "", "provider-specific user id (with --provider)")
return cmd
}
// granteeMode names the two ways `grant project remove` can address a grantee.
type granteeMode int
const (
granteeModeProvider granteeMode = iota // --provider + --provider-user-id
granteeModeID // --grantee-type + --grantee-id
)
// projectGranteeMode validates that exactly one addressing mode was supplied
// and fully specified, returning which one. The two modes are mutually
// exclusive: a provider account (github + user id) hits the by-provider revoke
// route, while a ULID grantee hits the typed-id route that also covers org and
// team grantees.
func projectGranteeMode(provider, providerUserID, granteeType, granteeID string) (granteeMode, error) {
byProvider := provider != "" || providerUserID != ""
byID := granteeType != "" || granteeID != ""
switch {
case byProvider && byID:
return 0, errors.New("specify either --provider/--provider-user-id or --grantee-type/--grantee-id, not both")
case byProvider:
if provider == "" || providerUserID == "" {
return 0, errors.New("both --provider and --provider-user-id are required")
}
return granteeModeProvider, nil
case byID:
if granteeType == "" || granteeID == "" {
return 0, errors.New("both --grantee-type and --grantee-id are required")
}
return granteeModeID, nil
default:
return 0, errors.New("identify the grantee with --provider/--provider-user-id or --grantee-type/--grantee-id")
}
}
// --- repo grants ----------------------------------------------------------
func newGrantRepoCmd() *cobra.Command {