review 2

.gitignore

@@ -14,9 +14,13 @@
 
 # Binaries
 cmd/client/main
-cmd/client/agent
+cmd/client/client_darwin_amd64
+cmd/client/client_linux_amd64
+cmd/client/client_windows_amd64
 cmd/server/main
 cmd/server/server
+cmd/migrator/main
+cmd/migrator/migrator
 
 # Dependency directories (remove the comment below to include it)
 vendor/
@@ -25,5 +29,16 @@ vendor/
 .idea
 .vscode
 
-# Data
-data/
+# Configs
+config/migrator_client.yaml
+config/migrator_server.yaml
+config/server.yaml
+config/server_test.yaml
+config/client.yaml
+config/client_test.yaml
+
+# log
+*.log
+
+# client
+__debug_bin*

.golangci.yml

@@ -0,0 +1,56 @@
+linters:
+    enable-all: true
+    disable:
+        - nlreturn
+        - varnamelen
+        - wsl
+        - perfsprint
+        - depguard
+        - forbidigo
+        - exhaustruct
+        - tenv
+        - tagalign
+        - nosprintfhostport
+        - lll
+        - loggercheck
+        - paralleltest
+        - tagliatelle
+        - gochecknoglobals
+        - nonamedreturns
+        - wrapcheck
+        - gocognit
+        - cyclop
+        - exhaustive
+        - funlen
+        - nilnil
+        - mnd
+        - godox
+        - gocyclo
+        - gochecknoinits
+
+linters-settings:
+    revive:
+        rules:
+            - name: var-naming
+              arguments:
+                  - ["ID"]
+                  - ["VM"]
+                  - - skipPackageNameChecks: true
+
+    stylecheck:
+        checks: ["all", "-ST1003"]
+
+    gci:
+        sections:
+            - standard # Standard lib
+            - default # External dependencies
+            - prefix(github.com/bjlag/go-keeper) # Internal packages
+
+    ireturn:
+        allow:
+            - anon
+            - error
+            - empty
+            - stdlib
+            - github\.com\/charmbracelet\/bubbletea\.Model
+            - github\.com\/golang-migrate\/migrate\/v4\/database\.Driver

Makefile

