Skip to content

feat: add --key flag to provisionerd start #14002

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
Jul 25, 2024
Merged

feat: add --key flag to provisionerd start #14002

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f4f1b1b
feat: add --key flag to provisionerd start
f0ssel Jul 24, 2024
47aa9c4
tests
f0ssel Jul 25, 2024
aa314a3
fix test
f0ssel Jul 25, 2024
7b83b7e
more tests
f0ssel Jul 25, 2024
727abcd
restrict route
f0ssel Jul 25, 2024
e54e662
fix tags with key flag
f0ssel Jul 25, 2024
10b09ed
fix tags with key flag
f0ssel Jul 25, 2024
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
fix tags with key flag
  • Loading branch information
@f0ssel
f0ssel committed Jul 25, 2024
commit e54e662b83e4117986ac6db261e641a9f5b92af7
7 changes: 6 additions & 1 deletion enterprise/cli/provisionerdaemonstart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,14 @@ func (r *RootCmd) provisionerDaemonStart() *serpent.Command {
// When authorizing with a PSK / provisioner key, we automatically scope the provisionerd
// to organization. Scoping to user with PSK / provisioner key auth is not a valid configuration.
if preSharedKey != "" || provisionerKey != "" {
logger.Info(ctx, "psk or provisioner key auth automatically sets tag "+provisionersdk.TagScope+"="+provisionersdk.ScopeOrganization)
logger.Info(ctx, "psk automatically sets tag "+provisionersdk.TagScope+"="+provisionersdk.ScopeOrganization)
tags[provisionersdk.TagScope] = provisionersdk.ScopeOrganization
}
if provisionerKey != "" {
logger.Info(ctx, "provisioner key auth automatically sets tag "+provisionersdk.TagScope+" empty")
// no scope tag will default to org scope
delete(tags, provisionersdk.TagScope)
}
Comment on lines +160 to +164
Copy link
Member

Choose a reason for hiding this comment

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

Is this because it's all done on coderd? And we should be passing no tags into the provisioner daemon?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Correct, the API will actually fail if you pass any tags + a provisioner key. I felt this was a good opportunity to break that behavior altogether.


err = os.MkdirAll(cacheDir, 0o700)
if err != nil {
Expand Down
Loading