From fed73f184eeca55448a524004936608cc08806f0 Mon Sep 17 00:00:00 2001 From: Vyacheslav1557 <slavabirin1@yandex.ru> Date: Sat, 12 Apr 2025 20:05:04 +0500 Subject: [PATCH] refactor: rename submodule refactor: rename submodule refactor: rename submodule --- .gitmodules | 2 +- Makefile | 2 +- config.yaml | 2 +- contracts | 1 + internal/tester/delivery.go | 2 +- internal/tester/delivery/rest/handlers.go | 2 +- main.go | 2 +- proto | 1 - 8 files changed, 7 insertions(+), 7 deletions(-) create mode 160000 contracts delete mode 160000 proto 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/contracts b/contracts new file mode 160000 index 0000000..f00483d --- /dev/null +++ b/contracts @@ -0,0 +1 @@ +Subproject commit f00483d24a53a243734c793fc24e02d52d39fdab 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" ) 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" diff --git a/proto b/proto deleted file mode 160000 index 1fbee7b..0000000 --- a/proto +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1fbee7ba29c358c76d1c835ac6999ce9e1b59ee9