Compare commits

..

4 Commits

Author SHA1 Message Date
Bel LaPointe
20a9589eb8 add HTTP server test with main and testdata 2024-04-12 14:05:02 -06:00
Bel LaPointe
a8d1d69f63 parse []string from env 2024-04-12 13:57:53 -06:00
Bel LaPointe
a7e254ff94 drop random human messages 2024-04-12 13:53:31 -06:00
Bel LaPointe
a2cc8ed2a1 run as FILL_WITH_TESTDATA=true go run . to run with slack messages in RAM 2024-04-12 13:37:10 -06:00
5 changed files with 198 additions and 8 deletions

View File

@@ -17,10 +17,11 @@ type Config struct {
Debug bool Debug bool
InitializeSlack bool InitializeSlack bool
SlackToken string SlackToken string
SlackChannels string SlackChannels []string
PostgresConn string PostgresConn string
BasicAuthUser string BasicAuthUser string
BasicAuthPassword string BasicAuthPassword string
FillWithTestdata bool
storage Storage storage Storage
queue Queue queue Queue
driver Driver driver Driver
@@ -72,6 +73,10 @@ func newConfigFromEnv(ctx context.Context, getEnv func(string) string) (Config,
return Config{}, err return Config{}, err
} }
m[k] = got m[k] = got
case nil, []interface{}:
m[k] = strings.Split(s, ",")
default:
return Config{}, fmt.Errorf("not impl: parse %s as %T", envK, v)
} }
} }
@@ -92,6 +97,11 @@ func newConfigFromEnv(ctx context.Context, getEnv func(string) string) (Config,
} }
result.driver = pg result.driver = pg
} }
if result.FillWithTestdata {
if err := FillWithTestdata(ctx, result.driver); err != nil {
return Config{}, err
}
}
result.storage = NewStorage(result.driver) result.storage = NewStorage(result.driver)
result.queue = NewQueue(result.driver) result.queue = NewQueue(result.driver)

View File

@@ -13,6 +13,8 @@ func TestNewConfig(t *testing.T) {
return "1" return "1"
case "INITIALIZE_SLACK": case "INITIALIZE_SLACK":
return "true" return "true"
case "SLACK_CHANNELS":
return "x,y"
default: default:
return "" return ""
} }
@@ -22,5 +24,7 @@ func TestNewConfig(t *testing.T) {
t.Error(got) t.Error(got)
} else if !got.InitializeSlack { } else if !got.InitializeSlack {
t.Error(got) t.Error(got)
} else if len(got.SlackChannels) != 2 || got.SlackChannels[0] != "x" || got.SlackChannels[1] != "y" {
t.Error(got)
} }
} }

57
main.go
View File

@@ -12,8 +12,10 @@ import (
"net/http" "net/http"
"os/signal" "os/signal"
"slices" "slices"
"strconv"
"strings" "strings"
"syscall" "syscall"
"time"
) )
func main() { func main() {
@@ -63,7 +65,8 @@ func newHandler(cfg Config) http.HandlerFunc {
mux := http.NewServeMux() mux := http.NewServeMux()
mux.Handle("POST /api/v1/events/slack", http.HandlerFunc(newHandlerPostAPIV1EventsSlack(cfg))) mux.Handle("POST /api/v1/events/slack", http.HandlerFunc(newHandlerPostAPIV1EventsSlack(cfg)))
mux.Handle("GET /api/v1/messages", http.HandlerFunc(newHandlerGetAPIV1Message(cfg))) mux.Handle("GET /api/v1/threads", http.HandlerFunc(newHandlerGetAPIV1Threads(cfg)))
mux.Handle("GET /api/v1/threads/{thread}", http.HandlerFunc(newHandlerGetAPIV1ThreadsThread(cfg)))
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
if cfg.Debug { if cfg.Debug {
@@ -76,17 +79,57 @@ func newHandler(cfg Config) http.HandlerFunc {
} }
} }
func newHandlerGetAPIV1Message(cfg Config) http.HandlerFunc { func newHandlerGetAPIV1Threads(cfg Config) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
if u, p, _ := r.BasicAuth(); u != cfg.BasicAuthUser || p != cfg.BasicAuthPassword { if !basicAuth(cfg, w, r) {
http.Error(w, "shoo", http.StatusForbidden)
return return
} }
http.Error(w, "not impl", http.StatusNotImplemented) since := time.Unix(0, 0)
if sinceS := r.URL.Query().Get("since"); sinceS == "" {
} else if n, err := strconv.ParseInt(sinceS, 10, 64); err != nil {
http.Error(w, err.Error(), http.StatusBadRequest)
return
} else {
since = time.Unix(n, 0)
}
threads, err := cfg.storage.ThreadsSince(r.Context(), since)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
json.NewEncoder(w).Encode(map[string]any{"threads": threads})
} }
} }
func newHandlerGetAPIV1ThreadsThread(cfg Config) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
if !basicAuth(cfg, w, r) {
return
}
thread := strings.Split(strings.Split(r.URL.Path, "/threads/")[1], "/")[0]
messages, err := cfg.storage.Thread(r.Context(), thread)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
json.NewEncoder(w).Encode(map[string]any{"thread": map[string]any{"messages": messages}})
}
}
func basicAuth(cfg Config, w http.ResponseWriter, r *http.Request) bool {
if u, p, _ := r.BasicAuth(); u != cfg.BasicAuthUser || p != cfg.BasicAuthPassword {
http.Error(w, "shoo", http.StatusForbidden)
return false
}
return true
}
func newHandlerPostAPIV1EventsSlack(cfg Config) http.HandlerFunc { func newHandlerPostAPIV1EventsSlack(cfg Config) http.HandlerFunc {
if cfg.InitializeSlack { if cfg.InitializeSlack {
return handlerPostAPIV1EventsSlackInitialize return handlerPostAPIV1EventsSlackInitialize
@@ -126,7 +169,7 @@ func _newHandlerPostAPIV1EventsSlack(cfg Config) http.HandlerFunc {
} else if allowList.Token != cfg.SlackToken { } else if allowList.Token != cfg.SlackToken {
http.Error(w, "invalid .token", http.StatusForbidden) http.Error(w, "invalid .token", http.StatusForbidden)
return return
} else if !slices.Contains(strings.Split(cfg.SlackChannels, ","), allowList.Event.Channel) { } else if !slices.Contains(cfg.SlackChannels, allowList.Event.Channel) {
return return
} }
@@ -143,6 +186,6 @@ func _newHandlerPostAPIV1EventsSlack(cfg Config) http.HandlerFunc {
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), http.StatusInternalServerError)
return return
} }
log.Printf("ingested %+v", m) log.Printf("ingested %v", m.ID)
} }
} }

