fixup

Emyrk · Emyrk · commit 268c187188d4 · 2024-06-26T14:16:55.000-05:00
diff --git a/enterprise/cli/groupcreate.go b/enterprise/cli/groupcreate.go
@@ -16,6 +16,7 @@ func (r *RootCmd) groupCreate() *serpent.Command {
 	var (
 		avatarURL   string
 		displayName string
+		orgContext  = agpl.NewOrganizationContext()
 	)
 
 	client := new(codersdk.Client)
@@ -29,7 +30,7 @@ func (r *RootCmd) groupCreate() *serpent.Command {
 		Handler: func(inv *serpent.Invocation) error {
 			ctx := inv.Context()
 
-			org, err := agpl.CurrentOrganization(&r.RootCmd, inv, client)
+			org, err := orgContext.Selected(inv, client)
 			if err != nil {
 				return xerrors.Errorf("current organization: %w", err)
 			}
@@ -63,6 +64,7 @@ func (r *RootCmd) groupCreate() *serpent.Command {
 			Value:       serpent.StringOf(&displayName),
 		},
 	}
+	orgContext.AttachOptions(cmd)
 
 	return cmd
 }
diff --git a/enterprise/cli/groupdelete.go b/enterprise/cli/groupdelete.go
@@ -13,6 +13,7 @@ import (
 )
 
 func (r *RootCmd) groupDelete() *serpent.Command {
+	orgContext := agpl.NewOrganizationContext()
 	client := new(codersdk.Client)
 	cmd := &serpent.Command{
 		Use:   "delete <name>",
@@ -27,7 +28,7 @@ func (r *RootCmd) groupDelete() *serpent.Command {
 				groupName = inv.Args[0]
 			)
 
-			org, err := agpl.CurrentOrganization(&r.RootCmd, inv, client)
+			org, err := orgContext.Selected(inv, client)
 			if err != nil {
 				return xerrors.Errorf("current organization: %w", err)
 			}
@@ -46,6 +47,7 @@ func (r *RootCmd) groupDelete() *serpent.Command {
 			return nil
 		},
 	}
+	orgContext.AttachOptions(cmd)
 
 	return cmd
 }
diff --git a/enterprise/cli/groupedit.go b/enterprise/cli/groupedit.go
@@ -22,6 +22,7 @@ func (r *RootCmd) groupEdit() *serpent.Command {
 		displayName string
 		addUsers    []string
 		rmUsers     []string
+		orgContext  = agpl.NewOrganizationContext()
 	)
 	client := new(codersdk.Client)
 	cmd := &serpent.Command{
@@ -37,7 +38,7 @@ func (r *RootCmd) groupEdit() *serpent.Command {
 				groupName = inv.Args[0]
 			)
 
-			org, err := agpl.CurrentOrganization(&r.RootCmd, inv, client)
+			org, err := orgContext.Selected(inv, client)
 			if err != nil {
 				return xerrors.Errorf("current organization: %w", err)
 			}
@@ -116,6 +117,7 @@ func (r *RootCmd) groupEdit() *serpent.Command {
 			Value:         serpent.StringArrayOf(&rmUsers),
 		},
 	}
+	orgContext.AttachOptions(cmd)
 
 	return cmd
 }
diff --git a/enterprise/cli/grouplist.go b/enterprise/cli/grouplist.go
@@ -18,6 +18,7 @@ func (r *RootCmd) groupList() *serpent.Command {
 		cliui.TableFormat([]groupTableRow{}, nil),
 		cliui.JSONFormat(),
 	)
