clean up

f0ssel · f0ssel · commit 8b08a162a44c · 2024-04-26T15:12:49.000Z
diff --git a/coderd/tailnet.go b/coderd/tailnet.go
@@ -357,10 +357,10 @@ func (s *ServerTailnet) ReverseProxy(targetURL, dashboardURL *url.URL, agentID u
 	proxy := httputil.NewSingleHostReverseProxy(&tgt)
 	proxy.ErrorHandler = func(w http.ResponseWriter, r *http.Request, theErr error) {
 		var (
-			desc         = "Failed to proxy request to application: " + theErr.Error()
-			additional   = ""
-			switchLink   = ""
-			switchTarget = ""
+			desc                 = "Failed to proxy request to application: " + theErr.Error()
+			additionalInfo       = ""
+			additionalButtonLink = ""
+			additionalButtonText = ""
 		)
 
 		var tlsError tls.RecordHeaderError
@@ -373,17 +373,16 @@ func (s *ServerTailnet) ReverseProxy(targetURL, dashboardURL *url.URL, agentID u
 			}
 			_, protocol, isPort := app.PortInfo()
 			if isPort {
+				targetProtocol := "https"
 				if protocol == "https" {
-					app = app.ChangePortProtocol("http")
-				}
-				if protocol == "http" {
-					app = app.ChangePortProtocol("https")
+					targetProtocol = "http"
 				}
+				app = app.ChangePortProtocol(targetProtocol)
 
 				switchURL.Host = fmt.Sprintf("%s%s", app.String(), strings.TrimPrefix(wildcardHostname, "*"))
-				switchLink = switchURL.String()
-				switchTarget = protocol
-				additional += fmt.Sprintf("This error seems to be due to an app protocol mismatch, try switching to %s.", strings.ToUpper(protocol))
+				additionalButtonLink = switchURL.String()
+				additionalButtonText = fmt.Sprintf("Switch to %s", strings.ToUpper(targetProtocol))
+				additionalInfo += fmt.Sprintf("This error seems to be due to an app protocol mismatch, try switching to %s.", strings.ToUpper(targetProtocol))
 			}
 		}
 
@@ -393,9 +392,9 @@ func (s *ServerTailnet) ReverseProxy(targetURL, dashboardURL *url.URL, agentID u
 			Description:          desc,
 			RetryEnabled:         true,
 			DashboardURL:         dashboardURL.String(),
-			AdditionalInfo:       additional,
-			AdditionalButtonLink: switchLink,
-			AdditionalButtonText: fmt.Sprintf("Switch to %s", strings.ToUpper(switchTarget)),
+			AdditionalInfo:       additionalInfo,
+			AdditionalButtonLink: additionalButtonLink,
+			AdditionalButtonText: additionalButtonText,
 		})
 	}
 	proxy.Director = s.director(agentID, proxy.Director)
diff --git a/coderd/workspaceapps/appurl/appurl.go b/coderd/workspaceapps/appurl/appurl.go
@@ -84,41 +84,7 @@ func (a ApplicationURL) Path() string {
 	return fmt.Sprintf("/@%s/%s.%s/apps/%s", a.Username, a.WorkspaceName, a.AgentName, a.AppSlugOrPort)
 }
 
-// func (a ApplicationURL) IsPort() bool {
-// 	// check if https port
-// 	if strings.HasSuffix(a.AppSlugOrPort, "s") {
-// 		trimmed := strings.TrimSuffix(a.AppSlugOrPort, "s")
-// 		_, err := strconv.ParseInt(trimmed, 10, 64)
-// 		//nolint:gosimple
-// 		if err != nil {
-// 			return false
-// 		}
-
-// 		return true
-// 	}
-
-// 	// check if port at all
-// 	_, err := strconv.ParseInt(a.AppSlugOrPort, 10, 64)
-// 	//nolint:gosimple
-// 	if err != nil {
-// 		return false
-// 	}
-
-// 	return true
-// }
-
-// func (a ApplicationURL) PortProtocol() string {
-// 	if strings.HasSuffix(a.AppSlugOrPort, "s") {
-// 		trimmed := strings.TrimSuffix(a.AppSlugOrPort, "s")
-// 		_, err := strconv.ParseInt(trimmed, 10, 64)
-// 		if err == nil {
-// 			return "https"
-// 		}
-// 	}
-
-// 	return "http"
-// }
-
+// PortInfo returns the port, protocol, and whether the AppSlugOrPort is a port or not.
 func (a ApplicationURL) PortInfo() (uint, string, bool) {
 	var (
 		port     uint64
diff --git a/site/static/error.html b/site/static/error.html
@@ -33,7 +33,7 @@
       .container {
         --side-padding: 24px;
         width: 100%;
-        max-width: calc(460px + var(--side-padding) * 2);
+        max-width: calc(500px + var(--side-padding) * 2);
         padding: 0 var(--side-padding);
         text-align: center;
       }
@@ -198,9 +198,9 @@ <h3>Warnings</h3>
       </div>
       {{ end }}
       <div class="button-group">
-        {{- if and .Error.AdditionalButtonText .Error.AdditionButtonLink }}
-        <a href="{{ .Error.AdditionButtonLink }}"
-          >Switch to {{ .Error.AdditionalButtonText }}</a
+        {{- if and .Error.AdditionalButtonText .Error.AdditionalButtonLink }}
+        <a href="{{ .Error.AdditionalButtonLink }}"
+          >{{ .Error.AdditionalButtonText }}</a
         >
         {{ end }} {{- if .Error.RetryEnabled }}
         <button onclick="window.location.reload()">Retry</button>
