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.

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

Conversation

johnstcn
Copy link
Member

@johnstcn johnstcn commented Aug 30, 2023

fixes #9235
fixes #9234

This PR fixes a bug in provisioner daemon authentication where a provisioner daemon run using --psk=whatever without explicitly specifying --tag scope=organization would fail to pick up any jobs.

Additionally, we were not respecting the global CODER_VERBOSE variable such that it was impossible to get debug logs from external provisioner daemons.

I also sprinkled in a few more logging statements that helped me troubleshoot the issue.

@johnstcn johnstcn self-assigned this Aug 30, 2023
@johnstcn johnstcn changed the title fix(provisionerd): correctly mutate default tags for PSK auth fix(enterprise/cli): correctly mutate default tags for PSK auth Aug 30, 2023
@@ -83,6 +83,9 @@ func (r *RootCmd) provisionerDaemonStart() *clibase.Cmd {
}()

logger := slog.Make(sloghuman.Sink(inv.Stderr))
if ok, _ := inv.ParsedFlags().GetBool("verbose"); ok {
logger = logger.Leveled(slog.LevelDebug)
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@johnstcn johnstcn changed the title fix(enterprise/cli): correctly mutate default tags for PSK auth fix(enterprise/cli): correctly set default tags for PSK auth Aug 31, 2023
@johnstcn johnstcn requested a review from spikecurtis August 31, 2023 10:04
@johnstcn johnstcn merged commit bc9fdd1 into main Sep 1, 2023
@johnstcn johnstcn deleted the cj/provisionerd-psk-tags branch September 1, 2023 09:37
@github-actions github-actions bot locked and limited conversation to collaborators Sep 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
3 participants