Add editorconfig and run goimports

.editorconfig

@@ -0,0 +1,21 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.go]
+indent_style = tab
+indent_size = 4
+ij_go_add_parentheses_for_single_import = true
+ij_go_GROUP_CURRENT_PROJECT_IMPORTS = true
+ij_go_group_stdlib_imports = true
+ij_go_import_sorting = goimports
+ij_go_local_group_mode = project
+ij_go_local_package_prefixes = "github.com/signalapp/svr2"
+ij_go_move_all_imports_in_one_declaration = true
+ij_go_move_all_stdlib_imports_in_one_group = true

host/cmd/control/main.go

@@ -14,11 +14,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/signalapp/svr2/peerid"
-	"github.com/signalapp/svr2/web/client"
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
 
+	"github.com/signalapp/svr2/peerid"
+	"github.com/signalapp/svr2/web/client"
+
 	pb "github.com/signalapp/svr2/proto"
 )
 

host/cmd/svr2client/main.go

@@ -19,6 +19,7 @@ import (
 	"sync/atomic"
 
 	"github.com/gorilla/websocket"
+
 	"github.com/signalapp/svr2/auth"
 	"github.com/signalapp/svr2/web/client"
 

host/cmd/svr3client/main.go

@@ -25,9 +25,10 @@ import (
 
 	"github.com/gorilla/websocket"
 	"github.com/gtank/ristretto255"
+	"google.golang.org/protobuf/proto"
+
 	"github.com/signalapp/svr2/auth"
 	"github.com/signalapp/svr2/web/client"
-	"google.golang.org/protobuf/proto"
 
 	pb "github.com/signalapp/svr2/proto"
 )

host/config/config.go

@@ -10,10 +10,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/signalapp/svr2/util"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"gopkg.in/yaml.v2"
+
+	"github.com/signalapp/svr2/util"
 )
 
 type Config struct {

host/dispatch/dispatcher.go

@@ -11,13 +11,14 @@ import (
 	"sync"
 	"time"
 
+	metrics "github.com/hashicorp/go-metrics"
+	"golang.org/x/sync/errgroup"
+
 	"github.com/signalapp/svr2/config"
 	"github.com/signalapp/svr2/logger"
 	"github.com/signalapp/svr2/peerid"
 	"github.com/signalapp/svr2/util"
-	"golang.org/x/sync/errgroup"
 
-	metrics "github.com/hashicorp/go-metrics"
 	pb "github.com/signalapp/svr2/proto"
 )
 

host/dispatch/metrics.go

@@ -5,9 +5,10 @@ package dispatch
 
 import (
 	"github.com/google/go-cmp/cmp"
+	metrics "github.com/hashicorp/go-metrics"
+
 	"github.com/signalapp/svr2/peerid"
 
-	metrics "github.com/hashicorp/go-metrics"
 	pb "github.com/signalapp/svr2/proto"
 )
 

host/dispatch/metrics_test.go

@@ -9,9 +9,9 @@ import (
 	"strings"
 	"testing"
 
-	pb "github.com/signalapp/svr2/proto"
-
 	metrics "github.com/hashicorp/go-metrics"
+
+	pb "github.com/signalapp/svr2/proto"
 )
 
 type mockMetricsWriter struct {

host/enclave/iface.go

@@ -5,7 +5,6 @@ package enclave
 
 import (
 	"github.com/signalapp/svr2/peerid"
-
 	pb "github.com/signalapp/svr2/proto"
 )
 

host/enclave/sgx.go

@@ -52,9 +52,10 @@ import (
 	"time"
 	"unsafe"
 
+	"google.golang.org/protobuf/proto"
+
 	"github.com/signalapp/svr2/logger"
 	"github.com/signalapp/svr2/peerid"
-	"google.golang.org/protobuf/proto"
 
 	pb "github.com/signalapp/svr2/proto"
 )

host/enclave/socket.go

@@ -14,9 +14,10 @@ import (
 	"time"
 
 	"github.com/mdlayher/vsock"
+	"google.golang.org/protobuf/proto"
+
 	"github.com/signalapp/svr2/logger"
 	"github.com/signalapp/svr2/peerid"
-	"google.golang.org/protobuf/proto"
 
 	pb "github.com/signalapp/svr2/proto"
 )

host/integration/integration_test.go

@@ -23,11 +23,12 @@ import (
 
 	"github.com/alicebob/miniredis/v2"
 	"github.com/gorilla/websocket"
+	"golang.org/x/sync/errgroup"
+
 	"github.com/signalapp/svr2/auth"
 	"github.com/signalapp/svr2/peerid"
 	"github.com/signalapp/svr2/servicetest"
 	"github.com/signalapp/svr2/web/client"
-	"golang.org/x/sync/errgroup"
 
 	pb "github.com/signalapp/svr2/proto"
 )

host/logger/logger.go

@@ -7,9 +7,10 @@ package logger
 import (
 	"log"
 
-	"github.com/signalapp/svr2/config"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
+
+	"github.com/signalapp/svr2/config"
 )
 
 // init sets up reasonable logging defaults for tests / non-main

host/main.go

@@ -10,23 +10,23 @@ import (
 	"fmt"
 	"io"
 	"log"
+	stdlog "log"
 	"net"
 	"os"
 	"os/exec"
 	"os/signal"
 	"time"
 
+	metrics "github.com/hashicorp/go-metrics"
 	"github.com/hashicorp/go-metrics/datadog"
+	"google.golang.org/protobuf/encoding/prototext"
+
 	"github.com/signalapp/svr2/auth"
 	"github.com/signalapp/svr2/config"
 	"github.com/signalapp/svr2/enclave"
 	"github.com/signalapp/svr2/logger"
 	"github.com/signalapp/svr2/service"
-	"google.golang.org/protobuf/encoding/prototext"
 
-	stdlog "log"
-
-	metrics "github.com/hashicorp/go-metrics"
 	pb "github.com/signalapp/svr2/proto"
 )
 

host/peer/client.go

@@ -14,11 +14,12 @@ import (
 	"time"
 
 	"github.com/hashicorp/go-metrics"
+	"golang.org/x/sync/errgroup"
+
 	"github.com/signalapp/svr2/config"
 	"github.com/signalapp/svr2/logger"
 	"github.com/signalapp/svr2/peerid"
 	"github.com/signalapp/svr2/util"
-	"golang.org/x/sync/errgroup"
 
 	pb "github.com/signalapp/svr2/proto"
 )

host/peer/peerdb/peerdb.go

@@ -14,11 +14,12 @@ import (
 	"time"
 
 	"github.com/redis/go-redis/v9"
+	"google.golang.org/protobuf/encoding/protojson"
+
 	"github.com/signalapp/svr2/config"
 	"github.com/signalapp/svr2/logger"
 	"github.com/signalapp/svr2/peerid"
 	"github.com/signalapp/svr2/util"
-	"google.golang.org/protobuf/encoding/protojson"
 
 	pb "github.com/signalapp/svr2/proto"
 )

host/peer/peerdb/peerdb_test.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/alicebob/miniredis/v2"
+
 	"github.com/signalapp/svr2/config"
 	"github.com/signalapp/svr2/peerid"
 	"github.com/signalapp/svr2/util"

host/peer/server.go

@@ -11,11 +11,12 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/signalapp/svr2/logger"
-	"github.com/signalapp/svr2/peerid"
+	metrics "github.com/hashicorp/go-metrics"
 	"golang.org/x/sync/errgroup"
 
-	metrics "github.com/hashicorp/go-metrics"
+	"github.com/signalapp/svr2/logger"
+	"github.com/signalapp/svr2/peerid"
+
 	pb "github.com/signalapp/svr2/proto"
 )
 

host/raftmanager/raftmanager_test.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/signalapp/svr2/config"
 	"github.com/signalapp/svr2/peerid"
-
 	pb "github.com/signalapp/svr2/proto"
 )
 

