wtfgo -> gokit/stringutils

Author: joonas-fi

cmd/alertmanager/alerts.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"github.com/function61/eventhorizon/pkg/ehevent"
 	"github.com/function61/gokit/ossignal"
+	"github.com/function61/gokit/stringutils"
 	"github.com/function61/lambda-alertmanager/pkg/amdomain"
 	"github.com/function61/lambda-alertmanager/pkg/amstate"
-	"github.com/function61/lambda-alertmanager/pkg/wtfgo"
 	"github.com/scylladb/termtables"
 	"github.com/spf13/cobra"
 	"strings"
@@ -91,7 +91,7 @@ func alertList(ctx context.Context) error {
 			alert.Id,
 			alert.Timestamp.Format(time.RFC3339),
 			alert.Subject,
-			wtfgo.Truncate(removeLinebreaks(alert.Details), 50))
+			stringutils.Truncate(removeLinebreaks(alert.Details), 50))
 	}
 
 	fmt.Println(view.Render())

cmd/alertmanager/httpmonitors.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"github.com/function61/eventhorizon/pkg/ehevent"
 	"github.com/function61/gokit/ossignal"
+	"github.com/function61/gokit/stringutils"
 	"github.com/function61/lambda-alertmanager/pkg/amdomain"
 	"github.com/function61/lambda-alertmanager/pkg/amstate"
-	"github.com/function61/lambda-alertmanager/pkg/wtfgo"
 	"github.com/scylladb/termtables"
 	"github.com/spf13/cobra"
 	"time"
@@ -103,7 +103,11 @@ func httpMonitorList(ctx context.Context) error {
 	view.AddHeaders("Id", "Enabled", "Url", "Find")
 
 	for _, alert := range app.State.HttpMonitors() {
-		view.AddRow(alert.Id, boolToCheckmark(alert.Enabled), wtfgo.Truncate(alert.Url, 44), alert.Find)
+		view.AddRow(
+			alert.Id,
+			boolToCheckmark(alert.Enabled),
+			stringutils.Truncate(alert.Url, 44),
+			alert.Find)
 	}
 
 	fmt.Println(view.Render())

cmd/alertmanager/sns.go

@@ -6,8 +6,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/sns"
 	"github.com/function61/gokit/envvar"
+	"github.com/function61/gokit/stringutils"
 	"github.com/function61/lambda-alertmanager/pkg/amstate"
-	"github.com/function61/lambda-alertmanager/pkg/wtfgo"
 )
 
 func publishAlert(alert amstate.Alert) error {
@@ -35,8 +35,8 @@ func publishAlert(alert amstate.Alert) error {
 		Default string `json:"default"` // email etc.
 		Sms     string `json:"sms"`
 	}{
-		Default: ackLinkMaybe + wtfgo.Truncate(messageText, 4*1024),
-		Sms:     wtfgo.Substr(messageText, 0, 160-7), // -7 for "ALERT >" prefix in SMS messages
+		Default: ackLinkMaybe + stringutils.Truncate(messageText, 4*1024),
+		Sms:     stringutils.Truncate(messageText, 160-7), // -7 for "ALERT >" prefix in SMS messages
 	}
 
 	messagePerProtocolJson, err := json.Marshal(&messagePerProtocol)

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/aws/aws-lambda-go v1.14.0
 	github.com/aws/aws-sdk-go v1.29.0
 	github.com/function61/eventhorizon v0.2.1-0.20200227140656-f89fe5d462ca
-	github.com/function61/gokit v0.0.0-20200226141201-fe205250686d
+	github.com/function61/gokit v0.0.0-20200229073330-25232411c1f6
 	github.com/mattn/go-runewidth v0.0.8 // indirect
 	github.com/scylladb/termtables v1.0.0
 	github.com/spf13/cobra v0.0.6

go.sum

@@ -40,6 +40,8 @@ github.com/function61/eventhorizon v0.2.1-0.20200227140656-f89fe5d462ca h1:FY7y7
 github.com/function61/eventhorizon v0.2.1-0.20200227140656-f89fe5d462ca/go.mod h1:SztwDAaqWnLPSFyVmV0zbBgRsvExr0GzrlOj9sWTC+Y=
 github.com/function61/gokit v0.0.0-20200226141201-fe205250686d h1:sbcDaH7t/trZpAv77EU9hl/rjjse+Mc70MO8MAhILnM=
 github.com/function61/gokit v0.0.0-20200226141201-fe205250686d/go.mod h1:jAkW2pwxa4N3qxEUDA3zDhfiJInBfF4BjsbkWAU13aU=
+github.com/function61/gokit v0.0.0-20200229073330-25232411c1f6 h1:UyuV6K5s+Y1eE7CdaBfwm+Yh6AiYFV2i6CfOuSJtvgw=
+github.com/function61/gokit v0.0.0-20200229073330-25232411c1f6/go.mod h1:jAkW2pwxa4N3qxEUDA3zDhfiJInBfF4BjsbkWAU13aU=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=