diff --git a/.gitmodules b/.gitmodules index 6fd0375..b358abe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "proto"] - path = contracts + path = proto url = https://git.sch9.ru/new_gate/contracts diff --git a/Makefile b/Makefile index 5a607f0..eb340fb 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ tag = latest gen: - @oapi-codegen --config=config.yaml ./contracts/tester/v1/openapi.yaml + @oapi-codegen --config=config.yaml ./proto/tester/v1/openapi.yaml dev: gen @go run main.go build: gen diff --git a/config.yaml b/config.yaml index 10eaf26..7e2a9cf 100644 --- a/config.yaml +++ b/config.yaml @@ -2,4 +2,4 @@ package: testerv1 generate: fiber-server: true models: true -output: ./contracts/tester/v1/tester.go \ No newline at end of file +output: ./proto/tester/v1/tester.go \ No newline at end of file diff --git a/internal/tester/delivery.go b/internal/tester/delivery.go index c978917..d1045a9 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/contracts/tester/v1" + testerv1 "git.sch9.ru/new_gate/ms-tester/proto/tester/v1" "github.com/gofiber/fiber/v2" ) diff --git a/internal/tester/delivery/rest/handlers.go b/internal/tester/delivery/rest/handlers.go index fc7fdf5..cd5bbb3 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 ce4db72..cfb5686 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/contracts b/proto similarity index 100% rename from contracts rename to proto