Skip to content

fix: improve wsproxy error when proxyurl is set to a primary #11586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 12, 2024
Merged

fix: improve wsproxy error when proxyurl is set to a primary #11586

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9656c7a
coder error first
Emyrk Jan 11, 2024
16b50de
lint
Emyrk Jan 12, 2024
e1f8c41
linting
Emyrk Jan 12, 2024
31450af
json -> JSON
Emyrk Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
json -> JSON
  • Loading branch information
@Emyrk
Emyrk committed Jan 12, 2024
commit 31450af97982ae8fe99b92d744c6160fdb0be0e9
4 changes: 2 additions & 2 deletions enterprise/coderd/proxyhealth/proxyhealth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,10 +283,10 @@ func (p *ProxyHealth) runOnce(ctx context.Context, now time.Time) (map[uuid.UUID

// If the response is not json, then the user likely input a bad url that returns status code 200.
// This is very common, since most webpages do return a 200. So let's improve the error message.
if notJsonErr := codersdk.ExpectJSONMime(resp); notJsonErr != nil {
if notJSONErr := codersdk.ExpectJSONMime(resp); notJSONErr != nil {
err = errors.Join(
isCoderErr,
fmt.Errorf("attempted to query health at %q but got back the incorrect content type: %w", reqURL, notJsonErr),
fmt.Errorf("attempted to query health at %q but got back the incorrect content type: %w", reqURL, notJSONErr),
)

status.Report.Errors = []string{
Expand Down