Use IGL database

Icinga · Nov 4, 2024 · 511a805 · 511a805
1 parent 6f41bd0
commit 511a805
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/cmd/icinga-kubernetes/main.go b/cmd/icinga-kubernetes/main.go
@@ -233,19 +233,19 @@ func main() {
 	}, periodic.Immediate()).Stop()
 
 	var nclient *notifications.Client
-	if err := notifications.SyncSourceConfig(ctx, db, &cfg.Notifications); err != nil {
+	if err := notifications.SyncSourceConfig(ctx, db2, &cfg.Notifications); err != nil {
 		klog.Fatal(err)
 	}
 
 	if cfg.Notifications.Url == "" {
-		err = notifications.RetrieveConfig(ctx, db, &cfg.Notifications)
+		err = notifications.RetrieveConfig(ctx, db2, &cfg.Notifications)
 		if err != nil {
 			klog.Error(errors.Wrap(err, "cannot retrieve Icinga Notifications config"))
 		}
 	}
 
 	if cfg.Notifications.Url != "" {
-		nclient = notifications.NewClient(db, cfg.Notifications)
+		nclient = notifications.NewClient(db2, cfg.Notifications)
 	}
 
 	if cfg.Prometheus.Url != "" {

diff --git a/pkg/notifications/client.go b/pkg/notifications/client.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
+	"github.com/icinga/icinga-go-library/database"
 	"github.com/icinga/icinga-kubernetes/internal"
-	"github.com/icinga/icinga-kubernetes/pkg/database"
 	"github.com/pkg/errors"
 	"io"
 	"k8s.io/klog/v2"
@@ -20,12 +20,12 @@ type Notifiable interface {
 }
 
 type Client struct {
-	db     *database.Database
+	db     *database.DB
 	client http.Client
 	Config
 }
 
-func NewClient(db *database.Database, c Config) *Client {
+func NewClient(db *database.DB, c Config) *Client {
 	return &Client{db: db, client: http.Client{}, Config: c}
 }
 

diff --git a/pkg/notifications/notifications.go b/pkg/notifications/notifications.go
@@ -3,13 +3,13 @@ package notifications
 import (
 	"context"
 	"fmt"
-	"github.com/icinga/icinga-kubernetes/pkg/database"
+	"github.com/icinga/icinga-go-library/database"
 	schemav1 "github.com/icinga/icinga-kubernetes/pkg/schema/v1"
 	"github.com/pkg/errors"
 )
 
 // SyncSourceConfig synchronises the Icinga Notifications credentials from the YAML config to the database.
-func SyncSourceConfig(ctx context.Context, db *database.Database, config *Config) error {
+func SyncSourceConfig(ctx context.Context, db *database.DB, config *Config) error {
 	var configPairs []*schemav1.Config
 
 	if config.Url != "" {
@@ -23,7 +23,7 @@ func SyncSourceConfig(ctx context.Context, db *database.Database, config *Config
 
 		stmt := fmt.Sprintf(
 			`DELETE FROM %s WHERE %s IN (?)`,
-			db.QuoteIdentifier(database.TableName(&schemav1.Config{})),
+			database.TableName(&schemav1.Config{}),
 			"`key`",
 		)
 
@@ -45,7 +45,7 @@ func SyncSourceConfig(ctx context.Context, db *database.Database, config *Config
 }
 
 // RetrieveConfig retrieves the Icinga Notifications config from the database. The username is "source-<sourceID>".
-func RetrieveConfig(ctx context.Context, db *database.Database, config *Config) error {
+func RetrieveConfig(ctx context.Context, db *database.DB, config *Config) error {
 	var dbConfig []*schemav1.Config
 	if err := db.SelectContext(ctx, &dbConfig, db.BuildSelectStmt(&schemav1.Config{}, &schemav1.Config{})); err != nil {
 		return errors.Wrap(err, "cannot fetch Icinga Notifications config from DB")