Skip to content

Commit 29759d1

Browse files
spikecurtisspikecurtis
committed
Merge branch 'main' of github.com:coder/coder into spike/contributor
2 parents cb3b7c4 + e8e4cf9 commit 29759d1

68 files changed

Lines changed: 1475 additions & 798 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ site/out/index.html: $(shell find ./site -not -path './site/node_modules/*' -typ
8383
# Restores GITKEEP files!
8484
git checkout HEAD site/out
8585

86-
site/src/api/typesGenerated.ts: $(shell find codersdk -type f -name '*.go')
86+
site/src/api/typesGenerated.ts: scripts/apitypings/main.go $(shell find codersdk -type f -name '*.go')
8787
go run scripts/apitypings/main.go > site/src/api/typesGenerated.ts
8888
cd site && yarn run format:types
8989

‎cli/autostart.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@ The default schedule is at 09:00 in your local timezone (TZ env, UTC by default)
1818

1919
func autostart() *cobra.Command {
2020
autostartCmd := &cobra.Command{
21-
Use: "autostart enable <workspace>",
22-
Short: "schedule a workspace to automatically start at a regular time",
23-
Long: autostartDescriptionLong,
24-
Example: "coder autostart enable my-workspace --minute 30 --hour 9 --days 1-5 --tz Europe/Dublin",
25-
Hidden: true,
21+
Annotations: workspaceCommand,
22+
Use: "autostart enable <workspace>",
23+
Short: "schedule a workspace to automatically start at a regular time",
24+
Long: autostartDescriptionLong,
25+
Example: "coder autostart enable my-workspace --minute 30 --hour 9 --days 1-5 --tz Europe/Dublin",
26+
Hidden: true,
2627
}
2728

2829
autostartCmd.AddCommand(autostartEnable())

‎cli/configssh.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ func configSSH() *cobra.Command {
3636
skipProxyCommand bool
3737
)
3838
cmd := &cobra.Command{
39-
Use: "config-ssh",
39+
Annotations: workspaceCommand,
40+
Use: "config-ssh",
41+
Short: "Populate your SSH config with Host entries for all of your workspaces",
4042
RunE: func(cmd *cobra.Command, args []string) error {
4143
client, err := createClient(cmd)
4244
if err != nil {

‎cli/create.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ func create() *cobra.Command {
2020
templateName string
2121
)
2222
cmd := &cobra.Command{
23-
Use: "create [name]",
24-
Short: "Create a workspace from a template",
23+
Annotations: workspaceCommand,
24+
Use: "create [name]",
25+
Short: "Create a workspace from a template",
2526
RunE: func(cmd *cobra.Command, args []string) error {
2627
client, err := createClient(cmd)
2728
if err != nil {

‎cli/delete.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ import (
1313
// nolint
1414
func delete() *cobra.Command {
1515
return &cobra.Command{
16-
Use: "delete <workspace>",
17-
Aliases: []string{"rm"},
18-
Args: cobra.ExactArgs(1),
16+
Annotations: workspaceCommand,
17+
Use: "delete <workspace>",
18+
Short: "Delete a workspace",
19+
Aliases: []string{"rm"},
20+
Args: cobra.ExactArgs(1),
1921
RunE: func(cmd *cobra.Command, args []string) error {
2022
client, err := createClient(cmd)
2123
if err != nil {

‎cli/list.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ import (
1313

1414
func list() *cobra.Command {
1515
return &cobra.Command{
16-
Use: "list",
17-
Aliases: []string{"ls"},
16+
Annotations: workspaceCommand,
17+
Use: "list",
18+
Short: "List all workspaces",
19+
Aliases: []string{"ls"},
1820
RunE: func(cmd *cobra.Command, args []string) error {
1921
client, err := createClient(cmd)
2022
if err != nil {

‎cli/login.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ func init() {
3737

3838
func login() *cobra.Command {
3939
return &cobra.Command{
40-
Use: "login <url>",
41-
Args: cobra.ExactArgs(1),
40+
Use: "login <url>",
41+
Short: "Authenticate with a Coder deployment",
42+
Args: cobra.ExactArgs(1),
4243
RunE: func(cmd *cobra.Command, args []string) error {
4344
rawURL := args[0]
4445

‎cli/parametercreate.go‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎cli/parameterdelete.go‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎cli/parameterlist.go‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)