Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history 
Signed-off-by: kpango <[email protected]>
  • Loading branch information
kpango committed Jul 28, 2020
2 parents 8efffdf + 6bc8431 commit f87b538
Show file tree
Hide file tree
Showing 37 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion pkg/agent/core/ngt/usecase/agentd_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/observability"
"github.com/vdaas/vald/internal/runner"
"github.com/vdaas/vald/internal/servers/starter"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/sidecar/handler/grpc/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/agent/sidecar"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/agent/sidecar"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/sidecar/handler/rest/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/agent/sidecar"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/agent/sidecar"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/sidecar/usecase/initcontainer/initcontainer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/observability"
"github.com/vdaas/vald/internal/runner"
"github.com/vdaas/vald/internal/servers/starter"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/sidecar/usecase/sidecar/sidecar_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/observability"
"github.com/vdaas/vald/internal/runner"
"github.com/vdaas/vald/internal/servers/starter"
Expand Down
2 changes: 1 addition & 1 deletion pkg/discoverer/k8s/handler/grpc/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/payload"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/payload"
"github.com/vdaas/vald/internal/singleflight"
"github.com/vdaas/vald/pkg/discoverer/k8s/service"
"go.uber.org/goleak"
Expand Down
2 changes: 1 addition & 1 deletion pkg/discoverer/k8s/handler/rest/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/discoverer"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/discoverer"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/discoverer/k8s/usecase/discovered_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/observability"
"github.com/vdaas/vald/internal/runner"
"github.com/vdaas/vald/internal/servers/starter"
Expand Down
2 changes: 1 addition & 1 deletion pkg/gateway/backup/handler/rest/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/gateway/vald"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/gateway/vald"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/gateway/filter/handler/rest/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/gateway/vald"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/gateway/vald"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/gateway/lb/handler/rest/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/gateway/vald"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/gateway/vald"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/gateway/lb/usecase/vald_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/observability"
"github.com/vdaas/vald/internal/runner"
"github.com/vdaas/vald/internal/servers/starter"
Expand Down
2 changes: 1 addition & 1 deletion pkg/gateway/meta/handler/rest/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/gateway/vald"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/gateway/vald"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/gateway/tool/location/location_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/payload"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/payload"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/gateway/vald/handler/rest/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/gateway/vald"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/gateway/vald"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/backup/cassandra/handler/rest/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/manager/backup"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/manager/backup"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/backup/cassandra/service/cassandra_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/internal/config"
"github.com/vdaas/vald/internal/db/nosql/cassandra"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/pkg/manager/backup/cassandra/model"
"go.uber.org/goleak"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/backup/cassandra/usecase/backupd_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/observability"
"github.com/vdaas/vald/internal/runner"
"github.com/vdaas/vald/internal/servers/starter"
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/backup/mysql/handler/rest/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/manager/backup"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/manager/backup"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/backup/mysql/service/mysql_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/internal/config"
"github.com/vdaas/vald/internal/db/rdb/mysql"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/internal/net/tcp"
"github.com/vdaas/vald/pkg/manager/backup/mysql/model"
"go.uber.org/goleak"
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/backup/mysql/usecase/backupd_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/observability"
"github.com/vdaas/vald/internal/runner"
"github.com/vdaas/vald/internal/servers/starter"
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/compressor/handler/grpc/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/payload"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/payload"
"github.com/vdaas/vald/pkg/manager/compressor/service"
"go.uber.org/goleak"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/compressor/handler/rest/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/manager/compressor"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/manager/compressor"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/index/handler/grpc/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/manager/index"
"github.com/vdaas/vald/apis/grpc/payload"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/pkg/manager/index/service"
"go.uber.org/goleak"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/index/handler/rest/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/manager/index"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/manager/index"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/index/service/indexinfos_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"testing"
"unsafe"

"github.com/vdaas/vald/apis/grpc/payload"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/payload"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/index/usecase/indexer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/observability"
"github.com/vdaas/vald/internal/runner"
"github.com/vdaas/vald/internal/servers/starter"
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/replication/agent/handler/grpc/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/payload"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/payload"
"github.com/vdaas/vald/pkg/manager/replication/agent/service"
"go.uber.org/goleak"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/replication/agent/handler/rest/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/manager/replication/agent"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/manager/replication/agent"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/replication/agent/usecase/backupd_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/observability"
"github.com/vdaas/vald/internal/runner"
"github.com/vdaas/vald/internal/servers/starter"
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/replication/controller/handler/grpc/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/manager/replication/controller"
"github.com/vdaas/vald/apis/grpc/payload"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/pkg/manager/replication/controller/service"
"go.uber.org/goleak"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/replication/controller/handler/rest/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/manager/replication/controller"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/manager/replication/controller"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/manager/replication/controller/usecase/discovered_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/observability"
"github.com/vdaas/vald/internal/runner"
"github.com/vdaas/vald/internal/servers/starter"
Expand Down
2 changes: 1 addition & 1 deletion pkg/meta/cassandra/handler/rest/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/meta"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/meta"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/meta/cassandra/usecase/meta_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/observability"
"github.com/vdaas/vald/internal/runner"
"github.com/vdaas/vald/internal/servers/starter"
Expand Down
2 changes: 1 addition & 1 deletion pkg/meta/redis/handler/rest/handler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/apis/grpc/meta"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/apis/grpc/meta"
"go.uber.org/goleak"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/meta/redis/usecase/meta_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"reflect"
"testing"

"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/errors"
"github.com/vdaas/vald/internal/errgroup"
"github.com/vdaas/vald/internal/observability"
"github.com/vdaas/vald/internal/runner"
"github.com/vdaas/vald/internal/servers/starter"
Expand Down

0 comments on commit f87b538

Please sign in to comment.