Skip to content

Commit f85fa32

Browse files
rtmelsovrtmelsov
authored
Merge pull request #13 from rtmelsov/develop
Develop
2 parents 8e8327c + 81cd4d3 commit f85fa32

File tree

11 files changed

+45
-87
lines changed

11 files changed

+45
-87
lines changed

‎Makefile‎

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,42 @@
1-
# Makefile (минимальный)
21
APP := tui
32
PKG := ./cmd/tui
43
DIST := dist
5-
SERVER_PKG ?= ./cmd/server
6-
GRPC_ADDR ?= 127.0.0.1:8080
7-
DB_DSN ?= mem://
4+
LDFLAGS := -s -w
5+
CGO := 0
86

9-
10-
11-
.PHONY: build run clean linux mac windows
7+
.PHONY: build run clean linux-amd64 linux-arm64 windows-amd64 darwin-arm64 release tidy
128

139
build:
1410
mkdir -p $(DIST)
1511
go mod tidy
16-
CGO_ENABLED=0 go build -o $(DIST)/$(APP) $(PKG)
12+
CGO_ENABLED=$(CGO) go build -ldflags '$(LDFLAGS)' -o $(DIST)/$(APP) $(PKG)
1713

1814
run: build
1915
$(DIST)/$(APP)
2016

2117
clean:
2218
rm -rf $(DIST)
2319

24-
# Кросс-сборки, если нужно
25-
linux:
26-
mkdir -p $(DIST)
27-
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o $(DIST)/$(APP)_linux_amd64 $(PKG)
28-
29-
mac:
20+
# Универсальный шаблон: build-<goos>_<goarch>
21+
build-%:
3022
mkdir -p $(DIST)
31-
CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -o $(DIST)/$(APP)_darwin_arm64 $(PKG)
32-
33-
windows:
34-
mkdir -p $(DIST)
35-
CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -o $(DIST)/$(APP)_windows_amd64.exe $(PKG)
36-
37-
help:
38-
@echo "make run - run server via 'go run'"
39-
@echo "make build -build server binary into ./bin/server"
40-
@echo "env overrides: GRPC_ADDR (default: $(GRPC_ADDR)), DB_DSN (default: $(DB_DSN))"
41-
@echo "example: make run GRPC_ADDR=:9090 DB_DSN='postgres://...@localhost:5432/vault?sslmode=disable"
42-
buildServer:
43-
@mkdir -p bin
44-
@echo "===> go build ./cmd/server -> ./bin/server"
45-
@go build -o bin/server $(SERVER_PKG)
23+
@GOOS=$(word 1,$(subst _, ,$*)) GOARCH=$(word 2,$(subst _, ,$*)) \
24+
CGO_ENABLED=$(CGO) go build -ldflags '$(LDFLAGS)' \
25+
-o $(DIST)/$(APP)_$*$(if $(findstring windows,$(word 1,$(subst _, ,$*))),.exe,) $(PKG)
26+
27+
linux-amd64: build-linux_amd64
28+
linux-arm64: build-linux_arm64
29+
windows-amd64: build-windows_amd64
30+
darwin-arm64: build-darwin_arm64
31+
32+
# Сборка всего и упаковка
33+
release: linux-amd64 linux-arm64 windows-amd64 darwin-arm64
34+
cd $(DIST) && \
35+
tar -czf $(APP)_linux_amd64.tgz $(APP)_linux_amd64 && \
36+
tar -czf $(APP)_linux_arm64.tgz $(APP)_linux_arm64 && \
37+
tar -czf $(APP)_darwin_arm64.tgz $(APP)_darwin_arm64 && \
38+
zip -9 $(APP)_windows_amd64.zip $(APP)_windows_amd64.exe
4639

4740
tidy:
48-
@go mod tidy
41+
go mod tidy
42+

