Skip to content

chore(coderd): remove the window option in open_in #16104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 15, 2025
Merged

chore(coderd): remove the window option in open_in #16104

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b67454e
remove window option in open_in
defelmnq Jan 13, 2025
ecfbdd1
revert test files gen
defelmnq Jan 13, 2025
14639cd
revert test files gen
defelmnq Jan 13, 2025
78c8051
make fmt
defelmnq Jan 13, 2025
1fd686d
add back field as deprecated
defelmnq Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
revert test files gen
  • Loading branch information
@defelmnq
defelmnq committed Jan 13, 2025
commit ecfbdd16ce793f4c024673c4a5c94e3b2f76f79c
2 changes: 1 addition & 1 deletion coderd/provisionerdserver/provisionerdserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2018,7 +2018,7 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
case sdkproto.AppOpenIn_TAB:
openIn = database.WorkspaceAppOpenInTab
case sdkproto.AppOpenIn_SLIM_WINDOW:
openIn = database.WorkspaceAppOpenInWindow
openIn = database.WorkspaceAppOpenInSlimWindow
}

dbApp, err := db.InsertWorkspaceApp(ctx, database.InsertWorkspaceAppParams{
Expand Down
6 changes: 3 additions & 3 deletions provisioner/terraform/provision.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ func (s *server) Plan(

e := s.executor(sess.WorkDirectory, database.ProvisionerJobTimingStagePlan)
if err := e.checkMinVersion(ctx); err != nil {
return provisionersdk.PlanErrorf("%s", err.Error())
return provisionersdk.PlanErrorf(err.Error())
}
logTerraformEnvVars(sess)

Expand Down Expand Up @@ -168,7 +168,7 @@ func (s *server) Plan(
request.Metadata.GetWorkspaceTransition() == proto.WorkspaceTransition_DESTROY,
)
if err != nil {
return provisionersdk.PlanErrorf("%s", err.Error())
return provisionersdk.PlanErrorf(err.Error())
}

// Prepend init timings since they occur prior to plan timings.
Expand All @@ -189,7 +189,7 @@ func (s *server) Apply(

e := s.executor(sess.WorkDirectory, database.ProvisionerJobTimingStageApply)
if err := e.checkMinVersion(ctx); err != nil {
return provisionersdk.ApplyErrorf("%s", err.Error())
return provisionersdk.ApplyErrorf(err.Error())
}
logTerraformEnvVars(sess)

Expand Down
2 changes: 1 addition & 1 deletion provisioner/terraform/timings_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func TestTimingsFromProvision(t *testing.T) {
// Given: a fake terraform bin that behaves as we expect it to.
fakeBin := filepath.Join(cwd, "testdata", "timings-aggregation/fake-terraform.sh")

t.Log("%s", fakeBin)
t.Logf(fakeBin)

ctx, api := setupProvisioner(t, &provisionerServeOptions{
binaryPath: fakeBin,
Expand Down
Loading