nathan/vctp2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename eventid to cloudid
Some checks are pending
CI / Lint (push) Waiting to run
Details
CI / Test (push) Waiting to run
Details
CI / End-to-End (push) Waiting to run
Details
CI / Publish Docker (push) Blocked by required conditions
Details
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Nathan Coad
2024-09-16 14:20:14 +10:00
parent a84c403a69
commit 6d86a93539
5 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
db/migrations/20240916041639_rename_eventid.sql Normal file
View File

@@ -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

2
db/queries/models.go
View File

@@ -32,7 +32,7 @@ type Inventory struct {
Vcenter string Vcenter string
VmId sql.NullString VmId sql.NullString
EventKey sql.NullString EventKey sql.NullString
EventId sql.NullString CloudId sql.NullString
CreationTime sql.NullInt64 CreationTime sql.NullInt64
DeletionTime sql.NullInt64 DeletionTime sql.NullInt64
ResourcePool sql.NullString ResourcePool sql.NullString

4
db/queries/query.sql
View File

@@ -12,11 +12,11 @@ WHERE "VmId" = sqlc.arg('vmId') AND "Datacenter" = sqlc.arg('datacenterName');
-- name: GetInventoryEventId :one -- name: GetInventoryEventId :one
SELECT * FROM "Inventory" SELECT * FROM "Inventory"
WHERE "EventId" = ? LIMIT 1; WHERE "CloudId" = ? LIMIT 1;
-- name: CreateInventory :one -- name: CreateInventory :one
INSERT INTO "Inventory" ( 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( ) VALUES(
?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
) )

32
db/queries/query.sql.go
View File

@@ -72,11 +72,11 @@ func (q *Queries) CreateEvent(ctx context.Context, arg CreateEventParams) (Event
const createInventory = `-- name: CreateInventory :one const createInventory = `-- name: CreateInventory :one
INSERT INTO "Inventory" ( 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( ) 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 { type CreateInventoryParams struct {
@@ -84,7 +84,7 @@ type CreateInventoryParams struct {
Vcenter string Vcenter string
VmId sql.NullString VmId sql.NullString
EventKey sql.NullString EventKey sql.NullString
EventId sql.NullString CloudId sql.NullString
CreationTime sql.NullInt64 CreationTime sql.NullInt64
ResourcePool sql.NullString ResourcePool sql.NullString
VmType sql.NullString VmType sql.NullString
@@ -105,7 +105,7 @@ func (q *Queries) CreateInventory(ctx context.Context, arg CreateInventoryParams
arg.Vcenter, arg.Vcenter,
arg.VmId, arg.VmId,
arg.EventKey, arg.EventKey,
arg.EventId, arg.CloudId,
arg.CreationTime, arg.CreationTime,
arg.ResourcePool, arg.ResourcePool,
arg.VmType, arg.VmType,
@@ -126,7 +126,7 @@ func (q *Queries) CreateInventory(ctx context.Context, arg CreateInventoryParams
&i.Vcenter, &i.Vcenter,
&i.VmId, &i.VmId,
&i.EventKey, &i.EventKey,
&i.EventId, &i.CloudId,
&i.CreationTime, &i.CreationTime,
&i.DeletionTime, &i.DeletionTime,
&i.ResourcePool, &i.ResourcePool,
@@ -191,7 +191,7 @@ func (q *Queries) CreateUpdate(ctx context.Context, arg CreateUpdateParams) (Upd
} }
const getInventoryByName = `-- name: GetInventoryByName :many 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" = ? WHERE "Name" = ?
` `
@@ -210,7 +210,7 @@ func (q *Queries) GetInventoryByName(ctx context.Context, name string) ([]Invent
&i.Vcenter, &i.Vcenter,
&i.VmId, &i.VmId,
&i.EventKey, &i.EventKey,
&i.EventId, &i.CloudId,
&i.CreationTime, &i.CreationTime,
&i.DeletionTime, &i.DeletionTime,
&i.ResourcePool, &i.ResourcePool,
@@ -239,12 +239,12 @@ func (q *Queries) GetInventoryByName(ctx context.Context, name string) ([]Invent
} }
const getInventoryEventId = `-- name: GetInventoryEventId :one 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" SELECT Iid, Name, Vcenter, VmId, EventKey, CloudId, CreationTime, DeletionTime, ResourcePool, VmType, Datacenter, Cluster, Folder, ProvisionedDisk, InitialVcpus, InitialRam, SrmPlaceholder, IsTemplate, PowerState FROM "Inventory"
WHERE "EventId" = ? LIMIT 1 WHERE "CloudId" = ? LIMIT 1
` `
func (q *Queries) GetInventoryEventId(ctx context.Context, eventid sql.NullString) (Inventory, error) { func (q *Queries) GetInventoryEventId(ctx context.Context, cloudid sql.NullString) (Inventory, error) {
row := q.db.QueryRowContext(ctx, getInventoryEventId, eventid) row := q.db.QueryRowContext(ctx, getInventoryEventId, cloudid)
var i Inventory var i Inventory
err := row.Scan( err := row.Scan(
&i.Iid, &i.Iid,
@@ -252,7 +252,7 @@ func (q *Queries) GetInventoryEventId(ctx context.Context, eventid sql.NullStrin
&i.Vcenter, &i.Vcenter,
&i.VmId, &i.VmId,
&i.EventKey, &i.EventKey,
&i.EventId, &i.CloudId,
&i.CreationTime, &i.CreationTime,
&i.DeletionTime, &i.DeletionTime,
&i.ResourcePool, &i.ResourcePool,
@@ -271,7 +271,7 @@ func (q *Queries) GetInventoryEventId(ctx context.Context, eventid sql.NullStrin
} }
const getInventoryVmId = `-- name: GetInventoryVmId :one 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 WHERE "VmId" = ?1 AND "Datacenter" = ?2
` `
@@ -289,7 +289,7 @@ func (q *Queries) GetInventoryVmId(ctx context.Context, arg GetInventoryVmIdPara
&i.Vcenter, &i.Vcenter,
&i.VmId, &i.VmId,
&i.EventKey, &i.EventKey,
&i.EventId, &i.CloudId,
&i.CreationTime, &i.CreationTime,
&i.DeletionTime, &i.DeletionTime,
&i.ResourcePool, &i.ResourcePool,
@@ -369,7 +369,7 @@ func (q *Queries) ListEvents(ctx context.Context) ([]Events, error) {
} }
const listInventory = `-- name: ListInventory :many 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" ORDER BY "Name"
` `
@@ -388,7 +388,7 @@ func (q *Queries) ListInventory(ctx context.Context) ([]Inventory, error) {
&i.Vcenter, &i.Vcenter,
&i.VmId, &i.VmId,
&i.EventKey, &i.EventKey,
&i.EventId, &i.CloudId,
&i.CreationTime, &i.CreationTime,
&i.DeletionTime, &i.DeletionTime,
&i.ResourcePool, &i.ResourcePool,

2
internal/tasks/processEvents.go
View File

@@ -127,7 +127,7 @@ func (c *CronTask) RunVmCheck(ctx context.Context, logger *slog.Logger) error {
params := queries.CreateInventoryParams{ params := queries.CreateInventoryParams{
Name: vmObject.Vm.Name, Name: vmObject.Vm.Name,
Vcenter: evt.Source, 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}, EventKey: sql.NullString{String: evt.EventKey.String, Valid: evt.EventKey.Valid},
VmId: sql.NullString{String: evt.VmId.String, Valid: evt.VmId.Valid}, VmId: sql.NullString{String: evt.VmId.String, Valid: evt.VmId.Valid},
Datacenter: sql.NullString{String: evt.DatacenterName.String, Valid: evt.DatacenterName.Valid}, Datacenter: sql.NullString{String: evt.DatacenterName.String, Valid: evt.DatacenterName.Valid},