Skip to content

Commit b25a3f4

Browse files
JoshVeeJoshVee
committed
chore: remove custom flag
1 parent bbcc4a9 commit b25a3f4

File tree

3 files changed

+23
-62
lines changed

3 files changed

+23
-62
lines changed

‎cli/root.go

+20-59
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,17 @@ var (
4646
)
4747

4848
const (
49-
varURL = "url"
50-
varToken = "token"
51-
varAgentToken = "agent-token"
52-
varAgentURL = "agent-url"
53-
varHeader = "header"
54-
varDerpHeader = "derp-header"
55-
varDerpHeaderUseDefault = "derp-header-use-default"
56-
varNoOpen = "no-open"
57-
varNoVersionCheck = "no-version-warning"
58-
varNoFeatureWarning = "no-feature-warning"
59-
varForceTty = "force-tty"
60-
varVerbose = "verbose"
61-
notLoggedInMessage = "You are not logged in. Try logging in using 'coder login <url>'."
49+
varURL = "url"
50+
varToken = "token"
51+
varAgentToken = "agent-token"
52+
varAgentURL = "agent-url"
53+
varHeader = "header"
54+
varNoOpen = "no-open"
55+
varNoVersionCheck = "no-version-warning"
56+
varNoFeatureWarning = "no-feature-warning"
57+
varForceTty = "force-tty"
58+
varVerbose = "verbose"
59+
notLoggedInMessage = "You are not logged in. Try logging in using 'coder login <url>'."
6260

6361
envNoVersionCheck = "CODER_NO_VERSION_WARNING"
6462
envNoFeatureWarning = "CODER_NO_FEATURE_WARNING"
@@ -172,8 +170,6 @@ func Root(subcommands []*cobra.Command) *cobra.Command {
172170
_ = cmd.PersistentFlags().MarkHidden(varAgentURL)
173171
cliflag.String(cmd.PersistentFlags(), config.FlagName, "", "CODER_CONFIG_DIR", config.DefaultDir(), "Path to the global `coder` config directory.")
174172
cliflag.StringArray(cmd.PersistentFlags(), varHeader, "", "CODER_HEADER", []string{}, "HTTP headers added to all requests. Provide as \"Key=Value\"")
175-
cliflag.StringArray(cmd.PersistentFlags(), varDerpHeader, "", "CODER_DERP_HEADER", []string{}, "HTTP headers added to all DERP requests. Provide as \"Key=Value\"")
176-
cliflag.Bool(cmd.PersistentFlags(), varDerpHeaderUseDefault, "", "CODER_DERP_HEADER_USE_DEFAULT", false, "Use default HTTP headers for all DERP requests.")
177173
cmd.PersistentFlags().Bool(varForceTty, false, "Force the `coder` command to run as if connected to a TTY.")
178174
_ = cmd.PersistentFlags().MarkHidden(varForceTty)
179175
cmd.PersistentFlags().Bool(varNoOpen, false, "Block automatically opening URLs in the browser.")
@@ -336,63 +332,28 @@ func createUnauthenticatedClient(cmd *cobra.Command, serverURL *url.URL) (*coder
336332
if err != nil {
337333
return nil, err
338334
}
339-
340-
headerMap, err := parseHeaderString(headers)
341-
if err != nil {
342-
return nil, err
343-
}
344-
345335
transport := &headerTransport{
346336
transport: http.DefaultTransport,
347-
headers: headerMap,
337+
headers: map[string]string{},
348338
}
349-
350-
client.HTTPClient.Transport = transport
351-
352-
derpHeaders, err := cmd.Flags().GetStringArray(varDerpHeader)
353-
if err != nil {
354-
return nil, err
355-
}
356-
357-
derpHeaderMap, err := parseHeaderString(derpHeaders)
358-
if err != nil {
359-
return nil, err
339+
for _, header := range headers {
340+
parts := strings.SplitN(header, "=", 2)
341+
if len(parts) < 2 {
342+
return nil, xerrors.Errorf("split header %q had less than two parts", header)
343+
}
344+
transport.headers[parts[0]] = parts[1]
360345
}
361346

347+
client.HTTPClient.Transport = transport
362348
client.DERPHeader = &http.Header{}
363349

364-
derpHeadersUseDefault, err := cmd.Flags().GetBool(varDerpHeaderUseDefault)
365-
if err != nil {
366-
return nil, err
367-
}
368-
369-
if derpHeadersUseDefault {
370-
for header, value := range headerMap {
371-
client.DERPHeader.Set(header, value)
372-
}
373-
}
374-
375-
for header, value := range derpHeaderMap {
350+
for header, value := range transport.headers {
376351
client.DERPHeader.Set(header, value)
377352
}
378353

379354
return client, nil
380355
}
381356

382-
func parseHeaderString(headers []string) (map[string]string, error) {
383-
headerMap := map[string]string{}
384-
385-
for _, header := range headers {
386-
parts := strings.SplitN(header, "=", 2)
387-
if len(parts) < 2 {
388-
return nil, xerrors.Errorf("split header %q had less than two parts", header)
389-
}
390-
headerMap[parts[0]] = parts[1]
391-
}
392-
393-
return headerMap, nil
394-
}
395-
396357
// createAgentClient returns a new client from the command context.
397358
// It works just like CreateClient, but uses the agent token and URL instead.
398359
func createAgentClient(cmd *cobra.Command) (*agentsdk.Client, error) {

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ replace github.com/tcnksm/go-httpstat => github.com/kylecarbs/go-httpstat v0.0.0
4040

4141
// There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:
4242
// https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main
43-
replace tailscale.com => github.com/JoshVee/tailscale v0.0.0-20230312075737-979756badabf
43+
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20230313001210-e2ae516db094
4444

4545
// Switch to our fork that imports fixes from http://github.com/tailscale/ssh.
4646
// See: https://github.com/coder/coder/issues/3371

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
114114
github.com/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
115115
github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
116116
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs=
117-
github.com/JoshVee/tailscale v0.0.0-20230312075737-979756badabf h1:4r5bosAHmI1IlivX9aHZmWlrgz206xmm+iE3zBmA6l4=
118-
github.com/JoshVee/tailscale v0.0.0-20230312075737-979756badabf/go.mod h1:jpg+77g19FpXL43U1VoIqoSg1K/Vh5CVxycGldQ8KhA=
119117
github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
120118
github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
121119
github.com/Masterminds/goutils v1.1.0/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
@@ -378,6 +376,8 @@ github.com/coder/retry v1.3.1-0.20230210155434-e90a2e1e091d h1:09JG37IgTB6n3ouX9
378376
github.com/coder/retry v1.3.1-0.20230210155434-e90a2e1e091d/go.mod h1:r+1J5i/989wt6CUeNSuvFKKA9hHuKKPMxdzDbTuvwwk=
379377
github.com/coder/ssh v0.0.0-20220811105153-fcea99919338 h1:tN5GKFT68YLVzJoA8AHuiMNJ0qlhoD3pGN3JY9gxSko=
380378
github.com/coder/ssh v0.0.0-20220811105153-fcea99919338/go.mod h1:ZSS+CUoKHDrqVakTfTWUlKSr9MtMFkC4UvtQKD7O914=
379+
github.com/coder/tailscale v1.1.1-0.20230313001210-e2ae516db094 h1:X3+8Qw/I6c+DosStGEw5GS54UxhTGGwOgJjah1A9Lrg=
380+
github.com/coder/tailscale v1.1.1-0.20230313001210-e2ae516db094/go.mod h1:jpg+77g19FpXL43U1VoIqoSg1K/Vh5CVxycGldQ8KhA=
381381
github.com/coder/terraform-provider-coder v0.6.15 h1:Llvh4RwxSQ/goy7ToTOeHf3tdEz+79qbyOh61hNnJs0=
382382
github.com/coder/terraform-provider-coder v0.6.15/go.mod h1:UIfU3bYNeSzJJvHyJ30tEKjD6Z9utloI+HUM/7n94CY=
383383
github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=

0 commit comments

Comments
 (0)