Skip to content

Commit 088c95e

Browse files
burmudarburmudar
committed
remove legacy orgs command registrations
1 parent 24ef747 commit 088c95e

9 files changed

Lines changed: 7 additions & 419 deletions

File tree

‎cmd/src/doc.go‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,13 @@ Examples:
5757
}
5858

5959
commanders := map[string]*commander{
60-
"": &commands,
61-
"batch": &batchCommands,
62-
"config": &configCommands,
63-
"extsvc": &extsvcCommands,
64-
"code-intel": &codeintelCommands,
65-
"orgs": &orgsCommands,
66-
"orgs members": &orgsMembersCommands,
67-
"repos": &reposCommands,
68-
"users": &usersCommands,
60+
"": &commands,
61+
"batch": &batchCommands,
62+
"config": &configCommands,
63+
"extsvc": &extsvcCommands,
64+
"code-intel": &codeintelCommands,
65+
"repos": &reposCommands,
66+
"users": &usersCommands,
6967
}
7068

7169
pending := out.Pending(output.Line("", output.StylePending, "Rendering Markdown..."))

‎cmd/src/orgs.go‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
package main
22

33
import (
4-
"flag"
5-
"fmt"
6-
74
"github.com/sourcegraph/src-cli/internal/clicompat"
85
"github.com/urfave/cli/v3"
96
)
107

