synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-08 11:39:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Extract instance type when provisioning VMs (#4839)

Browse Source 
This should help us identify what instances our users consume.
This commit is contained in:
Kyle Carberry
2022-11-01 14:51:57 -07:00
committed by GitHub
parent 26a920a740
commit a672ae8c7d
12 changed files with 260 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coderd/database/dump.sql generated
View File

@ -442,7 +442,8 @@ CREATE TABLE workspace_resources (
type character varying(192) NOT NULL,
name character varying(64) NOT NULL,
hide boolean DEFAULT false NOT NULL,
icon character varying(256) DEFAULT ''::character varying NOT NULL
icon character varying(256) DEFAULT ''::character varying NOT NULL,
instance_type character varying(256)
);
CREATE TABLE workspaces (

2
coderd/database/migrations/000069_resource_instance_type.down.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE workspace_resources
DROP COLUMN instance_type;

2
coderd/database/migrations/000069_resource_instance_type.up.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE workspace_resources
ADD COLUMN instance_type varchar(256);

17
coderd/database/models.go
View File

@ -696,14 +696,15 @@ type WorkspaceBuild struct {
}
type WorkspaceResource struct {
ID uuid.UUID `db:"id" json:"id"`
CreatedAt time.Time `db:"created_at" json:"created_at"`
JobID uuid.UUID `db:"job_id" json:"job_id"`
Transition WorkspaceTransition `db:"transition" json:"transition"`
Type string `db:"type" json:"type"`
Name string `db:"name" json:"name"`
Hide bool `db:"hide" json:"hide"`
Icon string `db:"icon" json:"icon"`
ID uuid.UUID `db:"id" json:"id"`
CreatedAt time.Time `db:"created_at" json:"created_at"`
JobID uuid.UUID `db:"job_id" json:"job_id"`
Transition WorkspaceTransition `db:"transition" json:"transition"`
Type string `db:"type" json:"type"`
Name string `db:"name" json:"name"`
Hide bool `db:"hide" json:"hide"`
Icon string `db:"icon" json:"icon"`
InstanceType sql.NullString `db:"instance_type" json:"instance_type"`
}
type WorkspaceResourceMetadatum struct {

35
coderd/database/queries.sql.go
View File

@ -5481,7 +5481,7 @@ func (q *sqlQuerier) UpdateWorkspaceBuildByID(ctx context.Context, arg UpdateWor
const getWorkspaceResourceByID = `-- name: GetWorkspaceResourceByID :one
SELECT
id, created_at, job_id, transition, type, name, hide, icon
id, created_at, job_id, transition, type, name, hide, icon, instance_type
FROM
workspace_resources
WHERE
@ -5500,6 +5500,7 @@ func (q *sqlQuerier) GetWorkspaceResourceByID(ctx context.Context, id uuid.UUID)
&i.Name,
&i.Hide,
&i.Icon,
&i.InstanceType,
)
return i, err
}
@ -5614,7 +5615,7 @@ func (q *sqlQuerier) GetWorkspaceResourceMetadataCreatedAfter(ctx context.Contex
const getWorkspaceResourcesByJobID = `-- name: GetWorkspaceResourcesByJobID :many
SELECT
id, created_at, job_id, transition, type, name, hide, icon
id, created_at, job_id, transition, type, name, hide, icon, instance_type
FROM
workspace_resources
WHERE
@ -5639,6 +5640,7 @@ func (q *sqlQuerier) GetWorkspaceResourcesByJobID(ctx context.Context, jobID uui
&i.Name,
&i.Hide,
&i.Icon,
&i.InstanceType,
); err != nil {
return nil, err
}
@ -5655,7 +5657,7 @@ func (q *sqlQuerier) GetWorkspaceResourcesByJobID(ctx context.Context, jobID uui
const getWorkspaceResourcesByJobIDs = `-- name: GetWorkspaceResourcesByJobIDs :many
SELECT
id, created_at, job_id, transition, type, name, hide, icon
id, created_at, job_id, transition, type, name, hide, icon, instance_type
FROM
workspace_resources
WHERE
@ -5680,6 +5682,7 @@ func (q *sqlQuerier) GetWorkspaceResourcesByJobIDs(ctx context.Context, ids []uu
&i.Name,
&i.Hide,
&i.Icon,
&i.InstanceType,
); err != nil {
return nil, err
}
@ -5695,7 +5698,7 @@ func (q *sqlQuerier) GetWorkspaceResourcesByJobIDs(ctx context.Context, ids []uu
}
const getWorkspaceResourcesCreatedAfter = `-- name: GetWorkspaceResourcesCreatedAfter :many
SELECT id, created_at, job_id, transition, type, name, hide, icon FROM workspace_resources WHERE created_at > $1
SELECT id, created_at, job_id, transition, type, name, hide, icon, instance_type FROM workspace_resources WHERE created_at > $1
`
func (q *sqlQuerier) GetWorkspaceResourcesCreatedAfter(ctx context.Context, createdAt time.Time) ([]WorkspaceResource, error) {
@ -5716,6 +5719,7 @@ func (q *sqlQuerier) GetWorkspaceResourcesCreatedAfter(ctx context.Context, crea
&i.Name,
&i.Hide,
&i.Icon,
&i.InstanceType,
); err != nil {
return nil, err
}
@ -5732,20 +5736,21 @@ func (q *sqlQuerier) GetWorkspaceResourcesCreatedAfter(ctx context.Context, crea
const insertWorkspaceResource = `-- name: InsertWorkspaceResource :one
INSERT INTO
workspace_resources (id, created_at, job_id, transition, type, name, hide, icon)
workspace_resources (id, created_at, job_id, transition, type, name, hide, icon, instance_type)
VALUES
($1, $2, $3, $4, $5, $6, $7, $8) RETURNING id, created_at, job_id, transition, type, name, hide, icon
($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING id, created_at, job_id, transition, type, name, hide, icon, instance_type
`
type InsertWorkspaceResourceParams struct {
ID uuid.UUID `db:"id" json:"id"`
CreatedAt time.Time `db:"created_at" json:"created_at"`
JobID uuid.UUID `db:"job_id" json:"job_id"`
Transition WorkspaceTransition `db:"transition" json:"transition"`
Type string `db:"type" json:"type"`
Name string `db:"name" json:"name"`
Hide bool `db:"hide" json:"hide"`
Icon string `db:"icon" json:"icon"`
ID uuid.UUID `db:"id" json:"id"`
CreatedAt time.Time `db:"created_at" json:"created_at"`
JobID uuid.UUID `db:"job_id" json:"job_id"`
Transition WorkspaceTransition `db:"transition" json:"transition"`
Type string `db:"type" json:"type"`
Name string `db:"name" json:"name"`
Hide bool `db:"hide" json:"hide"`
Icon string `db:"icon" json:"icon"`
InstanceType sql.NullString `db:"instance_type" json:"instance_type"`
}
func (q *sqlQuerier) InsertWorkspaceResource(ctx context.Context, arg InsertWorkspaceResourceParams) (WorkspaceResource, error) {
@ -5758,6 +5763,7 @@ func (q *sqlQuerier) InsertWorkspaceResource(ctx context.Context, arg InsertWork
arg.Name,
arg.Hide,
arg.Icon,
arg.InstanceType,
)
var i WorkspaceResource
err := row.Scan(
@ -5769,6 +5775,7 @@ func (q *sqlQuerier) InsertWorkspaceResource(ctx context.Context, arg InsertWork
&i.Name,
&i.Hide,
&i.Icon,
&i.InstanceType,
)
return i, err
}

4
coderd/database/queries/workspaceresources.sql
View File

@ -27,9 +27,9 @@ SELECT * FROM workspace_resources WHERE created_at > $1;
-- name: InsertWorkspaceResource :one
INSERT INTO
workspace_resources (id, created_at, job_id, transition, type, name, hide, icon)
workspace_resources (id, created_at, job_id, transition, type, name, hide, icon, instance_type)
VALUES
($1, $2, $3, $4, $5, $6, $7, $8) RETURNING *;
($1, $2, $3, $4, $5, $6, $7, $8, $9) RETURNING *;
-- name: GetWorkspaceResourceMetadataByResourceID :many
SELECT

4
coderd/provisionerdaemons.go
View File

@ -750,6 +750,10 @@ func insertWorkspaceResource(ctx context.Context, db database.Store, jobID uuid.
Name: protoResource.Name,
Hide: protoResource.Hide,
Icon: protoResource.Icon,
InstanceType: sql.NullString{
String: protoResource.InstanceType,
Valid: protoResource.InstanceType != "",
},
})
if err != nil {
return xerrors.Errorf("insert provisioner job resource %q: %w", protoResource.Name, err)

18
coderd/telemetry/telemetry.go
View File

@ -539,10 +539,11 @@ func ConvertWorkspaceApp(app database.WorkspaceApp) WorkspaceApp {
// ConvertWorkspaceResource anonymizes a workspace resource.
func ConvertWorkspaceResource(resource database.WorkspaceResource) WorkspaceResource {
return WorkspaceResource{
ID: resource.ID,
JobID: resource.JobID,
Transition: resource.Transition,
Type: resource.Type,
ID: resource.ID,
JobID: resource.JobID,
Transition: resource.Transition,
Type: resource.Type,
InstanceType: resource.InstanceType.String,
}
}
@ -667,10 +668,11 @@ type User struct {
}
type WorkspaceResource struct {
ID uuid.UUID `json:"id"`
JobID uuid.UUID `json:"job_id"`
Transition database.WorkspaceTransition `json:"transition"`
Type string `json:"type"`
ID uuid.UUID `json:"id"`
JobID uuid.UUID `json:"job_id"`
Transition database.WorkspaceTransition `json:"transition"`
Type string `json:"type"`
InstanceType string `json:"instance_type"`
}
type WorkspaceResourceMetadata struct {