‎internal/akclient/delete_file.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,16 @@ func DeleteFile(fileID string) error {
1919
if fileID == "" {
2020
return fmt.Errorf("empty fileID")
2121
}
22-
envs, err := helpers.LoadConfig()
23-
if err != nil {
24-
return err
25-
}
2622

2723
// ctx с Authorization: Bearer <token>
2824
ctx, err := middleware.AddAuthData()
2925
if err != nil {
3026
return err
3127
}
3228

33-
conn, err := grpc.NewClient(envs.Addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
29+
conn, err := grpc.NewClient(helpers.Addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
3430
if err != nil {
35-
return fmt.Errorf("dial %s: %w", envs.Addr, err)
31+
return fmt.Errorf("dial %s: %w", helpers.Addr, err)
3632
}
3733
defer conn.Close()
3834

‎internal/akclient/download_file.go‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,14 @@ func safeBase(name string) string {
4545
}
4646

4747
func DownloadFile(fileID string) (*filev1.GetFilesResponse, error) {
48-
envs, err := helpers.LoadConfig()
49-
50-
if err != nil {
51-
return nil, err
52-
}
5348
ctx, err := middleware.AddAuthData()
5449
if err != nil {
5550
return nil, err
5651
}
57-
outDir := envs.DownloadFilesDir
58-
conn, err := grpc.NewClient(envs.Addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
52+
outDir := helpers.DownloadFilesDir
53+
conn, err := grpc.NewClient(helpers.Addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
5954
if err != nil {
60-
log.Fatalf("dial %s: %v", envs.Addr, err)
55+
log.Fatalf("dial %s: %v", helpers.Addr, err)
6156
}
6257
defer conn.Close()
6358

‎internal/akclient/get_files.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,15 @@ func GetFiles() (*filev1.GetFilesResponse, error) {
1717
GetFilesRequest := &filev1.GetFilesRequest{
1818
Limit: 50,
1919
}
20-
envs, err := helpers.LoadConfig()
21-
if err != nil {
22-
return nil, err
23-
}
2420

2521
ctxWithMeta, err := middleware.AddAuthData()
2622
if err != nil {
2723
return nil, err
2824
}
2925

30-
conn, err := grpc.NewClient(envs.Addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
26+
conn, err := grpc.NewClient(helpers.Addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
3127
if err != nil {
32-
log.Fatalf("dial %s: %v", envs.Addr, err)
28+
log.Fatalf("dial %s: %v", helpers.Addr, err)
3329
}
3430
defer conn.Close()
3531

‎internal/akclient/get_profile.go‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
package akclient
33

44
import (
5-
"errors"
65
"log"
76

87
"github.com/rtmelsov/adv-keeper/internal/helpers"
@@ -15,18 +14,13 @@ import (
1514
)
1615

1716
func GetProfile() (*commonv1.GetProfileResponse, error) {
18-
envs, err := helpers.LoadConfig()
19-
if err != nil {
20-
return nil, errors.New("не получилось распарсить переменные окуржения")
21-
}
22-
2317
ctx, err := middleware.AddAuthData()
2418
if err != nil {
2519
return nil, err
2620
}
27-
conn, err := grpc.NewClient(envs.Addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
21+
conn, err := grpc.NewClient(helpers.Addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
2822
if err != nil {
29-
log.Fatalf("dial %s: %v", envs.Addr, err)
23+
log.Fatalf("dial %s: %v", helpers.Addr, err)
3024
}
3125
defer conn.Close()
3226

‎internal/akclient/login.go‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,9 @@ import (
1414
)
1515

1616
func Login(LoginRequest *commonv1.LoginRequest) (*commonv1.LoginResponse, error) {
17-
envs, err := helpers.LoadConfig()
17+
conn, err := grpc.NewClient(helpers.Addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
1818
if err != nil {
19-
return nil, err
20-
}
21-
22-
conn, err := grpc.NewClient(envs.Addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
23-
if err != nil {
24-
log.Fatalf("dial %s: %v", envs.Addr, err)
19+
log.Fatalf("dial %s: %v", helpers.Addr, err)
2520
}
2621
defer conn.Close()
2722

‎internal/akclient/logout.go‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,9 @@ import (
1515
)
1616

1717
func Logout() (*commonv1.TokenPair, error) {
18-
envs, err := helpers.LoadConfig()
18+
conn, err := grpc.NewClient(helpers.Addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
1919
if err != nil {
20-
return nil, err
21-
}
22-
23-
conn, err := grpc.NewClient(envs.Addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
24-
if err != nil {
25-
log.Fatalf("dial %s: %v", envs.Addr, err)
20+
log.Fatalf("dial %s: %v", helpers.Addr, err)
2621
}
2722
defer conn.Close()
2823

‎internal/akclient/register.go‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"log"
77
"time"
88

9-
"errors"
109
"github.com/rtmelsov/adv-keeper/internal/helpers"
1110
"google.golang.org/grpc"
1211
"google.golang.org/grpc/credentials/insecure"
@@ -15,13 +14,9 @@ import (
1514
)
1615

1716
func Register(RegisterRequest *commonv1.RegisterRequest) (*commonv1.RegisterResponse, error) {
18-
envs, err := helpers.LoadConfig()
17+
conn, err := grpc.NewClient(helpers.Addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
1918
if err != nil {
20-
return nil, errors.New("не получилось распарсить переменные окуржения")
21-
}
22-
conn, err := grpc.NewClient(envs.Addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
23-
if err != nil {
24-
log.Fatalf("dial %s: %v", envs.Addr, err)
19+
log.Fatalf("dial %s: %v", helpers.Addr, err)
2520
}
2621
defer conn.Close()
2722

‎internal/akclient/upload_file.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,8 @@ func UploadFile(path string) (*filev1.UploadResponse, error) {
3737
return nil, err
3838
}
3939

40-
envs, err := helpers.LoadConfig()
41-
if err != nil {
42-
return nil, err
43-
}
44-
4540
conn, err := grpc.NewClient(
46-
envs.Addr,
41+
helpers.Addr,
4742
grpc.WithTransportCredentials(insecure.NewCredentials()),
4843
grpc.WithKeepaliveParams(keepalive.ClientParameters{
4944
Time: 1 * time.Minute,

‎internal/helpers/config.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ import (
77
"github.com/joho/godotenv"
88
)
99

10+
var (
11+
Addr = "89.207.255.214:8080"
12+
DownloadFilesDir = "./"
13+
)
14+
1015
type Config struct {
1116
Addr string `env:"AK_GRPC_ADDR,required"`
1217
DBDSN string `env:"DB_DSN,required"`

0 commit comments

Comments
 (0)