Skip to content

Commit 529202d

Browse files
f0sself0ssel
committed
tests
1 parent d8620ea commit 529202d

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

‎coderd/tailnet_test.go

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"github.com/coder/coder/v2/agent/agenttest"
2727
"github.com/coder/coder/v2/agent/proto"
2828
"github.com/coder/coder/v2/coderd"
29+
"github.com/coder/coder/v2/coderd/workspaceapps/appurl"
2930
"github.com/coder/coder/v2/codersdk/agentsdk"
3031
"github.com/coder/coder/v2/codersdk/workspacesdk"
3132
"github.com/coder/coder/v2/tailnet"
@@ -81,7 +82,7 @@ func TestServerTailnet_ReverseProxy_ProxyEnv(t *testing.T) {
8182
u, err := url.Parse(fmt.Sprintf("http://127.0.0.1:%d", workspacesdk.AgentHTTPAPIServerPort))
8283
require.NoError(t, err)
8384

84-
rp := serverTailnet.ReverseProxy(u, u, a.id)
85+
rp := serverTailnet.ReverseProxy(u, u, a.id, appurl.ApplicationURL{}, "")
8586

8687
rw := httptest.NewRecorder()
8788
req := httptest.NewRequest(
@@ -112,7 +113,7 @@ func TestServerTailnet_ReverseProxy(t *testing.T) {
112113
u, err := url.Parse(fmt.Sprintf("http://127.0.0.1:%d", workspacesdk.AgentHTTPAPIServerPort))
113114
require.NoError(t, err)
114115

115-
rp := serverTailnet.ReverseProxy(u, u, a.id)
116+
rp := serverTailnet.ReverseProxy(u, u, a.id, appurl.ApplicationURL{}, "")
116117

117118
rw := httptest.NewRecorder()
118119
req := httptest.NewRequest(
@@ -143,7 +144,7 @@ func TestServerTailnet_ReverseProxy(t *testing.T) {
143144
u, err := url.Parse(fmt.Sprintf("http://127.0.0.1:%d", workspacesdk.AgentHTTPAPIServerPort))
144145
require.NoError(t, err)
145146

146-
rp := serverTailnet.ReverseProxy(u, u, a.id)
147+
rp := serverTailnet.ReverseProxy(u, u, a.id, appurl.ApplicationURL{}, "")
147148

148149
rw := httptest.NewRecorder()
149150
req := httptest.NewRequest(
@@ -177,7 +178,7 @@ func TestServerTailnet_ReverseProxy(t *testing.T) {
177178
u, err := url.Parse(fmt.Sprintf("http://127.0.0.1:%d", workspacesdk.AgentHTTPAPIServerPort))
178179
require.NoError(t, err)
179180

180-
rp := serverTailnet.ReverseProxy(u, u, a.id)
181+
rp := serverTailnet.ReverseProxy(u, u, a.id, appurl.ApplicationURL{}, "")
181182

182183
req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil)
183184
require.NoError(t, err)
@@ -222,7 +223,7 @@ func TestServerTailnet_ReverseProxy(t *testing.T) {
222223
u, err := url.Parse("http://127.0.0.1" + port)
223224
require.NoError(t, err)
224225

225-
rp := serverTailnet.ReverseProxy(u, u, a.id)
226+
rp := serverTailnet.ReverseProxy(u, u, a.id, appurl.ApplicationURL{}, "")
226227

227228
for i := 0; i < 5; i++ {
228229
rw := httptest.NewRecorder()
@@ -279,7 +280,7 @@ func TestServerTailnet_ReverseProxy(t *testing.T) {
279280
require.NoError(t, err)
280281

281282
for i, ag := range agents {
282-
rp := serverTailnet.ReverseProxy(u, u, ag.id)
283+
rp := serverTailnet.ReverseProxy(u, u, ag.id, appurl.ApplicationURL{}, "")
283284

284285
rw := httptest.NewRecorder()
285286
req := httptest.NewRequest(
@@ -317,7 +318,7 @@ func TestServerTailnet_ReverseProxy(t *testing.T) {
317318
uri, err := url.Parse(s.URL)
318319
require.NoError(t, err)
319320

320-
rp := serverTailnet.ReverseProxy(uri, uri, a.id)
321+
rp := serverTailnet.ReverseProxy(uri, uri, a.id, appurl.ApplicationURL{}, "")
321322

322323
rw := httptest.NewRecorder()
323324
req := httptest.NewRequest(
@@ -347,7 +348,7 @@ func TestServerTailnet_ReverseProxy(t *testing.T) {
347348
u, err := url.Parse(fmt.Sprintf("http://127.0.0.1:%d", workspacesdk.AgentHTTPAPIServerPort))
348349
require.NoError(t, err)
349350

350-
rp := serverTailnet.ReverseProxy(u, u, a.id)
351+
rp := serverTailnet.ReverseProxy(u, u, a.id, appurl.ApplicationURL{}, "")
351352

352353
rw := httptest.NewRecorder()
353354
req := httptest.NewRequest(

‎coderd/workspaceapps/appurl/appurl.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,9 @@ func (a *ApplicationURL) ChangePortProtocol(target string) {
129129
if err == nil {
130130
a.AppSlugOrPort = trimmed
131131
}
132-
} else {
132+
}
133+
134+
if target == "https" {
133135
if a.Protocol() == "https" {
134136
return
135137
}

‎coderd/workspaceapps/appurl/appurl_test.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,16 @@ func TestParseSubdomainAppURL(t *testing.T) {
124124
Username: "user",
125125
},
126126
},
127+
{
128+
Name: "Port--Agent--Workspace--User",
129+
Subdomain: "8080s--agent--workspace--user",
130+
Expected: appurl.ApplicationURL{
131+
AppSlugOrPort: "8080s",
132+
AgentName: "agent",
133+
WorkspaceName: "workspace",
134+
Username: "user",
135+
},
136+
},
127137
{
128138
Name: "HyphenatedNames",
129139
Subdomain: "app-slug--agent-name--workspace-name--user-name",

0 commit comments

Comments
 (0)