From 496401a889b46ee864719251e8bbf9483fc934fb Mon Sep 17 00:00:00 2001 From: Yash Mehrotra Date: Thu, 12 Sep 2024 12:50:55 +0530 Subject: [PATCH 1/2] chore: bump duty --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a2b391504..b40dc151c 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/containrrr/shoutrrr v0.8.0 github.com/fergusstrange/embedded-postgres v1.25.0 // indirect github.com/flanksource/commons v1.29.10 - github.com/flanksource/duty v1.0.640 + github.com/flanksource/duty v1.0.642 github.com/flanksource/gomplate/v3 v3.24.30 github.com/flanksource/kopper v1.0.9 github.com/gomarkdown/markdown v0.0.0-20240419095408-642f0ee99ae2 diff --git a/go.sum b/go.sum index 66f013f93..0ac101e5a 100644 --- a/go.sum +++ b/go.sum @@ -877,8 +877,8 @@ github.com/flanksource/artifacts v1.0.14 h1:Vv70bccsae0MwGaf/uSPp34J5V1/PyKfct9z github.com/flanksource/artifacts v1.0.14/go.mod h1:qHVCnQu5k50aWNJ5UhpcAKEl7pAzqUrFFKGSm147G70= github.com/flanksource/commons v1.29.10 h1:T/S95Pl8kASEFvQjQ7fJjTUqeVdhxQXg1vfkULTYFJQ= github.com/flanksource/commons v1.29.10/go.mod h1:iTbrXOSp3Spv570Nly97D/U9cQjLZoVlmWCXqWzsvRU= -github.com/flanksource/duty v1.0.640 h1:hv9iQUlP2fOux8SErSj0s93x6FO25JD+noXWtkujxY4= -github.com/flanksource/duty v1.0.640/go.mod h1:Oj9zIX94CR2U+nmnt97gNLMrsBWILyIhIBeJynIIgqE= +github.com/flanksource/duty v1.0.642 h1:GcEZBwLGPbm7HJGCgJnMTgP/twYQeJavx9IIi3w4Pfk= +github.com/flanksource/duty v1.0.642/go.mod h1:Oj9zIX94CR2U+nmnt97gNLMrsBWILyIhIBeJynIIgqE= github.com/flanksource/gomplate/v3 v3.20.4/go.mod h1:27BNWhzzSjDed1z8YShO6W+z6G9oZXuxfNFGd/iGSdc= github.com/flanksource/gomplate/v3 v3.24.30 h1:6Y25KnAMX4iCuEXe1C8d1kB2PdV+zD1ZulZrv6DV14Q= github.com/flanksource/gomplate/v3 v3.24.30/go.mod h1:/lAM7+fkcCCfghCAjzdCqwgWxN5Ow8Sk6nkdFPjejCE= From b4e7c5e5747f1aae8a5350607a653097334415dc Mon Sep 17 00:00:00 2001 From: Yash Mehrotra Date: Thu, 12 Sep 2024 18:01:23 +0530 Subject: [PATCH 2/2] chore: use topology pkg to save components --- go.mod | 2 +- go.sum | 4 ++-- push/topology.go | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index b40dc151c..e756166b2 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/containrrr/shoutrrr v0.8.0 github.com/fergusstrange/embedded-postgres v1.25.0 // indirect github.com/flanksource/commons v1.29.10 - github.com/flanksource/duty v1.0.642 + github.com/flanksource/duty v1.0.643 github.com/flanksource/gomplate/v3 v3.24.30 github.com/flanksource/kopper v1.0.9 github.com/gomarkdown/markdown v0.0.0-20240419095408-642f0ee99ae2 diff --git a/go.sum b/go.sum index 0ac101e5a..656066d91 100644 --- a/go.sum +++ b/go.sum @@ -877,8 +877,8 @@ github.com/flanksource/artifacts v1.0.14 h1:Vv70bccsae0MwGaf/uSPp34J5V1/PyKfct9z github.com/flanksource/artifacts v1.0.14/go.mod h1:qHVCnQu5k50aWNJ5UhpcAKEl7pAzqUrFFKGSm147G70= github.com/flanksource/commons v1.29.10 h1:T/S95Pl8kASEFvQjQ7fJjTUqeVdhxQXg1vfkULTYFJQ= github.com/flanksource/commons v1.29.10/go.mod h1:iTbrXOSp3Spv570Nly97D/U9cQjLZoVlmWCXqWzsvRU= -github.com/flanksource/duty v1.0.642 h1:GcEZBwLGPbm7HJGCgJnMTgP/twYQeJavx9IIi3w4Pfk= -github.com/flanksource/duty v1.0.642/go.mod h1:Oj9zIX94CR2U+nmnt97gNLMrsBWILyIhIBeJynIIgqE= +github.com/flanksource/duty v1.0.643 h1:P2bi//29BdbJbuXiT3NnWkxN8CSyJJCcngw72H48soE= +github.com/flanksource/duty v1.0.643/go.mod h1:Oj9zIX94CR2U+nmnt97gNLMrsBWILyIhIBeJynIIgqE= github.com/flanksource/gomplate/v3 v3.20.4/go.mod h1:27BNWhzzSjDed1z8YShO6W+z6G9oZXuxfNFGd/iGSdc= github.com/flanksource/gomplate/v3 v3.24.30 h1:6Y25KnAMX4iCuEXe1C8d1kB2PdV+zD1ZulZrv6DV14Q= github.com/flanksource/gomplate/v3 v3.24.30/go.mod h1:/lAM7+fkcCCfghCAjzdCqwgWxN5Ow8Sk6nkdFPjejCE= diff --git a/push/topology.go b/push/topology.go index b2b2f113e..68db2888c 100644 --- a/push/topology.go +++ b/push/topology.go @@ -8,6 +8,7 @@ import ( "github.com/flanksource/duty/context" dutydb "github.com/flanksource/duty/db" "github.com/flanksource/duty/models" + dutytopology "github.com/flanksource/duty/topology" "github.com/flanksource/incident-commander/db" "github.com/google/uuid" "github.com/labstack/echo/v4" @@ -61,7 +62,7 @@ func PushTopology(c echo.Context) error { compIDs = append(compIDs, c.ID) } - if err := data.Save(ctx.DB()); err != nil { + if err := dutytopology.SaveComponent(ctx, &data); err != nil { return dutyAPI.WriteError(c, dutyAPI.Errorf(dutyAPI.EINTERNAL, "error saving components: %v", dutydb.ErrorDetails(err))) }