From 331e413afa6a9de2993af1d4aa105c18f644524d Mon Sep 17 00:00:00 2001
From: Vyacheslav1557 <slavabirin1@yandex.ru>
Date: Fri, 16 Aug 2024 21:43:31 +0500
Subject: [PATCH] fix: package name&dir

---
 Makefile                      | 5 +----
 buf.gen.yaml                  | 6 +++---
 internal/transport/server.go  | 4 ++--
 internal/transport/session.go | 2 +-
 internal/transport/user.go    | 2 +-
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 29ae2e9..caa845b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,5 @@
-GEN_DIR=pkg/go/gen
-
 gen:
-	@buf generate proto/session -o ${GEN_DIR}/session
-	@buf generate proto/user -o ${GEN_DIR}/user
+	@buf generate
 dev:
 	@make gen
 	@go run main.go
diff --git a/buf.gen.yaml b/buf.gen.yaml
index b0d7ad4..92b08eb 100644
--- a/buf.gen.yaml
+++ b/buf.gen.yaml
@@ -2,11 +2,11 @@ version: v1
 managed:
   enabled: true
   go_package_prefix:
-    default: git.sch9.ru/new_gate/ms-auth/pkg/go/gen/
+    default: git.sch9.ru/new_gate/ms-auth/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
diff --git a/internal/transport/server.go b/internal/transport/server.go
index 9678b4e..eb36cef 100644
--- a/internal/transport/server.go
+++ b/internal/transport/server.go
@@ -3,8 +3,8 @@ package transport
 import (
 	"context"
 	"git.sch9.ru/new_gate/ms-auth/internal/models"
-	sessionv1 "git.sch9.ru/new_gate/ms-auth/pkg/go/gen/session/v1"
-	userv1 "git.sch9.ru/new_gate/ms-auth/pkg/go/gen/user/v1"
+	sessionv1 "git.sch9.ru/new_gate/ms-auth/pkg/go/gen/proto/session/v1"
+	userv1 "git.sch9.ru/new_gate/ms-auth/pkg/go/gen/proto/user/v1"
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/types/known/timestamppb"
 	"net"
diff --git a/internal/transport/session.go b/internal/transport/session.go
index edfa8ed..53d6978 100644
--- a/internal/transport/session.go
+++ b/internal/transport/session.go
@@ -2,7 +2,7 @@ package transport
 
 import (
 	"context"
-	sessionv1 "git.sch9.ru/new_gate/ms-auth/pkg/go/gen/session/v1"
+	sessionv1 "git.sch9.ru/new_gate/ms-auth/pkg/go/gen/proto/session/v1"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/emptypb"
diff --git a/internal/transport/user.go b/internal/transport/user.go
index b955626..9b1296c 100644
--- a/internal/transport/user.go
+++ b/internal/transport/user.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"git.sch9.ru/new_gate/ms-auth/internal/lib"
 	"git.sch9.ru/new_gate/ms-auth/internal/models"
-	userv1 "git.sch9.ru/new_gate/ms-auth/pkg/go/gen/user/v1"
+	userv1 "git.sch9.ru/new_gate/ms-auth/pkg/go/gen/proto/user/v1"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/emptypb"