Dismissed property

coder · mtojek · Nov 29, 2023 · Nov 24, 2023 · Nov 24, 2023 · Nov 27, 2023
commit 29a5cda17955b81a8a0799af76a41cce406574c8
diff --git a/coderd/healthcheck/accessurl.go b/coderd/healthcheck/accessurl.go
@@ -41,6 +41,8 @@ func (r *AccessURLReport) Run(ctx context.Context, opts *AccessURLReportOptions)
 
 	r.Severity = health.SeverityOK
 	r.Warnings = []string{}
+	r.Dismissed = opts.Dismissed
+
 	if opts.AccessURL == nil {
 		r.Error = ptr.Ref("access URL is nil")
 		r.Severity = health.SeverityError

diff --git a/coderd/healthcheck/database.go b/coderd/healthcheck/database.go
@@ -40,6 +40,8 @@ type DatabaseReportOptions struct {
 func (r *DatabaseReport) Run(ctx context.Context, opts *DatabaseReportOptions) {
 	r.Warnings = []string{}
 	r.Severity = health.SeverityOK
+	r.Dismissed = opts.Dismissed
+
 	r.ThresholdMS = opts.Threshold.Milliseconds()
 	if r.ThresholdMS == 0 {
 		r.ThresholdMS = DatabaseDefaultThreshold.Milliseconds()

diff --git a/coderd/healthcheck/derphealth/derp.go b/coderd/healthcheck/derphealth/derp.go
@@ -36,9 +36,10 @@ const (
 // @typescript-generate Report
 type Report struct {
 	// Healthy is deprecated and left for backward compatibility purposes, use `Severity` instead.
-	Healthy  bool            `json:"healthy"`
-	Severity health.Severity `json:"severity" enums:"ok,warning,error"`
-	Warnings []string        `json:"warnings"`
+	Healthy   bool            `json:"healthy"`
+	Severity  health.Severity `json:"severity" enums:"ok,warning,error"`
+	Warnings  []string        `json:"warnings"`
+	Dismissed bool            `json:"dismissed`
 
 	Regions map[int]*RegionReport `json:"regions"`
 
@@ -47,8 +48,6 @@ type Report struct {
 	NetcheckLogs []string         `json:"netcheck_logs"`
 
 	Error *string `json:"error"`
-
-	Dismissed bool `json:"dismissed`
 }
 
 // @typescript-generate RegionReport
@@ -105,9 +104,10 @@ type ReportOptions struct {
 func (r *Report) Run(ctx context.Context, opts *ReportOptions) {
 	r.Healthy = true
 	r.Severity = health.SeverityOK
+	r.Warnings = []string{}
+	r.Dismissed = opts.Dismissed
 
 	r.Regions = map[int]*RegionReport{}
-	r.Warnings = []string{}
 
 	wg := &sync.WaitGroup{}
 	mu := sync.Mutex{}

diff --git a/coderd/healthcheck/websocket.go b/coderd/healthcheck/websocket.go
@@ -15,14 +15,6 @@ import (
 	"github.com/coder/coder/v2/coderd/healthcheck/health"
 )
 
-type WebsocketReportOptions struct {
-	APIKey     string
-	AccessURL  *url.URL
-	HTTPClient *http.Client
-
-	Dismissed bool
-}
-
 // @typescript-generate WebsocketReport
 type WebsocketReport struct {
 	// Healthy is deprecated and left for backward compatibility purposes, use `Severity` instead.
@@ -36,12 +28,22 @@ type WebsocketReport struct {
 	Error *string `json:"error"`
 }
 
+type WebsocketReportOptions struct {
+	APIKey     string
+	AccessURL  *url.URL
+	HTTPClient *http.Client
+
+	Dismissed bool
+}
+
 func (r *WebsocketReport) Run(ctx context.Context, opts *WebsocketReportOptions) {
 	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
 	defer cancel()
 
 	r.Severity = health.SeverityOK
 	r.Warnings = []string{}
+	r.Dismissed = opts.Dismissed
+
 	u, err := opts.AccessURL.Parse("/api/v2/debug/ws")
 	if err != nil {
 		r.Error = convertError(xerrors.Errorf("parse access url: %w", err))

diff --git a/coderd/healthcheck/workspaceproxy.go b/coderd/healthcheck/workspaceproxy.go
@@ -14,15 +14,6 @@ import (
 	"github.com/coder/coder/v2/codersdk"
 )
 
-type WorkspaceProxyReportOptions struct {
-	// CurrentVersion is the current server version.
-	// We pass this in to make it easier to test.
-	CurrentVersion               string
-	WorkspaceProxiesFetchUpdater WorkspaceProxiesFetchUpdater
-
-	Dismissed bool
-}
-
 // @typescript-generate WorkspaceProxyReport
 type WorkspaceProxyReport struct {
 	Healthy   bool            `json:"healthy"`
@@ -34,6 +25,15 @@ type WorkspaceProxyReport struct {
 	WorkspaceProxies codersdk.RegionsResponse[codersdk.WorkspaceProxy] `json:"workspace_proxies"`
 }
 
+type WorkspaceProxyReportOptions struct {
+	// CurrentVersion is the current server version.
+	// We pass this in to make it easier to test.
+	CurrentVersion               string
+	WorkspaceProxiesFetchUpdater WorkspaceProxiesFetchUpdater
+
+	Dismissed bool
+}
+
 type WorkspaceProxiesFetchUpdater interface {
 	Fetch(context.Context) (codersdk.RegionsResponse[codersdk.WorkspaceProxy], error)
 	Update(context.Context) error
@@ -55,6 +55,7 @@ func (r *WorkspaceProxyReport) Run(ctx context.Context, opts *WorkspaceProxyRepo
 	r.Healthy = true
 	r.Severity = health.SeverityOK
 	r.Warnings = []string{}
+	r.Dismissed = opts.Dismissed
 
 	if opts.WorkspaceProxiesFetchUpdater == nil {
 		opts.WorkspaceProxiesFetchUpdater = &AGPLWorkspaceProxiesFetchUpdater{}