@@ -0,0 +1,102 @@
+BUILD_VERSION ?= "v1.0.0"
+BUILD_DATE ?= $(shell date +'%Y/%m/%d %H:%M:%S')
+
+NAME = $(shell basename "$(PWD)")
+DIR = $(shell pwd)
+DOCKER_FILE = "docker-compose.local.yaml"
+
+.DEFAULT_GOAL := up
+
+.PHONY: all
+all: help
+
+## up: start app
+.PHONY: up
+up: docker-up wait-db migrate
+
+## down: stop app
+.PHONY: down
+down: docker-down
+
+wait-db:
+	@echo " > Wait DB"
+	@sleep 5
+
+## clean: stop app and remove volumes
+.PHONY: clean
+clean: docker-down-clear
+
+## docker-up: start docker
+.PHONY: docker-up
+docker-up:
+	@echo " > Start docker"
+	@docker-compose -f $(DIR)/docker/$(DOCKER_FILE) up -d
+
+## docker-down: stop docker
+.PHONY: docker-down
+docker-down:
+	@echo " > Stop docker"
+	@docker-compose -f $(DIR)/docker/$(DOCKER_FILE) down --remove-orphans
+
+## docker-down-clear: stop docker and remove volumes
+.PHONY: docker-down-clear
+docker-down-clear:
+	@echo " > Stop docker and remove volumes"
+	@docker-compose -f $(DIR)/docker/$(DOCKER_FILE) down -v --remove-orphans
+
+## migrate: apply migrations
+.PHONY: migrate
+migrate:
+	@echo " > Apply migrations"
+	@go run $(DIR)/cmd/migrator -c="./config/migrator_server.yaml"
+
+## lint: start linter
+.PHONY: lint
+lint:
+	@echo " > Start linter"
+	@golangci-lint run
+
+## fmt: start fmt
+.PHONY: fmt
+fmt:
+	@echo " > Start fmt"
+	@goimports -local "github.com/bjlag/go-keeper" -d -w $$(find . -type f -name '*.go' -not -path "*_mock.go" -not -path "./internal/generated/*")
+
+## test: start testing
+.PHONY: test
+test:
+	@echo " > Testing"
+	@go test -v $(DIR)/...
+
+## tidy: start `go mod tidy`
+.PHONY: tidy
+tidy:
+	@echo "  >  Go mod tidy"
+	@GOPATH=$(GOPATH) GOBIN=$(GOBIN) go mod tidy
+
+## proto: generate grpc client/server from proto files
+.PHONY: proto
+proto:
+	@echo "  >  Generate gRPC"
+	@protoc --go_out=. --go_opt=paths=import --go-grpc_out=. --go-grpc_opt=paths=import --go-grpc_opt=require_unimplemented_servers=false proto/*
+
+## doc: open documentation
+.PHONY: doc
+doc:
+	godoc -http=:8888 -play
+
+build-client:
+	@echo " > Building client for OSX"
+	@GOOS=darwin GOARCH=amd64 go build -ldflags "-X main.buildVersion=$(BUILD_VERSION) -X 'main.buildDate=$(BUILD_DATE)'" -o ./cmd/client/client_darwin_amd64 ./cmd/client/.
+	@echo " > Building client for Linux"
+	@GOOS=linux GOARCH=amd64 go build -ldflags "-X main.buildVersion=$(BUILD_VERSION) -X 'main.buildDate=$(BUILD_DATE)'" -o ./cmd/client/client_linux_amd64 ./cmd/client/.
+	@echo " > Building client for Windows"
+	@GOOS=windows GOARCH=amd64 go build -ldflags "-X main.buildVersion=$(BUILD_VERSION) -X 'main.buildDate=$(BUILD_DATE)'" -o ./cmd/client/client_windows_amd64 ./cmd/client/.
+
+.PHONY: help
+help: Makefile
+	@echo
+	@echo " Choose a command run in "$(NAME)":"
+	@echo
+	@sed -n 's/^##//p' $< | column -t -s ':' |  sed -e 's/^/ /'
+	@echo

README.md

@@ -1,3 +1,5 @@
 # go-keeper
 
+Выпускная работа на курсе "Яндекс Практикум: Продвинутый Go-разработчик". 
+
 GoKeeper представляет собой клиент-серверную систему, позволяющую пользователю надёжно и безопасно хранить логины, пароли, бинарные данные и прочую приватную информацию.

cmd/client/main.go

@@ -1,5 +1,71 @@
+// Отвечает за запуск клиента.
+//
+// Конфигурация указывается через флаг -c, описывается в YAML файле:
+//   - пример ./config/client.yaml.dist
+//
+// Флаг -version выведет текущую версию и дату сборки.
 package main
 
+import (
+	"context"
+	"flag"
+	"fmt"
+	logNative "log"
+	"os/signal"
+	"syscall"
+
+	"github.com/ilyakaznacheev/cleanenv"
+	"go.uber.org/zap"
+
+	"github.com/bjlag/go-keeper/internal/app/client"
+	"github.com/bjlag/go-keeper/internal/infrastructure/logger"
+)
+
+const (
+	// Конфигурация по умолчанию, если не передать флаг конфигурации при старте приложения.
+	configPathDefault = "./config/client.yaml"
+)
+
+var (
+	viewVersion  bool
+	buildVersion string
+	buildDate    string
+)
+
 func main() {
+	defer func() {
+		if r := recover(); r != nil {
+			logNative.Fatalf("panic occurred: %v", r)
+		}
+	}()
+
+	var configPath string
+
+	flag.StringVar(&configPath, "c", configPathDefault, "Path to config file")
+	flag.BoolVar(&viewVersion, "version", false, "View build version and data")
+	flag.Parse()
+
+	if viewVersion {
+		fmt.Printf("Version: %s\nBuild: %s\n", buildVersion, buildDate)
+		return
+	}
+
+	var cfg client.Config
+	if err := cleanenv.ReadConfig(configPath, &cfg); err != nil {
+		panic(err)
+	}
+
+	log := logger.Get(cfg.Env)
+	defer func() {
+		_ = log.Sync()
+	}()
+
+	log.Debug("Config loaded", zap.Any("config", cfg))
+
+	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGTERM, syscall.SIGINT, syscall.SIGQUIT)
+	defer cancel()
 
+	if err := client.NewApp(cfg, log).Run(ctx); err != nil {
+		panic(err)
+	}
 }

cmd/migrator/main.go

@@ -0,0 +1,95 @@
+// Отвечает за применение миграций к базе данных.
+// Поддерживает PostgreSQL и SQLite.
+//
+// Конфигурация указывается через флаг -c, описывается в YAML файле:
+//   - пример для клиента ./config/migrator_client.yaml.dist
+//   - пример для сервера ./config/migrator_server.yaml.dist
+package main
+
+import (
+	"errors"
+	"flag"
+	"io/fs"
+	logNative "log"
+
+	"github.com/golang-migrate/migrate/v4"
+	"github.com/ilyakaznacheev/cleanenv"
+	"github.com/jmoiron/sqlx"
+	"go.uber.org/zap"
+
+	"github.com/bjlag/go-keeper/internal/infrastructure/db/pg"
+	"github.com/bjlag/go-keeper/internal/infrastructure/db/sqlite"
+	"github.com/bjlag/go-keeper/internal/infrastructure/logger"
+	"github.com/bjlag/go-keeper/internal/infrastructure/migrator"
+)
+
+func main() {
+	defer func() {
+		if r := recover(); r != nil {
+			logNative.Fatalf("panic occurred: %v", r)
+		}
+	}()
+
+	var configPath string
+
+	flag.StringVar(&configPath, "c", "", "Path to config file")
+	flag.Parse()
+
+	var cfg migrator.Config
+	if err := cleanenv.ReadConfig(configPath, &cfg); err != nil {
+		panic(err)
+	}
+
+	log := logger.Get(cfg.Env)
+	defer func() {
+		_ = log.Sync()
+	}()
+
+	log.Debug("Config loaded", zap.Any("config", cfg))
+	log = log.With(zap.Any("db_type", cfg.Database.Type))
+
+	var (
+		err error
+		db  *sqlx.DB
+	)
+
+	switch cfg.Database.Type {
+	case migrator.TypePG:
+		dbConf := cfg.Database
+		db, err = pg.New(pg.GetDSN(dbConf.Host, dbConf.Port, dbConf.Name, dbConf.User, dbConf.Password)).Connect()
+	case migrator.TypeSqlite:
+		db, err = sqlite.New("./client.db").Connect()
+	}
+	defer func() {
+		_ = db.Close()
+	}()
+
+	if err != nil {
+		log.Error("Failed to open db", zap.Error(err))
+		panic(err)
+	}
+
+	m, err := migrator.Get(db, cfg.Database.Type, cfg.Database.Name, cfg.SourcePath, cfg.MigrationsTable)
+	if err != nil {
+		log.Error("Failed to initialize migrator", zap.Error(err))
+		panic(err)
+	}
+
+	log.Info("Applying migrations")
+
+	if err = m.Up(); err != nil {
+		if errors.Is(err, migrate.ErrNoChange) {
+			log.Info("No changes")
+			return
+		}
+		var e *fs.PathError
+		if errors.As(err, &e) {
+			log.Info("No migration files")
+			return
+		}
+		log.Error("Migration failed", zap.Error(err))
+		return
+	}
+
+	log.Info("Migrations applied")
+}