Commit7c8c027

authored

chore: disallow sdk imports from the db package, switch enum to string(#14539)

* chore: disallow sdk imports from the db package* convert to string

1 parent4843062 commit7c8c027Copy full SHA for 7c8c027

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 3 deletions

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`	`typeHealthSettingsstruct {`
`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`	`typeNotificationsSettingsstruct {`

Lines changed: 2 additions & 1 deletion

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))`

Comments

(0)