diff --git a/cmd/feedback/main.go b/cmd/feedback/main.go index a0ad7bf..0785c0c 100644 --- a/cmd/feedback/main.go +++ b/cmd/feedback/main.go @@ -6,7 +6,7 @@ import ( "os" "gitea.pena/PenaSide/feedback/internal/app" "gitea.pena/PenaSide/feedback/internal/config" - _ "penahub.gitlab.yandexcloud.net/devops/linters/golang.git/pkg/dummy" + _ "gitea.pena/PenaSide/linters-golang/pkg/dummy" "time" ) diff --git a/go.mod b/go.mod index f2d02b6..83f736b 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,9 @@ go 1.22.0 toolchain go1.22.2 require ( + gitea.pena/PenaSide/common v0.0.0-20241120141501-1695a0981562 + gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a + gitea.pena/PenaSide/trashlog v0.0.0-20241119225515-2fd267647ca4 github.com/caarlos0/env/v8 v8.0.0 github.com/go-playground/validator/v10 v10.12.0 github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1 @@ -14,9 +17,6 @@ require ( github.com/themakers/hlog v0.0.0-20191205140925-235e0e4baddf go.etcd.io/bbolt v1.3.7 go.uber.org/zap v1.27.0 - penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240607202348-efe5f2bf3e8c - penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240829220549-d35409b619a3 - penahub.gitlab.yandexcloud.net/external/trashlog.git v0.1.2-0.20240523172059-9bbe8a9faa31 ) require ( diff --git a/go.sum b/go.sum index eca6b9a..8459be6 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,11 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +gitea.pena/PenaSide/common v0.0.0-20241120141501-1695a0981562 h1:LobhWlICMcbCCI+SouOzeRk2K5MsXSVHtv3QOcHRZnY= +gitea.pena/PenaSide/common v0.0.0-20241120141501-1695a0981562/go.mod h1:l71j3W1yROhOSfjWZ6wcMuzjBR37gu2ZTcXsorEJoiw= +gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a h1:UySqMgaOKNsR42Y6GQXoM2wn/waYNc9cakMUSvbEEAg= +gitea.pena/PenaSide/linters-golang v0.0.0-20241119212350-2759fa93724a/go.mod h1:gdd+vOT6up9STkEbxa2qESLIMZFjCmRbkcheFQCVgZU= +gitea.pena/PenaSide/trashlog v0.0.0-20241119225515-2fd267647ca4 h1:y9B4CSPIgiUoaXKyXLZxs1A9hxzDj26F9MH2R6uTkHQ= +gitea.pena/PenaSide/trashlog v0.0.0-20241119225515-2fd267647ca4/go.mod h1:Bp5fJX0XsTV3QYximX6R2kCRvVKQAPwxjjCPm+ToTY8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ClickHouse/clickhouse-go v1.5.4 h1:cKjXeYLNWVJIx2J1K6H2CqyRmfwVJVY1OV1coaaFcI0= github.com/ClickHouse/clickhouse-go v1.5.4/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI= @@ -294,9 +300,3 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240607202348-efe5f2bf3e8c h1:CWb4UcuNXhd1KTNOmy2U0TJO4+Qxgxrj5cwkyFqbgrk= -penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240607202348-efe5f2bf3e8c/go.mod h1:+bPxq2wfW5S1gd+83vZYmHm33AE7nEBfznWS8AM1TKE= -penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240829220549-d35409b619a3 h1:sf6e2mp582L3i/FMDd2q6QuWm1njRXzYpIX0SipsvM4= -penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240829220549-d35409b619a3/go.mod h1:i7M72RIpkSjcQtHID6KKj9RT/EYZ1rxS6tIPKWa/BSY= -penahub.gitlab.yandexcloud.net/external/trashlog.git v0.1.2-0.20240523172059-9bbe8a9faa31 h1:WlRVJnzU0sti+qBq/JTCgFPU0RoxIqGHu7hzDirxE2k= -penahub.gitlab.yandexcloud.net/external/trashlog.git v0.1.2-0.20240523172059-9bbe8a9faa31/go.mod h1:3ml0dAGT8U8RhpevKBfRgG6yKZum8EI2uJxAb2WCIy4= diff --git a/internal/app/app_feedback.go b/internal/app/app_feedback.go index 768eb6e..10a48e2 100644 --- a/internal/app/app_feedback.go +++ b/internal/app/app_feedback.go @@ -4,8 +4,8 @@ import ( "context" "github.com/themakers/hlog" "gitea.pena/PenaSide/feedback/internal/models" - "penahub.gitlab.yandexcloud.net/external/trashlog.git/app" - "penahub.gitlab.yandexcloud.net/external/trashlog.git/wrappers/zaptrashlog" + "gitea.pena/PenaSide/trashlog/app" + "gitea.pena/PenaSide/trashlog/wrappers/zaptrashlog" "time" tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" diff --git a/internal/server/http.go b/internal/server/http.go index 7c13f16..9d0ad70 100644 --- a/internal/server/http.go +++ b/internal/server/http.go @@ -7,7 +7,7 @@ import ( "github.com/gofiber/fiber/v2/middleware/recover" "github.com/themakers/hlog" "go.uber.org/zap" - "penahub.gitlab.yandexcloud.net/backend/penahub_common/log_mw" + "gitea.pena/PenaSide/common/log_mw" "gitea.pena/PenaSide/feedback/internal/config" "gitea.pena/PenaSide/feedback/internal/initialize" )