Skip to content

Commit d6d9dac

Browse files
mtojekmtojek
committed
Merge branch 'main' into 8128-new-user-state-dormant
2 parents e63f7a8 + dfb1a1d commit d6d9dac

File tree

86 files changed

+1616
-857
lines changed

Some content is hidden

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

86 files changed

+1616
-857
lines changed

‎cli/portforward.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func (r *RootCmd) portForward() *clibase.Cmd {
3232
client := new(codersdk.Client)
3333
cmd := &clibase.Cmd{
3434
Use: "port-forward <workspace>",
35-
Short: `Forward ports from a workspace to the local machine. Forward ports from a workspace to the local machine. For reverse port forwarding, use "coder ssh -R".`,
35+
Short: `Forward ports from a workspace to the local machine. For reverse port forwarding, use "coder ssh -R".`,
3636
Aliases: []string{"tunnel"},
3737
Long: formatExamples(
3838
example{

‎cli/templatecreate.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,11 @@ func (r *RootCmd) templateCreate() *clibase.Cmd {
170170
Description: "Specify a set of values for Terraform-managed variables.",
171171
Value: clibase.StringArrayOf(&variables),
172172
},
173+
{
174+
Flag: "var",
175+
Description: "Alias of --variable.",
176+
Value: clibase.StringArrayOf(&variables),
177+
},
173178
{
174179
Flag: "provisioner-tag",
175180
Description: "Specify a set of tags to target provisioner daemons.",

‎cli/templateedit_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestTemplateEdit(t *testing.T) {
4040
name := "new-template-name"
4141
displayName := "New Display Name 789"
4242
desc := "lorem ipsum dolor sit amet et cetera"
43-
icon := "/icons/new-icon.png"
43+
icon := "/icon/new-icon.png"
4444
defaultTTL := 12 * time.Hour
4545
allowUserCancelWorkspaceJobs := false
4646

@@ -168,7 +168,7 @@ func TestTemplateEdit(t *testing.T) {
168168
// Test the cli command.
169169
displayName := "New Display Name 789"
170170
description := "New Description ABC"
171-
icon := "/icons/new-icon.png"
171+
icon := "/icon/new-icon.png"
172172
cmdArgs := []string{
173173
"templates",
174174
"edit",

‎cli/templatepush.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,11 @@ func (r *RootCmd) templatePush() *clibase.Cmd {
291291
Description: "Specify a set of values for Terraform-managed variables.",
292292
Value: clibase.StringArrayOf(&variables),
293293
},
294+
{
295+
Flag: "var",
296+
Description: "Alias of --variable.",
297+
Value: clibase.StringArrayOf(&variables),
298+
},
294299
{
295300
Flag: "provisioner-tag",
296301
Description: "Specify a set of tags to target provisioner daemons.",

‎cli/testdata/coder_--help.golden

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ Coder v0.0.0-devel — A tool for provisioning self-hosted development environme
2121
logout Unauthenticate your local session
2222
netcheck Print network debug information for DERP and STUN
2323
ping Ping a workspace
24-
port-forward Forward ports from a workspace to the local machine.
25-
Forward ports from a workspace to the local machine. For
24+
port-forward Forward ports from a workspace to the local machine. For
2625
reverse port forwarding, use "coder ssh -R".
2726
publickey Output your Coder public key used for Git operations
2827
rename Rename a workspace

‎cli/testdata/coder_port-forward_--help.golden

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Usage: coder port-forward [flags] <workspace>
22

3-
Forward ports from a workspace to the local machine. Forward ports from a
4-
workspace to the local machine. For reverse port forwarding, use "coder ssh -R".
3+
Forward ports from a workspace to the local machine. For reverse port
4+
forwarding, use "coder ssh -R".
55

66
Aliases: tunnel
77

‎cli/testdata/coder_templates_create_--help.golden

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ Create a template from the current directory or as specified by flag
3434
--provisioner-tag string-array
3535
Specify a set of tags to target provisioner daemons.
3636

37+
--var string-array
38+
Alias of --variable.
39+
3740
--variable string-array
3841
Specify a set of values for Terraform-managed variables.
3942

‎cli/testdata/coder_templates_push_--help.golden

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ Push a new template version from the current directory or as specified by flag
3232
--provisioner-tag string-array
3333
Specify a set of tags to target provisioner daemons.
3434

35+
--var string-array
36+
Alias of --variable.
37+
3538
--variable string-array
3639
Specify a set of values for Terraform-managed variables.
3740

‎coderd/activitybump.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func activityBumpWorkspace(ctx context.Context, log slog.Logger, db database.Sto
7474
newDeadline = build.MaxDeadline
7575
}
7676

77-
if _, err := s.UpdateWorkspaceBuildByID(ctx, database.UpdateWorkspaceBuildByIDParams{
77+
if err := s.UpdateWorkspaceBuildByID(ctx, database.UpdateWorkspaceBuildByIDParams{
7878
ID: build.ID,
7979
UpdatedAt: database.Now(),
8080
ProvisionerState: build.ProvisionerState,

‎coderd/activitybump_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ func TestWorkspaceActivityBump(t *testing.T) {
9292
dbBuild, err := db.GetWorkspaceBuildByID(ctx, workspace.LatestBuild.ID)
9393
require.NoError(t, err)
9494

95-
_, err = db.UpdateWorkspaceBuildByID(ctx, database.UpdateWorkspaceBuildByIDParams{
95+
err = db.UpdateWorkspaceBuildByID(ctx, database.UpdateWorkspaceBuildByIDParams{
9696
ID: workspace.LatestBuild.ID,
9797
UpdatedAt: database.Now(),
9898
ProvisionerState: dbBuild.ProvisionerState,

‎coderd/apidoc/docs.go

Lines changed: 25 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 22 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1839,23 +1839,23 @@ func (q *querier) InsertTemplate(ctx context.Context, arg database.InsertTemplat
18391839
return q.db.InsertTemplate(ctx, arg)
18401840
}
18411841

1842-
func (q *querier) InsertTemplateVersion(ctx context.Context, arg database.InsertTemplateVersionParams) (database.TemplateVersion, error) {
1842+
func (q *querier) InsertTemplateVersion(ctx context.Context, arg database.InsertTemplateVersionParams) error {
18431843
if !arg.TemplateID.Valid {
18441844
// Making a new template version is the same permission as creating a new template.
18451845
err := q.authorizeContext(ctx, rbac.ActionCreate, rbac.ResourceTemplate.InOrg(arg.OrganizationID))
18461846
if err != nil {
1847-
return database.TemplateVersion{}, err
1847+
return err
18481848
}
18491849
} else {
18501850
// Must do an authorized fetch to prevent leaking template ids this way.
18511851
tpl, err := q.GetTemplateByID(ctx, arg.TemplateID.UUID)
18521852
if err != nil {
1853-
return database.TemplateVersion{}, err
1853+
return err
18541854
}
18551855
// Check the create permission on the template.
18561856
err = q.authorizeContext(ctx, rbac.ActionCreate, tpl)
18571857
if err != nil {
1858-
return database.TemplateVersion{}, err
1858+
return err
18591859
}
18601860
}
18611861

@@ -1954,10 +1954,10 @@ func (q *querier) InsertWorkspaceApp(ctx context.Context, arg database.InsertWor
19541954
return q.db.InsertWorkspaceApp(ctx, arg)
19551955
}
19561956

1957-
func (q *querier) InsertWorkspaceBuild(ctx context.Context, arg database.InsertWorkspaceBuildParams) (database.WorkspaceBuild, error) {
1957+
func (q *querier) InsertWorkspaceBuild(ctx context.Context, arg database.InsertWorkspaceBuildParams) error {
19581958
w, err := q.db.GetWorkspaceByID(ctx, arg.WorkspaceID)
19591959
if err != nil {
1960-
return database.WorkspaceBuild{}, err
1960+
return err
19611961
}
19621962

19631963
var action rbac.Action = rbac.ActionUpdate
@@ -1966,7 +1966,7 @@ func (q *querier) InsertWorkspaceBuild(ctx context.Context, arg database.InsertW
19661966
}
19671967

19681968
if err = q.authorizeContext(ctx, action, w.WorkspaceBuildRBAC(arg.Transition)); err != nil {
1969-
return database.WorkspaceBuild{}, err
1969+
return err
19701970
}
19711971

19721972
return q.db.InsertWorkspaceBuild(ctx, arg)
@@ -2195,24 +2195,24 @@ func (q *querier) UpdateTemplateScheduleByID(ctx context.Context, arg database.U
21952195
return update(q.log, q.auth, fetch, q.db.UpdateTemplateScheduleByID)(ctx, arg)
21962196
}
21972197

2198-
func (q *querier) UpdateTemplateVersionByID(ctx context.Context, arg database.UpdateTemplateVersionByIDParams) (database.TemplateVersion, error) {
2198+
func (q *querier) UpdateTemplateVersionByID(ctx context.Context, arg database.UpdateTemplateVersionByIDParams) error {
21992199
// An actor is allowed to update the template version if they are authorized to update the template.
22002200
tv, err := q.db.GetTemplateVersionByID(ctx, arg.ID)
22012201
if err != nil {
2202-
return database.TemplateVersion{}, err
2202+
return err
22032203
}
22042204
var obj rbac.Objecter
22052205
if !tv.TemplateID.Valid {
22062206
obj = rbac.ResourceTemplate.InOrg(tv.OrganizationID)
22072207
} else {
22082208
tpl, err := q.db.GetTemplateByID(ctx, tv.TemplateID.UUID)
22092209
if err != nil {
2210-
return database.TemplateVersion{}, err
2210+
return err
22112211
}
22122212
obj = tpl
22132213
}
22142214
if err := q.authorizeContext(ctx, rbac.ActionUpdate, obj); err != nil {
2215-
return database.TemplateVersion{}, err
2215+
return err
22162216
}
22172217
return q.db.UpdateTemplateVersionByID(ctx, arg)
22182218
}
@@ -2468,28 +2468,28 @@ func (q *querier) UpdateWorkspaceAutostart(ctx context.Context, arg database.Upd
24682468
return update(q.log, q.auth, fetch, q.db.UpdateWorkspaceAutostart)(ctx, arg)
24692469
}
24702470

2471-
func (q *querier) UpdateWorkspaceBuildByID(ctx context.Context, arg database.UpdateWorkspaceBuildByIDParams) (database.WorkspaceBuild, error) {
2471+
func (q *querier) UpdateWorkspaceBuildByID(ctx context.Context, arg database.UpdateWorkspaceBuildByIDParams) error {
24722472
build, err := q.db.GetWorkspaceBuildByID(ctx, arg.ID)
24732473
if err != nil {
2474-
return database.WorkspaceBuild{}, err
2474+
return err
24752475
}
24762476

24772477
workspace, err := q.db.GetWorkspaceByID(ctx, build.WorkspaceID)
24782478
if err != nil {
2479-
return database.WorkspaceBuild{}, err
2479+
return err
24802480
}
24812481
err = q.authorizeContext(ctx, rbac.ActionUpdate, workspace.RBACObject())
24822482
if err != nil {
2483-
return database.WorkspaceBuild{}, err
2483+
return err
24842484
}
24852485

24862486
return q.db.UpdateWorkspaceBuildByID(ctx, arg)
24872487
}
24882488

24892489
// UpdateWorkspaceBuildCostByID is used by the provisioning system to update the cost of a workspace build.
2490-
func (q *querier) UpdateWorkspaceBuildCostByID(ctx context.Context, arg database.UpdateWorkspaceBuildCostByIDParams) (database.WorkspaceBuild, error) {
2490+
func (q *querier) UpdateWorkspaceBuildCostByID(ctx context.Context, arg database.UpdateWorkspaceBuildCostByIDParams) error {
24912491
if err := q.authorizeContext(ctx, rbac.ActionUpdate, rbac.ResourceSystem); err != nil {
2492-
return database.WorkspaceBuild{}, err
2492+
return err
24932493
}
24942494
return q.db.UpdateWorkspaceBuildCostByID(ctx, arg)
24952495
}

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ func (s *MethodTestSuite) TestTemplate() {
810810
TemplateID: uuid.NullUUID{UUID: t1.ID, Valid: true},
811811
Name: tv.Name,
812812
UpdatedAt: tv.UpdatedAt,
813-
}).Asserts(t1, rbac.ActionUpdate).Returns(tv)
813+
}).Asserts(t1, rbac.ActionUpdate)
814814
}))
815815
s.Run("UpdateTemplateVersionDescriptionByJobID", s.Subtest(func(db database.Store, check *expects) {
816816
jobID := uuid.New()
@@ -1242,7 +1242,7 @@ func (s *MethodTestSuite) TestWorkspace() {
12421242
UpdatedAt: build.UpdatedAt,
12431243
Deadline: build.Deadline,
12441244
ProvisionerState: []byte{},
1245-
}).Asserts(ws, rbac.ActionUpdate).Returns(build)
1245+
}).Asserts(ws, rbac.ActionUpdate)
12461246
}))
12471247
s.Run("SoftDeleteWorkspaceByID", s.Subtest(func(db database.Store, check *expects) {
12481248
ws := dbgen.Workspace(s.T(), db, database.Workspace{})
@@ -1377,7 +1377,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
13771377
check.Args(database.UpdateWorkspaceBuildCostByIDParams{
13781378
ID: b.ID,
13791379
DailyCost: 10,
1380-
}).Asserts(rbac.ResourceSystem, rbac.ActionUpdate).Returns(o)
1380+
}).Asserts(rbac.ResourceSystem, rbac.ActionUpdate)
13811381
}))
13821382
s.Run("UpsertLastUpdateCheck", s.Subtest(func(db database.Store, check *expects) {
13831383
check.Args("value").Asserts(rbac.ResourceSystem, rbac.ActionUpdate)

0 commit comments

Comments
 (0)