Fix http client, call url and sms message

main.go

@@ -10,20 +10,23 @@ import (
 	"os"
 )
 
+var logLevel *slog.LevelVar
+
 func init() {
+	logLevel = &slog.LevelVar{}
+	logLevel.Set(slog.LevelInfo)
+
 	logger := slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{
-		Level: slog.LevelDebug,
+		Level: logLevel,
 	}))
 	slog.SetDefault(logger)
 }
 
 func main() {
 	port := ":8080"
 	slog.Info("Starting smseagle-proxy", "port", port)
-
 	cfg := config.Read()
 	if cfg.Debug {
-		logLevel := &slog.LevelVar{}
 		logLevel.Set(slog.LevelDebug)
 		slog.Debug("Debug mode on")
 	}

pkg/alerter/grafana.go

@@ -11,28 +11,15 @@ import (
 )
 
 type OncallWebhook struct {
-	GrafanaWebhook GrafanaWebhook `json:"alert_payload"`
+	AlertGroup AlertGroup `json:"alert_group"`
 }
 
-type GrafanaWebhook struct {
-	Title   string         `json:"title"`
-	State   string         `json:"state"`
-	Message string         `json:"message"`
-	Alerts  []GrafanaAlert `json:"alerts"`
+type AlertGroup struct {
+	Permalinks OncallPermalink `json:"permalinks"`
 }
 
-type GrafanaAlert struct {
-	Status       string             `json:"status"`
-	Labels       map[string]string  `json:"labels"`
-	Annotations  map[string]string  `json:"annotations"`
-	StartsAt     string             `json:"startsAt"`
-	EndsAt       string             `json:"endsAt"`
-	GeneratorURL string             `json:"generatorURL"`
-	Fingerpriot  string             `json:"fingerprint"`
-	SilenceURL   string             `json:"silenceURL"`
-	DashboardURL string             `json:"dashboardURL"`
-	PanelURL     string             `json:"panelURL"`
-	Values       map[string]float32 `json:"values"`
+type OncallPermalink struct {
+	Web string `json:"web"`
 }
 
 type Notifier interface {
@@ -50,15 +37,15 @@ func NewGrafana(notifier Notifier, cfg *config.ProxyConfig) *Grafana {
 	}
 }
 
-func parseGrafanaWebhook(r *http.Request) (*GrafanaWebhook, error) {
+func parseOncallWebhook(r *http.Request) (*OncallWebhook, error) {
 	slog.Debug("Parsing", "request", r)
 	var webhook OncallWebhook
 	err := json.NewDecoder(r.Body).Decode(&webhook)
 	if err != nil {
 		return nil, err
 	}
 	slog.Debug("Parsed %w", "webhook", &webhook)
-	return &webhook.GrafanaWebhook, nil
+	return &webhook, nil
 }
 
 func (g *Grafana) HandleCall(w http.ResponseWriter, r *http.Request) {
@@ -76,7 +63,7 @@ func (g *Grafana) handleRequest(w http.ResponseWriter, r *http.Request, c Contac
 		return
 	}
 
-	webhook, err := parseGrafanaWebhook(r)
+	webhook, err := parseOncallWebhook(r)
 	if err != nil {
 		slog.Error("decoding webhook failed", "error", err)
 		w.WriteHeader(http.StatusBadRequest)
@@ -94,7 +81,7 @@ func (g *Grafana) handleRequest(w http.ResponseWriter, r *http.Request, c Contac
 
 	message := SMSEagleMessage{
 		Receiver:    receiver,
-		Message:     fmt.Sprintf("test: %s", webhook.Title),
+		Message:     fmt.Sprintf("Ny alarm: %s", webhook.AlertGroup.Permalinks.Web),
 		ContactType: c,
 	}
 

pkg/alerter/grafana_test.go

@@ -90,7 +90,7 @@ var _ = Describe("Grafana", func() {
 				Expect(mock.message.Receiver).Should(Equal(smseagle.Infrastrukturdrift))
 			})
 			It("message should be correct", func() {
-				Expect(mock.message.Message).Should(Equal("Instance localhost:8082 down"))
+				Expect(mock.message.Message).Should(Equal("Ny alarm: http://grafana:3000/a/grafana-oncall-app/alert-groups/I57917WDFNGHY"))
 			})
 			It("should have sms contact type", func() {
 				Expect(mock.message.ContactType).Should(Equal(smseagle.SMS))
@@ -110,7 +110,7 @@ var _ = Describe("Grafana", func() {
 				Expect(mock.message.Receiver).Should(Equal(smseagle.Appdrift))
 			})
 			It("message should be correct", func() {
-				Expect(mock.message.Message).Should(Equal("Instance localhost:8082 down"))
+				Expect(mock.message.Message).Should(Equal("Ny alarm: http://grafana:3000/a/grafana-oncall-app/alert-groups/I57917WDFNGHY"))
 			})
 			It("should have sms contact type", func() {
 				Expect(mock.message.ContactType).Should(Equal(smseagle.SMS))
@@ -140,7 +140,7 @@ var _ = Describe("Grafana", func() {
 				Expect(mock.message.Receiver).Should(Equal(smseagle.Infrastrukturdrift))
 			})
 			It("message should be correct", func() {
-				Expect(mock.message.Message).Should(Equal("Instance localhost:8082 down"))
+				Expect(mock.message.Message).Should(Equal("Ny alarm: http://grafana:3000/a/grafana-oncall-app/alert-groups/I57917WDFNGHY"))
 			})
 			It("should have call contact type", func() {
 				Expect(mock.message.ContactType).Should(Equal(smseagle.Call))
@@ -160,7 +160,7 @@ var _ = Describe("Grafana", func() {
 				Expect(mock.message.Receiver).Should(Equal(smseagle.Appdrift))
 			})
 			It("message should be correct", func() {
-				Expect(mock.message.Message).Should(Equal("Instance localhost:8082 down"))
+				Expect(mock.message.Message).Should(Equal("Ny alarm: http://grafana:3000/a/grafana-oncall-app/alert-groups/I57917WDFNGHY"))
 			})
 			It("should have call contact type", func() {
 				Expect(mock.message.ContactType).Should(Equal(smseagle.Call))

pkg/smseagle/client.go

@@ -7,24 +7,24 @@ import (
 	"net/http"
 )
 
-func sendSMS(cfg *config.ProxyConfig, phoneNumber string, message string) error {
-	requestUrl := fmt.Sprintf("http://%s/http_api/send_sms?access_token=%s&to=%s&message=%s", cfg.SMS.Url, cfg.SMS.AccessToken, phoneNumber, message)
+func sendSMS(cfg *config.ProxyConfig, phoneNumber string, message string, client *http.Client) error {
+	requestUrl := fmt.Sprintf("%s/http_api/send_sms?access_token=%s&to=%s&message=%s", cfg.SMS.Url, cfg.SMS.AccessToken, phoneNumber, message)
 	slog.Debug("Sending sms", "url", requestUrl)
-	res, err := http.Get(requestUrl)
+	res, err := client.Get(requestUrl)
 	if err != nil {
 		return err
 	}
-	slog.Debug("sms request succesful", "response code", res.StatusCode, "response text", res.Body)
+	slog.Debug("sms request successful", "response code", res.StatusCode, "response text", res.Status)
 	return nil
 }
 
-func call(cfg *config.ProxyConfig, phoneNumber string) error {
-	requestUrl := fmt.Sprintf("http://%s/http_api/call_with_termination?access_token=%s&to=%s", cfg.Call.Url, cfg.Call.AccessToken, phoneNumber)
+func call(cfg *config.ProxyConfig, phoneNumber string, client *http.Client) error {
+	requestUrl := fmt.Sprintf("%s/http_api/call_with_termination?access_token=%s&to=%s&duration=30", cfg.Call.Url, cfg.Call.AccessToken, phoneNumber)
 	slog.Debug("Sending call request", "url", requestUrl)
-	res, err := http.Get(requestUrl)
+	res, err := client.Get(requestUrl)
 	if err != nil {
 		return err
 	}
-	slog.Debug("Call request successful", "response", res.Body)
+	slog.Debug("Call request successful", "response code", res.StatusCode, "response text", res.Status)
 	return nil
 }

pkg/smseagle/handler.go

@@ -1,8 +1,10 @@
 package smseagle
 
 import (
+	"crypto/tls"
 	"kartverket.no/smseagle-proxy/pkg/config"
 	"log/slog"
+	"net/http"
 	"strings"
 )
 
@@ -46,15 +48,19 @@ func (s *SMSEagle) Notify(message *SMSEagleMessage) error {
 		phoneNumber = s.cfg.InfraPhoneNumber
 	}
 
+	client := &http.Client{Transport: &http.Transport{
+		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
+	}}
+
 	if message.ContactType == SMS {
 		msg := strings.ReplaceAll(message.Message, " ", "+")
-		err := sendSMS(s.cfg, phoneNumber, msg)
+		err := sendSMS(s.cfg, phoneNumber, msg, client)
 		if err != nil {
 			slog.Error("Error sending sms", "error", err)
 			return err
 		}
 	} else if message.ContactType == Call {
-		err := call(s.cfg, phoneNumber)
+		err := call(s.cfg, phoneNumber, client)
 		if err != nil {
 			slog.Error("Error sending call request", "error", err)
 			return err

pkg/smseagle/handler_test.go

@@ -21,11 +21,11 @@ var _ = Describe("Handler", func() {
 			AppdriftPhoneNumber: "123",
 			InfraPhoneNumber:    "456",
 			Call: config.SMSEagleConfig{
-				Url:         server.Addr(),
+				Url:         server.URL(),
 				AccessToken: "calltoken",
 			},
 			SMS: config.SMSEagleConfig{
-				Url:         server.Addr(),
+				Url:         server.URL(),
 				AccessToken: "smstoken",
 			},
 		}