PR comments

kylecarbs · kylecarbs · commit f02e82d62e81 · 2022-11-16T21:40:57.000Z
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -656,7 +656,7 @@ func (api *API) CreateInMemoryProvisionerDaemon(ctx context.Context, debounce ti
 		CreatedAt:    database.Now(),
 		Name:         name,
 		Provisioners: []database.ProvisionerType{database.ProvisionerTypeEcho, database.ProvisionerTypeTerraform},
-		Tags: dbtype.Map{
+		Tags: dbtype.StringMap{
 			provisionerdserver.TagScope: provisionerdserver.ScopeOrganization,
 		},
 	})
diff --git a/coderd/database/dbtype/dbtype.go b/coderd/database/dbtype/dbtype.go
@@ -7,9 +7,9 @@ import (
 	"golang.org/x/xerrors"
 )
 
-type Map map[string]string
+type StringMap map[string]string
 
-func (m *Map) Scan(src interface{}) error {
+func (m *StringMap) Scan(src interface{}) error {
 	if src == nil {
 		return nil
 	}
@@ -25,6 +25,6 @@ func (m *Map) Scan(src interface{}) error {
 	return nil
 }
 
-func (m Map) Value() (driver.Value, error) {
+func (m StringMap) Value() (driver.Value, error) {
 	return json.Marshal(m)
 }
diff --git a/coderd/database/migrations/000077_provisioner_daemon_tags.down.sql b/coderd/database/migrations/000077_provisioner_daemon_tags.down.sql
@@ -1,2 +1,2 @@
-ALTER TABLE provisioner_daemons DROP COLUMN auth_token;
 ALTER TABLE provisioner_daemons DROP COLUMN tags;
+ALTER TABLE provisioner_jobs DROP COLUMN tags;

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@ import (`
`7`	`7`	`"golang.org/x/xerrors"`
`8`	`8`	`)`
`9`	`9`
`10`		`-type Map map[string]string`
	`10`	`+type StringMap map[string]string`
`11`	`11`
`12`		`-func (m *Map) Scan(src interface{}) error {`
	`12`	`+func (m *StringMap) Scan(src interface{}) error {`
`13`	`13`	`if src == nil {`
`14`	`14`	`return nil`
`15`	`15`	`}`
`@@ -25,6 +25,6 @@ func (m *Map) Scan(src interface{}) error {`
`25`	`25`	`return nil`
`26`	`26`	`}`
`27`	`27`
`28`		`-func (m Map) Value() (driver.Value, error) {`
	`28`	`+func (m StringMap) Value() (driver.Value, error) {`
`29`	`29`	`return json.Marshal(m)`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-ALTER TABLE provisioner_daemons DROP COLUMN auth_token;`
`2`	`1`	`ALTER TABLE provisioner_daemons DROP COLUMN tags;`
	`2`	`+ALTER TABLE provisioner_jobs DROP COLUMN tags;`