Skip to content

Commit

Permalink
fix: sync admin identity & person on startup (#1353)
Browse files Browse the repository at this point in the history 
* fix: sync admin identity & person on startup

* wrap notification tests in one single Describe so we run them in order
  • Loading branch information
@adityathebe
adityathebe authored Sep 6, 2024
1 parent 16290eb commit 71f3b6a
Show file tree
Hide file tree
Showing 2 changed files with 185 additions and 167 deletions.
16 changes: 16 additions & 0 deletions auth/kratos_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import (
gocontext "context"

"github.com/flanksource/duty/context"
"github.com/flanksource/duty/models"
"github.com/google/uuid"
client "github.com/ory/client-go"
)

Expand Down Expand Up @@ -103,5 +105,19 @@ func (k *KratosHandler) CreateAdminUser(ctx context.Context) (string, error) {
return k.createAdminIdentity(ctx)
}

{
// If in case the admin identity wasn't synced with the people table, we sync it now.
var admin models.Person
if err := ctx.DB().Where("id = ?", id).Find(&admin).Error; err != nil {
return "", err
} else if admin.ID == uuid.Nil {
// Do a dummy update so the postgres tirgger syncs the admin person.
// This way we have the sync logic in one place.
if err := ctx.DB().Raw(`UPDATE identities SET traits = traits WHERE id = ?`, id).Error; err != nil {
return "", tx.Error
}
}
}

return id, nil
}
336 changes: 169 additions & 167 deletions notification/notification_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,181 +23,183 @@ import (
_ "github.com/flanksource/incident-commander/upstream"
)

