rename

f0ssel · f0ssel · commit b7e418955e46 · 2024-04-25T16:39:41.000Z
diff --git a/coderd/tailnet.go b/coderd/tailnet.go
@@ -369,16 +369,16 @@ func (s *ServerTailnet) ReverseProxy(targetURL, dashboardURL *url.URL, agentID u
 				Scheme: dashboardURL.Scheme,
 			}
 			if app.IsPort() {
-				if app.Protocol() == "https" {
+				if app.PortProtocol() == "https" {
 					app.ChangePortProtocol("http")
 				} else {
 					app.ChangePortProtocol("https")
 				}
 
 				switchURL.Host = fmt.Sprintf("%s%s", app.String(), strings.TrimPrefix(wildcardHostname, "*"))
 				switchLink = switchURL.String()
-				switchTarget = app.Protocol()
-				additional += fmt.Sprintf("This error seems to be due to an app protocol mismatch, try switching to %s.", strings.ToUpper(app.Protocol()))
+				switchTarget = app.PortProtocol()
+				additional += fmt.Sprintf("This error seems to be due to an app protocol mismatch, try switching to %s.", strings.ToUpper(app.PortProtocol()))
 			}
 		}
 
diff --git a/coderd/workspaceapps/appurl/appurl.go b/coderd/workspaceapps/appurl/appurl.go
@@ -107,7 +107,7 @@ func (a ApplicationURL) IsPort() bool {
 	return true
 }
 
-func (a ApplicationURL) Protocol() string {
+func (a ApplicationURL) PortProtocol() string {
 	if strings.HasSuffix(a.AppSlugOrPort, "s") {
 		trimmed := strings.TrimSuffix(a.AppSlugOrPort, "s")
 		_, err := strconv.ParseInt(trimmed, 10, 64)
@@ -121,7 +121,7 @@ func (a ApplicationURL) Protocol() string {
 
 func (a *ApplicationURL) ChangePortProtocol(target string) {
 	if target == "http" {
-		if a.Protocol() == "http" {
+		if a.PortProtocol() == "http" {
 			return
 		}
 		trimmed := strings.TrimSuffix(a.AppSlugOrPort, "s")
@@ -132,7 +132,7 @@ func (a *ApplicationURL) ChangePortProtocol(target string) {
 	}
 
 	if target == "https" {
-		if a.Protocol() == "https" {
+		if a.PortProtocol() == "https" {
 			return
 		}
 		_, err := strconv.ParseInt(a.AppSlugOrPort, 10, 64)
diff --git a/coderd/workspaceapps/proxy.go b/coderd/workspaceapps/proxy.go
@@ -546,7 +546,7 @@ func (s *Server) proxyWorkspaceApp(rw http.ResponseWriter, r *http.Request, appT
 	r.URL.Path = path
 	appURL.RawQuery = ""
 	if app.IsPort() {
-		appURL.Scheme = app.Protocol()
+		appURL.Scheme = app.PortProtocol()
 	}
 
 	proxy := s.AgentProvider.ReverseProxy(appURL, s.DashboardURL, appToken.AgentID, app, s.Hostname)

Original file line number	Diff line number	Diff line change
`@@ -369,16 +369,16 @@ func (s ServerTailnet) ReverseProxy(targetURL, dashboardURL url.URL, agentID u`
`369`	`369`	`Scheme: dashboardURL.Scheme,`
`370`	`370`	`}`
`371`	`371`	`if app.IsPort() {`
`372`		`- if app.Protocol() == "https" {`
	`372`	`+ if app.PortProtocol() == "https" {`
`373`	`373`	`app.ChangePortProtocol("http")`
`374`	`374`	`} else {`
`375`	`375`	`app.ChangePortProtocol("https")`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`switchURL.Host = fmt.Sprintf("%s%s", app.String(), strings.TrimPrefix(wildcardHostname, "*"))`
`379`	`379`	`switchLink = switchURL.String()`
`380`		`- switchTarget = app.Protocol()`
`381`		`- additional += fmt.Sprintf("This error seems to be due to an app protocol mismatch, try switching to %s.", strings.ToUpper(app.Protocol()))`
	`380`	`+ switchTarget = app.PortProtocol()`
	`381`	`+ additional += fmt.Sprintf("This error seems to be due to an app protocol mismatch, try switching to %s.", strings.ToUpper(app.PortProtocol()))`
`382`	`382`	`}`
`383`	`383`	`}`
`384`	`384`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func (a ApplicationURL) IsPort() bool {`
`107`	`107`	`return true`
`108`	`108`	`}`
`109`	`109`
`110`		`-func (a ApplicationURL) Protocol() string {`
	`110`	`+func (a ApplicationURL) PortProtocol() string {`
`111`	`111`	`if strings.HasSuffix(a.AppSlugOrPort, "s") {`
`112`	`112`	`trimmed := strings.TrimSuffix(a.AppSlugOrPort, "s")`
`113`	`113`	`_, err := strconv.ParseInt(trimmed, 10, 64)`
`@@ -121,7 +121,7 @@ func (a ApplicationURL) Protocol() string {`
`121`	`121`
`122`	`122`	`func (a *ApplicationURL) ChangePortProtocol(target string) {`
`123`	`123`	`if target == "http" {`
`124`		`- if a.Protocol() == "http" {`
	`124`	`+ if a.PortProtocol() == "http" {`
`125`	`125`	`return`
`126`	`126`	`}`
`127`	`127`	`trimmed := strings.TrimSuffix(a.AppSlugOrPort, "s")`
`@@ -132,7 +132,7 @@ func (a *ApplicationURL) ChangePortProtocol(target string) {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`if target == "https" {`
`135`		`- if a.Protocol() == "https" {`
	`135`	`+ if a.PortProtocol() == "https" {`
`136`	`136`	`return`
`137`	`137`	`}`
`138`	`138`	`_, err := strconv.ParseInt(a.AppSlugOrPort, 10, 64)`
Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,7 @@ func (s Server) proxyWorkspaceApp(rw http.ResponseWriter, r http.Request, appT`
`546`	`546`	`r.URL.Path = path`
`547`	`547`	`appURL.RawQuery = ""`
`548`	`548`	`if app.IsPort() {`
`549`		`- appURL.Scheme = app.Protocol()`
	`549`	`+ appURL.Scheme = app.PortProtocol()`
`550`	`550`	`}`
`551`	`551`
`552`	`552`	`proxy := s.AgentProvider.ReverseProxy(appURL, s.DashboardURL, appToken.AgentID, app, s.Hostname)`