Drop utils package

Author: yhabteab

internal/channel/plugin.go

@@ -4,11 +4,11 @@ import (
 	"bufio"
 	"encoding/json"
 	"fmt"
+	"github.com/icinga/icinga-go-library/database"
+	"github.com/icinga/icinga-go-library/logging"
 	"github.com/icinga/icinga-notifications/internal/daemon"
 	"github.com/icinga/icinga-notifications/pkg/plugin"
 	"github.com/icinga/icinga-notifications/pkg/rpc"
-	"github.com/icinga/icingadb/pkg/icingadb"
-	"github.com/icinga/icingadb/pkg/logging"
 	"go.uber.org/zap"
 	"io"
 	"os"
@@ -141,7 +141,7 @@ func forwardLogs(errPipe io.Reader, logger *zap.SugaredLogger) {
 }
 
 // UpsertPlugins upsert the available_channel_type table with working plugins
-func UpsertPlugins(channelPluginDir string, logger *logging.Logger, db *icingadb.DB) {
+func UpsertPlugins(channelPluginDir string, logger *logging.Logger, db *database.DB) {
 	logger.Debug("Updating available channel types")
 	files, err := os.ReadDir(channelPluginDir)
 	if err != nil {

internal/incident/incident.go

@@ -208,7 +208,7 @@ func (i *Incident) RetriggerEscalations(ev *event.Event) {
 
 	var notifications []*NotificationEntry
 	ctx := context.Background()
-	err = utils.RunInTx(ctx, i.db, func(tx *sqlx.Tx) error {
+	err = i.db.RunInTx(ctx, func(tx *sqlx.Tx) error {
 		err := ev.Sync(ctx, tx, i.db, i.Object.ID)
 		if err != nil {
 			return err

internal/incident/sync.go

@@ -155,10 +155,10 @@ func (i *Incident) addPendingNotifications(
 		for chID := range channels {
 			hr := &HistoryRow{
 				Key:                       recipient.ToKey(contact),
-				EventID:                   utils.ToDBInt(ev.ID),
+				EventID:                   types.ToInt(ev.ID),
 				Time:                      types.UnixMilli(time.Now()),
 				Type:                      Notified,
-				ChannelID:                 utils.ToDBInt(chID),
+				ChannelID:                 types.ToInt(chID),
 				CausedByIncidentHistoryID: causedBy,
 				NotificationState:         NotificationStatePending,
 			}

internal/object/object.go

@@ -62,7 +62,7 @@ func FromEvent(ctx context.Context, db *database.DB, ev *event.Event) (*Object,
 		cache[id.String()] = object
 	}
 
-	err := db.Transaction(ctx, func(tx *sqlx.Tx) error {
+	err := db.RunInTx(ctx, func(tx *sqlx.Tx) error {
 		dbObj := &ObjectRow{
 			ID:       object.ID,
 			SourceID: ev.SourceId,

internal/utils/utils.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/icinga/icinga-go-library/types"
 	"github.com/icinga/icinga-notifications/pkg/rpc"
-	"github.com/icinga/icingadb/pkg/types"
 	"io"
 	"log"
 	"os"