10000 feat(cli): allow specifying name of provisioner daemon by johnstcn · Pull Request #11077 · coder/coder · GitHub
[go: up one dir, main page]
Skip to content

feat(cli): allow specifying name of provisioner daemon #11077

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 8 commits into from
Dec 7, 2023
Merged

feat(cli): allow specifying name of provisioner daemon #11077

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4c4ef62
feat(cli): allow specifying name of provisioner daemon
johnstcn Dec 7, 2023
9415b66
fixup! feat(cli): allow specifying name of provisioner daemon
johnstcn Dec 7, 2023
95970f9
address PR comments
johnstcn Dec 7, 2023
80e49ff
strip domain suffix of host
johnstcn Dec 7, 2023
6fdcec2
truncate inmem provisionerd name with a really long hostname
johnstcn Dec 7, 2023
80f71eb
extract stringutil.Truncate
johnstcn Dec 7, 2023
b9e7141
return localhost if os.Hostname() fails
johnstcn Dec 7, 2023
30e8e59
invert logic
johnstcn Dec 7, 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
fixup! feat(cli): allow specifying name of provisioner daemon
  • Loading branch information
@johnstcn
johnstcn committed Dec 7, 2023
commit 9415b6648bc16f2ca5cd12a517764f89bc64e249
1 change: 0 additions & 1 deletion docs/cli/provisionerd_start.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion enterprise/cli/provisionerdaemons.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ func (r *RootCmd) provisionerDaemonStart() *clibase.Cmd {
if len(name) > 64 {
return xerrors.Errorf("name cannot be greater than 64 characters in length")
}
if name == "" {
name = cliutil.Hostname()
}

logger := slog.Make(sloghuman.Sink(inv.Stderr))
if ok, _ := inv.ParsedFlags().GetBool("verbose"); ok {
Expand Down Expand Up @@ -217,7 +220,7 @@ func (r *RootCmd) provisionerDaemonStart() *clibase.Cmd {
Env: "CODER_PROVISIONER_DAEMON_NAME",
Description: "Name of this provisioner daemon. Defaults to the current hostname without FQDN.",
Value: clibase.StringOf(&name),
Default: cliutil.Hostname(),
Default: "",
},
}

Expand Down
2 changes: 1 addition & 1 deletion enterprise/cli/testdata/coder_provisionerd_start_--help.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ OPTIONS:
-c, --cache-dir string, $CODER_CACHE_DIRECTORY (default: [cache dir])
Directory to store cached data.

--name string, $CODER_PROVISIONER_DAEMON_NAME (default: ser6)
--name string, $CODER_PROVISIONER_DAEMON_NAME
Name of this provisioner daemon. Defaults to the current hostname
without FQDN.

Expand Down
0