Skip to content

Commit b67454e

Browse files
committed
remove window option in open_in
1 parent 88a9c4b commit b67454e

File tree

8 files changed

+34
-43
lines changed

8 files changed

+34
-43
lines changed

coderd/provisionerdserver/provisionerdserver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2017,7 +2017,7 @@ func InsertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
20172017
switch app.OpenIn {
20182018
case sdkproto.AppOpenIn_TAB:
20192019
openIn = database.WorkspaceAppOpenInTab
2020-
case sdkproto.AppOpenIn_WINDOW:
2020+
case sdkproto.AppOpenIn_SLIM_WINDOW:
20212021
openIn = database.WorkspaceAppOpenInWindow
20222022
}
20232023

provisioner/terraform/provision.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func (s *server) Plan(
7878

7979
e := s.executor(sess.WorkDirectory, database.ProvisionerJobTimingStagePlan)
8080
if err := e.checkMinVersion(ctx); err != nil {
81-
return provisionersdk.PlanErrorf(err.Error())
81+
return provisionersdk.PlanErrorf("%s", err.Error())
8282
}
8383
logTerraformEnvVars(sess)
8484

@@ -168,7 +168,7 @@ func (s *server) Plan(
168168
request.Metadata.GetWorkspaceTransition() == proto.WorkspaceTransition_DESTROY,
169169
)
170170
if err != nil {
171-
return provisionersdk.PlanErrorf(err.Error())
171+
return provisionersdk.PlanErrorf("%s", err.Error())
172172
}
173173

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

190190
e := s.executor(sess.WorkDirectory, database.ProvisionerJobTimingStageApply)
191191
if err := e.checkMinVersion(ctx); err != nil {
192-
return provisionersdk.ApplyErrorf(err.Error())
192+
return provisionersdk.ApplyErrorf("%s", err.Error())
193193
}
194194
logTerraformEnvVars(sess)
195195

provisioner/terraform/resources.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,8 +437,6 @@ func ConvertState(ctx context.Context, modules []*tfjson.StateModule, rawGraph s
437437
switch strings.ToLower(attrs.OpenIn) {
438438
case "slim-window":
439439
openIn = proto.AppOpenIn_SLIM_WINDOW
440-
case "window":
441-
openIn = proto.AppOpenIn_WINDOW
442440
case "tab":
443441
openIn = proto.AppOpenIn_TAB
444442
}

provisioner/terraform/timings_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestTimingsFromProvision(t *testing.T) {
2828
// Given: a fake terraform bin that behaves as we expect it to.
2929
fakeBin := filepath.Join(cwd, "testdata", "timings-aggregation/fake-terraform.sh")
3030

31-
t.Logf(fakeBin)
31+
t.Log("%s", fakeBin)
3232

3333
ctx, api := setupProvisioner(t, &provisionerServeOptions{
3434
binaryPath: fakeBin,

provisionersdk/proto/provisioner.pb.go

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

provisionersdk/proto/provisioner.proto

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,8 @@ message Script {
164164
}
165165

166166
enum AppOpenIn {
167-
WINDOW = 0;
168-
SLIM_WINDOW = 1;
169-
TAB = 2;
167+
SLIM_WINDOW = 0;
168+
TAB = 1;
170169
}
171170

172171
// App represents a dev-accessible application on the workspace.

site/e2e/provisionerGenerated.ts

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

site/src/api/typesGenerated.ts

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

0 commit comments

Comments
 (0)