fix import style (#868)

cmd/operator/main.go

@@ -9,15 +9,14 @@ import (
 	"flag"
 	"time"
 
-	scheme "github.com/dapr/dapr/pkg/client/clientset/versioned"
-	"k8s.io/klog"
-
 	log "github.com/Sirupsen/logrus"
+	scheme "github.com/dapr/dapr/pkg/client/clientset/versioned"
 	k8s "github.com/dapr/dapr/pkg/kubernetes"
 	"github.com/dapr/dapr/pkg/operator"
 	"github.com/dapr/dapr/pkg/signals"
 	"github.com/dapr/dapr/pkg/version"
 	"github.com/dapr/dapr/utils"
+	"k8s.io/klog"
 )
 
 var (

pkg/actors/actors.go

@@ -15,17 +15,14 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mitchellh/mapstructure"
-
-	"github.com/dapr/dapr/pkg/channel/http"
-
-	"github.com/golang/protobuf/ptypes/any"
-
 	log "github.com/Sirupsen/logrus"
 	"github.com/dapr/components-contrib/state"
 	"github.com/dapr/dapr/pkg/channel"
+	"github.com/dapr/dapr/pkg/channel/http"
 	"github.com/dapr/dapr/pkg/placement"
 	daprinternal_pb "github.com/dapr/dapr/pkg/proto/daprinternal"
+	"github.com/golang/protobuf/ptypes/any"
+	"github.com/mitchellh/mapstructure"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 )

pkg/actors/actors_test.go

@@ -14,13 +14,12 @@ import (
 	"time"
 
 	"github.com/dapr/components-contrib/state"
-	jsoniter "github.com/json-iterator/go"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-
 	"github.com/dapr/dapr/pkg/channel"
 	"github.com/dapr/dapr/pkg/channel/http"
 	channelt "github.com/dapr/dapr/pkg/channel/testing"
+	jsoniter "github.com/json-iterator/go"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 )
 
 const (

pkg/channel/grpc/grpc_channel.go

@@ -12,11 +12,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/golang/protobuf/ptypes/any"
-	"google.golang.org/grpc"
-
 	"github.com/dapr/dapr/pkg/channel"
 	daprclient_pb "github.com/dapr/dapr/pkg/proto/daprclient"
+	"github.com/golang/protobuf/ptypes/any"
+	"google.golang.org/grpc"
 )
 
 // Channel is a concrete AppChannel implementation for interacting with gRPC based user code

pkg/channel/http/http_channel_test.go

@@ -14,10 +14,9 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/valyala/fasthttp"
-
 	"github.com/dapr/dapr/pkg/channel"
 	"github.com/stretchr/testify/assert"
+	"github.com/valyala/fasthttp"
 )
 
 type testConcurrencyHandler struct {

pkg/discovery/mdns.go

@@ -13,9 +13,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/grandcat/zeroconf"
-
 	log "github.com/Sirupsen/logrus"
+	"github.com/grandcat/zeroconf"
 )
 
 // RegisterMDNS uses mdns to publish an entry of the service to a local network

pkg/grpc/api.go