11-
var orgsCommands commander
12-
138
var orgsCommand = clicompat.Wrap(&cli.Command{
149
Name: "orgs",
1510
Aliases: []string{"org"},
@@ -43,26 +38,6 @@ The commands are:
4338
Use "src orgs [command] -h" for more information about a command.
4439
`
4540

46-
func init() {
47-
usage := orgsExamples
48-
49-
flagSet := flag.NewFlagSet("orgs", flag.ExitOnError)
50-
handler := func(args []string) error {
51-
orgsCommands.run(flagSet, "src orgs", usage, args)
52-
return nil
53-
}
54-
55-
// Register the command.
56-
commands = append(commands, &command{
57-
flagSet: flagSet,
58-
aliases: []string{"org"},
59-
handler: handler,
60-
usageFunc: func() {
61-
fmt.Println(usage)
62-
},
63-
})
64-
}
65-
6641
const orgFragment = `
6742
fragment OrgFields on Org {
6843
id

‎cmd/src/orgs_create.go‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ package main
22

33
import (
44
"context"
5-
"flag"
65
"fmt"
76

8-
"github.com/sourcegraph/src-cli/internal/api"
97
"github.com/sourcegraph/src-cli/internal/clicompat"
108
"github.com/urfave/cli/v3"
119
)
@@ -67,59 +65,3 @@ var orgsCreateCommand = clicompat.Wrap(&cli.Command{
6765
return err
6866
},
6967
})
70-
71-
func init() {
72-
usage := orgsCreateExamples
73-
74-
flagSet := flag.NewFlagSet("create", flag.ExitOnError)
75-
usageFunc := func() {
76-
fmt.Fprintf(flag.CommandLine.Output(), "Usage of 'src orgs %s':\n", flagSet.Name())
77-
flagSet.PrintDefaults()
78-
fmt.Println(usage)
79-
}
80-
var (
81-
nameFlag = flagSet.String("name", "", `The new organization's name. (required)`)
82-
displayNameFlag = flagSet.String("display-name", "", `The new organization's display name. Defaults to organization name if unspecified.`)
83-
apiFlags = api.NewFlags(flagSet)
84-
)
85-
86-
handler := func(args []string) error {
87-
if err := flagSet.Parse(args); err != nil {
88-
return err
89-
}
90-
91-
client := cfg.apiClient(apiFlags, flagSet.Output())
92-
93-
query := `mutation CreateOrg(
94-
$name: String!,
95-
$displayName: String!,
96-
) {
97-
createOrganization(
98-
name: $name,
99-
displayName: $displayName,
100-
) {
101-
id
102-
}
103-
}`
104-
105-
var result struct {
106-
CreateOrg Org
107-
}
108-
if ok, err := client.NewRequest(query, map[string]any{
109-
"name": *nameFlag,
110-
"displayName": *displayNameFlag,
111-
}).Do(context.Background(), &result); err != nil || !ok {
112-
return err
113-
}
114-
115-
fmt.Printf("Organization %q created.\n", *nameFlag)
116-
return nil
117-
}
118-
119-
// Register the command.
120-
orgsCommands = append(orgsCommands, &command{
121-
flagSet: flagSet,
122-
handler: handler,
123-
usageFunc: usageFunc,
124-
})
125-
}

‎cmd/src/orgs_delete.go‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ package main
22

33
import (
44
"context"
5-
"flag"
65
"fmt"
76

8-
"github.com/sourcegraph/src-cli/internal/api"
97
"github.com/sourcegraph/src-cli/internal/clicompat"
108
"github.com/urfave/cli/v3"
119
)
@@ -66,55 +64,3 @@ var orgsDeleteCommand = clicompat.Wrap(&cli.Command{
6664
return err
6765
},
6866
})
69-
70-
func init() {
71-
usage := orgsDeleteExamples
72-
73-
flagSet := flag.NewFlagSet("delete", flag.ExitOnError)
74-
usageFunc := func() {
75-
fmt.Fprintf(flag.CommandLine.Output(), "Usage of 'src orgs %s':\n", flagSet.Name())
76-
flagSet.PrintDefaults()
77-
fmt.Println(usage)
78-
}
79-
var (
80-
orgIDFlag = flagSet.String("id", "", `The ID of the organization to delete.`)
81-
apiFlags = api.NewFlags(flagSet)
82-
)
83-
84-
handler := func(args []string) error {
85-
if err := flagSet.Parse(args); err != nil {
86-
return err
87-
}
88-
89-
client := cfg.apiClient(apiFlags, flagSet.Output())
90-
91-
query := `mutation DeleteOrganization(
92-
$organization: ID!
93-
) {
94-
deleteOrganization(
95-
organization: $organization
96-
) {
97-
alwaysNil
98-
}
99-
}`
100-
101-
var result struct {
102-
DeleteOrganization struct{}
103-
}
104-
if ok, err := client.NewRequest(query, map[string]any{
105-
"organization": *orgIDFlag,
106-
}).Do(context.Background(), &result); err != nil || !ok {
107-
return err
108-
}
109-
110-
fmt.Printf("Organization with ID %q deleted.\n", *orgIDFlag)
111-
return nil
112-
}
113-
114-
// Register the command.
115-
orgsCommands = append(orgsCommands, &command{
116-
flagSet: flagSet,
117-
handler: handler,
118-
usageFunc: usageFunc,
119-
})
120-
}

‎cmd/src/orgs_get.go‎

Lines changed: 0 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ package main
22

33
import (
44
"context"
5-
"flag"
6-
"fmt"
75

8-
"github.com/sourcegraph/src-cli/internal/api"
96
"github.com/sourcegraph/src-cli/internal/clicompat"
107
"github.com/urfave/cli/v3"
118
)
@@ -73,60 +70,3 @@ var orgsGetCommand = clicompat.Wrap(&cli.Command{
7370
return execTemplate(tmpl, result.Organization)
7471
},
7572
})
76-
77-
func init() {
78-
usage := orgsGetExamples
79-
80-
flagSet := flag.NewFlagSet("get", flag.ExitOnError)
81-
usageFunc := func() {
82-
fmt.Fprintf(flag.CommandLine.Output(), "Usage of 'src orgs %s':\n", flagSet.Name())
83-
flagSet.PrintDefaults()
84-
fmt.Println(usage)
85-
}
86-
var (
87-
nameFlag = flagSet.String("name", "", `Look up organization by name. (e.g. "abc-org")`)
88-
formatFlag = flagSet.String("f", "{{.|json}}", `Format for the output, using the syntax of Go package text/template. (e.g. "{{.ID}}: {{.Name}} ({{.DisplayName}})")`)
89-
apiFlags = api.NewFlags(flagSet)
90-
)
91-
92-
handler := func(args []string) error {
93-
if err := flagSet.Parse(args); err != nil {
94-
return err
95-
}
96-
97-
client := cfg.apiClient(apiFlags, flagSet.Output())
98-
99-
tmpl, err := parseTemplate(*formatFlag)
100-
if err != nil {
101-
return err
102-
}
103-
104-
query := `query Organization(
105-
$name: String!,
106-
) {
107-
organization(
108-
name: $name
109-
) {
110-
...OrgFields
111-
}
112-
}` + orgFragment
113-
114-
var result struct {
115-
Organization *Org
116-
}
117-
if ok, err := client.NewRequest(query, map[string]any{
118-
"name": *nameFlag,
119-
}).Do(context.Background(), &result); err != nil || !ok {
120-
return err
121-
}
122-
123-
return execTemplate(tmpl, result.Organization)
124-
}
125-
126-
// Register the command.
127-
orgsCommands = append(orgsCommands, &command{
128-
flagSet: flagSet,
129-
handler: handler,
130-
usageFunc: usageFunc,
131-
})
132-
}

