From 3de3e9b570c19eef693500ffff438d1c41d1dfff Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <krestyaninov@perx.ru>
Date: Tue, 15 Oct 2024 17:21:09 +0300
Subject: [PATCH] pkg content moved from pkg
---
{pkg/content => content}/client.go | 0
{pkg/content => content}/config.go | 0
{pkg/content => content}/content.go | 0
{pkg/content => content}/versions/transport/client.go | 0
.../versions/transport/endpoints.microgen.go | 0
.../versions/transport/exchanges.microgen.go | 0
{pkg/content => content}/versions/transport/grpc/client.go | 2 +-
.../versions/transport/grpc/client.microgen.go | 2 +-
.../transport/grpc/protobuf_endpoint_converters.microgen.go | 2 +-
.../transport/grpc/protobuf_type_converters.microgen.go | 0
{pkg/content => content}/versions/transport/grpc/server.go | 6 +++---
.../versions/transport/grpc/server.microgen.go | 2 +-
.../versions/transport/server.microgen.go | 0
pkg/delivery/client/config.go | 2 +-
pkg/extension/extension.go | 2 +-
pkg/extension/service/extension.go | 2 +-
pkg/extension/storage.go | 2 +-
pkg/setup/collection_test.go | 2 +-
pkg/setup/item_test.go | 2 +-
pkg/setup/role_test.go | 2 +-
pkg/setup/setup.go | 2 +-
pkg/setup/setup_test.go | 2 +-
pkg/template/builder.go | 2 +-
pkg/template/builder_test.go | 2 +-
24 files changed, 18 insertions(+), 18 deletions(-)
rename {pkg/content => content}/client.go (100%)
rename {pkg/content => content}/config.go (100%)
rename {pkg/content => content}/content.go (100%)
rename {pkg/content => content}/versions/transport/client.go (100%)
rename {pkg/content => content}/versions/transport/endpoints.microgen.go (100%)
rename {pkg/content => content}/versions/transport/exchanges.microgen.go (100%)
rename {pkg/content => content}/versions/transport/grpc/client.go (85%)
rename {pkg/content => content}/versions/transport/grpc/client.microgen.go (89%)
rename {pkg/content => content}/versions/transport/grpc/protobuf_endpoint_converters.microgen.go (95%)
rename {pkg/content => content}/versions/transport/grpc/protobuf_type_converters.microgen.go (100%)
rename {pkg/content => content}/versions/transport/grpc/server.go (76%)
rename {pkg/content => content}/versions/transport/grpc/server.microgen.go (92%)
rename {pkg/content => content}/versions/transport/server.microgen.go (100%)
diff --git a/pkg/content/client.go b/content/client.go
similarity index 100%
rename from pkg/content/client.go
rename to content/client.go
diff --git a/pkg/content/config.go b/content/config.go
similarity index 100%
rename from pkg/content/config.go
rename to content/config.go
diff --git a/pkg/content/content.go b/content/content.go
similarity index 100%
rename from pkg/content/content.go
rename to content/content.go
diff --git a/pkg/content/versions/transport/client.go b/content/versions/transport/client.go
similarity index 100%
rename from pkg/content/versions/transport/client.go
rename to content/versions/transport/client.go
diff --git a/pkg/content/versions/transport/endpoints.microgen.go b/content/versions/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/content/versions/transport/endpoints.microgen.go
rename to content/versions/transport/endpoints.microgen.go
diff --git a/pkg/content/versions/transport/exchanges.microgen.go b/content/versions/transport/exchanges.microgen.go
similarity index 100%
rename from pkg/content/versions/transport/exchanges.microgen.go
rename to content/versions/transport/exchanges.microgen.go
diff --git a/pkg/content/versions/transport/grpc/client.go b/content/versions/transport/grpc/client.go
similarity index 85%
rename from pkg/content/versions/transport/grpc/client.go
rename to content/versions/transport/grpc/client.go
index ffa435b9..6cec6dc4 100644
--- a/pkg/content/versions/transport/grpc/client.go
+++ b/content/versions/transport/grpc/client.go
@@ -3,7 +3,7 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
+ "git.perx.ru/perxis/perxis-go/content/versions/transport"
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
diff --git a/pkg/content/versions/transport/grpc/client.microgen.go b/content/versions/transport/grpc/client.microgen.go
similarity index 89%
rename from pkg/content/versions/transport/grpc/client.microgen.go
rename to content/versions/transport/grpc/client.microgen.go
index abe65ad7..b7d00cec 100644
--- a/pkg/content/versions/transport/grpc/client.microgen.go
+++ b/content/versions/transport/grpc/client.microgen.go
@@ -3,7 +3,7 @@
package transportgrpc
import (
- "git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
+ "git.perx.ru/perxis/perxis-go/content/versions/transport"
pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
grpckit "github.com/go-kit/kit/transport/grpc"
grpc "google.golang.org/grpc"
diff --git a/pkg/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go b/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 95%
rename from pkg/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
index 714c861c..8893ca09 100644
--- a/pkg/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/content/versions/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,7 +7,7 @@ import (
"context"
"errors"
- "git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
+ "git.perx.ru/perxis/perxis-go/content/versions/transport"
pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
empty "google.golang.org/protobuf/types/known/emptypb"
)
diff --git a/pkg/content/versions/transport/grpc/protobuf_type_converters.microgen.go b/content/versions/transport/grpc/protobuf_type_converters.microgen.go
similarity index 100%
rename from pkg/content/versions/transport/grpc/protobuf_type_converters.microgen.go
rename to content/versions/transport/grpc/protobuf_type_converters.microgen.go
diff --git a/pkg/content/versions/transport/grpc/server.go b/content/versions/transport/grpc/server.go
similarity index 76%
rename from pkg/content/versions/transport/grpc/server.go
rename to content/versions/transport/grpc/server.go
index 26b30d26..299a5763 100644
--- a/pkg/content/versions/transport/grpc/server.go
+++ b/content/versions/transport/grpc/server.go
@@ -1,7 +1,7 @@
package transportgrpc
import (
- "git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
+ transport2 "git.perx.ru/perxis/perxis-go/content/versions/transport"
grpcerr "git.perx.ru/perxis/perxis-go/pkg/errors/grpc"
versions "git.perx.ru/perxis/perxis-go/pkg/version"
pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
@@ -9,8 +9,8 @@ import (
)
func NewServer(svc versions.Versions, opts ...grpckit.ServerOption) pb.VersionsServer {
- eps := transport.Endpoints(svc)
- eps = transport.EndpointsSet{
+ eps := transport2.Endpoints(svc)
+ eps = transport2.EndpointsSet{
GetEndpoint: grpcerr.ServerMiddleware(eps.GetEndpoint),
}
return NewGRPCServer(&eps, opts...)
diff --git a/pkg/content/versions/transport/grpc/server.microgen.go b/content/versions/transport/grpc/server.microgen.go
similarity index 92%
rename from pkg/content/versions/transport/grpc/server.microgen.go
rename to content/versions/transport/grpc/server.microgen.go
index 8e773515..ee8c4359 100644
--- a/pkg/content/versions/transport/grpc/server.microgen.go
+++ b/content/versions/transport/grpc/server.microgen.go
@@ -4,7 +4,7 @@
package transportgrpc
import (
- "git.perx.ru/perxis/perxis-go/pkg/content/versions/transport"
+ "git.perx.ru/perxis/perxis-go/content/versions/transport"
pb "git.perx.ru/perxis/perxis-go/proto/versions/content"
grpc "github.com/go-kit/kit/transport/grpc"
context "golang.org/x/net/context"
diff --git a/pkg/content/versions/transport/server.microgen.go b/content/versions/transport/server.microgen.go
similarity index 100%
rename from pkg/content/versions/transport/server.microgen.go
rename to content/versions/transport/server.microgen.go
diff --git a/pkg/delivery/client/config.go b/pkg/delivery/client/config.go
index ca1a6542..7560b5bd 100644
--- a/pkg/delivery/client/config.go
+++ b/pkg/delivery/client/config.go
@@ -1,7 +1,7 @@
package client
import (
- contentclient "git.perx.ru/perxis/perxis-go/pkg/content"
+ contentclient "git.perx.ru/perxis/perxis-go/content"
"github.com/go-kit/kit/transport/grpc"
)
diff --git a/pkg/extension/extension.go b/pkg/extension/extension.go
index 43207889..47efb3c8 100644
--- a/pkg/extension/extension.go
+++ b/pkg/extension/extension.go
@@ -4,11 +4,11 @@ import (
"context"
"io/fs"
+ "git.perx.ru/perxis/perxis-go/content"
"go.uber.org/zap"
"git.perx.ru/perxis/perxis-go"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/content"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/schema"
"git.perx.ru/perxis/perxis-go/pkg/setup"
diff --git a/pkg/extension/service/extension.go b/pkg/extension/service/extension.go
index 5d57e56c..d3aa219d 100644
--- a/pkg/extension/service/extension.go
+++ b/pkg/extension/service/extension.go
@@ -4,9 +4,9 @@ import (
"context"
"fmt"
+ "git.perx.ru/perxis/perxis-go/content"
"git.perx.ru/perxis/perxis-go/pkg/clients"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/content"
"git.perx.ru/perxis/perxis-go/pkg/extension"
"git.perx.ru/perxis/perxis-go/pkg/roles"
"git.perx.ru/perxis/perxis-go/pkg/setup"
diff --git a/pkg/extension/storage.go b/pkg/extension/storage.go
index c7dd6285..03eca128 100644
--- a/pkg/extension/storage.go
+++ b/pkg/extension/storage.go
@@ -4,6 +4,7 @@ import (
"context"
"strings"
+ "git.perx.ru/perxis/perxis-go/content"
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/data"
"git.perx.ru/perxis/perxis-go/pkg/errors"
@@ -11,7 +12,6 @@ import (
pb "git.perx.ru/perxis/perxis-go/proto/extensions"
"go.uber.org/zap"
- "git.perx.ru/perxis/perxis-go/pkg/content"
"git.perx.ru/perxis/perxis-go/pkg/items"
)
diff --git a/pkg/setup/collection_test.go b/pkg/setup/collection_test.go
index f1d9e4da..7b405d15 100644
--- a/pkg/setup/collection_test.go
+++ b/pkg/setup/collection_test.go
@@ -4,8 +4,8 @@ import (
"context"
"testing"
+ "git.perx.ru/perxis/perxis-go/content"
mockscollections "git.perx.ru/perxis/perxis-go/pkg/collections/mocks"
- "git.perx.ru/perxis/perxis-go/pkg/content"
"git.perx.ru/perxis/perxis-go/pkg/environments"
envmocks "git.perx.ru/perxis/perxis-go/pkg/environments/mocks"
"git.perx.ru/perxis/perxis-go/pkg/errors"
diff --git a/pkg/setup/item_test.go b/pkg/setup/item_test.go
index 0a128625..53c81540 100644
--- a/pkg/setup/item_test.go
+++ b/pkg/setup/item_test.go
@@ -4,7 +4,7 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/content"
+ "git.perx.ru/perxis/perxis-go/content"
"git.perx.ru/perxis/perxis-go/pkg/errors"
itemsMock "git.perx.ru/perxis/perxis-go/pkg/items/mocks"
"github.com/stretchr/testify/mock"
diff --git a/pkg/setup/role_test.go b/pkg/setup/role_test.go
index 1c218270..7276234d 100644
--- a/pkg/setup/role_test.go
+++ b/pkg/setup/role_test.go
@@ -4,7 +4,7 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/content"
+ "git.perx.ru/perxis/perxis-go/content"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/roles"
rolesMock "git.perx.ru/perxis/perxis-go/pkg/roles/mocks"
diff --git a/pkg/setup/setup.go b/pkg/setup/setup.go
index 88552696..ea786069 100644
--- a/pkg/setup/setup.go
+++ b/pkg/setup/setup.go
@@ -4,7 +4,7 @@ import (
"context"
"io/fs"
- "git.perx.ru/perxis/perxis-go/pkg/content"
+ "git.perx.ru/perxis/perxis-go/content"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
"go.uber.org/zap"
diff --git a/pkg/setup/setup_test.go b/pkg/setup/setup_test.go
index ff73b745..1c78183f 100644
--- a/pkg/setup/setup_test.go
+++ b/pkg/setup/setup_test.go
@@ -5,6 +5,7 @@ import (
"errors"
"testing"
+ "git.perx.ru/perxis/perxis-go/content"
clientsMock "git.perx.ru/perxis/perxis-go/pkg/clients/mocks"
collectionMock "git.perx.ru/perxis/perxis-go/pkg/collections/mocks"
"git.perx.ru/perxis/perxis-go/pkg/data"
@@ -19,7 +20,6 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/clients"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/content"
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/roles"
"git.perx.ru/perxis/perxis-go/pkg/schema"
diff --git a/pkg/template/builder.go b/pkg/template/builder.go
index 64530be6..b048831b 100644
--- a/pkg/template/builder.go
+++ b/pkg/template/builder.go
@@ -5,8 +5,8 @@ import (
"context"
"text/template"
+ "git.perx.ru/perxis/perxis-go/content"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/content"
"git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/spaces"
)
diff --git a/pkg/template/builder_test.go b/pkg/template/builder_test.go
index 128f7064..cd48d0a3 100644
--- a/pkg/template/builder_test.go
+++ b/pkg/template/builder_test.go
@@ -5,9 +5,9 @@ import (
"errors"
"testing"
+ "git.perx.ru/perxis/perxis-go/content"
"git.perx.ru/perxis/perxis-go/pkg/collections"
colsmocks "git.perx.ru/perxis/perxis-go/pkg/collections/mocks"
- "git.perx.ru/perxis/perxis-go/pkg/content"
"git.perx.ru/perxis/perxis-go/pkg/environments"
envsmocks "git.perx.ru/perxis/perxis-go/pkg/environments/mocks"
"git.perx.ru/perxis/perxis-go/pkg/items"
--
GitLab