@@ -12,23 +12,19 @@ import (
 	"time"
 
 	"github.com/dapr/components-contrib/bindings"
-
-	"github.com/google/uuid"
-
-	"github.com/dapr/dapr/pkg/actors"
-
-	"github.com/golang/protobuf/ptypes/any"
-	"github.com/golang/protobuf/ptypes/empty"
-
 	"github.com/dapr/components-contrib/pubsub"
 	"github.com/dapr/components-contrib/state"
+	"github.com/dapr/dapr/pkg/actors"
 	components_v1alpha1 "github.com/dapr/dapr/pkg/apis/components/v1alpha1"
 	"github.com/dapr/dapr/pkg/channel"
 	"github.com/dapr/dapr/pkg/components"
 	"github.com/dapr/dapr/pkg/messaging"
 	dapr_pb "github.com/dapr/dapr/pkg/proto/dapr"
 	daprinternal_pb "github.com/dapr/dapr/pkg/proto/daprinternal"
+	"github.com/golang/protobuf/ptypes/any"
 	durpb "github.com/golang/protobuf/ptypes/duration"
+	"github.com/golang/protobuf/ptypes/empty"
+	"github.com/google/uuid"
 	jsoniter "github.com/json-iterator/go"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

pkg/grpc/grpc.go

@@ -9,10 +9,9 @@ import (
 	"fmt"
 	"sync"
 
-	"google.golang.org/grpc"
-
 	"github.com/dapr/dapr/pkg/channel"
 	grpc_channel "github.com/dapr/dapr/pkg/channel/grpc"
+	"google.golang.org/grpc"
 )
 
 // Manager is a wrapper around gRPC connection pooling

pkg/http/api.go

@@ -13,15 +13,13 @@ import (
 
 	"github.com/dapr/components-contrib/bindings"
 	"github.com/dapr/components-contrib/pubsub"
-	"github.com/google/uuid"
-
-	jsoniter "github.com/json-iterator/go"
-
 	"github.com/dapr/components-contrib/state"
 	"github.com/dapr/dapr/pkg/actors"
 	"github.com/dapr/dapr/pkg/channel"
 	"github.com/dapr/dapr/pkg/channel/http"
 	"github.com/dapr/dapr/pkg/messaging"
+	"github.com/google/uuid"
+	jsoniter "github.com/json-iterator/go"
 	routing "github.com/qiangxue/fasthttp-routing"
 )
 

pkg/http/server.go

@@ -9,14 +9,13 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/valyala/fasthttp/pprofhandler"
-
 	cors "github.com/AdhityaRamadhanus/fasthttpcors"
 	log "github.com/Sirupsen/logrus"
 	"github.com/dapr/dapr/pkg/config"
 	diag "github.com/dapr/dapr/pkg/diagnostics"
 	routing "github.com/qiangxue/fasthttp-routing"
 	"github.com/valyala/fasthttp"
+	"github.com/valyala/fasthttp/pprofhandler"
 )
 
 // Server is an interface for the Dapr HTTP server

pkg/kubernetes/kubernetes_test.go

@@ -8,15 +8,13 @@ package kubernetes
 import (
 	"testing"
 
+	versioned "github.com/dapr/dapr/pkg/client/clientset/versioned"
+	"github.com/stretchr/testify/assert"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
-
-	"github.com/stretchr/testify/assert"
-
-	versioned "github.com/dapr/dapr/pkg/client/clientset/versioned"
 	fake "k8s.io/client-go/kubernetes/fake"
 )
 

pkg/messaging/direct_messaging.go

@@ -10,12 +10,11 @@ import (
 	"errors"
 	"time"
 
-	"github.com/golang/protobuf/ptypes/any"
-
 	"github.com/dapr/components-contrib/servicediscovery"
 	"github.com/dapr/dapr/pkg/channel"
 	"github.com/dapr/dapr/pkg/modes"
 	daprinternal_pb "github.com/dapr/dapr/pkg/proto/daprinternal"
+	"github.com/golang/protobuf/ptypes/any"
 	"google.golang.org/grpc"
 )
 

pkg/operator/handlers/components.go

@@ -5,17 +5,14 @@ import (
 	"fmt"
 	"time"
 
-	"google.golang.org/grpc"
-
-	"k8s.io/apimachinery/pkg/labels"
-
 	log "github.com/Sirupsen/logrus"
+	components_v1alpha1 "github.com/dapr/dapr/pkg/apis/components/v1alpha1"
+	pb "github.com/dapr/dapr/pkg/proto/daprinternal"
+	"google.golang.org/grpc"
 	corev1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/kubernetes"
-
-	components_v1alpha1 "github.com/dapr/dapr/pkg/apis/components/v1alpha1"
-	pb "github.com/dapr/dapr/pkg/proto/daprinternal"
 )
 
 // ComponentsHandler handles the lifetime management of Component CRDs

pkg/operator/handlers/dapr_handler.go

