Dec 9, 2023 · Dec 9, 2023 · Dec 9, 2023
diff --git a/cli/restart.go b/cli/restart.go
 build, err = client.CreateWorkspaceBuild(ctx, workspace.ID, startReq)
 // It's possible for a workspace build to fail due to the template requiring starting
 // workspaces with the active version.
 if cerr, ok := codersdk.AsError(err); ok && cerr.StatusCode() == http.StatusUnauthorized {
 if cerr, ok := codersdk.AsError(err); ok && cerr.StatusCode() == http.StatusForbidden {
 _, _ = fmt.Fprintln(inv.Stdout, "Failed to restart with the template version from your last build. Policy may require you to restart with the current active template version.")
 build, err = startWorkspace(inv, client, workspace, parameterFlags, WorkspaceUpdate)
 if err != nil {
diff --git a/cli/ssh.go b/cli/ssh.go
 "sync"
 "time"

 "github.com/coder/retry"
 "github.com/gen2brain/beeep"
 "github.com/gofrs/flock"
 "github.com/google/uuid"
 "golang.org/x/xerrors"
 "gvisor.dev/gvisor/pkg/tcpip/adapters/gonet"

 "github.com/coder/retry"

 "cdr.dev/slog"
 "cdr.dev/slog/sloggers/sloghuman"

diff --git a/cli/start.go b/cli/start.go
 build, err := startWorkspace(inv, client, workspace, parameterFlags, WorkspaceStart)
 // It's possible for a workspace build to fail due to the template requiring starting
 // workspaces with the active version.
 if cerr, ok := codersdk.AsError(err); ok && cerr.StatusCode() == http.StatusUnauthorized {
 if cerr, ok := codersdk.AsError(err); ok && cerr.StatusCode() == http.StatusForbidden {
 _, _ = fmt.Fprintln(inv.Stdout, "Failed to restart with the template version from your last build. Policy may require you to restart with the current active template version.")
 build, err = startWorkspace(inv, client, workspace, parameterFlags, WorkspaceUpdate)
 if err != nil {
diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go
 if xerrors.As(err, &buildErr) {
 var authErr dbauthz.NotAuthorizedError
 if xerrors.As(err, &authErr) {
 buildErr.Status = http.StatusUnauthorized
 buildErr.Status = http.StatusForbidden
 }

 if buildErr.Status == http.StatusInternalServerError {
diff --git a/coderd/wsbuilder/wsbuilder.go b/coderd/wsbuilder/wsbuilder.go
 if err != nil {
 code := http.StatusInternalServerError
 if rbac.IsUnauthorizedError(err) {
 code = http.StatusUnauthorized
 code = http.StatusForbidden
 }
 return BuildError{code, "insert workspace build", err}
 }
diff --git a/enterprise/coderd/workspacebuilds_test.go b/enterprise/coderd/workspacebuilds_test.go
 {
 Name:               "MemberFails",
 Client:             memberClient,
 ExpectedStatusCode: http.StatusUnauthorized,
 ExpectedStatusCode: http.StatusForbidden,
 },
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -63,7 +63,7 @@ func (r RootCmd) restart() clibase.Cmd {
		build, err = client.CreateWorkspaceBuild(ctx, workspace.ID, startReq)
		// It's possible for a workspace build to fail due to the template requiring starting
		// workspaces with the active version.
		if cerr, ok := codersdk.AsError(err); ok && cerr.StatusCode() == http.StatusUnauthorized {
		if cerr, ok := codersdk.AsError(err); ok && cerr.StatusCode() == http.StatusForbidden {
		_, _ = fmt.Fprintln(inv.Stdout, "Failed to restart with the template version from your last build. Policy may require you to restart with the current active template version.")
		build, err = startWorkspace(inv, client, workspace, parameterFlags, WorkspaceUpdate)
		if err != nil {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,7 +14,6 @@ import (
		"sync"
		"time"

		"github.com/coder/retry"
		"github.com/gen2brain/beeep"
		"github.com/gofrs/flock"
		"github.com/google/uuid"
Expand All		@@ -25,6 +24,8 @@ import (
		"golang.org/x/xerrors"
		"gvisor.dev/gvisor/pkg/tcpip/adapters/gonet"

		"github.com/coder/retry"

		"cdr.dev/slog"
		"cdr.dev/slog/sloggers/sloghuman"

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -34,7 +34,7 @@ func (r RootCmd) start() clibase.Cmd {
		build, err := startWorkspace(inv, client, workspace, parameterFlags, WorkspaceStart)
		// It's possible for a workspace build to fail due to the template requiring starting
		// workspaces with the active version.
		if cerr, ok := codersdk.AsError(err); ok && cerr.StatusCode() == http.StatusUnauthorized {
		if cerr, ok := codersdk.AsError(err); ok && cerr.StatusCode() == http.StatusForbidden {
		_, _ = fmt.Fprintln(inv.Stdout, "Failed to restart with the template version from your last build. Policy may require you to restart with the current active template version.")
		build, err = startWorkspace(inv, client, workspace, parameterFlags, WorkspaceUpdate)
		if err != nil {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -379,7 +379,7 @@ func (api API) postWorkspaceBuilds(rw http.ResponseWriter, r http.Request) {
		if xerrors.As(err, &buildErr) {
		var authErr dbauthz.NotAuthorizedError
		if xerrors.As(err, &authErr) {
		buildErr.Status = http.StatusUnauthorized
		buildErr.Status = http.StatusForbidden
		}

		if buildErr.Status == http.StatusInternalServerError {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -353,7 +353,7 @@ func (b *Builder) buildTx(authFunc func(action rbac.Action, object rbac.Objecter
		if err != nil {
		code := http.StatusInternalServerError
		if rbac.IsUnauthorizedError(err) {
		code = http.StatusUnauthorized
		code = http.StatusForbidden
		}
		return BuildError{code, "insert workspace build", err}
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -103,7 +103,7 @@ func TestWorkspaceBuild(t *testing.T) {
		{
		Name: "MemberFails",
		Client: memberClient,
		ExpectedStatusCode: http.StatusUnauthorized,
		ExpectedStatusCode: http.StatusForbidden,
		},
		}

Expand Down