From c8f88c19bfd035b41bb9ccabb8d9f6e30236af4d Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <krestyaninov@perx.ru>
Date: Fri, 24 Nov 2023 12:19:23 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=20images=20?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D1=83=D1=80=D0=BE=D0=B2=D0=B5=D0=BD=D1=8C=20=D0=B2?=
 =?UTF-8?q?=D1=8B=D1=88=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../imgconv.go => images/convert/convert.go   |   8 +++++--
 .../convert/convert_test.go                   |   2 +-
 .../convert}/default_format.go                |   2 +-
 .../imgconv => images/convert}/testdata/1.bmp | Bin
 .../imgconv => images/convert}/testdata/1.gif | Bin
 .../imgconv => images/convert}/testdata/1.go  |   0
 .../convert}/testdata/1.jpeg                  | Bin
 .../imgconv => images/convert}/testdata/1.png | Bin
 .../convert}/testdata/1.tiff                  | Bin
 .../convert}/testdata/1.webp                  | Bin
 .../images/imgconv => images/convert}/webp.go |   2 +-
 .../imgconv => images/convert}/webp_test.go   |   2 +-
 .../middleware/error_logging_middleware.go    |   6 ++---
 .../middleware/logging_middleware.go          |   6 ++---
 .../middleware/middleware.go                  |   4 ++--
 .../middleware/recovering_middleware.go       |   4 ++--
 .../middleware/telemetry_middleware.go        |   4 ++--
 {pkg/images => images}/mocks/Images.go        |  22 +++++++++++-------
 {pkg/images => images}/mocks/Middleware.go    |  17 ++++++++------
 {pkg/images => images}/service.go             |   0
 .../transport/client.microgen.go              |   2 +-
 .../transport/endpoints.microgen.go           |   0
 .../transport/exchanges.microgen.go           |   2 +-
 .../transport/grpc/client.microgen.go         |   2 +-
 .../protobuf_endpoint_converters.microgen.go  |   2 +-
 .../grpc/protobuf_type_converters.microgen.go |   6 ++---
 .../transport/grpc/server.microgen.go         |   2 +-
 .../transport/server.microgen.go              |   2 +-
 28 files changed, 55 insertions(+), 42 deletions(-)
 rename pkg/images/imgconv/imgconv.go => images/convert/convert.go (93%)
 rename pkg/images/imgconv/imgconv_test.go => images/convert/convert_test.go (99%)
 rename {pkg/images/imgconv => images/convert}/default_format.go (97%)
 rename {pkg/images/imgconv => images/convert}/testdata/1.bmp (100%)
 rename {pkg/images/imgconv => images/convert}/testdata/1.gif (100%)
 rename {pkg/images/imgconv => images/convert}/testdata/1.go (100%)
 rename {pkg/images/imgconv => images/convert}/testdata/1.jpeg (100%)
 rename {pkg/images/imgconv => images/convert}/testdata/1.png (100%)
 rename {pkg/images/imgconv => images/convert}/testdata/1.tiff (100%)
 rename {pkg/images/imgconv => images/convert}/testdata/1.webp (100%)
 rename {pkg/images/imgconv => images/convert}/webp.go (97%)
 rename {pkg/images/imgconv => images/convert}/webp_test.go (96%)
 rename {pkg/images => images}/middleware/error_logging_middleware.go (77%)
 rename {pkg/images => images}/middleware/logging_middleware.go (85%)
 rename {pkg/images => images}/middleware/middleware.go (74%)
 rename {pkg/images => images}/middleware/recovering_middleware.go (83%)
 rename {pkg/images => images}/middleware/telemetry_middleware.go (89%)
 rename {pkg/images => images}/mocks/Images.go (74%)
 rename {pkg/images => images}/mocks/Middleware.go (75%)
 rename {pkg/images => images}/service.go (100%)
 rename {pkg/images => images}/transport/client.microgen.go (93%)
 rename {pkg/images => images}/transport/endpoints.microgen.go (100%)
 rename {pkg/images => images}/transport/exchanges.microgen.go (86%)
 rename {pkg/images => images}/transport/grpc/client.microgen.go (89%)
 rename {pkg/images => images}/transport/grpc/protobuf_endpoint_converters.microgen.go (96%)
 rename {pkg/images => images}/transport/grpc/protobuf_type_converters.microgen.go (91%)
 rename {pkg/images => images}/transport/grpc/server.microgen.go (92%)
 rename {pkg/images => images}/transport/server.microgen.go (91%)

