From e1516e450b03a53878a63f911612a2a3195c06ea Mon Sep 17 00:00:00 2001 From: Andrey Chervyakov Date: Mon, 12 Apr 2021 17:17:09 +0600 Subject: [PATCH] Put project modules under pkg directory --- cmd/cgnolink/main.go | 6 +++--- config.go => pkg/cgnolink/config.go | 0 {database => pkg/cgnolink/database}/database.go | 0 {database => pkg/cgnolink/database}/migrate.go | 0 {database => pkg/cgnolink/database}/util.go | 0 {errors => pkg/cgnolink/errors}/errors.go | 0 {link => pkg/cgnolink/link}/dto.go | 0 {link => pkg/cgnolink/link}/entity.go | 0 {link => pkg/cgnolink/link}/handlers.go | 0 {link => pkg/cgnolink/link}/repository.go | 2 +- {link => pkg/cgnolink/link}/service.go | 2 +- {server => pkg/cgnolink/server}/middleware.go | 0 {server => pkg/cgnolink/server}/server.go | 4 ++-- 13 files changed, 7 insertions(+), 7 deletions(-) rename config.go => pkg/cgnolink/config.go (100%) rename {database => pkg/cgnolink/database}/database.go (100%) rename {database => pkg/cgnolink/database}/migrate.go (100%) rename {database => pkg/cgnolink/database}/util.go (100%) rename {errors => pkg/cgnolink/errors}/errors.go (100%) rename {link => pkg/cgnolink/link}/dto.go (100%) rename {link => pkg/cgnolink/link}/entity.go (100%) rename {link => pkg/cgnolink/link}/handlers.go (100%) rename {link => pkg/cgnolink/link}/repository.go (99%) rename {link => pkg/cgnolink/link}/service.go (98%) rename {server => pkg/cgnolink/server}/middleware.go (100%) rename {server => pkg/cgnolink/server}/server.go (95%) diff --git a/cmd/cgnolink/main.go b/cmd/cgnolink/main.go index 4a72941..45ce28a 100644 --- a/cmd/cgnolink/main.go +++ b/cmd/cgnolink/main.go @@ -1,9 +1,9 @@ package main import ( - "cgnolink" - "cgnolink/database" - appserver "cgnolink/server" + "cgnolink/pkg/cgnolink" + "cgnolink/pkg/cgnolink/database" + appserver "cgnolink/pkg/cgnolink/server" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "os" diff --git a/config.go b/pkg/cgnolink/config.go similarity index 100% rename from config.go rename to pkg/cgnolink/config.go diff --git a/database/database.go b/pkg/cgnolink/database/database.go similarity index 100% rename from database/database.go rename to pkg/cgnolink/database/database.go diff --git a/database/migrate.go b/pkg/cgnolink/database/migrate.go similarity index 100% rename from database/migrate.go rename to pkg/cgnolink/database/migrate.go diff --git a/database/util.go b/pkg/cgnolink/database/util.go similarity index 100% rename from database/util.go rename to pkg/cgnolink/database/util.go diff --git a/errors/errors.go b/pkg/cgnolink/errors/errors.go similarity index 100% rename from errors/errors.go rename to pkg/cgnolink/errors/errors.go diff --git a/link/dto.go b/pkg/cgnolink/link/dto.go similarity index 100% rename from link/dto.go rename to pkg/cgnolink/link/dto.go diff --git a/link/entity.go b/pkg/cgnolink/link/entity.go similarity index 100% rename from link/entity.go rename to pkg/cgnolink/link/entity.go diff --git a/link/handlers.go b/pkg/cgnolink/link/handlers.go similarity index 100% rename from link/handlers.go rename to pkg/cgnolink/link/handlers.go diff --git a/link/repository.go b/pkg/cgnolink/link/repository.go similarity index 99% rename from link/repository.go rename to pkg/cgnolink/link/repository.go index f8149d6..aa19b82 100644 --- a/link/repository.go +++ b/pkg/cgnolink/link/repository.go @@ -1,7 +1,7 @@ package link import ( - "cgnolink/database" + "cgnolink/pkg/cgnolink/database" "context" "errors" "github.com/jackc/pgtype" diff --git a/link/service.go b/pkg/cgnolink/link/service.go similarity index 98% rename from link/service.go rename to pkg/cgnolink/link/service.go index 26f048f..b7f00f6 100644 --- a/link/service.go +++ b/pkg/cgnolink/link/service.go @@ -1,7 +1,7 @@ package link import ( - apperrors "cgnolink/errors" + apperrors "cgnolink/pkg/cgnolink/errors" "github.com/patrickmn/go-cache" "golang.org/x/crypto/bcrypt" "net/url" diff --git a/server/middleware.go b/pkg/cgnolink/server/middleware.go similarity index 100% rename from server/middleware.go rename to pkg/cgnolink/server/middleware.go diff --git a/server/server.go b/pkg/cgnolink/server/server.go similarity index 95% rename from server/server.go rename to pkg/cgnolink/server/server.go index 11e23de..254116b 100644 --- a/server/server.go +++ b/pkg/cgnolink/server/server.go @@ -1,8 +1,8 @@ package server import ( - apperrors "cgnolink/errors" - "cgnolink/link" + apperrors "cgnolink/pkg/cgnolink/errors" + "cgnolink/pkg/cgnolink/link" "github.com/jackc/pgx/v4/pgxpool" "github.com/knadh/koanf" "github.com/labstack/echo/v4"