Skip to content

Commit 15acead

Browse files
EmyrkEmyrk
committed
Merge remote-tracking branch 'origin/main' into stevenmasley/skip_prompt
2 parents 9c09a08 + d72c45e commit 15acead

Some content is hidden

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

75 files changed

+970
-980
lines changed

‎.golangci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ linters-settings:
103103
settings:
104104
ruleguard:
105105
failOn: all
106-
rules: rules.go
106+
rules: '${configDir}/scripts/rules.go'
107107

108108
staticcheck:
109109
# https://staticcheck.io/docs/options#checks

‎agent/usershell/usershell_darwin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ package usershell
33
import "os"
44

55
// Get returns the $SHELL environment variable.
6-
func Get(username string) (string, error) {
6+
func Get(_ string) (string, error) {
77
return os.Getenv("SHELL"), nil
88
}

‎cli/autostop.go

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

‎cli/cliui/provisionerjob.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/google/uuid"
1313
"golang.org/x/xerrors"
1414

15-
"github.com/coder/coder/coderd/database"
1615
"github.com/coder/coder/codersdk"
1716
)
1817

@@ -165,16 +164,16 @@ func ProvisionerJob(ctx context.Context, writer io.Writer, opts ProvisionerJobOp
165164
}
166165
output := ""
167166
switch log.Level {
168-
case database.LogLevelTrace, database.LogLevelDebug:
167+
case codersdk.LogLevelTrace, codersdk.LogLevelDebug:
169168
if !opts.Verbose {
170169
continue
171170
}
172171
output = Styles.Placeholder.Render(log.Output)
173-
case database.LogLevelError:
172+
case codersdk.LogLevelError:
174173
output = defaultStyles.Error.Render(log.Output)
175-
case database.LogLevelWarn:
174+
case codersdk.LogLevelWarn:
176175
output = Styles.Warn.Render(log.Output)
177-
case database.LogLevelInfo:
176+
case codersdk.LogLevelInfo:
178177
output = log.Output
179178
}
180179
jobMutex.Lock()