@@ -5,13 +5,12 @@ import (
 	"strings"
 	"sync"
 
-	"k8s.io/apimachinery/pkg/util/intstr"
-
 	log "github.com/Sirupsen/logrus"
 	"github.com/dapr/dapr/pkg/kubernetes"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
 const (

pkg/operator/handlers/dapr_handler_test.go

@@ -3,10 +3,9 @@ package handlers
 import (
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-
 	versioned "github.com/dapr/dapr/pkg/client/clientset/versioned"
 	"github.com/dapr/dapr/pkg/kubernetes"
+	"github.com/stretchr/testify/assert"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/runtime/runtime.go

@@ -16,42 +16,34 @@ import (
 	"sync"
 	"time"
 
-	"github.com/golang/protobuf/ptypes/empty"
-
-	"github.com/golang/protobuf/ptypes/any"
-
+	log "github.com/Sirupsen/logrus"
 	"github.com/dapr/components-contrib/bindings"
 	"github.com/dapr/components-contrib/exporters"
-
 	"github.com/dapr/components-contrib/pubsub"
 	"github.com/dapr/components-contrib/secretstores"
 	"github.com/dapr/components-contrib/servicediscovery"
 	"github.com/dapr/components-contrib/state"
-
 	"github.com/dapr/dapr/pkg/actors"
+	components_v1alpha1 "github.com/dapr/dapr/pkg/apis/components/v1alpha1"
+	"github.com/dapr/dapr/pkg/channel"
+	http_channel "github.com/dapr/dapr/pkg/channel/http"
+	"github.com/dapr/dapr/pkg/components"
 	bindings_loader "github.com/dapr/dapr/pkg/components/bindings"
 	exporter_loader "github.com/dapr/dapr/pkg/components/exporters"
 	pubsub_loader "github.com/dapr/dapr/pkg/components/pubsub"
 	secretstores_loader "github.com/dapr/dapr/pkg/components/secretstores"
 	servicediscovery_loader "github.com/dapr/dapr/pkg/components/servicediscovery"
 	state_loader "github.com/dapr/dapr/pkg/components/state"
+	"github.com/dapr/dapr/pkg/config"
 	"github.com/dapr/dapr/pkg/discovery"
+	"github.com/dapr/dapr/pkg/grpc"
 	"github.com/dapr/dapr/pkg/http"
 	"github.com/dapr/dapr/pkg/messaging"
-	jsoniter "github.com/json-iterator/go"
-
-	"github.com/dapr/dapr/pkg/channel"
-	http_channel "github.com/dapr/dapr/pkg/channel/http"
-
-	"github.com/dapr/dapr/pkg/config"
-	"github.com/dapr/dapr/pkg/grpc"
-
-	"github.com/dapr/dapr/pkg/components"
 	"github.com/dapr/dapr/pkg/modes"
-
-	log "github.com/Sirupsen/logrus"
-	components_v1alpha1 "github.com/dapr/dapr/pkg/apis/components/v1alpha1"
 	daprclient_pb "github.com/dapr/dapr/pkg/proto/daprclient"
+	"github.com/golang/protobuf/ptypes/any"
+	"github.com/golang/protobuf/ptypes/empty"
+	jsoniter "github.com/json-iterator/go"
 )
 
 const (

pkg/runtime/runtime_test.go

@@ -10,21 +10,19 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/stretchr/testify/mock"
-
 	"github.com/dapr/components-contrib/pubsub"
 	"github.com/dapr/components-contrib/secretstores"
+	components_v1alpha1 "github.com/dapr/dapr/pkg/apis/components/v1alpha1"
 	"github.com/dapr/dapr/pkg/channel"
 	http_channel "github.com/dapr/dapr/pkg/channel/http"
 	channelt "github.com/dapr/dapr/pkg/channel/testing"
 	pubsub_loader "github.com/dapr/dapr/pkg/components/pubsub"
 	secretstores_loader "github.com/dapr/dapr/pkg/components/secretstores"
+	"github.com/dapr/dapr/pkg/config"
 	"github.com/dapr/dapr/pkg/modes"
 	daprt "github.com/dapr/dapr/pkg/testing"
-
-	components_v1alpha1 "github.com/dapr/dapr/pkg/apis/components/v1alpha1"
-	"github.com/dapr/dapr/pkg/config"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

tests/e2e/utils/helpers.go

@@ -20,11 +20,10 @@ import (
 	guuid "github.com/google/uuid"
 )
 
-
 // SimpleKeyValue can be used to simplify code, providing simple key-value pairs.
 type SimpleKeyValue struct {
-	Key interface{}
-	Value interface {}
+	Key   interface{}
+	Value interface{}
 }
 
 // GenerateRandomStringKeys generates random string keys (values are nil).
@@ -47,7 +46,7 @@ func GenerateRandomStringValues(keyValues []SimpleKeyValue) []SimpleKeyValue {
 	output := make([]SimpleKeyValue, 0, len(keyValues))
 	for i, keyValue := range keyValues {
 		key := keyValue.Key
-		value := fmt.Sprintf("Value for entry #%d with key %v.", i + 1, key)
+		value := fmt.Sprintf("Value for entry #%d with key %v.", i+1, key)
 		output = append(output, SimpleKeyValue{key, value})
 	}
 

utils/utils.go

@@ -9,9 +9,8 @@ import (
 	"flag"
 	"path/filepath"
 
-	"k8s.io/client-go/rest"
-
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/util/homedir"
 )