var _ = ginkgo.Describe("Notification on incident creation", ginkgo.Ordered, func() {
var (
john *models.Person
incident *models.Incident
component *models.Component
team *dbModels.Team
)

ginkgo.It("should create a person", func() {
john = &models.Person{
ID: uuid.New(),
Name: "James Bond",
}
tx := DefaultContext.DB().Create(john)
Expect(tx.Error).To(BeNil())
var _ = ginkgo.Describe("Notifications", ginkgo.Ordered, func() {
var _ = ginkgo.Describe("Notification on incident creation", ginkgo.Ordered, func() {
var (
john *models.Person
incident *models.Incident
component *models.Component
team *dbModels.Team
)

ginkgo.It("should create a person", func() {
john = &models.Person{
ID: uuid.New(),
Name: "James Bond",
}
tx := DefaultContext.DB().Create(john)
Expect(tx.Error).To(BeNil())
})

ginkgo.It("should create a new component", func() {
component = &models.Component{
ID: uuid.New(),
Name: "logistics",
Type: "Entity",
ExternalId: "dummy/logistics",
}
tx := DefaultContext.DB().Create(component)
Expect(tx.Error).To(BeNil())
})

ginkgo.It("should create a team", func() {
teamSpec := api.TeamSpec{
Components: []types.ResourceSelector{{Name: "logistics"}},
Notifications: []api.NotificationConfig{
{
URL: fmt.Sprintf("generic+%s", webhookEndpoint),
Properties: map[string]string{
"template": "json",
"disabletls": "yes",
"title": "New incident: {{.incident.title}}",
},
},
},
}

specRaw, err := collections.StructToJSON(teamSpec)
Expect(err).To(BeNil())

var spec types.JSONMap
err = json.Unmarshal([]byte(specRaw), &spec)
Expect(err).To(BeNil())

team = &dbModels.Team{
ID: uuid.New(),
Name: "ghostbusters",
CreatedBy: john.ID,
Spec: spec,
}
tx := DefaultContext.DB().Create(team)
Expect(tx.Error).To(BeNil())
})

ginkgo.It("should create a new notification", func() {
notif := models.Notification{
ID: uuid.New(),
Events: pq.StringArray([]string{"incident.created"}),
Template: "Severity: {{.incident.severity}}",
TeamID: &team.ID,
Source: models.SourceCRD,
}

err := DefaultContext.DB().Create(&notif).Error
Expect(err).To(BeNil())
})

ginkgo.It("should create an incident", func() {
incident = &models.Incident{
ID: uuid.New(),
Title: "Constantly hitting threshold",
CreatedBy: john.ID,
Type: models.IncidentTypeCost,
Status: models.IncidentStatusOpen,
Severity: "Blocker",
CommanderID: &john.ID,
}
tx := DefaultContext.DB().Create(incident)
Expect(tx.Error).To(BeNil())
})

ginkgo.It("should consume the event and send the notification", func() {
events.ConsumeAll(DefaultContext)

Eventually(func() int {
return len(webhookPostdata)
}, "10s", "200ms").Should(BeNumerically(">=", 1))

Expect(webhookPostdata).To(Not(BeNil()))
Expect(webhookPostdata["message"]).To(Equal(fmt.Sprintf("Severity: %s", incident.Severity)))
Expect(webhookPostdata["title"]).To(Equal(fmt.Sprintf("New incident: %s", incident.Title)))
})
})

ginkgo.It("should create a new component", func() {
component = &models.Component{
ID: uuid.New(),
Name: "logistics",
Type: "Entity",
ExternalId: "dummy/logistics",
}
tx := DefaultContext.DB().Create(component)
Expect(tx.Error).To(BeNil())
})
var _ = ginkgo.Describe("repeat interval test", ginkgo.Ordered, func() {
var n models.Notification
var config models.ConfigItem

ginkgo.It("should create a team", func() {
teamSpec := api.TeamSpec{
Components: []types.ResourceSelector{{Name: "logistics"}},
Notifications: []api.NotificationConfig{
ginkgo.BeforeAll(func() {
customReceiver := []api.NotificationConfig{
{
URL: fmt.Sprintf("generic+%s", webhookEndpoint),
Properties: map[string]string{
"template": "json",
"disabletls": "yes",
"title": "New incident: {{.incident.title}}",
"template": "json",
},
},
},
}

specRaw, err := collections.StructToJSON(teamSpec)
Expect(err).To(BeNil())

var spec types.JSONMap
err = json.Unmarshal([]byte(specRaw), &spec)
Expect(err).To(BeNil())

team = &dbModels.Team{
ID: uuid.New(),
Name: "ghostbusters",
CreatedBy: john.ID,
Spec: spec,
}
tx := DefaultContext.DB().Create(team)
Expect(tx.Error).To(BeNil())
})

ginkgo.It("should create a new notification", func() {
notif := models.Notification{
ID: uuid.New(),
Events: pq.StringArray([]string{"incident.created"}),
Template: "Severity: {{.incident.severity}}",
TeamID: &team.ID,
Source: models.SourceCRD,
}

err := DefaultContext.DB().Create(&notif).Error
Expect(err).To(BeNil())
})

ginkgo.It("should create an incident", func() {
incident = &models.Incident{
ID: uuid.New(),
Title: "Constantly hitting threshold",
CreatedBy: john.ID,
Type: models.IncidentTypeCost,
Status: models.IncidentStatusOpen,
Severity: "Blocker",
CommanderID: &john.ID,
}
tx := DefaultContext.DB().Create(incident)
Expect(tx.Error).To(BeNil())
})

ginkgo.It("should consume the event and send the notification", func() {
events.ConsumeAll(DefaultContext)

Eventually(func() int {
return len(webhookPostdata)
}, "10s", "200ms").Should(BeNumerically(">=", 1))

Expect(webhookPostdata).To(Not(BeNil()))
Expect(webhookPostdata["message"]).To(Equal(fmt.Sprintf("Severity: %s", incident.Severity)))
Expect(webhookPostdata["title"]).To(Equal(fmt.Sprintf("New incident: %s", incident.Title)))
})
})

var _ = ginkgo.Describe("repeat interval test", ginkgo.Ordered, func() {
var n models.Notification
var config models.ConfigItem

ginkgo.BeforeAll(func() {
customReceiver := []api.NotificationConfig{
{
URL: fmt.Sprintf("generic+%s", webhookEndpoint),
Properties: map[string]string{
"disabletls": "yes",
"template": "json",
},
},
}
customReceiverJson, err := json.Marshal(customReceiver)
Expect(err).To(BeNil())

n = models.Notification{
ID: uuid.New(),
Events: pq.StringArray([]string{"config.updated"}),
Source: models.SourceCRD,
Title: "Dummy",
Template: "dummy",
CustomServices: types.JSON(customReceiverJson),
RepeatInterval: "4h",
}

err = DefaultContext.DB().Create(&n).Error
Expect(err).To(BeNil())

config = models.ConfigItem{
ID: uuid.New(),
Name: lo.ToPtr("Deployment1"),
ConfigClass: models.ConfigClassDeployment,
Config: lo.ToPtr(`{"color": "red"}`),
Type: lo.ToPtr("Kubernetes::Deployment"),
}

err = DefaultContext.DB().Create(&config).Error
Expect(err).To(BeNil())
})

ginkgo.It("should have sent a notification for a config update", func() {
err := DefaultContext.DB().Model(&models.ConfigItem{}).Where("id = ?", config.ID).UpdateColumn("config", `{"color": "blue"}`).Error
Expect(err).To(BeNil())

events.ConsumeAll(DefaultContext)
Eventually(func() int64 {
var c int64
DefaultContext.DB().Model(&models.Event{}).Where("name = 'config.updated'").Count(&c)
return c
}, "10s", "200ms").Should(Equal(int64(0)))

// Check send history
var sentHistoryCount int64
err = DefaultContext.DB().Model(&models.NotificationSendHistory{}).Where("notification_id = ?", n.ID).Count(&sentHistoryCount).Error
Expect(err).To(BeNil())
Expect(sentHistoryCount).To(Equal(int64(1)))
})

ginkgo.It("should NOT have sent a notification for a subsequent config update", func() {
err := DefaultContext.DB().Model(&models.ConfigItem{}).Where("id = ?", config.ID).UpdateColumn("config", `{"color": "yellow"}`).Error
Expect(err).To(BeNil())

events.ConsumeAll(DefaultContext)
Eventually(func() int64 {
var c int64
DefaultContext.DB().Model(&models.Event{}).Where("name = 'config.updated'").Count(&c)
return c
}, "10s", "200ms").Should(Equal(int64(0)))

// Check send history
var sentHistoryCount int64
err = DefaultContext.DB().Model(&models.NotificationSendHistory{}).Where("notification_id = ?", n.ID).Count(&sentHistoryCount).Error
Expect(err).To(BeNil())
Expect(sentHistoryCount).To(Equal(int64(1)))
}
customReceiverJson, err := json.Marshal(customReceiver)
Expect(err).To(BeNil())

n = models.Notification{
ID: uuid.New(),
Events: pq.StringArray([]string{"config.updated"}),
Source: models.SourceCRD,
Title: "Dummy",
Template: "dummy",
CustomServices: types.JSON(customReceiverJson),
RepeatInterval: "4h",
}

err = DefaultContext.DB().Create(&n).Error
Expect(err).To(BeNil())

config = models.ConfigItem{
ID: uuid.New(),
Name: lo.ToPtr("Deployment1"),
ConfigClass: models.ConfigClassDeployment,
Config: lo.ToPtr(`{"color": "red"}`),
Type: lo.ToPtr("Kubernetes::Deployment"),
}

err = DefaultContext.DB().Create(&config).Error
Expect(err).To(BeNil())
})

ginkgo.It("should have sent a notification for a config update", func() {
err := DefaultContext.DB().Model(&models.ConfigItem{}).Where("id = ?", config.ID).UpdateColumn("config", `{"color": "blue"}`).Error
Expect(err).To(BeNil())

events.ConsumeAll(DefaultContext)
Eventually(func() int64 {
var c int64
DefaultContext.DB().Model(&models.Event{}).Where("name = 'config.updated'").Count(&c)
return c
}, "10s", "200ms").Should(Equal(int64(0)))

// Check send history
var sentHistoryCount int64
err = DefaultContext.DB().Model(&models.NotificationSendHistory{}).Where("notification_id = ?", n.ID).Count(&sentHistoryCount).Error
Expect(err).To(BeNil())
Expect(sentHistoryCount).To(Equal(int64(1)))
})

ginkgo.It("should NOT have sent a notification for a subsequent config update", func() {
err := DefaultContext.DB().Model(&models.ConfigItem{}).Where("id = ?", config.ID).UpdateColumn("config", `{"color": "yellow"}`).Error
Expect(err).To(BeNil())

events.ConsumeAll(DefaultContext)
Eventually(func() int64 {
var c int64
DefaultContext.DB().Model(&models.Event{}).Where("name = 'config.updated'").Count(&c)
return c
}, "10s", "200ms").Should(Equal(int64(0)))

// Check send history
var sentHistoryCount int64
err = DefaultContext.DB().Model(&models.NotificationSendHistory{}).Where("notification_id = ?", n.ID).Count(&sentHistoryCount).Error
Expect(err).To(BeNil())
Expect(sentHistoryCount).To(Equal(int64(1)))
})
})
})

0 comments on commit 71f3b6a

Please sign in to comment.