host/rate/rate.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/go-redis/redis_rate/v10"
 	"github.com/redis/go-redis/v9"
+
 	"github.com/signalapp/svr2/config"
 )
 

host/rate/rate_test.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/alicebob/miniredis/v2"
+
 	"github.com/signalapp/svr2/config"
 )
 

host/rustclient/rustclient_test.go

@@ -15,9 +15,10 @@ import (
 	"time"
 
 	"github.com/alicebob/miniredis/v2"
-	"github.com/signalapp/svr2/servicetest"
 	"google.golang.org/protobuf/encoding/prototext"
 
+	"github.com/signalapp/svr2/servicetest"
+
 	pb "github.com/signalapp/svr2/proto"
 )
 

host/service/service.go

@@ -10,11 +10,15 @@ import (
 	"fmt"
 	"net"
 	"net/http"
+	_ "net/http/pprof"
 	"os"
 	"os/signal"
 	"syscall"
 	"time"
 
+	"go.uber.org/zap"
+	"golang.org/x/sync/errgroup"
+
 	"github.com/signalapp/svr2/auth"
 	"github.com/signalapp/svr2/config"
 	"github.com/signalapp/svr2/dispatch"
@@ -28,11 +32,8 @@ import (
 	"github.com/signalapp/svr2/util"
 	"github.com/signalapp/svr2/web/handlers"
 	"github.com/signalapp/svr2/web/middleware"
-	"go.uber.org/zap"
-	"golang.org/x/sync/errgroup"
 
 	pb "github.com/signalapp/svr2/proto"
-	_ "net/http/pprof"
 )
 
 // Start starts all SVR components and only returns when a component has encountered an

host/service/service_test.go

@@ -16,13 +16,12 @@ import (
 	"testing"
 	"time"
 
-	"google.golang.org/protobuf/proto"
-
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
-
 	"github.com/alicebob/miniredis/v2"
 	"github.com/gorilla/websocket"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+	"google.golang.org/protobuf/proto"
+
 	"github.com/signalapp/svr2/auth"
 	"github.com/signalapp/svr2/config"
 	"github.com/signalapp/svr2/enclave"

host/servicetest/servicetest.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
+
 	"github.com/signalapp/svr2/util"
 	"github.com/signalapp/svr2/web/client"
 

host/web/handlers/control.go

@@ -9,9 +9,10 @@ import (
 	"mime"
 	"net/http"
 
+	"google.golang.org/protobuf/encoding/protojson"
+
 	"github.com/signalapp/svr2/logger"
 	"github.com/signalapp/svr2/peer/peerdb"
-	"google.golang.org/protobuf/encoding/protojson"
 
 	pb "github.com/signalapp/svr2/proto"
 )

host/web/handlers/handlers.go

@@ -6,6 +6,7 @@ package handlers
 
 import (
 	"fmt"
+
 	pb "github.com/signalapp/svr2/proto"
 )
 

host/web/handlers/set_log_level.go

@@ -10,9 +10,10 @@ import (
 	"net/url"
 	"strings"
 
+	"go.uber.org/zap/zapcore"
+
 	"github.com/signalapp/svr2/config"
 	"github.com/signalapp/svr2/logger"
-	"go.uber.org/zap/zapcore"
 
 	pb "github.com/signalapp/svr2/proto"
 )

host/web/handlers/set_log_level_test.go

@@ -11,9 +11,10 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/signalapp/svr2/config"
 	"go.uber.org/zap/zapcore"
 
+	"github.com/signalapp/svr2/config"
+
 	pb "github.com/signalapp/svr2/proto"
 )
 

host/web/handlers/websocket.go

@@ -11,10 +11,11 @@ import (
 
 	"github.com/gorilla/websocket"
 	"github.com/hashicorp/go-metrics"
+	"google.golang.org/protobuf/proto"
+
 	"github.com/signalapp/svr2/config"
 	"github.com/signalapp/svr2/logger"
 	"github.com/signalapp/svr2/util"
-	"google.golang.org/protobuf/proto"
 
 	pb "github.com/signalapp/svr2/proto"
 )

host/web/middleware/auth.go

@@ -4,9 +4,10 @@
 package middleware
 
 import (
+	"net/http"
+
 	"github.com/signalapp/svr2/auth"
 	"github.com/signalapp/svr2/logger"
-	"net/http"
 )
 
 // AuthCheck wraps an http.Handler to check the request's BasicAuth using the provided authenticator

host/web/middleware/metrics.go

@@ -11,6 +11,7 @@ import (
 	"strconv"
 
 	"github.com/hashicorp/go-metrics"
+
 	"github.com/signalapp/svr2/util"
 )
 

host/web/middleware/rate.go

@@ -10,6 +10,7 @@ import (
 	"strconv"
 
 	"github.com/hashicorp/go-metrics"
+
 	"github.com/signalapp/svr2/logger"
 	"github.com/signalapp/svr2/rate"
 )

host/web/server_test.go

@@ -15,11 +15,12 @@ import (
 	"time"
 
 	"github.com/gorilla/websocket"
+	"google.golang.org/protobuf/proto"
+
 	"github.com/signalapp/svr2/config"
 	"github.com/signalapp/svr2/dispatch"
 	"github.com/signalapp/svr2/util"
 	"github.com/signalapp/svr2/web/handlers"
-	"google.golang.org/protobuf/proto"
 
 	pb "github.com/signalapp/svr2/proto"
 )