+	orgContext := agpl.NewOrganizationContext()
 
 	client := new(codersdk.Client)
 	cmd := &serpent.Command{
@@ -30,7 +31,7 @@ func (r *RootCmd) groupList() *serpent.Command {
 		Handler: func(inv *serpent.Invocation) error {
 			ctx := inv.Context()
 
-			org, err := agpl.CurrentOrganization(&r.RootCmd, inv, client)
+			org, err := orgContext.Selected(inv, client)
 			if err != nil {
 				return xerrors.Errorf("current organization: %w", err)
 			}
@@ -58,6 +59,7 @@ func (r *RootCmd) groupList() *serpent.Command {
 	}
 
 	formatter.AttachOptions(&cmd.Options)
+	orgContext.AttachOptions(cmd)
 	return cmd
 }
 

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ func (r RootCmd) groupCreate() serpent.Command {`
`16`	`16`	`var (`
`17`	`17`	`avatarURL string`
`18`	`18`	`displayName string`
	`19`	`+ orgContext = agpl.NewOrganizationContext()`
`19`	`20`	`)`
`20`	`21`
`21`	`22`	`client := new(codersdk.Client)`
`@@ -29,7 +30,7 @@ func (r RootCmd) groupCreate() serpent.Command {`
`29`	`30`	`Handler: func(inv *serpent.Invocation) error {`
`30`	`31`	`ctx := inv.Context()`
`31`	`32`
`32`		`- org, err := agpl.CurrentOrganization(&r.RootCmd, inv, client)`
	`33`	`+ org, err := orgContext.Selected(inv, client)`
`33`	`34`	`if err != nil {`
`34`	`35`	`return xerrors.Errorf("current organization: %w", err)`
`35`	`36`	`}`
`@@ -63,6 +64,7 @@ func (r RootCmd) groupCreate() serpent.Command {`
`63`	`64`	`Value: serpent.StringOf(&displayName),`
`64`	`65`	`},`
`65`	`66`	`}`
	`67`	`+ orgContext.AttachOptions(cmd)`
`66`	`68`
`67`	`69`	`return cmd`
`68`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import (`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func (r RootCmd) groupDelete() serpent.Command {`
	`16`	`+ orgContext := agpl.NewOrganizationContext()`
`16`	`17`	`client := new(codersdk.Client)`
`17`	`18`	`cmd := &serpent.Command{`
`18`	`19`	`Use: "delete <name>",`
`@@ -27,7 +28,7 @@ func (r RootCmd) groupDelete() serpent.Command {`
`27`	`28`	`groupName = inv.Args[0]`
`28`	`29`	`)`
`29`	`30`
`30`		`- org, err := agpl.CurrentOrganization(&r.RootCmd, inv, client)`
	`31`	`+ org, err := orgContext.Selected(inv, client)`
`31`	`32`	`if err != nil {`
`32`	`33`	`return xerrors.Errorf("current organization: %w", err)`
`33`	`34`	`}`
`@@ -46,6 +47,7 @@ func (r RootCmd) groupDelete() serpent.Command {`
`46`	`47`	`return nil`
`47`	`48`	`},`
`48`	`49`	`}`
	`50`	`+ orgContext.AttachOptions(cmd)`
`49`	`51`
`50`	`52`	`return cmd`
`51`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ func (r RootCmd) groupEdit() serpent.Command {`
`22`	`22`	`displayName string`
`23`	`23`	`addUsers []string`
`24`	`24`	`rmUsers []string`
	`25`	`+ orgContext = agpl.NewOrganizationContext()`
`25`	`26`	`)`
`26`	`27`	`client := new(codersdk.Client)`
`27`	`28`	`cmd := &serpent.Command{`
`@@ -37,7 +38,7 @@ func (r RootCmd) groupEdit() serpent.Command {`
`37`	`38`	`groupName = inv.Args[0]`
`38`	`39`	`)`
`39`	`40`
`40`		`- org, err := agpl.CurrentOrganization(&r.RootCmd, inv, client)`
	`41`	`+ org, err := orgContext.Selected(inv, client)`
`41`	`42`	`if err != nil {`
`42`	`43`	`return xerrors.Errorf("current organization: %w", err)`
`43`	`44`	`}`
`@@ -116,6 +117,7 @@ func (r RootCmd) groupEdit() serpent.Command {`
`116`	`117`	`Value: serpent.StringArrayOf(&rmUsers),`
`117`	`118`	`},`
`118`	`119`	`}`
	`120`	`+ orgContext.AttachOptions(cmd)`
`119`	`121`
`120`	`122`	`return cmd`
`121`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ func (r RootCmd) groupList() serpent.Command {`
`18`	`18`	`cliui.TableFormat([]groupTableRow{}, nil),`
`19`	`19`	`cliui.JSONFormat(),`
`20`	`20`	`)`
	`21`	`+ orgContext := agpl.NewOrganizationContext()`
`21`	`22`
`22`	`23`	`client := new(codersdk.Client)`
`23`	`24`	`cmd := &serpent.Command{`
`@@ -30,7 +31,7 @@ func (r RootCmd) groupList() serpent.Command {`
`30`	`31`	`Handler: func(inv *serpent.Invocation) error {`
`31`	`32`	`ctx := inv.Context()`
`32`	`33`
`33`		`- org, err := agpl.CurrentOrganization(&r.RootCmd, inv, client)`
	`34`	`+ org, err := orgContext.Selected(inv, client)`
`34`	`35`	`if err != nil {`
`35`	`36`	`return xerrors.Errorf("current organization: %w", err)`
`36`	`37`	`}`
`@@ -58,6 +59,7 @@ func (r RootCmd) groupList() serpent.Command {`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`formatter.AttachOptions(&cmd.Options)`
	`62`	`+ orgContext.AttachOptions(cmd)`
`61`	`63`	`return cmd`
`62`	`64`	`}`
`63`	`65`