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 df932a8282989e17936438b66b714dd9b4b14df6..f67963a27aa6e072acc93856d0467fc2f1782a9f 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 18e9b65a502b6cacc1913a9c14cfe5ff0aac8a1c..afe77026f00a12292c8b50761e4624663c6bbfdb 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 68d4c21f67b202f8639963930c71dcd6ab1cc3f9..03f91fc0d1bdbad1e45fb1ef82e10998b20f988e 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 3143498e490013dd747185a339c4111df107dd90..4976330ce5902c6cfee94b32380104443184565b 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 e2e482a6af8f4ffde281120f35c17fae425202f6..5ce88e702eda9eadaa48145199c6ad4822cbd1ee 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 4105337e56e73a344cdcd3019d0f71d229d88910..dafc02c3ceab0b36d8cffd01ee2bfc0676b5e67a 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 e4f8c664ebf84a4700165e56708f70bb85d470d8..346d7b7c164910bb2797f9c6aff98ae9d07f47ed 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 fb16e0e77d874c40d74362960259dac2d8d3ec32..2629f8716e707c291c71f4a612f3617f418c3dea 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 02467f9338aaf12741f0a95f65c7a1905e4f8fbf..fa706dd4dee6b36100a5d157f7585d1ab247fce6 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 2a7c6cbc571e085d1c8f6894f5b2c72422c2800c..a61928639701acd199d0723a7c7c5c48ddb552ee 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 09bf05fece9262b9811ed3cb9d0323f9aeb1267d..f24bf38101c5a45cd2d5baecf026bd6cd888c010 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 df9a47826c572de96d2cb55bb64aa6730729dd7e..9656a4f93a97851010e12bb758af550e02749f33 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 e528e995661c010eaf46206f003fcdbf43635810..674a60963e08af92751d15645b5d12ffbeb0306a 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 a86a2811e632a18aa473d506a4fe241a88d4aa9c..0d3be2dd990542737c183733beb187221102e510 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 6c41a8c257af438b91b9fbacef8a316a22c639e1..b30a322dfa585a57a2b516a65c2700b5f94f3761 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 06651e678c8a520c4aac19e38e51f4397da0493b..8db9d72ecf8da84906423f2a7729143ca12c5722 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 dcfc07598dbd6b2e0adb04d804e1cb8f223e55bf..3280c0d3f417438d7b69c329addc756736e999dd 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 b3b4eafad723a51cfbc03a774754c27dc7bf24b3..0ffe29c384bc0e353ac6c481f3b41fd6eba5030f 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 7cd25b06d7810e0bcd7371224264f551d6ba4832..d9eca723738235efeb98a015b930fe89e5a4d867 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 0a5f5ec2374db349e5eea81ec147d8258649412f..93dfce4cd5ca3fb7fec9d9a41644788cb0fb11d1 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 d0e36f879dfcafb2c037722ab171eb79240ef95c..1c823c4787c1ef263b425abda9c19bcdf484a6f0 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 9c0a447e802a95d3002f6e45060a2a359024ff5a..ba7864900bb696f53b6b6d1d71504ee173b3d914 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 36d09a320a2bd7fa92ceaa341fad44c89989942b..199f6262262fc26ac22b6b8c6f9efc12ecbb45e1 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 0797d930363b79877509b71c6e010004ff156eae..ce986aba99c9eca224d69974957d0122ac99bbc9 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 0162a58d32899eb8722273664f350006dad3553a..089a571e4898c0f89392fbc72b200a8319825d10 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 bfa7487ca160b8098337e4ebb885c74424aecd24..0d320851c73f8da29c0c1220d9c66c0f0c2e20bc 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 71d2cf729e20f354e4860963c78e70cc24e198e2..7589660ea52c4abd53c55afb160a8a548055c660 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 51f6d68668be2c416501fadbe14dbaeead5308df..1fe240c59bde6361296ff845cd56eba5bb3af58d 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"
)