Skip to content

Commit

Permalink
fix: fmt import (#2379)
Browse files Browse the repository at this point in the history
  • Loading branch information
demoManito authored Sep 27, 2022
1 parent 8d067a3 commit 4d95050
Show file tree
Hide file tree
Showing 54 changed files with 108 additions and 54 deletions.
3 changes: 2 additions & 1 deletion api/metadata/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"io"
"sync"

"github.com/go-kratos/kratos/v2/log"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
Expand All @@ -18,6 +17,8 @@ import (
protoreflect "google.golang.org/protobuf/reflect/protoreflect"
"google.golang.org/protobuf/reflect/protoregistry"
dpb "google.golang.org/protobuf/types/descriptorpb"

"github.com/go-kratos/kratos/v2/log"
)

// Server is api meta server
Expand Down
1 change: 1 addition & 0 deletions cmd/kratos/internal/project/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

"github.com/AlecAivazis/survey/v2"
"github.com/fatih/color"

"github.com/go-kratos/kratos/cmd/kratos/v2/internal/base"
)

Expand Down
3 changes: 2 additions & 1 deletion cmd/kratos/internal/project/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ import (
"time"

"github.com/AlecAivazis/survey/v2"
"github.com/go-kratos/kratos/cmd/kratos/v2/internal/base"
"github.com/spf13/cobra"

"github.com/go-kratos/kratos/cmd/kratos/v2/internal/base"
)

// CmdNew represents the new command.
Expand Down
3 changes: 2 additions & 1 deletion cmd/protoc-gen-go-errors/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ import (
"golang.org/x/text/cases"
"golang.org/x/text/language"

"github.com/go-kratos/kratos/cmd/protoc-gen-go-errors/v2/errors"
"google.golang.org/protobuf/compiler/protogen"
"google.golang.org/protobuf/proto"

"github.com/go-kratos/kratos/cmd/protoc-gen-go-errors/v2/errors"
)

const (
Expand Down
1 change: 1 addition & 0 deletions config/file/watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"path/filepath"

"github.com/fsnotify/fsnotify"

"github.com/go-kratos/kratos/v2/config"
)

Expand Down
1 change: 1 addition & 0 deletions contrib/config/apollo/apollo.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/apolloconfig/agollo/v4/constant"
apolloConfig "github.com/apolloconfig/agollo/v4/env/config"
"github.com/apolloconfig/agollo/v4/extension"

"github.com/go-kratos/kratos/v2/encoding"
)

Expand Down
3 changes: 2 additions & 1 deletion contrib/config/consul/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import (
"path/filepath"
"strings"

"github.com/go-kratos/kratos/v2/config"
"github.com/hashicorp/consul/api"

"github.com/go-kratos/kratos/v2/config"
)

// Option is etcd config option.
Expand Down
3 changes: 2 additions & 1 deletion contrib/config/consul/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import (
"testing"
"time"

"github.com/go-kratos/kratos/v2/config"
"github.com/hashicorp/consul/api"

"github.com/go-kratos/kratos/v2/config"
)

const testPath = "kratos/test/config"
Expand Down
3 changes: 2 additions & 1 deletion contrib/config/consul/watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package consul
import (
"context"

"github.com/go-kratos/kratos/v2/config"
"github.com/hashicorp/consul/api"
"github.com/hashicorp/consul/api/watch"

"github.com/go-kratos/kratos/v2/config"
)

type watcher struct {
Expand Down
3 changes: 2 additions & 1 deletion contrib/config/etcd/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import (
"path/filepath"
"strings"

"github.com/go-kratos/kratos/v2/config"
clientv3 "go.etcd.io/etcd/client/v3"

"github.com/go-kratos/kratos/v2/config"
)

// Option is etcd config option.
Expand Down
3 changes: 2 additions & 1 deletion contrib/config/etcd/watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package etcd
import (
"context"

"github.com/go-kratos/kratos/v2/config"
clientv3 "go.etcd.io/etcd/client/v3"

"github.com/go-kratos/kratos/v2/config"
)

type watcher struct {
Expand Down
3 changes: 2 additions & 1 deletion contrib/config/kubernetes/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@ import (
"path/filepath"
"strings"

"github.com/go-kratos/kratos/v2/config"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"

"github.com/go-kratos/kratos/v2/config"
)

// Option is kubernetes option.
Expand Down
3 changes: 2 additions & 1 deletion contrib/config/kubernetes/watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import (
"context"
"fmt"

"github.com/go-kratos/kratos/v2/config"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/watch"

"github.com/go-kratos/kratos/v2/config"
)

type watcher struct {
Expand Down
3 changes: 2 additions & 1 deletion contrib/config/nacos/watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import (
"path/filepath"
"strings"

"github.com/go-kratos/kratos/v2/config"
"github.com/nacos-group/nacos-sdk-go/vo"

"github.com/go-kratos/kratos/v2/config"
)

type Watcher struct {
Expand Down
3 changes: 2 additions & 1 deletion contrib/log/aliyun/aliyun.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import (

sls "github.com/aliyun/aliyun-log-go-sdk"
"github.com/aliyun/aliyun-log-go-sdk/producer"
log "github.com/go-kratos/kratos/v2/log"
"google.golang.org/protobuf/proto"

log "github.com/go-kratos/kratos/v2/log"
)

// Logger see more detail https://github.com/aliyun/aliyun-log-go-sdk
Expand Down
1 change: 1 addition & 0 deletions contrib/log/fluent/fluent.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"time"

"github.com/fluent/fluent-logger-golang/fluent"

"github.com/go-kratos/kratos/v2/log"
)

Expand Down
3 changes: 2 additions & 1 deletion contrib/log/logrus/logrus.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package logrus

import (
"github.com/go-kratos/kratos/v2/log"
"github.com/sirupsen/logrus"

"github.com/go-kratos/kratos/v2/log"
)

var _ log.Logger = (*Logger)(nil)
Expand Down
3 changes: 2 additions & 1 deletion contrib/log/logrus/logrus_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import (
"strings"
"testing"

"github.com/go-kratos/kratos/v2/log"
"github.com/sirupsen/logrus"

"github.com/go-kratos/kratos/v2/log"
)

func TestLoggerLog(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion contrib/log/tencent/tencent.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ import (
"strconv"
"time"

log "github.com/go-kratos/kratos/v2/log"
cls "github.com/tencentcloud/tencentcloud-cls-sdk-go"
"google.golang.org/protobuf/proto"

log "github.com/go-kratos/kratos/v2/log"
)

type Logger interface {
Expand Down
3 changes: 2 additions & 1 deletion contrib/log/zap/zap.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package zap
import (
"fmt"

"github.com/go-kratos/kratos/v2/log"
"go.uber.org/zap"

"github.com/go-kratos/kratos/v2/log"
)

var _ log.Logger = (*Logger)(nil)
Expand Down
3 changes: 2 additions & 1 deletion contrib/metrics/prometheus/counter.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package prometheus

import (
"github.com/go-kratos/kratos/v2/metrics"
"github.com/prometheus/client_golang/prometheus"

"github.com/go-kratos/kratos/v2/metrics"
)

var _ metrics.Counter = (*counter)(nil)
Expand Down
3 changes: 2 additions & 1 deletion contrib/metrics/prometheus/gauge.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package prometheus

import (
"github.com/go-kratos/kratos/v2/metrics"
"github.com/prometheus/client_golang/prometheus"

"github.com/go-kratos/kratos/v2/metrics"
)

var _ metrics.Gauge = (*gauge)(nil)
Expand Down
3 changes: 2 additions & 1 deletion contrib/metrics/prometheus/histogram.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package prometheus

import (
"github.com/go-kratos/kratos/v2/metrics"
"github.com/prometheus/client_golang/prometheus"

"github.com/go-kratos/kratos/v2/metrics"
)

var _ metrics.Observer = (*histogram)(nil)
Expand Down
3 changes: 2 additions & 1 deletion contrib/metrics/prometheus/summary.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package prometheus

import (
"github.com/go-kratos/kratos/v2/metrics"
"github.com/prometheus/client_golang/prometheus"

"github.com/go-kratos/kratos/v2/metrics"
)

var _ metrics.Observer = (*summary)(nil)
Expand Down
3 changes: 2 additions & 1 deletion contrib/registry/consul/registry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import (
"testing"
"time"

"github.com/go-kratos/kratos/v2/registry"
"github.com/hashicorp/consul/api"

"github.com/go-kratos/kratos/v2/registry"
)

func tcpServer(t *testing.T, lis net.Listener) {
Expand Down
3 changes: 2 additions & 1 deletion contrib/registry/discovery/discovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ import (
"sync/atomic"
"time"

"github.com/go-kratos/kratos/v2/log"
"github.com/go-resty/resty/v2"
"github.com/pkg/errors"

"github.com/go-kratos/kratos/v2/log"
)

type Discovery struct {
Expand Down
3 changes: 2 additions & 1 deletion contrib/registry/etcd/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import (
"math/rand"
"time"

"github.com/go-kratos/kratos/v2/registry"
clientv3 "go.etcd.io/etcd/client/v3"

"github.com/go-kratos/kratos/v2/registry"
)

var (
Expand Down
3 changes: 2 additions & 1 deletion contrib/registry/etcd/registry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ import (

"google.golang.org/grpc"

"github.com/go-kratos/kratos/v2/registry"
clientv3 "go.etcd.io/etcd/client/v3"

"github.com/go-kratos/kratos/v2/registry"
)

func TestRegistry(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion contrib/registry/etcd/watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ package etcd
import (
"context"

"github.com/go-kratos/kratos/v2/registry"
clientv3 "go.etcd.io/etcd/client/v3"

"github.com/go-kratos/kratos/v2/registry"
)

var _ registry.Watcher = (*watcher)(nil)
Expand Down
3 changes: 2 additions & 1 deletion contrib/registry/kubernetes/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"strings"
"time"

"github.com/go-kratos/kratos/v2/registry"
jsoniter "github.com/json-iterator/go"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand All @@ -21,6 +20,8 @@ import (
"k8s.io/client-go/kubernetes"
listerv1 "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/cache"

"github.com/go-kratos/kratos/v2/registry"
)

// Defines the key name of specific fields
Expand Down
3 changes: 2 additions & 1 deletion contrib/registry/nacos/watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import (
"context"
"fmt"

"github.com/go-kratos/kratos/v2/registry"
"github.com/nacos-group/nacos-sdk-go/clients/naming_client"
"github.com/nacos-group/nacos-sdk-go/model"
"github.com/nacos-group/nacos-sdk-go/vo"

"github.com/go-kratos/kratos/v2/registry"
)

var _ registry.Watcher = (*watcher)(nil)
Expand Down
3 changes: 2 additions & 1 deletion contrib/registry/zookeeper/register_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import (
"testing"
"time"

"github.com/go-kratos/kratos/v2/registry"
"github.com/go-zookeeper/zk"

"github.com/go-kratos/kratos/v2/registry"
)

func TestRegistry_GetService(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion contrib/registry/zookeeper/watcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import (
"path"
"sync/atomic"

"github.com/go-kratos/kratos/v2/registry"
"github.com/go-zookeeper/zk"

"github.com/go-kratos/kratos/v2/registry"
)

var _ registry.Watcher = (*watcher)(nil)
Expand Down
3 changes: 2 additions & 1 deletion encoding/json/json.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import (
"encoding/json"
"reflect"

"github.com/go-kratos/kratos/v2/encoding"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"

"github.com/go-kratos/kratos/v2/encoding"
)

// Name is the name registered for the json codec.
Expand Down
3 changes: 2 additions & 1 deletion encoding/yaml/yaml.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package yaml

import (
"github.com/go-kratos/kratos/v2/encoding"
"gopkg.in/yaml.v3"

"github.com/go-kratos/kratos/v2/encoding"
)

// Name is the name registered for the yaml codec.
Expand Down
Loading

0 comments on commit 4d95050

Please sign in to comment.