Icinga DB Source: Address Review

- event.Event: Extend baseEv.Event instead of a pointer.
- object: Merge IdTagRow and TagRow.
- objects.go: Remove mysterious trailing whitespace.

Author: oxzi

internal/event/event.go

@@ -31,7 +31,7 @@ type Event struct {
 	SourceId int64     `json:"-"`
 	ID       int64     `json:"-"`
 
-	*baseEv.Event `json:",inline"`
+	baseEv.Event `json:",inline"`
 }
 
 // Validate validates the current event state.

internal/incident/incident.go

@@ -492,7 +492,7 @@ func (i *Incident) evaluateEscalations(eventTime time.Time) ([]*rule.Escalation,
 
 			i.RetriggerEscalations(&event.Event{
 				Time: nextEvalAt,
-				Event: &baseEv.Event{
+				Event: baseEv.Event{
 					Type:    baseEv.TypeIncidentAge,
 					Message: fmt.Sprintf("Incident reached age %v", nextEvalAt.Sub(i.StartedAt.Time())),
 				},

internal/incident/incidents.go

@@ -131,7 +131,7 @@ func LoadOpenIncidents(ctx context.Context, db *database.DB, logger *logging.Log
 
 						i.RetriggerEscalations(&event.Event{
 							Time: time.Now(),
-							Event: &baseEv.Event{
+							Event: baseEv.Event{
 								Type:    baseEv.TypeIncidentAge,
 								Message: fmt.Sprintf("Incident reached age %v (daemon was restarted)", time.Since(i.StartedAt.Time())),
 							},

internal/incident/incidents_test.go

@@ -150,7 +150,7 @@ func makeIncident(ctx context.Context, db *database.DB, t *testing.T, sourceID i
 	ev := &event.Event{
 		Time:     time.Time{},
 		SourceId: sourceID,
-		Event: &baseEv.Event{
+		Event: baseEv.Event{
 			Name: testutils.MakeRandomString(t),
 			Tags: map[string]string{ // Always generate unique object tags not to produce same object ID!
 				"host":    testutils.MakeRandomString(t),

internal/object/db_types.go

@@ -2,16 +2,13 @@ package object
 
 import "github.com/icinga/icinga-go-library/types"
 
-// TagRow is a base type for IdTagRow and ExtraTagRow
-type TagRow struct {
+// IdTagRow represents a single database object id tag.
+type IdTagRow struct {
 	ObjectId types.Binary `db:"object_id"`
 	Tag      string       `db:"tag"`
 	Value    string       `db:"value"`
 }
 
-// IdTagRow represents a single database object id tag.
-type IdTagRow TagRow
-
 // TableName implements the contracts.TableNamer interface.
 func (e *IdTagRow) TableName() string {
 	return "object_id_tag"

internal/object/object.go

@@ -104,7 +104,7 @@ func FromEvent(ctx context.Context, db *database.DB, ev *event.Event) (*Object,
 	}
 
 	stmt, _ = db.BuildUpsertStmt(&IdTagRow{})
-	_, err = tx.NamedExecContext(ctx, stmt, mapToTagRows(newObject.ID, ev.Tags))
+	_, err = tx.NamedExecContext(ctx, stmt, mapToIdTagRows(newObject.ID, ev.Tags))
 	if err != nil {
 		return nil, fmt.Errorf("failed to upsert object id tags: %w", err)
 	}
@@ -193,11 +193,11 @@ func ID(source int64, tags map[string]string) types.Binary {
 	return h.Sum(nil)
 }
 
-// mapToTagRows transforms the object tags map to a slice of TagRow struct.
-func mapToTagRows(objectId types.Binary, tags map[string]string) []*TagRow {
-	var tagRows []*TagRow
+// mapToIdTagRows transforms the object tags map to a slice of TagRow struct.
+func mapToIdTagRows(objectId types.Binary, tags map[string]string) []*IdTagRow {
+	var tagRows []*IdTagRow
 	for key, val := range tags {
-		tagRows = append(tagRows, &TagRow{
+		tagRows = append(tagRows, &IdTagRow{
 			ObjectId: objectId,
 			Tag:      key,
 			Value:    val,

internal/object/objects.go

@@ -98,7 +98,7 @@ func restoreObjectsFromQuery(ctx context.Context, db *database.DB, query string,
 					if err != nil {
 						return errors.Wrap(err, "cannot restore objects ID tags")
 					}
-	
+
 					cacheMu.Lock()
 					defer cacheMu.Unlock()
 

internal/object/objects_test.go

@@ -83,7 +83,7 @@ func makeObject(ctx context.Context, db *database.DB, t *testing.T, sourceID int
 	ev := &event.Event{
 		Time:     time.Time{},
 		SourceId: sourceID,
-		Event: &baseEv.Event{
+		Event: baseEv.Event{
 			Name:       testutils.MakeRandomString(t),
 			Mute:       types.Bool{Valid: true, Bool: mute},
 			MuteReason: "Just for testing",