Skip to content
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

Machine ID: TBOT_USE_PROXY_ADDR use "yes" vs "1" for consistency #48667

Merged
merged 2 commits into from
Nov 8, 2024
+2 −2
Merged

Machine ID: TBOT_USE_PROXY_ADDR use "yes" vs "1" for consistency #48667

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebef5d2
Prefer "yes" over "1" for historical consistency
strideynet Nov 8, 2024
832364d
Try and retrigger the CLA check with an empty commit
strideynet Nov 8, 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
4 changes: 2 additions & 2 deletions lib/tbot/tbot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,11 +777,11 @@ type proxyPingResponse struct {
const useProxyAddrEnv = "TBOT_USE_PROXY_ADDR"

// shouldUseProxyAddr returns true if the TBOT_USE_PROXY_ADDR environment
// variable is set to "1". More generally, this indicates that the user wishes
// variable is set to "yes". More generally, this indicates that the user wishes
// for tbot to prefer using the proxy address that has been explicitly provided
// by the user rather than the one fetched via a discovery process (e.g ping).
func shouldUseProxyAddr() bool {
return os.Getenv(useProxyAddrEnv) == "1"
return os.Getenv(useProxyAddrEnv) == "yes"
}

// proxyWebAddr returns the address to use to connect to the proxy web port.
Expand Down
Loading