goimports all code

joonas-fi · joonas-fi · commit bd83843ce700 · 2020-03-29T16:37:15.000+03:00
diff --git a/cmd/alertmanager/alerts.go b/cmd/alertmanager/alerts.go
@@ -3,15 +3,16 @@ package main
 import (
 	"context"
 	"fmt"
+	"strings"
+	"time"
+
 	"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/scylladb/termtables"
 	"github.com/spf13/cobra"
-	"strings"
-	"time"
 )
 
 func alertEntry() *cobra.Command {
diff --git a/cmd/alertmanager/deadmansswitches.go b/cmd/alertmanager/deadmansswitches.go
@@ -3,13 +3,14 @@ package main
 import (
 	"context"
 	"fmt"
+	"time"
+
 	"github.com/function61/eventhorizon/pkg/ehevent"
 	"github.com/function61/gokit/ossignal"
 	"github.com/function61/lambda-alertmanager/pkg/amdomain"
 	"github.com/function61/lambda-alertmanager/pkg/amstate"
 	"github.com/scylladb/termtables"
 	"github.com/spf13/cobra"
-	"time"
 )
 
 func deadMansSwitchEntry() *cobra.Command {
diff --git a/cmd/alertmanager/deadmansswitches_test.go b/cmd/alertmanager/deadmansswitches_test.go
@@ -2,16 +2,17 @@ package main
 
 import (
 	"context"
+	"strings"
+	"testing"
+	"time"
+
 	"github.com/function61/eventhorizon/pkg/ehclient"
 	"github.com/function61/eventhorizon/pkg/ehevent"
 	"github.com/function61/eventhorizon/pkg/ehreader"
 	"github.com/function61/eventhorizon/pkg/ehreader/ehreadertest"
 	"github.com/function61/gokit/assert"
 	"github.com/function61/lambda-alertmanager/pkg/amdomain"
 	"github.com/function61/lambda-alertmanager/pkg/amstate"
-	"strings"
-	"testing"
-	"time"
 )
 
 func TestDeadmansswitchCheckin(t *testing.T) {
diff --git a/cmd/alertmanager/httpmonitors.go b/cmd/alertmanager/httpmonitors.go
@@ -3,14 +3,15 @@ package main
 import (
 	"context"
 	"fmt"
+	"time"
+
 	"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/scylladb/termtables"
 	"github.com/spf13/cobra"
-	"time"
 )
 
 func httpMonitorEntry() *cobra.Command {
diff --git a/cmd/alertmanager/httpmonitorscanner.go b/cmd/alertmanager/httpmonitorscanner.go
@@ -3,15 +3,16 @@ package main
 import (
 	"context"
 	"fmt"
-	"github.com/function61/gokit/ezhttp"
-	"github.com/function61/gokit/logex"
-	"github.com/function61/lambda-alertmanager/pkg/amstate"
 	"io/ioutil"
 	"log"
 	"net/http"
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/function61/gokit/ezhttp"
+	"github.com/function61/gokit/logex"
+	"github.com/function61/lambda-alertmanager/pkg/amstate"
 )
 
 type monitorFailure struct {
diff --git a/cmd/alertmanager/httpmonitorscanner_test.go b/cmd/alertmanager/httpmonitorscanner_test.go
@@ -3,9 +3,10 @@ package main
 import (
 	"context"
 	"fmt"
+	"testing"
+
 	"github.com/function61/gokit/assert"
 	"github.com/function61/lambda-alertmanager/pkg/amstate"
-	"testing"
 )
 
 func TestOneFails(t *testing.T) {
diff --git a/cmd/alertmanager/ingest.go b/cmd/alertmanager/ingest.go
@@ -5,13 +5,14 @@ package main
 
 import (
 	"context"
+	"os"
+	"strconv"
+
 	"github.com/aws/aws-lambda-go/events"
 	"github.com/function61/eventhorizon/pkg/ehevent"
 	"github.com/function61/gokit/logex"
 	"github.com/function61/lambda-alertmanager/pkg/amdomain"
 	"github.com/function61/lambda-alertmanager/pkg/amstate"
-	"os"
-	"strconv"
 )
 
 // invoked for "AlertManager-ingest" SNS topic
diff --git a/cmd/alertmanager/lambdahandler.go b/cmd/alertmanager/lambdahandler.go
@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"errors"
+
 	"github.com/aws/aws-lambda-go/events"
 	"github.com/aws/aws-lambda-go/lambda"
 	"github.com/function61/gokit/aws/lambdautils"
diff --git a/cmd/alertmanager/main.go b/cmd/alertmanager/main.go
@@ -3,6 +3,9 @@ package main
 import (
 	"context"
 	"fmt"
+	"os"
+	"time"
+
 	"github.com/function61/eventhorizon/pkg/ehcli"
 	"github.com/function61/eventhorizon/pkg/ehreader"
 	"github.com/function61/gokit/aws/lambdautils"
@@ -11,8 +14,6 @@ import (
 	"github.com/function61/gokit/ossignal"
 	"github.com/function61/lambda-alertmanager/pkg/amstate"
 	"github.com/spf13/cobra"
-	"os"
-	"time"
 )
 
 func main() {
diff --git a/cmd/alertmanager/restapi.go b/cmd/alertmanager/restapi.go
@@ -4,6 +4,11 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"log"
+	"net/http"
+	"os"
+	"time"
+
 	"github.com/function61/gokit/httputils"
 	"github.com/function61/gokit/jsonfile"
 	"github.com/function61/gokit/logex"
@@ -12,10 +17,6 @@ import (
 	"github.com/function61/lambda-alertmanager/pkg/alertmanagertypes"
 	"github.com/function61/lambda-alertmanager/pkg/amstate"
 	"github.com/spf13/cobra"
-	"log"
-	"net/http"
-	"os"
-	"time"
 )
 
 func newRestApi(ctx context.Context) http.Handler {
diff --git a/cmd/alertmanager/scheduled.go b/cmd/alertmanager/scheduled.go
@@ -4,13 +4,14 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/function61/eventhorizon/pkg/ehevent"
-	"github.com/function61/lambda-alertmanager/pkg/amdomain"
-	"github.com/function61/lambda-alertmanager/pkg/amstate"
 	"regexp"
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/function61/eventhorizon/pkg/ehevent"
+	"github.com/function61/lambda-alertmanager/pkg/amdomain"
+	"github.com/function61/lambda-alertmanager/pkg/amstate"
 )
 
 // runs every minute
diff --git a/cmd/alertmanager/scheduled_test.go b/cmd/alertmanager/scheduled_test.go
@@ -4,15 +4,16 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"os"
+	"testing"
+	"time"
+
 	"github.com/function61/eventhorizon/pkg/ehevent"
 	"github.com/function61/eventhorizon/pkg/ehreader"
 	"github.com/function61/eventhorizon/pkg/ehreader/ehreadertest"
 	"github.com/function61/gokit/assert"
 	"github.com/function61/lambda-alertmanager/pkg/amdomain"
 	"github.com/function61/lambda-alertmanager/pkg/amstate"
-	"os"
-	"testing"
-	"time"
 )
 
 var t0 = time.Date(2019, 9, 7, 12, 0, 0, 0, time.UTC)
diff --git a/cmd/alertmanager/sns.go b/cmd/alertmanager/sns.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/json"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/sns"
diff --git a/pkg/alertmanagerclient/client.go b/pkg/alertmanagerclient/client.go
@@ -2,6 +2,7 @@ package alertmanagerclient
 
 import (
 	"context"
+
 	"github.com/function61/gokit/ezhttp"
 	"github.com/function61/lambda-alertmanager/pkg/alertmanagertypes"
 )
diff --git a/pkg/amdomain/events.go b/pkg/amdomain/events.go
@@ -2,8 +2,9 @@
 package amdomain
 
 import (
-	"github.com/function61/eventhorizon/pkg/ehevent"
 	"time"
+
+	"github.com/function61/eventhorizon/pkg/ehevent"
 )
 
 var Types = ehevent.Allocators{
diff --git a/pkg/amstate/store.go b/pkg/amstate/store.go
@@ -3,15 +3,16 @@ package amstate
 import (
 	"context"
 	"encoding/json"
+	"log"
+	"sort"
+	"sync"
+	"time"
+
 	"github.com/function61/eventhorizon/pkg/ehclient"
 	"github.com/function61/eventhorizon/pkg/ehevent"
 	"github.com/function61/eventhorizon/pkg/ehreader"
 	"github.com/function61/gokit/logex"
 	"github.com/function61/lambda-alertmanager/pkg/amdomain"
-	"log"
-	"sort"
-	"sync"
-	"time"
 )
 
 const (
diff --git a/pkg/amstate/store_test.go b/pkg/amstate/store_test.go
@@ -2,13 +2,14 @@ package amstate
 
 import (
 	"context"
+	"testing"
+	"time"
+
 	"github.com/function61/eventhorizon/pkg/ehevent"
 	"github.com/function61/eventhorizon/pkg/ehreader"
 	"github.com/function61/eventhorizon/pkg/ehreader/ehreadertest"
 	"github.com/function61/gokit/assert"
 	"github.com/function61/lambda-alertmanager/pkg/amdomain"
-	"testing"
-	"time"
 )
 
 const (
diff --git a/pkg/amstate/utils.go b/pkg/amstate/utils.go
@@ -1,8 +1,9 @@
 package amstate
 
 import (
-	"github.com/function61/gokit/cryptorandombytes"
 	"time"
+
+	"github.com/function61/gokit/cryptorandombytes"
 )
 
 func FindAlertWithSubject(subject string, alerts []Alert) *Alert {

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package alertmanagerclient`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"context"`
	`5`	`+`
`5`	`6`	`"github.com/function61/gokit/ezhttp"`
`6`	`7`	`"github.com/function61/lambda-alertmanager/pkg/alertmanagertypes"`
`7`	`8`	`)`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,9 @@`
`2`	`2`	`package amdomain`
`3`	`3`
`4`	`4`	`import (`
`5`		`- "github.com/function61/eventhorizon/pkg/ehevent"`
`6`	`5`	`"time"`
	`6`	`+`
	`7`	`+ "github.com/function61/eventhorizon/pkg/ehevent"`
`7`	`8`	`)`
`8`	`9`
`9`	`10`	`var Types = ehevent.Allocators{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`package amstate`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/function61/gokit/cryptorandombytes"`
`5`	`4`	`"time"`
	`5`	`+`
	`6`	`+ "github.com/function61/gokit/cryptorandombytes"`
`6`	`7`	`)`
`7`	`8`
`8`	`9`	`func FindAlertWithSubject(subject string, alerts []Alert) *Alert {`