From 902ab96b2d3d322f22ebc04b3d8eba746343239a Mon Sep 17 00:00:00 2001 From: bel Date: Sun, 14 Apr 2024 15:40:49 -0600 Subject: [PATCH] wip pattern --- config.go | 2 ++ message.go | 5 +++-- report_test.go | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/config.go b/config.go index fe16ae6..e4915f6 100644 --- a/config.go +++ b/config.go @@ -27,6 +27,7 @@ type Config struct { LocalTokenizer string AssetPattern string DatacenterPattern string + EventNamePattern string storage Storage queue Queue driver Driver @@ -43,6 +44,7 @@ func newConfigFromEnv(ctx context.Context, getEnv func(string) string) (Config, OllamaModel: "gemma:2b", AssetPattern: `(dpg|svc|red)-[a-z0-9-]*`, DatacenterPattern: `[a-z]{4}[a-z]*-[0-9]`, + EventNamePattern: `(^\[[^\]]*\] *)`, } var m map[string]any diff --git a/message.go b/message.go index edb824f..d1b1286 100644 --- a/message.go +++ b/message.go @@ -107,9 +107,10 @@ type ( slackAction struct{} ) -func ParseSlack(b []byte, assetPattern, datacenterPattern string) (Message, error) { +func ParseSlack(b []byte, assetPattern, datacenterPattern, eventNamePattern string) (Message, error) { asset := regexp.MustCompile(assetPattern) datacenter := regexp.MustCompile(datacenterPattern) + eventName := regexp.MustCompile(eventNamePattern) s, err := parseSlack(b) if err != nil { @@ -134,7 +135,7 @@ func ParseSlack(b []byte, assetPattern, datacenterPattern string) (Message, erro Source: fmt.Sprintf(`https://renderinc.slack.com/archives/%s/p%s`, s.Event.Channel, strings.ReplaceAll(s.Event.ID, ".", "")), Channel: s.Event.Channel, Thread: s.Event.ID, - EventName: strings.Split(s.Event.Attachments[0].Title, ": Firing: ")[1], + EventName: eventNamePattern.FindString(strings.Split(s.Event.Attachments[0].Title, ": Firing: ")[1]), Event: strings.TrimPrefix(strings.Split(s.Event.Attachments[0].Title, ":")[0], "#"), Plaintext: s.Event.Attachments[0].Text, Asset: asset.FindString(s.Event.Attachments[0].Text), diff --git a/report_test.go b/report_test.go index 7ab64da..32b2734 100644 --- a/report_test.go +++ b/report_test.go @@ -16,7 +16,7 @@ func TestReport(t *testing.T) { w := bytes.NewBuffer(nil) db := NewRAM() - FillWithTestdata(ctx, db, renderAssetPattern, renderDatacenterPattern) + FillWithTestdata(ctx, db, renderAssetPattern, renderDatacenterPattern, renderEventNamePattern) s := NewStorage(db) if err := ReportSince(ctx, w, s, time.Now().Add(-1*time.Hour*24*365*20)); err != nil {