Skip to content

Commit 3f48e18

Browse files
kylecarbskylecarbs
committed
Rename to ForceHTTP
1 parent db65752 commit 3f48e18

File tree

5 files changed

+28
-26
lines changed

5 files changed

+28
-26
lines changed

‎cli/server.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -344,12 +344,12 @@ func Server(newAPI func(*coderd.Options) *coderd.API) *cobra.Command {
344344
HostName: "stun.l.google.com",
345345
STUNPort: 19302,
346346
}, {
347-
Name: "1b",
348-
RegionID: derpServerRegionID,
349-
HostName: accessURLParsed.Hostname(),
350-
DERPPort: accessURLPort,
351-
STUNPort: -1,
352-
HTTPForTests: accessURLParsed.Scheme == "http",
347+
Name: "1b",
348+
RegionID: derpServerRegionID,
349+
HostName: accessURLParsed.Hostname(),
350+
DERPPort: accessURLPort,
351+
STUNPort: -1,
352+
ForceHTTP: accessURLParsed.Scheme == "http",
353353
}},
354354
},
355355
2: {

‎coderd/coderd_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ func TestDERP(t *testing.T) {
6262
RegionCode: "cdr",
6363
RegionName: "Coder",
6464
Nodes: []*tailcfg.DERPNode{{
65-
Name: "1a",
66-
RegionID: 1,
67-
HostName: client.URL.Hostname(),
68-
DERPPort: derpPort,
69-
STUNPort: -1,
70-
HTTPForTests: true,
65+
Name: "1a",
66+
RegionID: 1,
67+
HostName: client.URL.Hostname(),
68+
DERPPort: derpPort,
69+
STUNPort: -1,
70+
ForceHTTP: true,
7171
}},
7272
},
7373
},

‎coderd/coderdtest/coderdtest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ func newWithAPI(t *testing.T, options *Options) (*codersdk.Client, io.Closer, *c
229229
DERPPort: derpPort,
230230
STUNPort: -1,
231231
InsecureForTests: true,
232-
HTTPForTests: true,
232+
ForceHTTP: true,
233233
}},
234234
},
235235
},

‎go.mod

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ replace github.com/chzyer/readline => github.com/kylecarbs/readline v0.0.0-20220
1414
// Required until https://github.com/briandowns/spinner/pull/136 is merged.
1515
replace github.com/briandowns/spinner => github.com/kylecarbs/spinner v1.18.2-0.20220329160715-20702b5af89e
1616

17-
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20220802200410-cba8e836c5f1
18-
1917
// Required until https://github.com/fergusstrange/embedded-postgres/pull/75 is merged.
2018
replace github.com/fergusstrange/embedded-postgres => github.com/kylecarbs/embedded-postgres v1.17.1-0.20220615202325-461532cecd3a
2119

@@ -46,6 +44,10 @@ replace github.com/pion/udp => github.com/mafredri/udp v0.1.2-0.20220805105907-b
4644
// https://github.com/hashicorp/hc-install/pull/68
4745
replace github.com/hashicorp/hc-install => github.com/mafredri/hc-install v0.4.1-0.20220727132613-e91868e28445
4846