130
main_test.go Normal file
View File

@@ -0,0 +1,130 @@
package main
import (
"bytes"
"context"
"encoding/json"
"fmt"
"io"
"net/http"
"net/http/httptest"
"net/url"
"os"
"path"
"slices"
"strconv"
"strings"
"testing"
"time"
)
func TestRun(t *testing.T) {
ctx, can := context.WithTimeout(context.Background(), time.Second*10)
defer can()
port := func() int {
s := httptest.NewServer(http.HandlerFunc(http.NotFound))
s.Close()
u, err := url.Parse(s.URL)
if err != nil {
t.Fatal(err)
}
portS := strings.Split(u.Host, ":")[1]
port, err := strconv.ParseInt(portS, 10, 32)
if err != nil {
t.Fatal(err)
}
return int(port)
}()
u := fmt.Sprintf("http://localhost:%d", port)
cfg := Config{}
cfg.Port = port
cfg.driver = NewRAM()
cfg.storage = NewStorage(cfg.driver)
cfg.queue = NewQueue(cfg.driver)
cfg.SlackToken = "redacted"
cfg.SlackChannels = []string{"C06U1DDBBU4"}
go func() {
if err := run(ctx, cfg); err != nil && ctx.Err() == nil {
t.Fatal(err)
}
}()
for {
if resp, err := http.Get(u); err == nil {
resp.Body.Close()
break
}
select {
case <-ctx.Done():
t.Fatal(ctx.Err())
case <-time.After(time.Millisecond * 50):
}
}
t.Run("POST /api/v1/events/slack", func(t *testing.T) {
b, err := os.ReadFile(path.Join("testdata", "slack_events", "opsgenie_alert_3.json"))
if err != nil {
t.Fatal(err)
}
resp, err := http.Post(fmt.Sprintf("%s/api/v1/events/slack", u), "application/json", bytes.NewReader(b))
if err != nil {
t.Fatal(err)
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
b, _ := io.ReadAll(resp.Body)
t.Fatalf("(%d) %s", resp.StatusCode, b)
}
})
t.Run("GET /api/v1/threads", func(t *testing.T) {
resp, err := http.Get(fmt.Sprintf("%s/api/v1/threads", u))
if err != nil {
t.Fatal(err)
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
b, _ := io.ReadAll(resp.Body)
t.Fatalf("(%d) %s", resp.StatusCode, b)
}
var result struct {
Threads []string
}
if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
t.Fatal(err)
} else if !slices.Contains(result.Threads, "1712911957.023359") {
t.Fatal(result.Threads)
}
})
t.Run("GET /api/v1/threads/1712911957.023359", func(t *testing.T) {
resp, err := http.Get(fmt.Sprintf("%s/api/v1/threads/1712911957.023359", u))
if err != nil {
t.Fatal(err)
}
defer resp.Body.Close()
if resp.StatusCode != http.StatusOK {
b, _ := io.ReadAll(resp.Body)
t.Fatalf("(%d) %s", resp.StatusCode, b)
}
var result struct {
Thread struct {
Messages []Message
}
}
if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
t.Fatal(err)
} else if len(result.Thread.Messages) != 1 {
t.Fatal(result.Thread)
} else {
t.Logf("%+v", result.Thread.Messages[0])
}
})
}

View File

@@ -131,6 +131,9 @@ func ParseSlack(b []byte) (Message, error) {
}, nil }, nil
} }
if s.Event.ParentID == "" {
return Message{}, ErrIrrelevantMessage
}
return Message{ return Message{
ID: fmt.Sprintf("%s/%v", s.Event.ParentID, s.TS), ID: fmt.Sprintf("%s/%v", s.Event.ParentID, s.TS),
TS: s.TS, TS: s.TS,