Merge pull request #678 from flanksource/use-ctx-2

chore: use ctx.DB in notifications and responder jobs

logs/handler.go

@@ -9,14 +9,15 @@ import (
 
 	"github.com/flanksource/commons/collections"
 	"github.com/flanksource/commons/template"
-	"github.com/flanksource/duty"
+	"github.com/flanksource/duty/context"
+	"github.com/flanksource/duty/query"
 	"github.com/flanksource/duty/types"
 	"github.com/flanksource/incident-commander/api"
-	"github.com/flanksource/incident-commander/db"
 	"github.com/labstack/echo/v4"
 )
 
 func LogsHandler(c echo.Context) error {
+	ctx := c.Request().Context().(context.Context)
 	var reqData struct {
 		ID     string            `json:"id"`
 		Name   string            `json:"name"`
@@ -36,7 +37,7 @@ func LogsHandler(c echo.Context) error {
 		})
 	}
 
-	component, err := duty.GetComponent(c.Request().Context(), db.Gorm, reqData.ID)
+	component, err := query.GetComponent(ctx, reqData.ID)
 	if err != nil {
 		return c.JSON(http.StatusInternalServerError, api.HTTPError{
 			Error:   err.Error(),

notification/notification_test.go

@@ -10,7 +10,6 @@ import (
 	"github.com/flanksource/duty/models"
 	"github.com/flanksource/duty/types"
 	"github.com/flanksource/incident-commander/api"
-	"github.com/flanksource/incident-commander/db"
 	dbModels "github.com/flanksource/incident-commander/db/models"
 	"github.com/flanksource/incident-commander/events"
 	"github.com/google/uuid"
@@ -112,7 +111,7 @@ var _ = ginkgo.Describe("Test Notification on incident creation", ginkgo.Ordered
 		sendHandler, err := events.NewNotificationSendConsumerAsync().EventConsumer()
 		Expect(err).NotTo(HaveOccurred())
 
-		ctx := context.NewContext(gocontext.Background()).WithDB(api.DefaultContext.DB(), db.Pool)
+		ctx := context.NewContext(gocontext.Background()).WithDB(api.DefaultContext.DB(), api.DefaultContext.Pool())
 
 		// Order of consumption is important as incident.create event
 		// produces a notification.send event

notification/suite_test.go

@@ -15,7 +15,6 @@ import (
 	"github.com/flanksource/duty/context"
 	"github.com/flanksource/duty/testutils"
 	"github.com/flanksource/incident-commander/api"
-	"github.com/flanksource/incident-commander/db"
 	ginkgo "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
@@ -85,11 +84,12 @@ var _ = ginkgo.BeforeSuite(func() {
 	}
 	logger.Infof("Started postgres on port: %d", port)
 
-	if db.Gorm, db.Pool, err = duty.SetupDB(connection, nil); err != nil {
+	dbGorm, dbPool, err := duty.SetupDB(connection, nil)
+	if err != nil {
 		ginkgo.Fail(err.Error())
 	}
 
-	api.DefaultContext = context.NewContext(gocontext.Background()).WithDB(db.Gorm, db.Pool)
+	api.DefaultContext = context.NewContext(gocontext.Background()).WithDB(dbGorm, dbPool)
 	setupWebhookServer()
 })
 

responder/config_sync.go

@@ -2,6 +2,7 @@ package responder
 
 import (
 	"github.com/flanksource/commons/logger"
+	"github.com/flanksource/duty/context"
 	"github.com/flanksource/duty/job"
 	"github.com/flanksource/duty/models"
 
@@ -12,17 +13,17 @@ import (
 // A shared config class for all responder configs.
 const configClass = "Responder"
 
-func upsertConfig(configType, externalID, name, config string) error {
+func upsertConfig(ctx context.Context, configType, externalID, name, config string) error {
 	dbUpdateConfigQuery := `UPDATE config_items SET config = ? WHERE external_id = ARRAY[?] AND type = ? AND config_class = ?`
-	tx := db.Gorm.Exec(dbUpdateConfigQuery, config, externalID, configType, configClass)
+	tx := ctx.DB().Exec(dbUpdateConfigQuery, config, externalID, configType, configClass)
 	if tx.Error != nil {
 		logger.Errorf("Error updating config into database: %v", tx.Error)
 		return tx.Error
 	}
 
 	if tx.RowsAffected == 0 {
 		dbInsertConfigQuery := `INSERT INTO config_items (config_class, type, name, external_id, config) VALUES (?, ?, ?, ARRAY[?], ?)`
-		if err := db.Gorm.Exec(dbInsertConfigQuery, configClass, configType, name, externalID, config).Error; err != nil {
+		if err := ctx.DB().Exec(dbInsertConfigQuery, configClass, configType, name, externalID, config).Error; err != nil {
 			logger.Errorf("Error inserting config into database: %v", err)
 			return tx.Error
 		}
@@ -64,7 +65,7 @@ func SyncConfig(ctx job.JobRuntime) error {
 			jobHistory.AddError(err.Error()).End()
 			continue
 		} else {
-			if err := upsertConfig(configType, team.ID.String(), configName, config); err != nil {
+			if err := upsertConfig(ctx.Context, configType, team.ID.String(), configName, config); err != nil {
 				logger.Errorf("Error upserting config: %v", err)
 				jobHistory.AddError(err.Error()).End()
 				continue

rules/job.go

@@ -9,7 +9,6 @@ import (
 	"github.com/flanksource/duty/job"
 	dutyModels "github.com/flanksource/duty/models"
 	"github.com/flanksource/incident-commander/api"
-	"github.com/flanksource/incident-commander/db"
 	"github.com/flanksource/incident-commander/db/models"
 )
 
@@ -36,7 +35,7 @@ func Run(ctx job.JobRuntime) error {
 	}
 
 	statuses := getAllStatii()
-	response, err := duty.QueryTopology(ctx, db.Pool, duty.TopologyOptions{
+	response, err := duty.QueryTopology(ctx, ctx.Pool(), duty.TopologyOptions{
 		Flatten: true,
 		Status:  statuses,
 	})
@@ -50,12 +49,12 @@ func Run(ctx job.JobRuntime) error {
 		return err
 	}
 
-	return createIncidents(autoCreatedOpenIncidents, response.Components)
+	return createIncidents(ctx.Context, autoCreatedOpenIncidents, response.Components)
 }
 
 // createIncidents creates incidents based on the components
 // and incident rules.
-func createIncidents(openIncidentsMap map[string]map[string]struct{}, components dutyModels.Components) error {
+func createIncidents(ctx context.Context, openIncidentsMap map[string]map[string]struct{}, components dutyModels.Components) error {
 outer:
 	for _, component := range components {
 		for _, _rule := range Rules {
@@ -82,7 +81,7 @@ outer:
 					continue // this rule already created this incident
 				}
 
-				if err := db.Gorm.Create(&incident).Error; err != nil {
+				if err := ctx.DB().Create(&incident).Error; err != nil {
 					return err
 				}
 
@@ -92,7 +91,7 @@ outer:
 					Type:       "factor",
 				}
 
-				if err := db.Gorm.Create(&hypothesis).Error; err != nil {
+				if err := ctx.DB().Create(&hypothesis).Error; err != nil {
 					return err
 				}
 
@@ -104,7 +103,7 @@ outer:
 					Description:      component.Name + " is " + string(component.Status),
 				}
 
-				if err := db.Gorm.Create(&evidence).Error; err != nil {
+				if err := ctx.DB().Create(&evidence).Error; err != nil {
 					return err
 				}