‎cli/cliui/resources.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func WorkspaceResources(writer io.Writer, resources []codersdk.WorkspaceResource
4141
// Address on stop indexes whether a resource still exists when in the stopped transition.
4242
addressOnStop := map[string]codersdk.WorkspaceResource{}
4343
for _, resource := range resources {
44-
if resource.Transition != database.WorkspaceTransitionStop {
44+
if resource.Transition != codersdk.WorkspaceTransitionStop {
4545
continue
4646
}
4747
addressOnStop[resource.Type+"."+resource.Name] = resource

‎cli/cliui/resources_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestWorkspaceResources(t *testing.T) {
2222
err := cliui.WorkspaceResources(ptty.Output(), []codersdk.WorkspaceResource{{
2323
Type: "google_compute_instance",
2424
Name: "dev",
25-
Transition: database.WorkspaceTransitionStart,
25+
Transition: codersdk.WorkspaceTransitionStart,
2626
Agents: []codersdk.WorkspaceAgent{{
2727
Name: "dev",
2828
Status: codersdk.WorkspaceAgentConnected,
@@ -46,15 +46,15 @@ func TestWorkspaceResources(t *testing.T) {
4646
done := make(chan struct{})
4747
go func() {
4848
err := cliui.WorkspaceResources(ptty.Output(), []codersdk.WorkspaceResource{{
49-
Transition: database.WorkspaceTransitionStart,
49+
Transition: codersdk.WorkspaceTransitionStart,
5050
Type: "google_compute_disk",
5151
Name: "root",
5252
}, {
53-
Transition: database.WorkspaceTransitionStop,
53+
Transition: codersdk.WorkspaceTransitionStop,
5454
Type: "google_compute_disk",
5555
Name: "root",
5656
}, {
57-
Transition: database.WorkspaceTransitionStart,
57+
Transition: codersdk.WorkspaceTransitionStart,
5858
Type: "google_compute_instance",
5959
Name: "dev",
6060
Agents: []codersdk.WorkspaceAgent{{
@@ -65,7 +65,7 @@ func TestWorkspaceResources(t *testing.T) {
6565
Architecture: "amd64",
6666
}},
6767
}, {
68-
Transition: database.WorkspaceTransitionStart,
68+
Transition: codersdk.WorkspaceTransitionStart,
6969
Type: "kubernetes_pod",
7070
Name: "dev",
7171
Agents: []codersdk.WorkspaceAgent{{

‎cli/configssh.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515

1616
"github.com/coder/coder/cli/cliflag"
1717
"github.com/coder/coder/cli/cliui"
18-
"github.com/coder/coder/coderd/database"
1918
"github.com/coder/coder/codersdk"
2019
)
2120

@@ -86,7 +85,7 @@ func configSSH() *cobra.Command {
8685
return err
8786
}
8887
for _, resource := range resources {
89-
if resource.Transition != database.WorkspaceTransitionStart {
88+
if resource.Transition != codersdk.WorkspaceTransitionStart {
9089
continue
9190
}
9291
for _, agent := range resource.Agents {

‎cli/create.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010

1111
"github.com/coder/coder/cli/cliflag"
1212
"github.com/coder/coder/cli/cliui"
13-
"github.com/coder/coder/coderd/database"
1413
"github.com/coder/coder/codersdk"
1514
)
1615

@@ -134,8 +133,8 @@ func create() *cobra.Command {
134133
parameters = append(parameters, codersdk.CreateParameterRequest{
135134
Name: parameterSchema.Name,
136135
SourceValue: value,
137-
SourceScheme: database.ParameterSourceSchemeData,
138-
DestinationScheme: database.ParameterDestinationScheme(parameterSchema.DefaultDestinationScheme),
136+
SourceScheme: codersdk.ParameterSourceSchemeData,
137+
DestinationScheme: parameterSchema.DefaultDestinationScheme,
139138
})
140139
}
141140
_, _ = fmt.Fprintln(cmd.OutOrStdout())

‎cli/delete.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"github.com/spf13/cobra"
77

88
"github.com/coder/coder/cli/cliui"
9-
"github.com/coder/coder/coderd/database"
109
"github.com/coder/coder/codersdk"
1110
)
1211

@@ -41,7 +40,7 @@ func delete() *cobra.Command {
4140
}
4241
before := time.Now()
4342
build, err := client.CreateWorkspaceBuild(cmd.Context(), workspace.ID, codersdk.CreateWorkspaceBuildRequest{
44-
Transition: database.WorkspaceTransitionDelete,
43+
Transition: codersdk.WorkspaceTransitionDelete,
4544
})
4645
if err != nil {
4746
return err

‎cli/list.go

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111

1212
"github.com/coder/coder/cli/cliui"
1313
"github.com/coder/coder/coderd/autobuild/schedule"
14-
"github.com/coder/coder/coderd/database"
1514
"github.com/coder/coder/codersdk"
1615
)
1716

@@ -50,7 +49,7 @@ func list() *cobra.Command {
5049
}
5150

5251
tableWriter := cliui.Table()
53-
header := table.Row{"workspace", "template", "status", "last built", "outdated", "autostart", "autostop"}
52+
header := table.Row{"workspace", "template", "status", "last built", "outdated", "autostart", "ttl"}
5453
tableWriter.AppendHeader(header)
5554
tableWriter.SortBy([]table.SortBy{{
5655
Name: "workspace",
@@ -66,17 +65,17 @@ func list() *cobra.Command {
6665
}
6766

6867
switch workspace.LatestBuild.Transition {
69-
case database.WorkspaceTransitionStart:
68+
case codersdk.WorkspaceTransitionStart:
7069
status = "Running"
7170
if inProgress {
7271
status = "Starting"
7372
}
74-
case database.WorkspaceTransitionStop:
73+
case codersdk.WorkspaceTransitionStop:
7574
status = "Stopped"
7675
if inProgress {
7776
status = "Stopping"
7877
}
79-
case database.WorkspaceTransitionDelete:
78+
case codersdk.WorkspaceTransitionDelete:
8079
status = "Deleted"
8180
if inProgress {
8281
status = "Deleting"
@@ -117,10 +116,8 @@ func list() *cobra.Command {
117116
}
118117

119118
autostopDisplay := "-"
120-
if workspace.AutostopSchedule != "" {
121-
if sched, err := schedule.Weekly(workspace.AutostopSchedule); err == nil {
122-
autostopDisplay = sched.Cron()
123-
}
119+
if workspace.TTL != nil {
120+
autostopDisplay = workspace.TTL.String()
124121
}
125122

126123
user := usersByID[workspace.OwnerID]

‎cli/portforward.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818

1919
coderagent "github.com/coder/coder/agent"
2020
"github.com/coder/coder/cli/cliui"
21-
"github.com/coder/coder/coderd/database"
2221
"github.com/coder/coder/codersdk"
2322
)
2423

@@ -80,7 +79,7 @@ func portForward() *cobra.Command {
8079
if err != nil {
8180
return err
8281
}
83-
if workspace.LatestBuild.Transition != database.WorkspaceTransitionStart {
82+
if workspace.LatestBuild.Transition != codersdk.WorkspaceTransitionStart {
8483
return xerrors.New("workspace must be in start transition to port-forward")
8584
}
8685
if workspace.LatestBuild.Job.CompletedAt == nil {

‎cli/root.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ func Root() *cobra.Command {
6262

6363
cmd.AddCommand(
6464
autostart(),
65-
autostop(),
6665
configSSH(),
6766
create(),
6867
delete(),
@@ -78,6 +77,7 @@ func Root() *cobra.Command {
7877
stop(),
7978
ssh(),
8079
templates(),
80+
ttl(),
8181
update(),
8282
users(),
8383
portForward(),

0 commit comments

Comments
 (0)