Skip to content

fix(enterprise/cli): correctly set default tags for PSK auth #9436

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 7 commits into from
Sep 1, 2023
Merged

fix(enterprise/cli): correctly set default tags for PSK auth #9436

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
95b51ed
fix(provisionerd): correctly mutate default tags for PSK auth
johnstcn Aug 30, 2023
4fda818
address PR comments
johnstcn Aug 30, 2023
79717aa
ignore error log in test
johnstcn Aug 30, 2023
89030f2
do not log context.Canceled errors
johnstcn Aug 31, 2023
3e1a94b
address PR comment
johnstcn Aug 31, 2023
34ef0a7
unconditionally set tag scope to org for psk auth
johnstcn Sep 1, 2023
475311a
cli: add some informational logging statements around provisionerd tags
johnstcn Sep 1, 2023
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
do not log context.Canceled errors
  • Loading branch information
@johnstcn
johnstcn committed Aug 31, 2023
commit 89030f2885c28706db2b9692e5806332587dac74
15 changes: 0 additions & 15 deletions enterprise/cli/provisionerdaemons_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ import (

"github.com/stretchr/testify/require"

"cdr.dev/slog/sloggers/slogtest"

"github.com/coder/coder/v2/cli/clitest"
"github.com/coder/coder/v2/coderd/coderdtest"
"github.com/coder/coder/v2/codersdk"
"github.com/coder/coder/v2/enterprise/coderd/coderdenttest"
"github.com/coder/coder/v2/enterprise/coderd/license"
Expand All @@ -20,13 +17,7 @@ import (
func TestProvisionerDaemon_PSK(t *testing.T) {
t.Parallel()

logger := slogtest.Make(t, &slogtest.Options{
IgnoreErrors: true,
})
client, _ := coderdenttest.New(t, &coderdenttest.Options{
Options: &coderdtest.Options{
Logger: &logger,
},
ProvisionerDaemonPSK: "provisionersftw",
LicenseOptions: &coderdenttest.LicenseOptions{
Features: license.Features{
Expand All @@ -47,13 +38,7 @@ func TestProvisionerDaemon_PSK(t *testing.T) {
func TestProvisionerDaemon_SessionToken(t *testing.T) {
t.Parallel()

logger := slogtest.Make(t, &slogtest.Options{
IgnoreErrors: true,
})
client, _ := coderdenttest.New(t, &coderdenttest.Options{
Options: &coderdtest.Options{
Logger: &logger,
},
ProvisionerDaemonPSK: "provisionersftw",
LicenseOptions: &coderdenttest.LicenseOptions{
Features: license.Features{
Expand Down
16 changes: 12 additions & 4 deletions enterprise/coderd/provisionerdaemons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,9 @@ func (api *API) provisionerDaemonServe(rw http.ResponseWriter, r *http.Request)
Tags: tags,
})
if err != nil {
log.Error(ctx, "write provisioner daemon", slog.Error(err))
if !xerrors.Is(err, context.Canceled) {
log.Error(ctx, "write provisioner daemon", slog.Error(err))
}
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Internal error writing provisioner daemon.",
Detail: err.Error(),
Expand All @@ -213,7 +215,9 @@ func (api *API) provisionerDaemonServe(rw http.ResponseWriter, r *http.Request)

rawTags, err := json.Marshal(daemon.Tags)
if err != nil {
log.Error(ctx, "marshal provisioner tags", slog.Error(err))
if !xerrors.Is(err, context.Canceled) {
log.Error(ctx, "marshal provisioner tags", slog.Error(err))
}
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Internal error marshaling daemon tags.",
Detail: err.Error(),
Expand All @@ -231,7 +235,9 @@ func (api *API) provisionerDaemonServe(rw http.ResponseWriter, r *http.Request)
CompressionMode: websocket.CompressionDisabled,
})
if err != nil {
log.Error(ctx, "accept provisioner websocket conn", slog.Error(err))
if !xerrors.Is(err, context.Canceled) {
log.Error(ctx, "accept provisioner websocket conn", slog.Error(err))
}
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Message: "Internal error accepting websocket connection.",
Detail: err.Error(),
Expand Down Expand Up @@ -277,7 +283,9 @@ func (api *API) provisionerDaemonServe(rw http.ResponseWriter, r *http.Request)
},
)
if err != nil {
log.Error(ctx, "create provisioner daemon server", slog.Error(err))
if !xerrors.Is(err, context.Canceled) {
log.Error(ctx, "create provisioner daemon server", slog.Error(err))
}
_ = conn.Close(websocket.StatusInternalError, httpapi.WebsocketCloseSprintf("create provisioner daemon server: %s", err))
return
}
Expand Down