From 7fb83557b292669d158f1032eadc767bfd2ca116 Mon Sep 17 00:00:00 2001 From: Vyacheslav1557 Date: Sat, 12 Apr 2025 20:05:04 +0500 Subject: [PATCH 1/3] refactor: rename submodule --- .gitmodules | 2 +- Makefile | 2 +- config.yaml | 2 +- proto => contracts | 0 internal/tester/delivery.go | 2 +- internal/tester/delivery/rest/handlers.go | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename proto => contracts (100%) diff --git a/.gitmodules b/.gitmodules index b358abe..6fd0375 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "proto"] - path = proto + path = contracts url = https://git.sch9.ru/new_gate/contracts diff --git a/Makefile b/Makefile index eb340fb..5a607f0 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ tag = latest gen: - @oapi-codegen --config=config.yaml ./proto/tester/v1/openapi.yaml + @oapi-codegen --config=config.yaml ./contracts/tester/v1/openapi.yaml dev: gen @go run main.go build: gen diff --git a/config.yaml b/config.yaml index 7e2a9cf..10eaf26 100644 --- a/config.yaml +++ b/config.yaml @@ -2,4 +2,4 @@ package: testerv1 generate: fiber-server: true models: true -output: ./proto/tester/v1/tester.go \ No newline at end of file +output: ./contracts/tester/v1/tester.go \ No newline at end of file diff --git a/proto b/contracts similarity index 100% rename from proto rename to contracts diff --git a/internal/tester/delivery.go b/internal/tester/delivery.go index d1045a9..c978917 100644 --- a/internal/tester/delivery.go +++ b/internal/tester/delivery.go @@ -1,7 +1,7 @@ package tester import ( - testerv1 "git.sch9.ru/new_gate/ms-tester/proto/tester/v1" + testerv1 "git.sch9.ru/new_gate/ms-tester/contracts/tester/v1" "github.com/gofiber/fiber/v2" ) diff --git a/internal/tester/delivery/rest/handlers.go b/internal/tester/delivery/rest/handlers.go index cd5bbb3..fc7fdf5 100644 --- a/internal/tester/delivery/rest/handlers.go +++ b/internal/tester/delivery/rest/handlers.go @@ -1,10 +1,10 @@ package rest import ( + testerv1 "git.sch9.ru/new_gate/ms-tester/contracts/tester/v1" "git.sch9.ru/new_gate/ms-tester/internal/models" "git.sch9.ru/new_gate/ms-tester/internal/tester" "git.sch9.ru/new_gate/ms-tester/pkg" - testerv1 "git.sch9.ru/new_gate/ms-tester/proto/tester/v1" "github.com/gofiber/fiber/v2" "io" ) -- 2.45.3 From a10d5af7850245a291e6c0a0c4b38d7f251198a4 Mon Sep 17 00:00:00 2001 From: Vyacheslav1557 Date: Sat, 12 Apr 2025 20:15:12 +0500 Subject: [PATCH 2/3] refactor: rename submodule --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index cfb5686..ce4db72 100644 --- a/main.go +++ b/main.go @@ -3,11 +3,11 @@ package main import ( "fmt" "git.sch9.ru/new_gate/ms-tester/config" + testerv1 "git.sch9.ru/new_gate/ms-tester/contracts/tester/v1" "git.sch9.ru/new_gate/ms-tester/internal/tester/delivery/rest" problemsRepository "git.sch9.ru/new_gate/ms-tester/internal/tester/repository" testerUseCase "git.sch9.ru/new_gate/ms-tester/internal/tester/usecase" "git.sch9.ru/new_gate/ms-tester/pkg" - testerv1 "git.sch9.ru/new_gate/ms-tester/proto/tester/v1" "github.com/gofiber/fiber/v2" fiberlogger "github.com/gofiber/fiber/v2/middleware/logger" "github.com/ilyakaznacheev/cleanenv" -- 2.45.3 From e63939ac3a72067889f7d204de44b6d13dc17a71 Mon Sep 17 00:00:00 2001 From: Vyacheslav1557 Date: Sat, 12 Apr 2025 21:10:06 +0500 Subject: [PATCH 3/3] refactor: rename submodule --- contracts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts b/contracts index 1fbee7b..f00483d 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit 1fbee7ba29c358c76d1c835ac6999ce9e1b59ee9 +Subproject commit f00483d24a53a243734c793fc24e02d52d39fdab -- 2.45.3