diff --git a/pkg/images/imgconv/imgconv.go b/images/convert/convert.go
similarity index 93%
rename from pkg/images/imgconv/imgconv.go
rename to images/convert/convert.go
index ad8e6b56..b704055d 100644
--- a/pkg/images/imgconv/imgconv.go
+++ b/images/convert/convert.go
@@ -1,4 +1,4 @@
-package imgconv
+package convert
 
 import (
 	"image"
@@ -14,6 +14,10 @@ type (
 	Format     string
 )
 
+func (f Format) String() string {
+	return string(f)
+}
+
 var (
 	defaultFormatEncoderRegistry = make(map[Format]EncodeFunc)
 	formatExtensions             = make(map[string]Format)
@@ -21,7 +25,7 @@ var (
 
 func RegisterFormatEncoder(format Format, fn EncodeFunc, extensions ...string) {
 	defaultFormatEncoderRegistry[format] = fn
-	formatExtensions[string(format)] = format
+	formatExtensions[format.String()] = format
 	for _, ext := range extensions {
 		formatExtensions[strings.TrimPrefix(strings.ToLower(ext), ".")] = format
 	}
diff --git a/pkg/images/imgconv/imgconv_test.go b/images/convert/convert_test.go
similarity index 99%
rename from pkg/images/imgconv/imgconv_test.go
rename to images/convert/convert_test.go
index 13660d7b..b7a759ea 100644
--- a/pkg/images/imgconv/imgconv_test.go
+++ b/images/convert/convert_test.go
@@ -1,4 +1,4 @@
-package imgconv
+package convert
 
 import (
 	"bytes"
diff --git a/pkg/images/imgconv/default_format.go b/images/convert/default_format.go
similarity index 97%
rename from pkg/images/imgconv/default_format.go
rename to images/convert/default_format.go
index 389df4ea..7e680d33 100644
--- a/pkg/images/imgconv/default_format.go
+++ b/images/convert/default_format.go
@@ -1,4 +1,4 @@
-package imgconv
+package convert
 
 import (
 	"image"
diff --git a/pkg/images/imgconv/testdata/1.bmp b/images/convert/testdata/1.bmp
similarity index 100%
rename from pkg/images/imgconv/testdata/1.bmp
rename to images/convert/testdata/1.bmp
diff --git a/pkg/images/imgconv/testdata/1.gif b/images/convert/testdata/1.gif
similarity index 100%
rename from pkg/images/imgconv/testdata/1.gif
rename to images/convert/testdata/1.gif
diff --git a/pkg/images/imgconv/testdata/1.go b/images/convert/testdata/1.go
similarity index 100%
rename from pkg/images/imgconv/testdata/1.go
rename to images/convert/testdata/1.go
diff --git a/pkg/images/imgconv/testdata/1.jpeg b/images/convert/testdata/1.jpeg
similarity index 100%
rename from pkg/images/imgconv/testdata/1.jpeg
rename to images/convert/testdata/1.jpeg
diff --git a/pkg/images/imgconv/testdata/1.png b/images/convert/testdata/1.png
similarity index 100%
rename from pkg/images/imgconv/testdata/1.png
rename to images/convert/testdata/1.png
diff --git a/pkg/images/imgconv/testdata/1.tiff b/images/convert/testdata/1.tiff
similarity index 100%
rename from pkg/images/imgconv/testdata/1.tiff
rename to images/convert/testdata/1.tiff
diff --git a/pkg/images/imgconv/testdata/1.webp b/images/convert/testdata/1.webp
similarity index 100%
rename from pkg/images/imgconv/testdata/1.webp
rename to images/convert/testdata/1.webp
diff --git a/pkg/images/imgconv/webp.go b/images/convert/webp.go
similarity index 97%
rename from pkg/images/imgconv/webp.go
rename to images/convert/webp.go
index f5f42e04..d9f5a892 100644
--- a/pkg/images/imgconv/webp.go
+++ b/images/convert/webp.go
@@ -1,6 +1,6 @@
 //go:build webp
 
-package imgconv
+package convert
 
 import (
 	"image"
diff --git a/pkg/images/imgconv/webp_test.go b/images/convert/webp_test.go
similarity index 96%
rename from pkg/images/imgconv/webp_test.go
rename to images/convert/webp_test.go
index b244d152..59518ca7 100644
--- a/pkg/images/imgconv/webp_test.go
+++ b/images/convert/webp_test.go
@@ -1,6 +1,6 @@
 //go:build webp
 
-package imgconv
+package convert
 
 import (
 	"bytes"
diff --git a/pkg/images/middleware/error_logging_middleware.go b/images/middleware/error_logging_middleware.go
similarity index 77%
rename from pkg/images/middleware/error_logging_middleware.go
rename to images/middleware/error_logging_middleware.go
index 749db73b..d0e36f87 100644
--- a/pkg/images/middleware/error_logging_middleware.go
+++ b/images/middleware/error_logging_middleware.go
@@ -1,16 +1,16 @@
 // Code generated by gowrap. DO NOT EDIT.
-// template: ../../../assets/templates/middleware/error_log
+// template: ../../assets/templates/middleware/error_log
 // gowrap: http://github.com/hexdigest/gowrap
 
 package middleware
 
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/images -i Images -t ../../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/images -i Images -t ../../assets/templates/middleware/error_log -o error_logging_middleware.go -l ""
 
 import (
 	"context"
 
+	"git.perx.ru/perxis/perxis-go/images"
 	"git.perx.ru/perxis/perxis-go/pkg/files"
-	"git.perx.ru/perxis/perxis-go/pkg/images"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/images/middleware/logging_middleware.go b/images/middleware/logging_middleware.go
similarity index 85%
rename from pkg/images/middleware/logging_middleware.go
rename to images/middleware/logging_middleware.go
index fb7d0af4..a69a56ee 100644
--- a/pkg/images/middleware/logging_middleware.go
+++ b/images/middleware/logging_middleware.go
@@ -1,19 +1,19 @@
 // Code generated by gowrap. DO NOT EDIT.
-// template: ../../../assets/templates/middleware/access_log
+// template: ../../assets/templates/middleware/access_log
 // gowrap: http://github.com/hexdigest/gowrap
 
 package middleware
 
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/images -i Images -t ../../../assets/templates/middleware/access_log -o logging_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/images -i Images -t ../../assets/templates/middleware/access_log -o logging_middleware.go -l ""
 
 import (
 	"context"
 	"fmt"
 	"time"
 
+	"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/images"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 )
diff --git a/pkg/images/middleware/middleware.go b/images/middleware/middleware.go
similarity index 74%
rename from pkg/images/middleware/middleware.go
rename to images/middleware/middleware.go
index d4717a0d..e29bdeb8 100644
--- a/pkg/images/middleware/middleware.go
+++ b/images/middleware/middleware.go
@@ -4,10 +4,10 @@
 
 package middleware
 
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/images -i Images -t ../../../assets/templates/middleware/middleware -o middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/images -i Images -t ../../assets/templates/middleware/middleware -o middleware.go -l ""
 
 import (
-	"git.perx.ru/perxis/perxis-go/pkg/images"
+	"git.perx.ru/perxis/perxis-go/images"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/images/middleware/recovering_middleware.go b/images/middleware/recovering_middleware.go
similarity index 83%
rename from pkg/images/middleware/recovering_middleware.go
rename to images/middleware/recovering_middleware.go
index 4fe31525..9ad61603 100644
--- a/pkg/images/middleware/recovering_middleware.go
+++ b/images/middleware/recovering_middleware.go
@@ -4,14 +4,14 @@
 
 package middleware
 
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/images -i Images -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/images -i Images -t ../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
 
 import (
 	"context"
 	"fmt"
 
+	"git.perx.ru/perxis/perxis-go/images"
 	"git.perx.ru/perxis/perxis-go/pkg/files"
-	"git.perx.ru/perxis/perxis-go/pkg/images"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/images/middleware/telemetry_middleware.go b/images/middleware/telemetry_middleware.go
similarity index 89%
rename from pkg/images/middleware/telemetry_middleware.go
rename to images/middleware/telemetry_middleware.go
index b3cb8bef..2c0aac8e 100644
--- a/pkg/images/middleware/telemetry_middleware.go
+++ b/images/middleware/telemetry_middleware.go
@@ -4,13 +4,13 @@
 
 package middleware
 
-//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/images -i Images -t ../../../assets/templates/middleware/telemetry -o telemetry_middleware.go -l ""
+//go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/images -i Images -t ../../assets/templates/middleware/telemetry -o telemetry_middleware.go -l ""
 
 import (
 	"context"
 
+	"git.perx.ru/perxis/perxis-go/images"
 	"git.perx.ru/perxis/perxis-go/pkg/files"
-	"git.perx.ru/perxis/perxis-go/pkg/images"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
diff --git a/pkg/images/mocks/Images.go b/images/mocks/Images.go
similarity index 74%
rename from pkg/images/mocks/Images.go
rename to images/mocks/Images.go
index baf57ae6..0797d930 100644
--- a/pkg/images/mocks/Images.go
+++ b/images/mocks/Images.go
@@ -1,12 +1,12 @@
-// Code generated by mockery v2.15.0. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
 import (
 	context "context"
 
+	images "git.perx.ru/perxis/perxis-go/images"
 	files "git.perx.ru/perxis/perxis-go/pkg/files"
-	images "git.perx.ru/perxis/perxis-go/pkg/images"
 
 	mock "github.com/stretchr/testify/mock"
 )
@@ -20,7 +20,15 @@ type Images struct {
 func (_m *Images) Get(ctx context.Context, source *files.File, opts *images.GetOptions) (*files.File, error) {
 	ret := _m.Called(ctx, source, opts)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Get")
+	}
+
 	var r0 *files.File
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *files.File, *images.GetOptions) (*files.File, error)); ok {
+		return rf(ctx, source, opts)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *files.File, *images.GetOptions) *files.File); ok {
 		r0 = rf(ctx, source, opts)
 	} else {
@@ -29,7 +37,6 @@ func (_m *Images) Get(ctx context.Context, source *files.File, opts *images.GetO
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *files.File, *images.GetOptions) error); ok {
 		r1 = rf(ctx, source, opts)
 	} else {
@@ -39,13 +46,12 @@ func (_m *Images) Get(ctx context.Context, source *files.File, opts *images.GetO
 	return r0, r1
 }
 
-type mockConstructorTestingTNewImages interface {
+// NewImages creates a new instance of Images. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewImages(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewImages creates a new instance of Images. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewImages(t mockConstructorTestingTNewImages) *Images {
+}) *Images {
 	mock := &Images{}
 	mock.Mock.Test(t)
 
diff --git a/pkg/images/mocks/Middleware.go b/images/mocks/Middleware.go
similarity index 75%
rename from pkg/images/mocks/Middleware.go
rename to images/mocks/Middleware.go
index 43ba1dd2..5f4292c7 100644
--- a/pkg/images/mocks/Middleware.go
+++ b/images/mocks/Middleware.go
@@ -1,9 +1,9 @@
-// Code generated by mockery v2.15.0. DO NOT EDIT.
+// Code generated by mockery v2.38.0. DO NOT EDIT.
 
 package mocks
 
 import (
-	images "git.perx.ru/perxis/perxis-go/pkg/images"
+	images "git.perx.ru/perxis/perxis-go/images"
 
 	mock "github.com/stretchr/testify/mock"
 )
@@ -17,6 +17,10 @@ type Middleware struct {
 func (_m *Middleware) Execute(_a0 images.Images) images.Images {
 	ret := _m.Called(_a0)
 
+	if len(ret) == 0 {
+		panic("no return value specified for Execute")
+	}
+
 	var r0 images.Images
 	if rf, ok := ret.Get(0).(func(images.Images) images.Images); ok {
 		r0 = rf(_a0)
@@ -29,13 +33,12 @@ func (_m *Middleware) Execute(_a0 images.Images) images.Images {
 	return r0
 }
 
-type mockConstructorTestingTNewMiddleware interface {
+// NewMiddleware creates a new instance of Middleware. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMiddleware(t interface {
 	mock.TestingT
 	Cleanup(func())
-}
-
-// NewMiddleware creates a new instance of Middleware. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewMiddleware(t mockConstructorTestingTNewMiddleware) *Middleware {
+}) *Middleware {
 	mock := &Middleware{}
 	mock.Mock.Test(t)
 
diff --git a/pkg/images/service.go b/images/service.go
similarity index 100%
rename from pkg/images/service.go
rename to images/service.go
diff --git a/pkg/images/transport/client.microgen.go b/images/transport/client.microgen.go
similarity index 93%
rename from pkg/images/transport/client.microgen.go
rename to images/transport/client.microgen.go
index 9994b2c3..d8b9342e 100644
--- a/pkg/images/transport/client.microgen.go
+++ b/images/transport/client.microgen.go
@@ -6,8 +6,8 @@ import (
 	"context"
 	"errors"
 
+	images "git.perx.ru/perxis/perxis-go/images"
 	files "git.perx.ru/perxis/perxis-go/pkg/files"
-	images "git.perx.ru/perxis/perxis-go/pkg/images"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
 )
diff --git a/pkg/images/transport/endpoints.microgen.go b/images/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/images/transport/endpoints.microgen.go
rename to images/transport/endpoints.microgen.go
diff --git a/pkg/images/transport/exchanges.microgen.go b/images/transport/exchanges.microgen.go
similarity index 86%
rename from pkg/images/transport/exchanges.microgen.go
rename to images/transport/exchanges.microgen.go
index 9b9992a0..71d2cf72 100644
--- a/pkg/images/transport/exchanges.microgen.go
+++ b/images/transport/exchanges.microgen.go
@@ -3,8 +3,8 @@
 package transport
 
 import (
+	images "git.perx.ru/perxis/perxis-go/images"
 	files "git.perx.ru/perxis/perxis-go/pkg/files"
-	images "git.perx.ru/perxis/perxis-go/pkg/images"
 )
 
 type (
diff --git a/pkg/images/transport/grpc/client.microgen.go b/images/transport/grpc/client.microgen.go
similarity index 89%
rename from pkg/images/transport/grpc/client.microgen.go
rename to images/transport/grpc/client.microgen.go
index cbafae5f..f613e655 100644
--- a/pkg/images/transport/grpc/client.microgen.go
+++ b/images/transport/grpc/client.microgen.go
@@ -3,7 +3,7 @@
 package transportgrpc
 
 import (
-	transport "git.perx.ru/perxis/perxis-go/pkg/images/transport"
+	transport "git.perx.ru/perxis/perxis-go/images/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/images"
 	grpckit "github.com/go-kit/kit/transport/grpc"
 	grpc "google.golang.org/grpc"
diff --git a/pkg/images/transport/grpc/protobuf_endpoint_converters.microgen.go b/images/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 96%
rename from pkg/images/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to images/transport/grpc/protobuf_endpoint_converters.microgen.go
index e1800e17..d206e2f4 100644
--- a/pkg/images/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/images/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,7 +7,7 @@ import (
 	"context"
 	"errors"
 
-	transport "git.perx.ru/perxis/perxis-go/pkg/images/transport"
+	transport "git.perx.ru/perxis/perxis-go/images/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/images"
 )
 
diff --git a/pkg/images/transport/grpc/protobuf_type_converters.microgen.go b/images/transport/grpc/protobuf_type_converters.microgen.go
similarity index 91%
rename from pkg/images/transport/grpc/protobuf_type_converters.microgen.go
rename to images/transport/grpc/protobuf_type_converters.microgen.go
index ff8c7233..48a13510 100644
--- a/pkg/images/transport/grpc/protobuf_type_converters.microgen.go
+++ b/images/transport/grpc/protobuf_type_converters.microgen.go
@@ -5,8 +5,8 @@
 package transportgrpc
 
 import (
+	service "git.perx.ru/perxis/perxis-go/images"
 	file "git.perx.ru/perxis/perxis-go/pkg/files"
-	service "git.perx.ru/perxis/perxis-go/pkg/images"
 	pbfile "git.perx.ru/perxis/perxis-go/proto/files"
 	pbimage "git.perx.ru/perxis/perxis-go/proto/images"
 )
@@ -74,9 +74,9 @@ func ProtoToPtrGetOptions(protoOpts *pbimage.GetRequest_GetOptions) (*service.Ge
 }
 
 //func PtrFilesFileToProto(source *files.File) (*pbimage.File, error) {
-//	panic("function not provided") // TODO: provide converter
+//	panic("function not provided") // TODO: provide convert
 //}
 //
 //func ProtoToPtrFilesFile(protoSource *images.File) (*files.File, error) {
-//	panic("function not provided") // TODO: provide converter
+//	panic("function not provided") // TODO: provide convert
 //}
diff --git a/pkg/images/transport/grpc/server.microgen.go b/images/transport/grpc/server.microgen.go
similarity index 92%
rename from pkg/images/transport/grpc/server.microgen.go
rename to images/transport/grpc/server.microgen.go
index 47e04dc3..19d48fcd 100644
--- a/pkg/images/transport/grpc/server.microgen.go
+++ b/images/transport/grpc/server.microgen.go
@@ -4,7 +4,7 @@
 package transportgrpc
 
 import (
-	transport "git.perx.ru/perxis/perxis-go/pkg/images/transport"
+	transport "git.perx.ru/perxis/perxis-go/images/transport"
 	pb "git.perx.ru/perxis/perxis-go/proto/images"
 	grpc "github.com/go-kit/kit/transport/grpc"
 	context "golang.org/x/net/context"
diff --git a/pkg/images/transport/server.microgen.go b/images/transport/server.microgen.go
similarity index 91%
rename from pkg/images/transport/server.microgen.go
rename to images/transport/server.microgen.go
index 26105401..de0d7e16 100644
--- a/pkg/images/transport/server.microgen.go
+++ b/images/transport/server.microgen.go
@@ -5,7 +5,7 @@ package transport
 import (
 	"context"
 
-	images "git.perx.ru/perxis/perxis-go/pkg/images"
+	images "git.perx.ru/perxis/perxis-go/images"
 	endpoint "github.com/go-kit/kit/endpoint"
 )
 
-- 
GitLab