Run "make fmt" (istio#2344)

moujf · Dec 27, 2017 · b545aae · b545aae
1 parent 9196de2
commit b545aae
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/broker/pkg/model/config/mock_store.go b/broker/pkg/model/config/mock_store.go
@@ -5,6 +5,7 @@ package config
 
 import (
 	gomock "github.com/golang/mock/gomock"
+
 	config "istio.io/api/broker/v1/config"
 )
 

diff --git a/mixer/pkg/il/compiler/compiler.go b/mixer/pkg/il/compiler/compiler.go
@@ -18,11 +18,12 @@ package compiler
 
 import (
 	"fmt"
+	"time"
+
 	descriptor "istio.io/api/mixer/v1/config/descriptor"
 	"istio.io/istio/mixer/pkg/expr"
 	"istio.io/istio/mixer/pkg/il"
 	"istio.io/istio/pkg/log"
-	"time"
 )
 
 // Compiler is a stateful compiler that can be used to gradually build an il.Program out of multiple independent

diff --git a/mixer/pkg/perf/run_test.go b/mixer/pkg/perf/run_test.go
@@ -43,10 +43,10 @@ func (b *mockB) fatalf(format string, args ...interface{}) {
 	b.fatalLog = append(b.fatalLog, fmt.Sprintf(format, args...))
 }
 
-var settings = Settings {
-	RunMode: InProcess,
-	Templates:make(map[string]template.Info),
-	Adapters: []adapter.InfoFn{},
+var settings = Settings{
+	RunMode:   InProcess,
+	Templates: make(map[string]template.Info),
+	Adapters:  []adapter.InfoFn{},
 }
 
 // TestBasic smoke-tests the basic run infrastructure. It is not a real benchmark.
@@ -63,4 +63,4 @@ func TestBasic(t *testing.T) {
 func TestRunDispatcher(t *testing.T) {
 	b := mockB{}
 	runDispatcherOnly(&b, &MinimalSetup, &settings)
-}
+}
diff --git a/mixer/pkg/runtime/logger.go b/mixer/pkg/runtime/logger.go
@@ -19,6 +19,7 @@ import (
 	"fmt"
 
 	"go.uber.org/zap"
+
 	"istio.io/istio/mixer/pkg/adapter"
 	"istio.io/istio/pkg/log"
 )

diff --git a/pilot/cmd/pilot-discovery/server/monitoring.go b/pilot/cmd/pilot-discovery/server/monitoring.go
@@ -21,6 +21,7 @@ import (
 
 	"github.com/golang/glog"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
+
 	"istio.io/istio/pilot/tools/version"
 )
 

diff --git a/pilot/proxy/envoy/discovery.go b/pilot/proxy/envoy/discovery.go
@@ -29,6 +29,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/hashicorp/go-multierror"
 	"github.com/prometheus/client_golang/prometheus"
+
 	"istio.io/istio/pilot/model"
 	"istio.io/istio/pilot/proxy"
 	"istio.io/istio/pilot/tools/version"

diff --git a/security/cmd/node_agent/na/nodeagent_test.go b/security/cmd/node_agent/na/nodeagent_test.go
@@ -18,6 +18,7 @@ import (
 	"bytes"
 	"fmt"
 	"net"
+	"strings"
 	"testing"
 	"time"
 
@@ -32,7 +33,6 @@ import (
 	mockutil "istio.io/istio/security/pkg/util/mock"
 	"istio.io/istio/security/pkg/workload"
 	pb "istio.io/istio/security/proto"
-	"strings"
 )
 
 const (
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ package config @@
     import (
     	gomock "github.com/golang/mock/gomock"
     	config "istio.io/api/broker/v1/config"
     )
@@ Expand Down @@