47+
// There are a few minor changes we make to Tailscale that we're slowly upstreaming. Compare here:
48+
// https://github.com/tailscale/tailscale/compare/main...coder:tailscale:main
49+
replace tailscale.com => github.com/coder/tailscale v1.1.1-0.20220831012541-a77bda274fd6
50+
4951
require (
5052
cdr.dev/slog v1.4.2-0.20220525200111-18dce5c2cd5f
5153
cloud.google.com/go/compute v1.7.0
@@ -131,12 +133,12 @@ require (
131133
go.uber.org/atomic v1.9.0
132134
go.uber.org/goleak v1.1.12
133135
golang.org/x/crypto v0.0.0-20220517005047-85d78b3ac167
134-
golang.org/x/exp v0.0.0-20220414153411-bcd21879b8fd
136+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
135137
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
136138
golang.org/x/net v0.0.0-20220630215102-69896b714898
137139
golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2
138140
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
139-
golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d
141+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8
140142
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
141143
golang.org/x/text v0.3.7
142144
golang.org/x/tools v0.1.11
@@ -270,7 +272,7 @@ require (
270272
github.com/tailscale/netlink v1.1.1-0.20211101221916-cabfb018fe85 // indirect
271273
github.com/tcnksm/go-httpstat v0.2.0 // indirect
272274
github.com/tdewolff/parse/v2 v2.6.0 // indirect
273-
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 // indirect
275+
github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 // indirect
274276
github.com/vektah/gqlparser/v2 v2.4.4 // indirect
275277
github.com/vishvananda/netlink v1.1.1-0.20211118161826-650dca95af54 // indirect
276278
github.com/vishvananda/netns v0.0.0-20211101163701-50045581ed74 // indirect

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,8 @@ github.com/coder/glog v1.0.1-0.20220322161911-7365fe7f2cd1 h1:UqBrPWSYvRI2s5RtOu
352352
github.com/coder/glog v1.0.1-0.20220322161911-7365fe7f2cd1/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4=
353353
github.com/coder/retry v1.3.0 h1:5lAAwt/2Cm6lVmnfBY7sOMXcBOwcwJhmV5QGSELIVWY=
354354
github.com/coder/retry v1.3.0/go.mod h1:tXuRgZgWjUnU5LZPT4lJh4ew2elUhexhlnXzrJWdyFY=
355-
github.com/coder/tailscale v1.1.1-0.20220802200410-cba8e836c5f1 h1:Lv081uuydkOPNFwOSGv8fIWZeMXcIjQI1Wr8aZpLejE=
356-
github.com/coder/tailscale v1.1.1-0.20220802200410-cba8e836c5f1/go.mod h1:1AAccn2hLv0wT6q/MZ/bPIki+B3csbjq+P+nM/Xm2Oo=
355+
github.com/coder/tailscale v1.1.1-0.20220831012541-a77bda274fd6 h1://ApBDDh58hFwMe0AzlgqJrGhzu6Rjk8fQXrR+mbhYE=
356+
github.com/coder/tailscale v1.1.1-0.20220831012541-a77bda274fd6/go.mod h1:MO+tWkQp2YIF3KBnnej/mQvgYccRS5Xk/IrEpZ4Z3BU=
357357
github.com/coder/wireguard-go/tun/netstack v0.0.0-20220823170024-a78136eb0cab h1:9yEvRWXXfyKzXu8AqywCi+tFZAoqCy4wVcsXwuvZNMc=
358358
github.com/coder/wireguard-go/tun/netstack v0.0.0-20220823170024-a78136eb0cab/go.mod h1:TCJ66NtXh3urJotTdoYQOHHkyE899vOQl5TuF+WLSes=
359359
github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
@@ -1811,8 +1811,8 @@ github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce/go.mod h1:o8v6yHRoi
18111811
github.com/tommy-muehle/go-mnd/v2 v2.4.0/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw=
18121812
github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM=
18131813
github.com/u-root/uio v0.0.0-20210528114334-82958018845c/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
1814-
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7 h1:XMAtQHwKjWHIRwg+8Nj/rzUomQY1q6cM3ncA0wP8GU4=
1815-
github.com/u-root/uio v0.0.0-20210528151154-e40b768296a7/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
1814+
github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4 h1:hl6sK6aFgTLISijk6xIzeqnPzQcsLqqvL6vEfTPinME=
1815+
github.com/u-root/uio v0.0.0-20220204230159-dac05f7d2cb4/go.mod h1:LpEX5FO/cB+WF4TYGY1V5qktpaZLkKkSegbr0V4eYXA=
18161816
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
18171817
github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
18181818
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
@@ -2054,8 +2054,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0
20542054
golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
20552055
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
20562056
golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw=
2057-
golang.org/x/exp v0.0.0-20220414153411-bcd21879b8fd h1:zVFyTKZN/Q7mNRWSs1GOYnHM9NiFSJ54YVRsD0rNWT4=
2058-
golang.org/x/exp v0.0.0-20220414153411-bcd21879b8fd/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
2057+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
2058+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
20592059
golang.org/x/exp/typeparams v0.0.0-20220328175248-053ad81199eb h1:fP6C8Xutcp5AlakmT/SkQot0pMicROAsEX7OfNPuG10=
20602060
golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
20612061
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
@@ -2385,8 +2385,8 @@ golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBc
23852385
golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
23862386
golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
23872387
golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2388-
golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d h1:/m5NbqQelATgoSPVC2Z23sR4kVNokFwDDyWh/3rGY+I=
2389-
golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
2388+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
2389+
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
23902390
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
23912391
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
23922392
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

0 commit comments

Comments
 (0)