‎cmd/src/orgs_list.go‎

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package main
22

33
import (
44
"context"
5-
"flag"
6-
"fmt"
75

86
"github.com/sourcegraph/src-cli/internal/api"
97
"github.com/sourcegraph/src-cli/internal/clicompat"
@@ -91,73 +89,3 @@ var orgsListCommand = clicompat.Wrap(&cli.Command{
9189
return nil
9290
},
9391
})
94-
95-
func init() {
96-
usage := orgsListExamples
97-
98-
flagSet := flag.NewFlagSet("list", flag.ExitOnError)
99-
usageFunc := func() {
100-
fmt.Fprintf(flag.CommandLine.Output(), "Usage of 'src orgs %s':\n", flagSet.Name())
101-
flagSet.PrintDefaults()
102-
fmt.Println(usage)
103-
}
104-
var (
105-
firstFlag = flagSet.Int("first", 1000, "Returns the first n organizations from the list.")
106-
queryFlag = flagSet.String("query", "", `Returns organizations whose names match the query. (e.g. "alice")`)
107-
formatFlag = flagSet.String("f", "{{.Name}}", `Format for the output, using the syntax of Go package text/template. (e.g. "{{.ID}}: {{.Name}} ({{.DisplayName}})" or "{{.|json}}")`)
108-
apiFlags = api.NewFlags(flagSet)
109-
)
110-
111-
handler := func(args []string) error {
112-
if err := flagSet.Parse(args); err != nil {
113-
return err
114-
}
115-
116-
client := cfg.apiClient(apiFlags, flagSet.Output())
117-
118-
tmpl, err := parseTemplate(*formatFlag)
119-
if err != nil {
120-
return err
121-
}
122-
123-
query := `query Organizations(
124-
$first: Int,
125-
$query: String,
126-
) {
127-
organizations(
128-
first: $first,
129-
query: $query,
130-
) {
131-
nodes {
132-
...OrgFields
133-
}
134-
}
135-
}` + orgFragment
136-
137-
var result struct {
138-
Organizations struct {
139-
Nodes []Org
140-
}
141-
}
142-
if ok, err := client.NewRequest(query, map[string]any{
143-
"first": api.NullInt(*firstFlag),
144-
"query": api.NullString(*queryFlag),
145-
}).Do(context.Background(), &result); err != nil || !ok {
146-
return err
147-
}
148-
149-
for _, org := range result.Organizations.Nodes {
150-
if err := execTemplate(tmpl, org); err != nil {
151-
return err
152-
}
153-
}
154-
return nil
155-
}
156-
157-
// Register the command.
158-
orgsCommands = append(orgsCommands, &command{
159-
flagSet: flagSet,
160-
handler: handler,
161-
usageFunc: usageFunc,
162-
})
163-
}

‎cmd/src/orgs_members.go‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
package main
22

33
import (
4-
"flag"
5-
"fmt"
6-
74
"github.com/sourcegraph/src-cli/internal/clicompat"
85
"github.com/urfave/cli/v3"
96
)
107

11-
var orgsMembersCommands commander
12-
138
var orgsMembersCommand = clicompat.Wrap(&cli.Command{
149
Name: "members",
1510
Aliases: []string{"member"},
@@ -36,23 +31,3 @@ The commands are:
3631
3732
Use "src orgs members [command] -h" for more information about a command.
3833
`
39-
40-
func init() {
41-
usage := orgsMembersExamples
42-
43-
flagSet := flag.NewFlagSet("members", flag.ExitOnError)
44-
handler := func(args []string) error {
45-
orgsMembersCommands.run(flagSet, "src orgs members", usage, args)
46-
return nil
47-
}
48-
49-
// Register the command.
50-
orgsCommands = append(orgsCommands, &command{
51-
flagSet: flagSet,
52-
aliases: []string{"member"},
53-
handler: handler,
54-
usageFunc: func() {
55-
fmt.Println(usage)
56-
},
57-
})
58-
}

0 commit comments

Comments
 (0)