Merge branch 'main' into restructure-new

matifali · web-flow · commit ce62ff21cacc · 2024-09-03T22:34:27.000+05:00
diff --git a/coderd/database/types.go b/coderd/database/types.go
@@ -10,7 +10,6 @@ import (
 	"golang.org/x/xerrors"
 
 	"github.com/coder/coder/v2/coderd/rbac/policy"
-	"github.com/coder/coder/v2/codersdk/healthsdk"
 )
 
 // AuditOAuthConvertState is never stored in the database. It is stored in a cookie
@@ -26,8 +25,8 @@ type AuditOAuthConvertState struct {
 }
 
 type HealthSettings struct {
-	ID                    uuid.UUID                 `db:"id" json:"id"`
-	DismissedHealthchecks []healthsdk.HealthSection `db:"dismissed_healthchecks" json:"dismissed_healthchecks"`
+	ID                    uuid.UUID `db:"id" json:"id"`
+	DismissedHealthchecks []string  `db:"dismissed_healthchecks" json:"dismissed_healthchecks"`
 }
 
 type NotificationsSettings struct {
diff --git a/coderd/debug.go b/coderd/debug.go
@@ -20,6 +20,7 @@ import (
 	"github.com/coder/coder/v2/coderd/httpmw"
 	"github.com/coder/coder/v2/coderd/rbac"
 	"github.com/coder/coder/v2/coderd/rbac/policy"
+	"github.com/coder/coder/v2/coderd/util/slice"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/codersdk/healthsdk"
 )
@@ -250,7 +251,7 @@ func (api *API) putDeploymentHealthSettings(rw http.ResponseWriter, r *http.Requ
 
 	aReq.New = database.HealthSettings{
 		ID:                    uuid.New(),
-		DismissedHealthchecks: settings.DismissedHealthchecks,
+		DismissedHealthchecks: slice.ToStrings(settings.DismissedHealthchecks),
 	}
 
 	err = api.Database.UpsertHealthSettings(ctx, string(settingsJSON))
diff --git a/docs/install/kubernetes.md b/docs/install/kubernetes.md
@@ -125,23 +125,23 @@ For the **mainline** Coder release:
 
    <!-- autoversion(mainline): "--version [version]" -->
 
-    	```shell
-    	helm install coder coder-v2/coder \
-    			--namespace coder \
-    			--values values.yaml \
-    			--version 2.14.2
-    	```
+   ```shell
+   helm install coder coder-v2/coder \
+       --namespace coder \
+       --values values.yaml \
+       --version 2.15.0
+   ```
 
     	For the **stable** Coder release:
 
     		<!-- autoversion(stable): "--version [version]" -->
 
-    	```shell
-    	helm install coder coder-v2/coder \
-    			--namespace coder \
-    			--values values.yaml \
-    			--version 2.13.5
-    	```
+   ```shell
+   helm install coder coder-v2/coder \
+       --namespace coder \
+       --values values.yaml \
+       --version 2.14.2
+   ```
 
 You can watch Coder start up by running `kubectl get pods -n coder`. Once Coder
 has started, the `coder-*` pods should enter the `Running` state.
diff --git a/docs/install/releases.md b/docs/install/releases.md
@@ -47,14 +47,14 @@ pages.
 
 | Release name | Release Date       | Status           |
 | ------------ | ------------------ | ---------------- |
-| 2.8.x        | February 06, 2024  | Not Supported    |
 | 2.9.x        | March 07, 2024     | Not Supported    |
 | 2.10.x       | April 03, 2024     | Not Supported    |
 | 2.11.x       | May 07, 2024       | Not Supported    |
-| 2.12.x       | June 04, 2024      | Security Support |
-| 2.13.x       | July 02, 2024      | Stable           |
-| 2.14.x       | August 06, 2024    | Mainline         |
-| 2.15.x       | September 03, 2024 | Not Released     |
+| 2.12.x       | June 04, 2024      | Not Supported    |
+| 2.13.x       | July 02, 2024      | Security Support |
+| 2.14.x       | August 06, 2024    | Stable           |
+| 2.15.x       | September 03, 2024 | Mainline         |
+| 2.16.x       | October 01, 2024   | Not Released     |
 
 > **Tip**: We publish a
 > [`preview`](https://github.com/coder/coder/pkgs/container/coder-preview) image

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import (`
`10`	`10`	`"golang.org/x/xerrors"`
`11`	`11`
`12`	`12`	`"github.com/coder/coder/v2/coderd/rbac/policy"`
`13`		`- "github.com/coder/coder/v2/codersdk/healthsdk"`
`14`	`13`	`)`
`15`	`14`
`16`	`15`	`// AuditOAuthConvertState is never stored in the database. It is stored in a cookie`
`@@ -26,8 +25,8 @@ type AuditOAuthConvertState struct {`
`26`	`25`	`}`
`27`	`26`
`28`	`27`	`type HealthSettings struct {`
`29`		- ID uuid.UUID `db:"id" json:"id"`
`30`		- DismissedHealthchecks []healthsdk.HealthSection `db:"dismissed_healthchecks" json:"dismissed_healthchecks"`
	`28`	+ ID uuid.UUID `db:"id" json:"id"`
	`29`	+ DismissedHealthchecks []string `db:"dismissed_healthchecks" json:"dismissed_healthchecks"`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`type NotificationsSettings struct {`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ import (`
`20`	`20`	`"github.com/coder/coder/v2/coderd/httpmw"`
`21`	`21`	`"github.com/coder/coder/v2/coderd/rbac"`
`22`	`22`	`"github.com/coder/coder/v2/coderd/rbac/policy"`
	`23`	`+ "github.com/coder/coder/v2/coderd/util/slice"`
`23`	`24`	`"github.com/coder/coder/v2/codersdk"`
`24`	`25`	`"github.com/coder/coder/v2/codersdk/healthsdk"`
`25`	`26`	`)`
`@@ -250,7 +251,7 @@ func (api API) putDeploymentHealthSettings(rw http.ResponseWriter, r http.Requ`
`250`	`251`
`251`	`252`	`aReq.New = database.HealthSettings{`
`252`	`253`	`ID: uuid.New(),`
`253`		`- DismissedHealthchecks: settings.DismissedHealthchecks,`
	`254`	`+ DismissedHealthchecks: slice.ToStrings(settings.DismissedHealthchecks),`
`254`	`255`	`}`
`255`	`256`
`256`	`257`	`err = api.Database.UpsertHealthSettings(ctx, string(settingsJSON))`