From 6d86a935394274867e3fea7c5960335d7dcbda8e Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Mon, 16 Sep 2024 14:20:14 +1000 Subject: [PATCH] rename eventid to cloudid --- .../20240916041639_rename_eventid.sql | 9 ++++++ db/queries/models.go | 2 +- db/queries/query.sql | 4 +-- db/queries/query.sql.go | 32 +++++++++---------- internal/tasks/processEvents.go | 2 +- 5 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 db/migrations/20240916041639_rename_eventid.sql diff --git a/db/migrations/20240916041639_rename_eventid.sql b/db/migrations/20240916041639_rename_eventid.sql new file mode 100644 index 0000000..eb9bebb --- /dev/null +++ b/db/migrations/20240916041639_rename_eventid.sql @@ -0,0 +1,9 @@ +-- +goose Up +-- +goose StatementBegin +ALTER TABLE "Inventory" RENAME COLUMN EventId to CloudId; +-- +goose StatementEnd + +-- +goose Down +-- +goose StatementBegin +ALTER TABLE "Inventory" RENAME COLUMN CloudId to EventId; +-- +goose StatementEnd diff --git a/db/queries/models.go b/db/queries/models.go index fa66029..0e04384 100644 --- a/db/queries/models.go +++ b/db/queries/models.go @@ -32,7 +32,7 @@ type Inventory struct { Vcenter string VmId sql.NullString EventKey sql.NullString - EventId sql.NullString + CloudId sql.NullString CreationTime sql.NullInt64 DeletionTime sql.NullInt64 ResourcePool sql.NullString diff --git a/db/queries/query.sql b/db/queries/query.sql index b42dd94..61d7a67 100644 --- a/db/queries/query.sql +++ b/db/queries/query.sql @@ -12,11 +12,11 @@ WHERE "VmId" = sqlc.arg('vmId') AND "Datacenter" = sqlc.arg('datacenterName'); -- name: GetInventoryEventId :one SELECT * FROM "Inventory" -WHERE "EventId" = ? LIMIT 1; +WHERE "CloudId" = ? LIMIT 1; -- name: CreateInventory :one INSERT INTO "Inventory" ( - "Name", "Vcenter", "VmId", "EventKey", "EventId", "CreationTime", "ResourcePool", "VmType", "IsTemplate", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", "InitialRam", "SrmPlaceholder", "PowerState" + "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "ResourcePool", "VmType", "IsTemplate", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", "InitialRam", "SrmPlaceholder", "PowerState" ) VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) diff --git a/db/queries/query.sql.go b/db/queries/query.sql.go index d860edc..965d665 100644 --- a/db/queries/query.sql.go +++ b/db/queries/query.sql.go @@ -72,11 +72,11 @@ func (q *Queries) CreateEvent(ctx context.Context, arg CreateEventParams) (Event const createInventory = `-- name: CreateInventory :one INSERT INTO "Inventory" ( - "Name", "Vcenter", "VmId", "EventKey", "EventId", "CreationTime", "ResourcePool", "VmType", "IsTemplate", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", "InitialRam", "SrmPlaceholder", "PowerState" + "Name", "Vcenter", "VmId", "EventKey", "CloudId", "CreationTime", "ResourcePool", "VmType", "IsTemplate", "Datacenter", "Cluster", "Folder", "ProvisionedDisk", "InitialVcpus", "InitialRam", "SrmPlaceholder", "PowerState" ) VALUES( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) -RETURNING Iid, Name, Vcenter, VmId, EventKey, EventId, CreationTime, DeletionTime, ResourcePool, VmType, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, SrmPlaceholder, IsTemplate, PowerState +RETURNING Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, VmType, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, SrmPlaceholder, IsTemplate, PowerState ` type CreateInventoryParams struct { @@ -84,7 +84,7 @@ type CreateInventoryParams struct { Vcenter string VmId sql.NullString EventKey sql.NullString - EventId sql.NullString + CloudId sql.NullString CreationTime sql.NullInt64 ResourcePool sql.NullString VmType sql.NullString @@ -105,7 +105,7 @@ func (q *Queries) CreateInventory(ctx context.Context, arg CreateInventoryParams arg.Vcenter, arg.VmId, arg.EventKey, - arg.EventId, + arg.CloudId, arg.CreationTime, arg.ResourcePool, arg.VmType, @@ -126,7 +126,7 @@ func (q *Queries) CreateInventory(ctx context.Context, arg CreateInventoryParams &i.Vcenter, &i.VmId, &i.EventKey, - &i.EventId, + &i.CloudId, &i.CreationTime, &i.DeletionTime, &i.ResourcePool, @@ -191,7 +191,7 @@ func (q *Queries) CreateUpdate(ctx context.Context, arg CreateUpdateParams) (Upd } const getInventoryByName = `-- name: GetInventoryByName :many -SELECT Iid, Name, Vcenter, VmId, EventKey, EventId, CreationTime, DeletionTime, ResourcePool, VmType, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, SrmPlaceholder, IsTemplate, PowerState FROM "Inventory" +SELECT Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, VmType, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, SrmPlaceholder, IsTemplate, PowerState FROM "Inventory" WHERE "Name" = ? ` @@ -210,7 +210,7 @@ func (q *Queries) GetInventoryByName(ctx context.Context, name string) ([]Invent &i.Vcenter, &i.VmId, &i.EventKey, - &i.EventId, + &i.CloudId, &i.CreationTime, &i.DeletionTime, &i.ResourcePool, @@ -239,12 +239,12 @@ func (q *Queries) GetInventoryByName(ctx context.Context, name string) ([]Invent } const getInventoryEventId = `-- name: GetInventoryEventId :one -SELECT Iid, Name, Vcenter, VmId, EventKey, EventId, CreationTime, DeletionTime, ResourcePool, VmType, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, SrmPlaceholder, IsTemplate, PowerState FROM "Inventory" -WHERE "EventId" = ? LIMIT 1 +SELECT Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, VmType, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, SrmPlaceholder, IsTemplate, PowerState FROM "Inventory" +WHERE "CloudId" = ? LIMIT 1 ` -func (q *Queries) GetInventoryEventId(ctx context.Context, eventid sql.NullString) (Inventory, error) { - row := q.db.QueryRowContext(ctx, getInventoryEventId, eventid) +func (q *Queries) GetInventoryEventId(ctx context.Context, cloudid sql.NullString) (Inventory, error) { + row := q.db.QueryRowContext(ctx, getInventoryEventId, cloudid) var i Inventory err := row.Scan( &i.Iid, @@ -252,7 +252,7 @@ func (q *Queries) GetInventoryEventId(ctx context.Context, eventid sql.NullStrin &i.Vcenter, &i.VmId, &i.EventKey, - &i.EventId, + &i.CloudId, &i.CreationTime, &i.DeletionTime, &i.ResourcePool, @@ -271,7 +271,7 @@ func (q *Queries) GetInventoryEventId(ctx context.Context, eventid sql.NullStrin } const getInventoryVmId = `-- name: GetInventoryVmId :one -SELECT Iid, Name, Vcenter, VmId, EventKey, EventId, CreationTime, DeletionTime, ResourcePool, VmType, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, SrmPlaceholder, IsTemplate, PowerState FROM "Inventory" +SELECT Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, VmType, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, SrmPlaceholder, IsTemplate, PowerState FROM "Inventory" WHERE "VmId" = ?1 AND "Datacenter" = ?2 ` @@ -289,7 +289,7 @@ func (q *Queries) GetInventoryVmId(ctx context.Context, arg GetInventoryVmIdPara &i.Vcenter, &i.VmId, &i.EventKey, - &i.EventId, + &i.CloudId, &i.CreationTime, &i.DeletionTime, &i.ResourcePool, @@ -369,7 +369,7 @@ func (q *Queries) ListEvents(ctx context.Context) ([]Events, error) { } const listInventory = `-- name: ListInventory :many -SELECT Iid, Name, Vcenter, VmId, EventKey, EventId, CreationTime, DeletionTime, ResourcePool, VmType, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, SrmPlaceholder, IsTemplate, PowerState FROM "Inventory" +SELECT Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, VmType, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, SrmPlaceholder, IsTemplate, PowerState FROM "Inventory" ORDER BY "Name" ` @@ -388,7 +388,7 @@ func (q *Queries) ListInventory(ctx context.Context) ([]Inventory, error) { &i.Vcenter, &i.VmId, &i.EventKey, - &i.EventId, + &i.CloudId, &i.CreationTime, &i.DeletionTime, &i.ResourcePool, diff --git a/internal/tasks/processEvents.go b/internal/tasks/processEvents.go index 356b02b..f7179f9 100644 --- a/internal/tasks/processEvents.go +++ b/internal/tasks/processEvents.go @@ -127,7 +127,7 @@ func (c *CronTask) RunVmCheck(ctx context.Context, logger *slog.Logger) error { params := queries.CreateInventoryParams{ Name: vmObject.Vm.Name, Vcenter: evt.Source, - EventId: sql.NullString{String: evt.CloudId, Valid: evt.CloudId != ""}, + CloudId: sql.NullString{String: evt.CloudId, Valid: evt.CloudId != ""}, EventKey: sql.NullString{String: evt.EventKey.String, Valid: evt.EventKey.Valid}, VmId: sql.NullString{String: evt.VmId.String, Valid: evt.VmId.Valid}, Datacenter: sql.NullString{String: evt.DatacenterName.String, Valid: evt.DatacenterName.Valid},