From 8b0bb1506d6d29af2d04771692a059ca456b25cd Mon Sep 17 00:00:00 2001 From: Derek Horton Date: Tue, 27 Feb 2024 13:25:02 -0600 Subject: [PATCH 1/2] We retrieved the run id during the first query so lets pass it into the update statement to speed up the update --- internal/response-consumer/handler.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/internal/response-consumer/handler.go b/internal/response-consumer/handler.go index 509d5437..177a8a65 100644 --- a/internal/response-consumer/handler.go +++ b/internal/response-consumer/handler.go @@ -115,6 +115,9 @@ func (this *handler) onMessage(ctx context.Context, msg *k.Message) { Events: eventsSerialized, } + // We retrieved the run id (primary key) above...lets use it here during the update to speed up the query + baseQuery = baseQuery.Where("id = ?", run.ID) + // Only update if the run is not marked as complete updateResult := baseQuery.Where("status not in ?", []string{db.RunStatusSuccess, db.RunStatusFailure}).Select("status", "events").Updates(toUpdate) if updateResult.Error != nil { From 5d1aecefb4e936971d5019a04919615cd5e375f9 Mon Sep 17 00:00:00 2001 From: Derek Horton Date: Tue, 5 Mar 2024 11:56:17 -0600 Subject: [PATCH 2/2] Modify the Makefile to pull the go utils from the $GOPATH --- Makefile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index ab772bfe..e33237d6 100644 --- a/Makefile +++ b/Makefile @@ -22,42 +22,42 @@ init: generate-api: # public API - ~/go/bin/oapi-codegen -generate server,spec -package public -o internal/api/controllers/public/spec.gen.go schema/public.openapi.yaml - ~/go/bin/oapi-codegen -generate types -package public -o internal/api/controllers/public/types.gen.go schema/public.openapi.yaml + ${GOPATH}/bin/oapi-codegen -generate server,spec -package public -o internal/api/controllers/public/spec.gen.go schema/public.openapi.yaml + ${GOPATH}/bin/oapi-codegen -generate types -package public -o internal/api/controllers/public/types.gen.go schema/public.openapi.yaml # internal API - ~/go/bin/oapi-codegen -generate server,spec -package private -o internal/api/controllers/private/spec.gen.go -import-mapping=./public.openapi.yaml:playbook-dispatcher/internal/api/controllers/public schema/private.openapi.yaml - ~/go/bin/oapi-codegen -generate types -package private -o internal/api/controllers/private/types.gen.go -import-mapping=./public.openapi.yaml:playbook-dispatcher/internal/api/controllers/public schema/private.openapi.yaml + ${GOPATH}/bin/oapi-codegen -generate server,spec -package private -o internal/api/controllers/private/spec.gen.go -import-mapping=./public.openapi.yaml:playbook-dispatcher/internal/api/controllers/public schema/private.openapi.yaml + ${GOPATH}/bin/oapi-codegen -generate types -package private -o internal/api/controllers/private/types.gen.go -import-mapping=./public.openapi.yaml:playbook-dispatcher/internal/api/controllers/public schema/private.openapi.yaml generate-clients: - ~/go/bin/oapi-codegen -generate client,types -package public -o internal/api/tests/public/client.gen.go schema/public.openapi.yaml - ~/go/bin/oapi-codegen -generate client,types -package private -o internal/api/tests/private/client.gen.go -import-mapping=./public.openapi.yaml:playbook-dispatcher/internal/api/controllers/public schema/private.openapi.yaml + ${GOPATH}/bin/oapi-codegen -generate client,types -package public -o internal/api/tests/public/client.gen.go schema/public.openapi.yaml + ${GOPATH}/bin/oapi-codegen -generate client,types -package private -o internal/api/tests/private/client.gen.go -import-mapping=./public.openapi.yaml:playbook-dispatcher/internal/api/controllers/public schema/private.openapi.yaml generate-messages: - ~/go/bin/gojsonschema --yaml-extension yaml -p message schema/playbookRunResponse.message.yaml > ./internal/common/model/message/runner.types.gen.go - ~/go/bin/gojsonschema --yaml-extension yaml -p message schema/playbookSatRunResponse.message.yaml > ./internal/common/model/message/rhcsat.types.gen.go + ${GOPATH}/bin/go-jsonschema --yaml-extension yaml -p message schema/playbookRunResponse.message.yaml > ./internal/common/model/message/runner.types.gen.go + ${GOPATH}/bin/go-jsonschema --yaml-extension yaml -p message schema/playbookSatRunResponse.message.yaml > ./internal/common/model/message/rhcsat.types.gen.go generate-cloud-connector: curl -s ${CLOUD_CONNECTOR_SCHEMA} -o cloud-connector.json json2yaml cloud-connector.json cloud-connector.yaml - ~/go/bin/oapi-codegen -generate client,types -package connectors -o internal/api/connectors/cloudConnector.gen.go cloud-connector.yaml + ${GOPATH}/bin/oapi-codegen -generate client,types -package connectors -o internal/api/connectors/cloudConnector.gen.go cloud-connector.yaml rm cloud-connector.json cloud-connector.yaml generate-rbac: curl -s ${RBAC_CONNECTOR_SCHEMA} -o rbac.json json2yaml rbac.json rbac.yaml - ~/go/bin/oapi-codegen -generate client,types -package rbac -include-tags Access -o internal/api/rbac/rbac.gen.go rbac.yaml + ${GOPATH}/bin/oapi-codegen -generate client,types -package rbac -include-tags Access -o internal/api/rbac/rbac.gen.go rbac.yaml rm rbac.json rbac.yaml generate-inventory: curl -s ${INVENTORY_CONNECTOR_SCHEMA} -o inventory.json json2yaml inventory.json inventory.yaml - ~/go/bin/oapi-codegen -generate client,types -package inventory -o internal/api/connectors/inventory/inventory.gen.go inventory.yaml + ${GOPATH}/bin/oapi-codegen -generate client,types -package inventory -o internal/api/connectors/inventory/inventory.gen.go inventory.yaml rm inventory.json inventory.yaml generate-sources: curl -s ${SOURCES_CONNECTOR_SCHEMA} -o sources.json json2yaml sources.json sources.yaml - ~/go/bin/oapi-codegen -generate client,types -package sources -o internal/api/connectors/sources/sources.gen.go sources.yaml + ${GOPATH}/bin/oapi-codegen -generate client,types -package sources -o internal/api/connectors/sources/sources.gen.go sources.yaml rm sources.yaml sources.json generate-utils: