From dd374cf563510154c5e172f9d0219334d67990ec Mon Sep 17 00:00:00 2001 From: Andrew Putilov Date: Mon, 29 Jun 2020 11:32:00 +0300 Subject: [PATCH] Format using make fmt Signed-off-by: Andrew Putilov --- examples/memstore-plugin/main.go | 2 +- plugin/storage/grpc/archive.go | 1 + plugin/storage/grpc/archive_test.go | 8 +++++--- plugin/storage/grpc/factory.go | 2 +- plugin/storage/grpc/factory_test.go | 4 ++-- plugin/storage/grpc/shared/grpc_client.go | 2 +- plugin/storage/grpc/shared/grpc_client_test.go | 4 ++-- plugin/storage/grpc/shared/grpc_server_test.go | 2 +- plugin/storage/grpc/shared/interface.go | 2 +- .../storage/grpc/shared/mocks/ArchiveReader.go | 17 ++++++++++++++++- .../storage/grpc/shared/mocks/ArchiveWriter.go | 17 ++++++++++++++++- 11 files changed, 47 insertions(+), 14 deletions(-) diff --git a/examples/memstore-plugin/main.go b/examples/memstore-plugin/main.go index c304cf43e981..d15fffdf2aa5 100644 --- a/examples/memstore-plugin/main.go +++ b/examples/memstore-plugin/main.go @@ -16,13 +16,13 @@ package main import ( "flag" - "github.com/jaegertracing/jaeger/plugin/storage/grpc/shared" "path" "strings" "github.com/spf13/viper" "github.com/jaegertracing/jaeger/plugin/storage/grpc" + "github.com/jaegertracing/jaeger/plugin/storage/grpc/shared" "github.com/jaegertracing/jaeger/plugin/storage/memory" "github.com/jaegertracing/jaeger/storage/dependencystore" "github.com/jaegertracing/jaeger/storage/spanstore" diff --git a/plugin/storage/grpc/archive.go b/plugin/storage/grpc/archive.go index 36360e3bba75..af70cadccdad 100644 --- a/plugin/storage/grpc/archive.go +++ b/plugin/storage/grpc/archive.go @@ -16,6 +16,7 @@ package grpc import ( "context" + "github.com/jaegertracing/jaeger/model" "github.com/jaegertracing/jaeger/plugin/storage/grpc/shared" "github.com/jaegertracing/jaeger/storage/spanstore" diff --git a/plugin/storage/grpc/archive_test.go b/plugin/storage/grpc/archive_test.go index 303d8ff3bff2..6e9aeefb05ff 100644 --- a/plugin/storage/grpc/archive_test.go +++ b/plugin/storage/grpc/archive_test.go @@ -16,11 +16,13 @@ package grpc import ( "context" - "github.com/jaegertracing/jaeger/model" - "github.com/jaegertracing/jaeger/plugin/storage/grpc/shared/mocks" + "testing" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "testing" + + "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/plugin/storage/grpc/shared/mocks" ) var ( diff --git a/plugin/storage/grpc/factory.go b/plugin/storage/grpc/factory.go index f74859540c49..172db01ab555 100644 --- a/plugin/storage/grpc/factory.go +++ b/plugin/storage/grpc/factory.go @@ -17,7 +17,6 @@ package grpc import ( "context" "flag" - "github.com/jaegertracing/jaeger/storage" "github.com/spf13/viper" "github.com/uber/jaeger-lib/metrics" @@ -25,6 +24,7 @@ import ( "github.com/jaegertracing/jaeger/plugin/storage/grpc/config" "github.com/jaegertracing/jaeger/plugin/storage/grpc/shared" + "github.com/jaegertracing/jaeger/storage" "github.com/jaegertracing/jaeger/storage/dependencystore" "github.com/jaegertracing/jaeger/storage/spanstore" ) diff --git a/plugin/storage/grpc/factory_test.go b/plugin/storage/grpc/factory_test.go index 2a21564d0c84..23de4d2d6adc 100644 --- a/plugin/storage/grpc/factory_test.go +++ b/plugin/storage/grpc/factory_test.go @@ -16,18 +16,18 @@ package grpc import ( "errors" - "github.com/jaegertracing/jaeger/plugin/storage/grpc/shared/mocks" - "github.com/stretchr/testify/mock" "testing" "github.com/spf13/viper" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" "github.com/uber/jaeger-lib/metrics" "go.uber.org/zap" "github.com/jaegertracing/jaeger/pkg/config" grpcConfig "github.com/jaegertracing/jaeger/plugin/storage/grpc/config" "github.com/jaegertracing/jaeger/plugin/storage/grpc/shared" + "github.com/jaegertracing/jaeger/plugin/storage/grpc/shared/mocks" "github.com/jaegertracing/jaeger/storage" "github.com/jaegertracing/jaeger/storage/dependencystore" dependencyStoreMocks "github.com/jaegertracing/jaeger/storage/dependencystore/mocks" diff --git a/plugin/storage/grpc/shared/grpc_client.go b/plugin/storage/grpc/shared/grpc_client.go index bd9a02d711ae..8b156dbbe7cf 100644 --- a/plugin/storage/grpc/shared/grpc_client.go +++ b/plugin/storage/grpc/shared/grpc_client.go @@ -17,10 +17,10 @@ package shared import ( "context" "fmt" - "google.golang.org/grpc/codes" "io" "time" + "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" diff --git a/plugin/storage/grpc/shared/grpc_client_test.go b/plugin/storage/grpc/shared/grpc_client_test.go index eeff3b769704..527dab4c2b7d 100644 --- a/plugin/storage/grpc/shared/grpc_client_test.go +++ b/plugin/storage/grpc/shared/grpc_client_test.go @@ -17,15 +17,15 @@ package shared import ( "context" "errors" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" "io" "testing" "time" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" + "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" + "google.golang.org/grpc/status" "github.com/jaegertracing/jaeger/model" "github.com/jaegertracing/jaeger/proto-gen/storage_v1" diff --git a/plugin/storage/grpc/shared/grpc_server_test.go b/plugin/storage/grpc/shared/grpc_server_test.go index c898a64daacc..66d20d81e2a4 100644 --- a/plugin/storage/grpc/shared/grpc_server_test.go +++ b/plugin/storage/grpc/shared/grpc_server_test.go @@ -16,7 +16,6 @@ package shared import ( "context" - "github.com/jaegertracing/jaeger/plugin/storage/grpc/shared/mocks" "testing" "time" @@ -24,6 +23,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/jaegertracing/jaeger/model" + "github.com/jaegertracing/jaeger/plugin/storage/grpc/shared/mocks" "github.com/jaegertracing/jaeger/proto-gen/storage_v1" grpcMocks "github.com/jaegertracing/jaeger/proto-gen/storage_v1/mocks" "github.com/jaegertracing/jaeger/storage/dependencystore" diff --git a/plugin/storage/grpc/shared/interface.go b/plugin/storage/grpc/shared/interface.go index ec64b93afd4d..3c7a8b77fa30 100644 --- a/plugin/storage/grpc/shared/interface.go +++ b/plugin/storage/grpc/shared/interface.go @@ -16,11 +16,11 @@ package shared import ( "context" - "github.com/jaegertracing/jaeger/model" "github.com/hashicorp/go-plugin" "google.golang.org/grpc" + "github.com/jaegertracing/jaeger/model" "github.com/jaegertracing/jaeger/proto-gen/storage_v1" "github.com/jaegertracing/jaeger/storage/dependencystore" "github.com/jaegertracing/jaeger/storage/spanstore" diff --git a/plugin/storage/grpc/shared/mocks/ArchiveReader.go b/plugin/storage/grpc/shared/mocks/ArchiveReader.go index bc6e87e67d37..7e06fdbc6435 100644 --- a/plugin/storage/grpc/shared/mocks/ArchiveReader.go +++ b/plugin/storage/grpc/shared/mocks/ArchiveReader.go @@ -1,12 +1,27 @@ // Code generated by mockery v1.0.0. DO NOT EDIT. +// Copyright (c) 2020 The Jaeger Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package mocks import ( context "context" - model "github.com/jaegertracing/jaeger/model" mock "github.com/stretchr/testify/mock" + + model "github.com/jaegertracing/jaeger/model" ) // ArchiveReader is an autogenerated mock type for the ArchiveReader type diff --git a/plugin/storage/grpc/shared/mocks/ArchiveWriter.go b/plugin/storage/grpc/shared/mocks/ArchiveWriter.go index 66fad00dde95..a25410f99fc8 100644 --- a/plugin/storage/grpc/shared/mocks/ArchiveWriter.go +++ b/plugin/storage/grpc/shared/mocks/ArchiveWriter.go @@ -1,10 +1,25 @@ // Code generated by mockery v1.0.0. DO NOT EDIT. +// Copyright (c) 2020 The Jaeger Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + package mocks import ( - model "github.com/jaegertracing/jaeger/model" mock "github.com/stretchr/testify/mock" + + model "github.com/jaegertracing/jaeger/model" ) // ArchiveWriter is an autogenerated mock type for the ArchiveWriter type