Merge remote-tracking branch 'refs/remotes/origin/develop' into develop
This commit is contained in:
commit
f2f1beeec9
5 changed files with 8 additions and 11 deletions
5
Makefile
5
Makefile
|
@ -1,8 +1,5 @@
|
|||
GEN_DIR=pkg/go/gen
|
||||
|
||||
gen:
|
||||
@buf generate proto/tester -o ${GEN_DIR}/tester
|
||||
@buf generate proto/session -o ${GEN_DIR}/session
|
||||
@buf generate
|
||||
dev:
|
||||
@make gen
|
||||
@go run main.go
|
||||
|
|
|
@ -2,11 +2,11 @@ version: v1
|
|||
managed:
|
||||
enabled: true
|
||||
go_package_prefix:
|
||||
default: git.sch9.ru/new_gate/ms-tester/pkg/go/gen/
|
||||
default: git.sch9.ru/new_gate/ms-tester/pkg/go/gen
|
||||
plugins:
|
||||
- name: go
|
||||
out: /
|
||||
out: pkg/go/gen
|
||||
opt: paths=source_relative
|
||||
- name: go-grpc
|
||||
out: /
|
||||
out: pkg/go/gen
|
||||
opt: paths=source_relative
|
||||
|
|
|
@ -2,7 +2,7 @@ package transport
|
|||
|
||||
import (
|
||||
"context"
|
||||
sessionv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/session/v1"
|
||||
sessionv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/proto/session/v1"
|
||||
"google.golang.org/grpc"
|
||||
"google.golang.org/grpc/codes"
|
||||
"google.golang.org/grpc/status"
|
||||
|
|
|
@ -3,8 +3,8 @@ package transport
|
|||
import (
|
||||
"context"
|
||||
"git.sch9.ru/new_gate/ms-tester/internal/models"
|
||||
sessionv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/session/v1"
|
||||
testerv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/tester/v1"
|
||||
sessionv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/proto/session/v1"
|
||||
testerv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/proto/tester/v1"
|
||||
"go.uber.org/zap"
|
||||
"google.golang.org/protobuf/types/known/timestamppb"
|
||||
"time"
|
||||
|
|
|
@ -4,7 +4,7 @@ import (
|
|||
"context"
|
||||
"git.sch9.ru/new_gate/ms-tester/internal/lib"
|
||||
"git.sch9.ru/new_gate/ms-tester/internal/models"
|
||||
testerv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/tester/v1"
|
||||
testerv1 "git.sch9.ru/new_gate/ms-tester/pkg/go/gen/proto/tester/v1"
|
||||
"google.golang.org/grpc/codes"
|
||||
"google.golang.org/grpc/status"
|
||||
"google.golang.org/protobuf/types/known/emptypb"
|
||||
|
|
Loading…
Reference in a new issue