From d6583291e0bd1f128fe3eb0457e4328138e61f64 Mon Sep 17 00:00:00 2001 From: Semyon Krestyaninov <krestyaninov@perx.ru> Date: Thu, 17 Oct 2024 08:55:17 +0300 Subject: [PATCH] pkg files moved from pkg --- {pkg/files => files}/downloader.go | 0 {pkg/files => files}/field.go | 0 {pkg/files => files}/field_test.go | 0 {pkg/files => files}/file.go | 0 {pkg/files => files}/file_test.go | 0 {pkg/files => files}/middleware/access_logging_middleware.go | 4 ++-- {pkg/files => files}/middleware/error_logging_middleware.go | 4 ++-- {pkg/files => files}/middleware/middleware.go | 4 ++-- {pkg/files => files}/middleware/recovering_middleware.go | 4 ++-- {pkg/files => files}/middleware/telemetry_middleware.go | 4 ++-- {pkg/files => files}/mocks/Downloader.go | 2 +- {pkg/files => files}/mocks/Files.go | 2 +- {pkg/files => files}/mocks/Middleware.go | 2 +- {pkg/files => files}/mocks/Storage.go | 2 +- {pkg/files => files}/mocks/Uploader.go | 2 +- {pkg/files => files}/service.go | 0 {pkg/files => files}/storage.go | 0 {pkg/files => files}/transport/client.go | 2 +- {pkg/files => files}/transport/endpoints.microgen.go | 0 {pkg/files => files}/transport/exchanges.microgen.go | 2 +- {pkg/files => files}/transport/grpc/client.go | 2 +- {pkg/files => files}/transport/grpc/client.microgen.go | 2 +- .../transport/grpc/protobuf_endpoint_converters.microgen.go | 4 ++-- .../transport/grpc/protobuf_type_converters.microgen.go | 2 +- {pkg/files => files}/transport/grpc/server.go | 4 ++-- {pkg/files => files}/transport/grpc/server.microgen.go | 2 +- {pkg/files => files}/transport/server.microgen.go | 2 +- {pkg/files => files}/uploader.go | 0 images/middleware/access_logging_middleware.go | 2 +- images/middleware/error_logging_middleware.go | 2 +- images/middleware/recovering_middleware.go | 2 +- images/middleware/telemetry_middleware.go | 2 +- images/mocks/Images.go | 2 +- images/service.go | 2 +- images/transport/client.go | 2 +- images/transport/exchanges.microgen.go | 2 +- images/transport/grpc/protobuf_type_converters.microgen.go | 2 +- 37 files changed, 35 insertions(+), 35 deletions(-) rename {pkg/files => files}/downloader.go (100%) rename {pkg/files => files}/field.go (100%) rename {pkg/files => files}/field_test.go (100%) rename {pkg/files => files}/file.go (100%) rename {pkg/files => files}/file_test.go (100%) rename {pkg/files => files}/middleware/access_logging_middleware.go (94%) rename {pkg/files => files}/middleware/error_logging_middleware.go (92%) rename {pkg/files => files}/middleware/middleware.go (74%) rename {pkg/files => files}/middleware/recovering_middleware.go (93%) rename {pkg/files => files}/middleware/telemetry_middleware.go (97%) rename {pkg/files => files}/mocks/Downloader.go (95%) rename {pkg/files => files}/mocks/Files.go (99%) rename {pkg/files => files}/mocks/Middleware.go (95%) rename {pkg/files => files}/mocks/Storage.go (99%) rename {pkg/files => files}/mocks/Uploader.go (95%) rename {pkg/files => files}/service.go (100%) rename {pkg/files => files}/storage.go (100%) rename {pkg/files => files}/transport/client.go (97%) rename {pkg/files => files}/transport/endpoints.microgen.go (100%) rename {pkg/files => files}/transport/exchanges.microgen.go (95%) rename {pkg/files => files}/transport/grpc/client.go (93%) rename {pkg/files => files}/transport/grpc/client.microgen.go (96%) rename {pkg/files => files}/transport/grpc/protobuf_endpoint_converters.microgen.go (98%) rename {pkg/files => files}/transport/grpc/protobuf_type_converters.microgen.go (98%) rename {pkg/files => files}/transport/grpc/server.go (90%) rename {pkg/files => files}/transport/grpc/server.microgen.go (98%) rename {pkg/files => files}/transport/server.microgen.go (98%) rename {pkg/files => files}/uploader.go (100%) diff --git a/pkg/files/downloader.go b/files/downloader.go similarity index 100% rename from pkg/files/downloader.go rename to files/downloader.go diff --git a/pkg/files/field.go b/files/field.go similarity index 100% rename from pkg/files/field.go rename to files/field.go diff --git a/pkg/files/field_test.go b/files/field_test.go similarity index 100% rename from pkg/files/field_test.go rename to files/field_test.go diff --git a/pkg/files/file.go b/files/file.go similarity index 100% rename from pkg/files/file.go rename to files/file.go diff --git a/pkg/files/file_test.go b/files/file_test.go similarity index 100% rename from pkg/files/file_test.go rename to files/file_test.go diff --git a/pkg/files/middleware/access_logging_middleware.go b/files/middleware/access_logging_middleware.go similarity index 94% rename from pkg/files/middleware/access_logging_middleware.go rename to files/middleware/access_logging_middleware.go index df932a82..f67963a2 100644 --- a/pkg/files/middleware/access_logging_middleware.go +++ b/files/middleware/access_logging_middleware.go @@ -4,14 +4,14 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/files -i Files -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/files -i Files -t ../../../assets/templates/middleware/access_log.tmpl -o access_logging_middleware.go -l "" import ( "context" "time" + "git.perx.ru/perxis/perxis-go/files" "git.perx.ru/perxis/perxis-go/pkg/auth" - "git.perx.ru/perxis/perxis-go/pkg/files" "go.uber.org/zap" ) diff --git a/pkg/files/middleware/error_logging_middleware.go b/files/middleware/error_logging_middleware.go similarity index 92% rename from pkg/files/middleware/error_logging_middleware.go rename to files/middleware/error_logging_middleware.go index 18e9b65a..afe77026 100644 --- a/pkg/files/middleware/error_logging_middleware.go +++ b/files/middleware/error_logging_middleware.go @@ -4,12 +4,12 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/files -i Files -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/files -i Files -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l "" import ( "context" - "git.perx.ru/perxis/perxis-go/pkg/files" + "git.perx.ru/perxis/perxis-go/files" "go.uber.org/zap" ) diff --git a/pkg/files/middleware/middleware.go b/files/middleware/middleware.go similarity index 74% rename from pkg/files/middleware/middleware.go rename to files/middleware/middleware.go index 68d4c21f..03f91fc0 100644 --- a/pkg/files/middleware/middleware.go +++ b/files/middleware/middleware.go @@ -4,10 +4,10 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/files -i Files -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/files -i Files -t ../../../assets/templates/middleware/middleware.tmpl -o middleware.go -l "" import ( - "git.perx.ru/perxis/perxis-go/pkg/files" + "git.perx.ru/perxis/perxis-go/files" "go.uber.org/zap" ) diff --git a/pkg/files/middleware/recovering_middleware.go b/files/middleware/recovering_middleware.go similarity index 93% rename from pkg/files/middleware/recovering_middleware.go rename to files/middleware/recovering_middleware.go index 3143498e..4976330c 100644 --- a/pkg/files/middleware/recovering_middleware.go +++ b/files/middleware/recovering_middleware.go @@ -4,13 +4,13 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/files -i Files -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/files -i Files -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l "" import ( "context" "fmt" - "git.perx.ru/perxis/perxis-go/pkg/files" + "git.perx.ru/perxis/perxis-go/files" "go.uber.org/zap" ) diff --git a/pkg/files/middleware/telemetry_middleware.go b/files/middleware/telemetry_middleware.go similarity index 97% rename from pkg/files/middleware/telemetry_middleware.go rename to files/middleware/telemetry_middleware.go index e2e482a6..5ce88e70 100644 --- a/pkg/files/middleware/telemetry_middleware.go +++ b/files/middleware/telemetry_middleware.go @@ -4,15 +4,15 @@ package middleware -//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/files -i Files -t ../../../assets/templates/middleware/telemetry_default -o telemetry_middleware.go -l "" +//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/files -i Files -t ../../../assets/templates/middleware/telemetry_default -o telemetry_middleware.go -l "" import ( "context" "time" + "git.perx.ru/perxis/perxis-go/files" oid "git.perx.ru/perxis/perxis-go/id" "git.perx.ru/perxis/perxis-go/pkg/auth" - "git.perx.ru/perxis/perxis-go/pkg/files" "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" diff --git a/pkg/files/mocks/Downloader.go b/files/mocks/Downloader.go similarity index 95% rename from pkg/files/mocks/Downloader.go rename to files/mocks/Downloader.go index 4105337e..dafc02c3 100644 --- a/pkg/files/mocks/Downloader.go +++ b/files/mocks/Downloader.go @@ -5,7 +5,7 @@ package mocks import ( io "io" - files "git.perx.ru/perxis/perxis-go/pkg/files" + files "git.perx.ru/perxis/perxis-go/files" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/files/mocks/Files.go b/files/mocks/Files.go similarity index 99% rename from pkg/files/mocks/Files.go rename to files/mocks/Files.go index e4f8c664..346d7b7c 100644 --- a/pkg/files/mocks/Files.go +++ b/files/mocks/Files.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - files "git.perx.ru/perxis/perxis-go/pkg/files" + files "git.perx.ru/perxis/perxis-go/files" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/files/mocks/Middleware.go b/files/mocks/Middleware.go similarity index 95% rename from pkg/files/mocks/Middleware.go rename to files/mocks/Middleware.go index fb16e0e7..2629f871 100644 --- a/pkg/files/mocks/Middleware.go +++ b/files/mocks/Middleware.go @@ -3,7 +3,7 @@ package mocks import ( - files "git.perx.ru/perxis/perxis-go/pkg/files" + files "git.perx.ru/perxis/perxis-go/files" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/files/mocks/Storage.go b/files/mocks/Storage.go similarity index 99% rename from pkg/files/mocks/Storage.go rename to files/mocks/Storage.go index 02467f93..fa706dd4 100644 --- a/pkg/files/mocks/Storage.go +++ b/files/mocks/Storage.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - files "git.perx.ru/perxis/perxis-go/pkg/files" + files "git.perx.ru/perxis/perxis-go/files" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/files/mocks/Uploader.go b/files/mocks/Uploader.go similarity index 95% rename from pkg/files/mocks/Uploader.go rename to files/mocks/Uploader.go index 2a7c6cbc..a6192863 100644 --- a/pkg/files/mocks/Uploader.go +++ b/files/mocks/Uploader.go @@ -5,7 +5,7 @@ package mocks import ( io "io" - files "git.perx.ru/perxis/perxis-go/pkg/files" + files "git.perx.ru/perxis/perxis-go/files" mock "github.com/stretchr/testify/mock" ) diff --git a/pkg/files/service.go b/files/service.go similarity index 100% rename from pkg/files/service.go rename to files/service.go diff --git a/pkg/files/storage.go b/files/storage.go similarity index 100% rename from pkg/files/storage.go rename to files/storage.go diff --git a/pkg/files/transport/client.go b/files/transport/client.go similarity index 97% rename from pkg/files/transport/client.go rename to files/transport/client.go index 09bf05fe..f24bf381 100644 --- a/pkg/files/transport/client.go +++ b/files/transport/client.go @@ -5,7 +5,7 @@ package transport import ( "context" - files "git.perx.ru/perxis/perxis-go/pkg/files" + files "git.perx.ru/perxis/perxis-go/files" ) func (set EndpointsSet) StartUpload(arg0 context.Context, arg1 *files.MultipartUpload) (res0 *files.MultipartUpload, res1 error) { diff --git a/pkg/files/transport/endpoints.microgen.go b/files/transport/endpoints.microgen.go similarity index 100% rename from pkg/files/transport/endpoints.microgen.go rename to files/transport/endpoints.microgen.go diff --git a/pkg/files/transport/exchanges.microgen.go b/files/transport/exchanges.microgen.go similarity index 95% rename from pkg/files/transport/exchanges.microgen.go rename to files/transport/exchanges.microgen.go index df9a4782..9656a4f9 100644 --- a/pkg/files/transport/exchanges.microgen.go +++ b/files/transport/exchanges.microgen.go @@ -2,7 +2,7 @@ package transport -import files "git.perx.ru/perxis/perxis-go/pkg/files" +import files "git.perx.ru/perxis/perxis-go/files" type ( StartUploadRequest struct { diff --git a/pkg/files/transport/grpc/client.go b/files/transport/grpc/client.go similarity index 93% rename from pkg/files/transport/grpc/client.go rename to files/transport/grpc/client.go index e528e995..674a6096 100644 --- a/pkg/files/transport/grpc/client.go +++ b/files/transport/grpc/client.go @@ -3,8 +3,8 @@ package transportgrpc import ( + transport "git.perx.ru/perxis/perxis-go/files/transport" grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc" - transport "git.perx.ru/perxis/perxis-go/pkg/files/transport" grpckit "github.com/go-kit/kit/transport/grpc" grpc "google.golang.org/grpc" ) diff --git a/pkg/files/transport/grpc/client.microgen.go b/files/transport/grpc/client.microgen.go similarity index 96% rename from pkg/files/transport/grpc/client.microgen.go rename to files/transport/grpc/client.microgen.go index a86a2811..0d3be2dd 100644 --- a/pkg/files/transport/grpc/client.microgen.go +++ b/files/transport/grpc/client.microgen.go @@ -3,7 +3,7 @@ package transportgrpc import ( - transport "git.perx.ru/perxis/perxis-go/pkg/files/transport" + transport "git.perx.ru/perxis/perxis-go/files/transport" pb "git.perx.ru/perxis/perxis-go/proto/files" grpckit "github.com/go-kit/kit/transport/grpc" grpc "google.golang.org/grpc" diff --git a/pkg/files/transport/grpc/protobuf_endpoint_converters.microgen.go b/files/transport/grpc/protobuf_endpoint_converters.microgen.go similarity index 98% rename from pkg/files/transport/grpc/protobuf_endpoint_converters.microgen.go rename to files/transport/grpc/protobuf_endpoint_converters.microgen.go index 6c41a8c2..b30a322d 100644 --- a/pkg/files/transport/grpc/protobuf_endpoint_converters.microgen.go +++ b/files/transport/grpc/protobuf_endpoint_converters.microgen.go @@ -7,8 +7,8 @@ import ( "context" "errors" - "git.perx.ru/perxis/perxis-go/pkg/files" - "git.perx.ru/perxis/perxis-go/pkg/files/transport" + "git.perx.ru/perxis/perxis-go/files" + "git.perx.ru/perxis/perxis-go/files/transport" pb "git.perx.ru/perxis/perxis-go/proto/files" empty "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/pkg/files/transport/grpc/protobuf_type_converters.microgen.go b/files/transport/grpc/protobuf_type_converters.microgen.go similarity index 98% rename from pkg/files/transport/grpc/protobuf_type_converters.microgen.go rename to files/transport/grpc/protobuf_type_converters.microgen.go index 06651e67..8db9d72e 100644 --- a/pkg/files/transport/grpc/protobuf_type_converters.microgen.go +++ b/files/transport/grpc/protobuf_type_converters.microgen.go @@ -5,7 +5,7 @@ package transportgrpc import ( - "git.perx.ru/perxis/perxis-go/pkg/files" + "git.perx.ru/perxis/perxis-go/files" pb "git.perx.ru/perxis/perxis-go/proto/files" ) diff --git a/pkg/files/transport/grpc/server.go b/files/transport/grpc/server.go similarity index 90% rename from pkg/files/transport/grpc/server.go rename to files/transport/grpc/server.go index dcfc0759..3280c0d3 100644 --- a/pkg/files/transport/grpc/server.go +++ b/files/transport/grpc/server.go @@ -1,9 +1,9 @@ package transportgrpc import ( + "git.perx.ru/perxis/perxis-go/files" + "git.perx.ru/perxis/perxis-go/files/transport" grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc" - "git.perx.ru/perxis/perxis-go/pkg/files" - "git.perx.ru/perxis/perxis-go/pkg/files/transport" pb "git.perx.ru/perxis/perxis-go/proto/files" grpckit "github.com/go-kit/kit/transport/grpc" ) diff --git a/pkg/files/transport/grpc/server.microgen.go b/files/transport/grpc/server.microgen.go similarity index 98% rename from pkg/files/transport/grpc/server.microgen.go rename to files/transport/grpc/server.microgen.go index b3b4eafa..0ffe29c3 100644 --- a/pkg/files/transport/grpc/server.microgen.go +++ b/files/transport/grpc/server.microgen.go @@ -4,7 +4,7 @@ package transportgrpc import ( - transport "git.perx.ru/perxis/perxis-go/pkg/files/transport" + transport "git.perx.ru/perxis/perxis-go/files/transport" pb "git.perx.ru/perxis/perxis-go/proto/files" grpc "github.com/go-kit/kit/transport/grpc" context "golang.org/x/net/context" diff --git a/pkg/files/transport/server.microgen.go b/files/transport/server.microgen.go similarity index 98% rename from pkg/files/transport/server.microgen.go rename to files/transport/server.microgen.go index 7cd25b06..d9eca723 100644 --- a/pkg/files/transport/server.microgen.go +++ b/files/transport/server.microgen.go @@ -5,7 +5,7 @@ package transport import ( "context" - files "git.perx.ru/perxis/perxis-go/pkg/files" + files "git.perx.ru/perxis/perxis-go/files" endpoint "github.com/go-kit/kit/endpoint" ) diff --git a/pkg/files/uploader.go b/files/uploader.go similarity index 100% rename from pkg/files/uploader.go rename to files/uploader.go diff --git a/images/middleware/access_logging_middleware.go b/images/middleware/access_logging_middleware.go index 0a5f5ec2..93dfce4c 100644 --- a/images/middleware/access_logging_middleware.go +++ b/images/middleware/access_logging_middleware.go @@ -10,9 +10,9 @@ import ( "context" "time" + "git.perx.ru/perxis/perxis-go/files" "git.perx.ru/perxis/perxis-go/images" "git.perx.ru/perxis/perxis-go/pkg/auth" - "git.perx.ru/perxis/perxis-go/pkg/files" "go.uber.org/zap" ) diff --git a/images/middleware/error_logging_middleware.go b/images/middleware/error_logging_middleware.go index d0e36f87..1c823c47 100644 --- a/images/middleware/error_logging_middleware.go +++ b/images/middleware/error_logging_middleware.go @@ -9,8 +9,8 @@ package middleware import ( "context" + "git.perx.ru/perxis/perxis-go/files" "git.perx.ru/perxis/perxis-go/images" - "git.perx.ru/perxis/perxis-go/pkg/files" "go.uber.org/zap" ) diff --git a/images/middleware/recovering_middleware.go b/images/middleware/recovering_middleware.go index 9c0a447e..ba786490 100644 --- a/images/middleware/recovering_middleware.go +++ b/images/middleware/recovering_middleware.go @@ -10,8 +10,8 @@ import ( "context" "fmt" + "git.perx.ru/perxis/perxis-go/files" "git.perx.ru/perxis/perxis-go/images" - "git.perx.ru/perxis/perxis-go/pkg/files" "go.uber.org/zap" ) diff --git a/images/middleware/telemetry_middleware.go b/images/middleware/telemetry_middleware.go index 36d09a32..199f6262 100644 --- a/images/middleware/telemetry_middleware.go +++ b/images/middleware/telemetry_middleware.go @@ -10,10 +10,10 @@ import ( "context" "time" + "git.perx.ru/perxis/perxis-go/files" oid "git.perx.ru/perxis/perxis-go/id" "git.perx.ru/perxis/perxis-go/images" "git.perx.ru/perxis/perxis-go/pkg/auth" - "git.perx.ru/perxis/perxis-go/pkg/files" "git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" diff --git a/images/mocks/Images.go b/images/mocks/Images.go index 0797d930..ce986aba 100644 --- a/images/mocks/Images.go +++ b/images/mocks/Images.go @@ -5,8 +5,8 @@ package mocks import ( context "context" + files "git.perx.ru/perxis/perxis-go/files" images "git.perx.ru/perxis/perxis-go/images" - files "git.perx.ru/perxis/perxis-go/pkg/files" mock "github.com/stretchr/testify/mock" ) diff --git a/images/service.go b/images/service.go index 0162a58d..089a571e 100644 --- a/images/service.go +++ b/images/service.go @@ -3,7 +3,7 @@ package images import ( "context" - "git.perx.ru/perxis/perxis-go/pkg/files" + "git.perx.ru/perxis/perxis-go/files" ) // Images - описывает интерфейс сервиса для обработки изображений diff --git a/images/transport/client.go b/images/transport/client.go index bfa7487c..0d320851 100644 --- a/images/transport/client.go +++ b/images/transport/client.go @@ -5,8 +5,8 @@ package transport import ( "context" + files "git.perx.ru/perxis/perxis-go/files" images "git.perx.ru/perxis/perxis-go/images" - files "git.perx.ru/perxis/perxis-go/pkg/files" ) func (set EndpointsSet) Get(arg0 context.Context, arg1 *files.File, arg2 *images.GetOptions) (res0 *files.File, res1 error) { diff --git a/images/transport/exchanges.microgen.go b/images/transport/exchanges.microgen.go index 71d2cf72..7589660e 100644 --- a/images/transport/exchanges.microgen.go +++ b/images/transport/exchanges.microgen.go @@ -3,8 +3,8 @@ package transport import ( + files "git.perx.ru/perxis/perxis-go/files" images "git.perx.ru/perxis/perxis-go/images" - files "git.perx.ru/perxis/perxis-go/pkg/files" ) type ( diff --git a/images/transport/grpc/protobuf_type_converters.microgen.go b/images/transport/grpc/protobuf_type_converters.microgen.go index 51f6d686..1fe240c5 100644 --- a/images/transport/grpc/protobuf_type_converters.microgen.go +++ b/images/transport/grpc/protobuf_type_converters.microgen.go @@ -5,8 +5,8 @@ package transportgrpc import ( + file "git.perx.ru/perxis/perxis-go/files" service "git.perx.ru/perxis/perxis-go/images" - file "git.perx.ru/perxis/perxis-go/pkg/files" pbfile "git.perx.ru/perxis/perxis-go/proto/files" pbimage "git.perx.ru/perxis/perxis-go/proto/images" ) -- GitLab