From 7230e1eae8ee81db5997173b24cea1ae384802a8 Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <krestyaninov@perx.ru>
Date: Thu, 17 Oct 2024 09:23:43 +0300
Subject: [PATCH] pkg schema moved from pkg
---
pkg/collections/collection.go | 2 +-
pkg/collections/marshal.go | 2 +-
pkg/collections/marshal_test.go | 4 ++--
pkg/collections/middleware/access_logging_middleware.go | 2 +-
pkg/collections/middleware/caching_middleware.go | 2 +-
pkg/collections/middleware/caching_middleware_test.go | 2 +-
pkg/collections/middleware/logging_middleware.go | 2 +-
pkg/collections/middleware/recovering_middleware.go | 2 +-
pkg/collections/middleware/telemetry_middleware.go | 2 +-
pkg/collections/mocks/Collections.go | 2 +-
pkg/collections/service.go | 2 +-
pkg/collections/transport/client.go | 2 +-
pkg/collections/transport/exchanges.microgen.go | 2 +-
.../transport/grpc/protobuf_type_converters.microgen.go | 2 +-
.../transport/grpc/protobuf_type_converters.microgen.go | 2 +-
pkg/extension/extension.go | 2 +-
pkg/extension/extension_test.go | 4 ++--
pkg/extension/schema_test.go | 6 +++---
pkg/files/field.go | 2 +-
pkg/files/field_test.go | 4 ++--
pkg/filter/filter.go | 6 +++---
pkg/filter/filter_test.go | 4 ++--
pkg/items/item.go | 6 +++---
pkg/items/item_test.go | 4 ++--
pkg/items/middleware/access_logging_middleware.go | 2 +-
pkg/items/middleware/client_encode_middleware.go | 2 +-
pkg/items/middleware/logging_middleware.go | 2 +-
pkg/items/middleware/recovering_middleware.go | 2 +-
pkg/items/middleware/telemetry_middleware.go | 2 +-
pkg/items/mocks/Items.go | 2 +-
pkg/items/mocks/PreSaver.go | 2 +-
pkg/items/mocks/ProcessDataFunc.go | 2 +-
pkg/items/service.go | 4 ++--
pkg/items/transport/client.go | 2 +-
pkg/items/transport/exchanges.microgen.go | 2 +-
.../transport/grpc/protobuf_type_converters.microgen.go | 2 +-
pkg/references/field.go | 2 +-
pkg/references/field_test.go | 6 +++---
pkg/schemaloader/loader.go | 2 +-
pkg/setup/collection_test.go | 4 ++--
pkg/setup/setup_test.go | 2 +-
{pkg/schema => schema}/field/array.go | 0
{pkg/schema => schema}/field/array_test.go | 0
{pkg/schema => schema}/field/boolean.go | 0
{pkg/schema => schema}/field/boolean_test.go | 0
{pkg/schema => schema}/field/encode.go | 0
{pkg/schema => schema}/field/errors.go | 0
{pkg/schema => schema}/field/evaluate.go | 0
{pkg/schema => schema}/field/field.go | 0
{pkg/schema => schema}/field/field_json.go | 0
{pkg/schema => schema}/field/field_test.go | 0
{pkg/schema => schema}/field/init.go | 0
{pkg/schema => schema}/field/loader.go | 0
{pkg/schema => schema}/field/location.go | 0
{pkg/schema => schema}/field/location_test.go | 0
{pkg/schema => schema}/field/number.go | 0
{pkg/schema => schema}/field/number_test.go | 0
{pkg/schema => schema}/field/object.go | 0
{pkg/schema => schema}/field/object_test.go | 0
{pkg/schema => schema}/field/options.go | 0
{pkg/schema => schema}/field/primary_key.go | 0
{pkg/schema => schema}/field/primary_key_test.go | 0
{pkg/schema => schema}/field/string.go | 0
{pkg/schema => schema}/field/string_test.go | 0
{pkg/schema => schema}/field/time.go | 0
{pkg/schema => schema}/field/time_test.go | 0
{pkg/schema => schema}/field/timestamp.go | 0
{pkg/schema => schema}/field/timestamp_test.go | 0
{pkg/schema => schema}/field/type.go | 0
{pkg/schema => schema}/field/unknown.go | 0
{pkg/schema => schema}/field/walk.go | 0
{pkg/schema => schema}/loader.go | 2 +-
{pkg/schema => schema}/localizer/localizer.go | 6 +++---
{pkg/schema => schema}/localizer/localizer_test.go | 4 ++--
{pkg/schema => schema}/modify/default.go | 2 +-
{pkg/schema => schema}/modify/default_test.go | 2 +-
{pkg/schema => schema}/modify/modify.go | 2 +-
{pkg/schema => schema}/modify/string.go | 2 +-
{pkg/schema => schema}/modify/string_test.go | 2 +-
{pkg/schema => schema}/modify/value.go | 2 +-
{pkg/schema => schema}/modify/value_test.go | 2 +-
{pkg/schema => schema}/schema.go | 6 +++---
{pkg/schema => schema}/schema_json.go | 0
{pkg/schema => schema}/schema_json_test.go | 2 +-
{pkg/schema => schema}/schema_test.go | 2 +-
{pkg/schema => schema}/test/object_test.go | 8 ++++----
{pkg/schema => schema}/validate/array.go | 2 +-
{pkg/schema => schema}/validate/array_test.go | 2 +-
{pkg/schema => schema}/validate/enum.go | 2 +-
{pkg/schema => schema}/validate/enum_test.go | 2 +-
{pkg/schema => schema}/validate/number.go | 2 +-
{pkg/schema => schema}/validate/number_test.go | 2 +-
{pkg/schema => schema}/validate/readonly.go | 2 +-
{pkg/schema => schema}/validate/readonly_test.go | 2 +-
{pkg/schema => schema}/validate/required.go | 2 +-
{pkg/schema => schema}/validate/required_test.go | 2 +-
{pkg/schema => schema}/validate/string.go | 2 +-
{pkg/schema => schema}/validate/string_test.go | 2 +-
{pkg/schema => schema}/validate/validate.go | 2 +-
{pkg/schema => schema}/walk/fn.go | 0
{pkg/schema => schema}/walk/walk.go | 5 ++---
{pkg/schema => schema}/walk/walk_test.go | 4 ++--
102 files changed, 95 insertions(+), 96 deletions(-)
rename {pkg/schema => schema}/field/array.go (100%)
rename {pkg/schema => schema}/field/array_test.go (100%)
rename {pkg/schema => schema}/field/boolean.go (100%)
rename {pkg/schema => schema}/field/boolean_test.go (100%)
rename {pkg/schema => schema}/field/encode.go (100%)
rename {pkg/schema => schema}/field/errors.go (100%)
rename {pkg/schema => schema}/field/evaluate.go (100%)
rename {pkg/schema => schema}/field/field.go (100%)
rename {pkg/schema => schema}/field/field_json.go (100%)
rename {pkg/schema => schema}/field/field_test.go (100%)
rename {pkg/schema => schema}/field/init.go (100%)
rename {pkg/schema => schema}/field/loader.go (100%)
rename {pkg/schema => schema}/field/location.go (100%)
rename {pkg/schema => schema}/field/location_test.go (100%)
rename {pkg/schema => schema}/field/number.go (100%)
rename {pkg/schema => schema}/field/number_test.go (100%)
rename {pkg/schema => schema}/field/object.go (100%)
rename {pkg/schema => schema}/field/object_test.go (100%)
rename {pkg/schema => schema}/field/options.go (100%)
rename {pkg/schema => schema}/field/primary_key.go (100%)
rename {pkg/schema => schema}/field/primary_key_test.go (100%)
rename {pkg/schema => schema}/field/string.go (100%)
rename {pkg/schema => schema}/field/string_test.go (100%)
rename {pkg/schema => schema}/field/time.go (100%)
rename {pkg/schema => schema}/field/time_test.go (100%)
rename {pkg/schema => schema}/field/timestamp.go (100%)
rename {pkg/schema => schema}/field/timestamp_test.go (100%)
rename {pkg/schema => schema}/field/type.go (100%)
rename {pkg/schema => schema}/field/unknown.go (100%)
rename {pkg/schema => schema}/field/walk.go (100%)
rename {pkg/schema => schema}/loader.go (88%)
rename {pkg/schema => schema}/localizer/localizer.go (97%)
rename {pkg/schema => schema}/localizer/localizer_test.go (99%)
rename {pkg/schema => schema}/modify/default.go (94%)
rename {pkg/schema => schema}/modify/default_test.go (97%)
rename {pkg/schema => schema}/modify/modify.go (97%)
rename {pkg/schema => schema}/modify/string.go (91%)
rename {pkg/schema => schema}/modify/string_test.go (98%)
rename {pkg/schema => schema}/modify/value.go (94%)
rename {pkg/schema => schema}/modify/value_test.go (97%)
rename {pkg/schema => schema}/schema.go (97%)
rename {pkg/schema => schema}/schema_json.go (100%)
rename {pkg/schema => schema}/schema_json_test.go (96%)
rename {pkg/schema => schema}/schema_test.go (85%)
rename {pkg/schema => schema}/test/object_test.go (99%)
rename {pkg/schema => schema}/validate/array.go (95%)
rename {pkg/schema => schema}/validate/array_test.go (98%)
rename {pkg/schema => schema}/validate/enum.go (96%)
rename {pkg/schema => schema}/validate/enum_test.go (97%)
rename {pkg/schema => schema}/validate/number.go (98%)
rename {pkg/schema => schema}/validate/number_test.go (99%)
rename {pkg/schema => schema}/validate/readonly.go (89%)
rename {pkg/schema => schema}/validate/readonly_test.go (93%)
rename {pkg/schema => schema}/validate/required.go (93%)
rename {pkg/schema => schema}/validate/required_test.go (98%)
rename {pkg/schema => schema}/validate/string.go (97%)
rename {pkg/schema => schema}/validate/string_test.go (99%)
rename {pkg/schema => schema}/validate/validate.go (97%)
rename {pkg/schema => schema}/walk/fn.go (100%)
rename {pkg/schema => schema}/walk/walk.go (97%)
rename {pkg/schema => schema}/walk/walk_test.go (99%)
diff --git a/pkg/collections/collection.go b/pkg/collections/collection.go
index 6c87ec23..32d67de2 100644
--- a/pkg/collections/collection.go
+++ b/pkg/collections/collection.go
@@ -5,7 +5,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/data"
"git.perx.ru/perxis/perxis-go/pkg/permission"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
)
// Config
diff --git a/pkg/collections/marshal.go b/pkg/collections/marshal.go
index 21c7bed0..8b8e4ff3 100644
--- a/pkg/collections/marshal.go
+++ b/pkg/collections/marshal.go
@@ -6,7 +6,7 @@ import (
"time"
"git.perx.ru/perxis/perxis-go/pkg/optional"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
jsoniter "github.com/json-iterator/go"
)
diff --git a/pkg/collections/marshal_test.go b/pkg/collections/marshal_test.go
index 2cc1bf52..69ba18ac 100644
--- a/pkg/collections/marshal_test.go
+++ b/pkg/collections/marshal_test.go
@@ -4,8 +4,8 @@ import (
"testing"
"git.perx.ru/perxis/perxis-go/pkg/optional"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
jsoniter "github.com/json-iterator/go"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
diff --git a/pkg/collections/middleware/access_logging_middleware.go b/pkg/collections/middleware/access_logging_middleware.go
index 3624955b..2fd81539 100644
--- a/pkg/collections/middleware/access_logging_middleware.go
+++ b/pkg/collections/middleware/access_logging_middleware.go
@@ -12,7 +12,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
"go.uber.org/zap"
)
diff --git a/pkg/collections/middleware/caching_middleware.go b/pkg/collections/middleware/caching_middleware.go
index cb95d0d9..1551db5a 100644
--- a/pkg/collections/middleware/caching_middleware.go
+++ b/pkg/collections/middleware/caching_middleware.go
@@ -6,7 +6,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/cache"
service "git.perx.ru/perxis/perxis-go/pkg/collections"
envService "git.perx.ru/perxis/perxis-go/pkg/environments"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
)
func makeKey(spaceId, envId, collectionId string, disableSchemaIncludes bool) string {
diff --git a/pkg/collections/middleware/caching_middleware_test.go b/pkg/collections/middleware/caching_middleware_test.go
index 24646008..14d6d5e3 100644
--- a/pkg/collections/middleware/caching_middleware_test.go
+++ b/pkg/collections/middleware/caching_middleware_test.go
@@ -11,7 +11,7 @@ import (
"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"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
diff --git a/pkg/collections/middleware/logging_middleware.go b/pkg/collections/middleware/logging_middleware.go
index 92e2811b..65db3a43 100644
--- a/pkg/collections/middleware/logging_middleware.go
+++ b/pkg/collections/middleware/logging_middleware.go
@@ -5,7 +5,7 @@ import (
"git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
logzap "git.perx.ru/perxis/perxis-go/zap"
"go.uber.org/zap"
)
diff --git a/pkg/collections/middleware/recovering_middleware.go b/pkg/collections/middleware/recovering_middleware.go
index 6f5594bc..11dbb42c 100644
--- a/pkg/collections/middleware/recovering_middleware.go
+++ b/pkg/collections/middleware/recovering_middleware.go
@@ -11,7 +11,7 @@ import (
"fmt"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
"go.uber.org/zap"
)
diff --git a/pkg/collections/middleware/telemetry_middleware.go b/pkg/collections/middleware/telemetry_middleware.go
index c189a7be..ac674726 100644
--- a/pkg/collections/middleware/telemetry_middleware.go
+++ b/pkg/collections/middleware/telemetry_middleware.go
@@ -13,8 +13,8 @@ import (
oid "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/schema"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/collections/mocks/Collections.go b/pkg/collections/mocks/Collections.go
index 9a0a67f6..df5a2cad 100644
--- a/pkg/collections/mocks/Collections.go
+++ b/pkg/collections/mocks/Collections.go
@@ -9,7 +9,7 @@ import (
mock "github.com/stretchr/testify/mock"
- schema "git.perx.ru/perxis/perxis-go/pkg/schema"
+ schema "git.perx.ru/perxis/perxis-go/schema"
)
// Collections is an autogenerated mock type for the Collections type
diff --git a/pkg/collections/service.go b/pkg/collections/service.go
index e73133e7..466bce00 100644
--- a/pkg/collections/service.go
+++ b/pkg/collections/service.go
@@ -3,7 +3,7 @@ package collections
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
)
// @microgen grpc
diff --git a/pkg/collections/transport/client.go b/pkg/collections/transport/client.go
index 2a430e6c..7dc3d696 100644
--- a/pkg/collections/transport/client.go
+++ b/pkg/collections/transport/client.go
@@ -6,7 +6,7 @@ import (
"context"
collections "git.perx.ru/perxis/perxis-go/pkg/collections"
- schema "git.perx.ru/perxis/perxis-go/pkg/schema"
+ schema "git.perx.ru/perxis/perxis-go/schema"
)
func (set EndpointsSet) Create(arg0 context.Context, arg1 *collections.Collection) (res0 *collections.Collection, res1 error) {
diff --git a/pkg/collections/transport/exchanges.microgen.go b/pkg/collections/transport/exchanges.microgen.go
index 3aabcbc8..b5e215ee 100644
--- a/pkg/collections/transport/exchanges.microgen.go
+++ b/pkg/collections/transport/exchanges.microgen.go
@@ -4,7 +4,7 @@ package transport
import (
collections "git.perx.ru/perxis/perxis-go/pkg/collections"
- schema "git.perx.ru/perxis/perxis-go/pkg/schema"
+ schema "git.perx.ru/perxis/perxis-go/schema"
)
type (
diff --git a/pkg/collections/transport/grpc/protobuf_type_converters.microgen.go b/pkg/collections/transport/grpc/protobuf_type_converters.microgen.go
index 282f308c..226af910 100644
--- a/pkg/collections/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/collections/transport/grpc/protobuf_type_converters.microgen.go
@@ -9,9 +9,9 @@ import (
service "git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/permission"
- schema "git.perx.ru/perxis/perxis-go/pkg/schema"
pb "git.perx.ru/perxis/perxis-go/proto/collections"
commonpb "git.perx.ru/perxis/perxis-go/proto/common"
+ schema "git.perx.ru/perxis/perxis-go/schema"
jsoniter "github.com/json-iterator/go"
"google.golang.org/protobuf/types/known/durationpb"
"google.golang.org/protobuf/types/known/timestamppb"
diff --git a/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go b/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go
index 7067dc51..422dee1b 100644
--- a/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/delivery/transport/grpc/protobuf_type_converters.microgen.go
@@ -13,13 +13,13 @@ import (
items "git.perx.ru/perxis/perxis-go/pkg/items"
locales "git.perx.ru/perxis/perxis-go/pkg/locales"
services "git.perx.ru/perxis/perxis-go/pkg/options"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
collectionspb "git.perx.ru/perxis/perxis-go/proto/collections"
"git.perx.ru/perxis/perxis-go/proto/common"
"git.perx.ru/perxis/perxis-go/proto/delivery"
environmentspb "git.perx.ru/perxis/perxis-go/proto/environments"
itemspb "git.perx.ru/perxis/perxis-go/proto/items"
localespb "git.perx.ru/perxis/perxis-go/proto/locales"
+ "git.perx.ru/perxis/perxis-go/schema"
"google.golang.org/protobuf/types/known/structpb"
"google.golang.org/protobuf/types/known/timestamppb"
)
diff --git a/pkg/extension/extension.go b/pkg/extension/extension.go
index 43207889..901a8085 100644
--- a/pkg/extension/extension.go
+++ b/pkg/extension/extension.go
@@ -10,9 +10,9 @@ import (
"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"
pb "git.perx.ru/perxis/perxis-go/proto/extensions"
+ "git.perx.ru/perxis/perxis-go/schema"
)
const (
diff --git a/pkg/extension/extension_test.go b/pkg/extension/extension_test.go
index 1e5755e6..90de7b4b 100644
--- a/pkg/extension/extension_test.go
+++ b/pkg/extension/extension_test.go
@@ -8,9 +8,9 @@ import (
"go.uber.org/zap/zaptest/observer"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
"git.perx.ru/perxis/perxis-go/pkg/setup"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/extension/schema_test.go b/pkg/extension/schema_test.go
index e17e891e..5c6a9202 100644
--- a/pkg/extension/schema_test.go
+++ b/pkg/extension/schema_test.go
@@ -7,9 +7,9 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/references"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
- "git.perx.ru/perxis/perxis-go/pkg/schema/validate"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/validate"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/files/field.go b/pkg/files/field.go
index 73868313..c7ba10a7 100644
--- a/pkg/files/field.go
+++ b/pkg/files/field.go
@@ -9,8 +9,8 @@ import (
"reflect"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
signer "git.perx.ru/perxis/perxis-go/pkg/urlsigner"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/mitchellh/mapstructure"
)
diff --git a/pkg/files/field_test.go b/pkg/files/field_test.go
index 7b631730..cf055cfd 100644
--- a/pkg/files/field_test.go
+++ b/pkg/files/field_test.go
@@ -3,8 +3,8 @@ package files
import (
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/filter/filter.go b/pkg/filter/filter.go
index d75dc998..d54147ea 100644
--- a/pkg/filter/filter.go
+++ b/pkg/filter/filter.go
@@ -7,9 +7,9 @@ import (
"strings"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
- "git.perx.ru/perxis/perxis-go/pkg/schema/validate"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/validate"
"github.com/hashicorp/go-multierror"
"github.com/mitchellh/mapstructure"
"go.mongodb.org/mongo-driver/bson"
diff --git a/pkg/filter/filter_test.go b/pkg/filter/filter_test.go
index 7283e26a..8a00754f 100644
--- a/pkg/filter/filter_test.go
+++ b/pkg/filter/filter_test.go
@@ -4,8 +4,8 @@ import (
"testing"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.mongodb.org/mongo-driver/bson/primitive"
diff --git a/pkg/items/item.go b/pkg/items/item.go
index dc56fe63..4cc3c047 100644
--- a/pkg/items/item.go
+++ b/pkg/items/item.go
@@ -8,10 +8,10 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/data"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/locales"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
- "git.perx.ru/perxis/perxis-go/pkg/schema/localizer"
pb "git.perx.ru/perxis/perxis-go/proto/items"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/localizer"
"google.golang.org/protobuf/types/known/structpb"
"google.golang.org/protobuf/types/known/timestamppb"
)
diff --git a/pkg/items/item_test.go b/pkg/items/item_test.go
index 05baa60a..2978030d 100644
--- a/pkg/items/item_test.go
+++ b/pkg/items/item_test.go
@@ -6,8 +6,8 @@ import (
"testing"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/items/middleware/access_logging_middleware.go b/pkg/items/middleware/access_logging_middleware.go
index 2342a6d9..3e5fcaa6 100644
--- a/pkg/items/middleware/access_logging_middleware.go
+++ b/pkg/items/middleware/access_logging_middleware.go
@@ -12,7 +12,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
"go.uber.org/zap"
)
diff --git a/pkg/items/middleware/client_encode_middleware.go b/pkg/items/middleware/client_encode_middleware.go
index 873a0e97..afc1cba2 100644
--- a/pkg/items/middleware/client_encode_middleware.go
+++ b/pkg/items/middleware/client_encode_middleware.go
@@ -6,7 +6,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
)
// ClientEncodeMiddleware выполняет операции encode/decode для передаваемых данных
diff --git a/pkg/items/middleware/logging_middleware.go b/pkg/items/middleware/logging_middleware.go
index 1178719e..73e44917 100644
--- a/pkg/items/middleware/logging_middleware.go
+++ b/pkg/items/middleware/logging_middleware.go
@@ -5,7 +5,7 @@ import (
"git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
logzap "git.perx.ru/perxis/perxis-go/zap"
"go.uber.org/zap"
)
diff --git a/pkg/items/middleware/recovering_middleware.go b/pkg/items/middleware/recovering_middleware.go
index d719dd11..d5792908 100644
--- a/pkg/items/middleware/recovering_middleware.go
+++ b/pkg/items/middleware/recovering_middleware.go
@@ -11,7 +11,7 @@ import (
"fmt"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
"go.uber.org/zap"
)
diff --git a/pkg/items/middleware/telemetry_middleware.go b/pkg/items/middleware/telemetry_middleware.go
index da626aa5..0fdbb001 100644
--- a/pkg/items/middleware/telemetry_middleware.go
+++ b/pkg/items/middleware/telemetry_middleware.go
@@ -13,8 +13,8 @@ import (
oid "git.perx.ru/perxis/perxis-go/id"
"git.perx.ru/perxis/perxis-go/pkg/auth"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
"git.perx.ru/perxis/perxis-go/pkg/telemetry/metrics"
+ "git.perx.ru/perxis/perxis-go/schema"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
otelmetric "go.opentelemetry.io/otel/metric"
diff --git a/pkg/items/mocks/Items.go b/pkg/items/mocks/Items.go
index e134822e..af3b5703 100644
--- a/pkg/items/mocks/Items.go
+++ b/pkg/items/mocks/Items.go
@@ -8,7 +8,7 @@ import (
items "git.perx.ru/perxis/perxis-go/pkg/items"
mock "github.com/stretchr/testify/mock"
- schema "git.perx.ru/perxis/perxis-go/pkg/schema"
+ schema "git.perx.ru/perxis/perxis-go/schema"
)
// Items is an autogenerated mock type for the Items type
diff --git a/pkg/items/mocks/PreSaver.go b/pkg/items/mocks/PreSaver.go
index 3acc3273..7d33d897 100644
--- a/pkg/items/mocks/PreSaver.go
+++ b/pkg/items/mocks/PreSaver.go
@@ -6,7 +6,7 @@ import (
context "context"
items "git.perx.ru/perxis/perxis-go/pkg/items"
- field "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ field "git.perx.ru/perxis/perxis-go/schema/field"
mock "github.com/stretchr/testify/mock"
)
diff --git a/pkg/items/mocks/ProcessDataFunc.go b/pkg/items/mocks/ProcessDataFunc.go
index 7689da0d..57c88679 100644
--- a/pkg/items/mocks/ProcessDataFunc.go
+++ b/pkg/items/mocks/ProcessDataFunc.go
@@ -7,7 +7,7 @@ import (
mock "github.com/stretchr/testify/mock"
- schema "git.perx.ru/perxis/perxis-go/pkg/schema"
+ schema "git.perx.ru/perxis/perxis-go/schema"
)
// ProcessDataFunc is an autogenerated mock type for the ProcessDataFunc type
diff --git a/pkg/items/service.go b/pkg/items/service.go
index 1f4f2867..39822dc1 100644
--- a/pkg/items/service.go
+++ b/pkg/items/service.go
@@ -6,8 +6,8 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/filter"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
// @microgen grpc
diff --git a/pkg/items/transport/client.go b/pkg/items/transport/client.go
index fd5de3f2..068b214d 100644
--- a/pkg/items/transport/client.go
+++ b/pkg/items/transport/client.go
@@ -7,7 +7,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
+ "git.perx.ru/perxis/perxis-go/schema"
"github.com/hashicorp/go-multierror"
"google.golang.org/grpc/status"
)
diff --git a/pkg/items/transport/exchanges.microgen.go b/pkg/items/transport/exchanges.microgen.go
index be18dc59..ef5024c7 100644
--- a/pkg/items/transport/exchanges.microgen.go
+++ b/pkg/items/transport/exchanges.microgen.go
@@ -4,7 +4,7 @@ package transport
import (
items "git.perx.ru/perxis/perxis-go/pkg/items"
- schema "git.perx.ru/perxis/perxis-go/pkg/schema"
+ schema "git.perx.ru/perxis/perxis-go/schema"
)
type (
diff --git a/pkg/items/transport/grpc/protobuf_type_converters.microgen.go b/pkg/items/transport/grpc/protobuf_type_converters.microgen.go
index 1aba4865..c3d62c6c 100644
--- a/pkg/items/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/items/transport/grpc/protobuf_type_converters.microgen.go
@@ -11,9 +11,9 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/filter"
service "git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/options"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
pbcommon "git.perx.ru/perxis/perxis-go/proto/common"
pb "git.perx.ru/perxis/perxis-go/proto/items"
+ "git.perx.ru/perxis/perxis-go/schema"
jsoniter "github.com/json-iterator/go"
"google.golang.org/protobuf/types/known/structpb"
)
diff --git a/pkg/references/field.go b/pkg/references/field.go
index f80e7b5a..0ffaa093 100644
--- a/pkg/references/field.go
+++ b/pkg/references/field.go
@@ -8,7 +8,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/data"
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/items"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
const ReferenceTypeName = "reference"
diff --git a/pkg/references/field_test.go b/pkg/references/field_test.go
index ac9d5c03..592476f0 100644
--- a/pkg/references/field_test.go
+++ b/pkg/references/field_test.go
@@ -8,9 +8,9 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/items"
"git.perx.ru/perxis/perxis-go/pkg/items/mocks"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
- "git.perx.ru/perxis/perxis-go/pkg/schema/validate"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/validate"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schemaloader/loader.go b/pkg/schemaloader/loader.go
index e27baf4e..ebf6994f 100644
--- a/pkg/schemaloader/loader.go
+++ b/pkg/schemaloader/loader.go
@@ -7,7 +7,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/collections"
"git.perx.ru/perxis/perxis-go/pkg/errors"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
// NewLoader возвращает новый загрузчик схем из коллекций
diff --git a/pkg/setup/collection_test.go b/pkg/setup/collection_test.go
index f1d9e4da..fd5141a7 100644
--- a/pkg/setup/collection_test.go
+++ b/pkg/setup/collection_test.go
@@ -12,8 +12,8 @@ import (
"github.com/stretchr/testify/mock"
"git.perx.ru/perxis/perxis-go/pkg/collections"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/setup/setup_test.go b/pkg/setup/setup_test.go
index ff73b745..8caab7ae 100644
--- a/pkg/setup/setup_test.go
+++ b/pkg/setup/setup_test.go
@@ -22,7 +22,7 @@ import (
"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"
+ "git.perx.ru/perxis/perxis-go/schema"
"go.uber.org/zap/zaptest"
)
diff --git a/pkg/schema/field/array.go b/schema/field/array.go
similarity index 100%
rename from pkg/schema/field/array.go
rename to schema/field/array.go
diff --git a/pkg/schema/field/array_test.go b/schema/field/array_test.go
similarity index 100%
rename from pkg/schema/field/array_test.go
rename to schema/field/array_test.go
diff --git a/pkg/schema/field/boolean.go b/schema/field/boolean.go
similarity index 100%
rename from pkg/schema/field/boolean.go
rename to schema/field/boolean.go
diff --git a/pkg/schema/field/boolean_test.go b/schema/field/boolean_test.go
similarity index 100%
rename from pkg/schema/field/boolean_test.go
rename to schema/field/boolean_test.go
diff --git a/pkg/schema/field/encode.go b/schema/field/encode.go
similarity index 100%
rename from pkg/schema/field/encode.go
rename to schema/field/encode.go
diff --git a/pkg/schema/field/errors.go b/schema/field/errors.go
similarity index 100%
rename from pkg/schema/field/errors.go
rename to schema/field/errors.go
diff --git a/pkg/schema/field/evaluate.go b/schema/field/evaluate.go
similarity index 100%
rename from pkg/schema/field/evaluate.go
rename to schema/field/evaluate.go
diff --git a/pkg/schema/field/field.go b/schema/field/field.go
similarity index 100%
rename from pkg/schema/field/field.go
rename to schema/field/field.go
diff --git a/pkg/schema/field/field_json.go b/schema/field/field_json.go
similarity index 100%
rename from pkg/schema/field/field_json.go
rename to schema/field/field_json.go
diff --git a/pkg/schema/field/field_test.go b/schema/field/field_test.go
similarity index 100%
rename from pkg/schema/field/field_test.go
rename to schema/field/field_test.go
diff --git a/pkg/schema/field/init.go b/schema/field/init.go
similarity index 100%
rename from pkg/schema/field/init.go
rename to schema/field/init.go
diff --git a/pkg/schema/field/loader.go b/schema/field/loader.go
similarity index 100%
rename from pkg/schema/field/loader.go
rename to schema/field/loader.go
diff --git a/pkg/schema/field/location.go b/schema/field/location.go
similarity index 100%
rename from pkg/schema/field/location.go
rename to schema/field/location.go
diff --git a/pkg/schema/field/location_test.go b/schema/field/location_test.go
similarity index 100%
rename from pkg/schema/field/location_test.go
rename to schema/field/location_test.go
diff --git a/pkg/schema/field/number.go b/schema/field/number.go
similarity index 100%
rename from pkg/schema/field/number.go
rename to schema/field/number.go
diff --git a/pkg/schema/field/number_test.go b/schema/field/number_test.go
similarity index 100%
rename from pkg/schema/field/number_test.go
rename to schema/field/number_test.go
diff --git a/pkg/schema/field/object.go b/schema/field/object.go
similarity index 100%
rename from pkg/schema/field/object.go
rename to schema/field/object.go
diff --git a/pkg/schema/field/object_test.go b/schema/field/object_test.go
similarity index 100%
rename from pkg/schema/field/object_test.go
rename to schema/field/object_test.go
diff --git a/pkg/schema/field/options.go b/schema/field/options.go
similarity index 100%
rename from pkg/schema/field/options.go
rename to schema/field/options.go
diff --git a/pkg/schema/field/primary_key.go b/schema/field/primary_key.go
similarity index 100%
rename from pkg/schema/field/primary_key.go
rename to schema/field/primary_key.go
diff --git a/pkg/schema/field/primary_key_test.go b/schema/field/primary_key_test.go
similarity index 100%
rename from pkg/schema/field/primary_key_test.go
rename to schema/field/primary_key_test.go
diff --git a/pkg/schema/field/string.go b/schema/field/string.go
similarity index 100%
rename from pkg/schema/field/string.go
rename to schema/field/string.go
diff --git a/pkg/schema/field/string_test.go b/schema/field/string_test.go
similarity index 100%
rename from pkg/schema/field/string_test.go
rename to schema/field/string_test.go
diff --git a/pkg/schema/field/time.go b/schema/field/time.go
similarity index 100%
rename from pkg/schema/field/time.go
rename to schema/field/time.go
diff --git a/pkg/schema/field/time_test.go b/schema/field/time_test.go
similarity index 100%
rename from pkg/schema/field/time_test.go
rename to schema/field/time_test.go
diff --git a/pkg/schema/field/timestamp.go b/schema/field/timestamp.go
similarity index 100%
rename from pkg/schema/field/timestamp.go
rename to schema/field/timestamp.go
diff --git a/pkg/schema/field/timestamp_test.go b/schema/field/timestamp_test.go
similarity index 100%
rename from pkg/schema/field/timestamp_test.go
rename to schema/field/timestamp_test.go
diff --git a/pkg/schema/field/type.go b/schema/field/type.go
similarity index 100%
rename from pkg/schema/field/type.go
rename to schema/field/type.go
diff --git a/pkg/schema/field/unknown.go b/schema/field/unknown.go
similarity index 100%
rename from pkg/schema/field/unknown.go
rename to schema/field/unknown.go
diff --git a/pkg/schema/field/walk.go b/schema/field/walk.go
similarity index 100%
rename from pkg/schema/field/walk.go
rename to schema/field/walk.go
diff --git a/pkg/schema/loader.go b/schema/loader.go
similarity index 88%
rename from pkg/schema/loader.go
rename to schema/loader.go
index 5a646e23..b1cd3b72 100644
--- a/pkg/schema/loader.go
+++ b/schema/loader.go
@@ -3,7 +3,7 @@ package schema
import (
"context"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
var defaultLoader field.Loader
diff --git a/pkg/schema/localizer/localizer.go b/schema/localizer/localizer.go
similarity index 97%
rename from pkg/schema/localizer/localizer.go
rename to schema/localizer/localizer.go
index 4cc99d60..a93eb824 100644
--- a/pkg/schema/localizer/localizer.go
+++ b/schema/localizer/localizer.go
@@ -6,9 +6,9 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/locales"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
- "git.perx.ru/perxis/perxis-go/pkg/schema/walk"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/walk"
)
var (
diff --git a/pkg/schema/localizer/localizer_test.go b/schema/localizer/localizer_test.go
similarity index 99%
rename from pkg/schema/localizer/localizer_test.go
rename to schema/localizer/localizer_test.go
index ab6b277c..bddca64e 100644
--- a/pkg/schema/localizer/localizer_test.go
+++ b/schema/localizer/localizer_test.go
@@ -4,8 +4,8 @@ import (
"testing"
"git.perx.ru/perxis/perxis-go/pkg/locales"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/modify/default.go b/schema/modify/default.go
similarity index 94%
rename from pkg/schema/modify/default.go
rename to schema/modify/default.go
index 637a0ff8..bc9ab070 100644
--- a/pkg/schema/modify/default.go
+++ b/schema/modify/default.go
@@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
type defaultValue struct {
diff --git a/pkg/schema/modify/default_test.go b/schema/modify/default_test.go
similarity index 97%
rename from pkg/schema/modify/default_test.go
rename to schema/modify/default_test.go
index 6ea9d110..5b0743c2 100644
--- a/pkg/schema/modify/default_test.go
+++ b/schema/modify/default_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/modify/modify.go b/schema/modify/modify.go
similarity index 97%
rename from pkg/schema/modify/modify.go
rename to schema/modify/modify.go
index 191a428c..82adf7cf 100644
--- a/pkg/schema/modify/modify.go
+++ b/schema/modify/modify.go
@@ -6,7 +6,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/expr"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
const ModifierPriority = 1000
diff --git a/pkg/schema/modify/string.go b/schema/modify/string.go
similarity index 91%
rename from pkg/schema/modify/string.go
rename to schema/modify/string.go
index 2f0ecc6f..054d1811 100644
--- a/pkg/schema/modify/string.go
+++ b/schema/modify/string.go
@@ -6,7 +6,7 @@ import (
"reflect"
"strings"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
type trimSpace bool
diff --git a/pkg/schema/modify/string_test.go b/schema/modify/string_test.go
similarity index 98%
rename from pkg/schema/modify/string_test.go
rename to schema/modify/string_test.go
index 2f645126..28e613d1 100644
--- a/pkg/schema/modify/string_test.go
+++ b/schema/modify/string_test.go
@@ -5,7 +5,7 @@ import (
"reflect"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/modify/value.go b/schema/modify/value.go
similarity index 94%
rename from pkg/schema/modify/value.go
rename to schema/modify/value.go
index 1f87c803..4547a8ca 100644
--- a/pkg/schema/modify/value.go
+++ b/schema/modify/value.go
@@ -6,7 +6,7 @@ import (
"reflect"
"git.perx.ru/perxis/perxis-go/pkg/expr"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/pkg/errors"
)
diff --git a/pkg/schema/modify/value_test.go b/schema/modify/value_test.go
similarity index 97%
rename from pkg/schema/modify/value_test.go
rename to schema/modify/value_test.go
index eb3b9a99..73111d41 100644
--- a/pkg/schema/modify/value_test.go
+++ b/schema/modify/value_test.go
@@ -5,7 +5,7 @@ import (
"reflect"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
func TestValue(t *testing.T) {
diff --git a/pkg/schema/schema.go b/schema/schema.go
similarity index 97%
rename from pkg/schema/schema.go
rename to schema/schema.go
index 7b337f8a..d939ecce 100644
--- a/pkg/schema/schema.go
+++ b/schema/schema.go
@@ -6,9 +6,9 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/expr"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
- "git.perx.ru/perxis/perxis-go/pkg/schema/modify"
- "git.perx.ru/perxis/perxis-go/pkg/schema/validate"
+ "git.perx.ru/perxis/perxis-go/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/modify"
+ "git.perx.ru/perxis/perxis-go/schema/validate"
)
type Schema struct {
diff --git a/pkg/schema/schema_json.go b/schema/schema_json.go
similarity index 100%
rename from pkg/schema/schema_json.go
rename to schema/schema_json.go
diff --git a/pkg/schema/schema_json_test.go b/schema/schema_json_test.go
similarity index 96%
rename from pkg/schema/schema_json_test.go
rename to schema/schema_json_test.go
index 31b47516..e345de5f 100644
--- a/pkg/schema/schema_json_test.go
+++ b/schema/schema_json_test.go
@@ -3,7 +3,7 @@ package schema
import (
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/schema/schema_test.go b/schema/schema_test.go
similarity index 85%
rename from pkg/schema/schema_test.go
rename to schema/schema_test.go
index dbedf48f..6dd85d2b 100644
--- a/pkg/schema/schema_test.go
+++ b/schema/schema_test.go
@@ -3,7 +3,7 @@ package schema
import (
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
)
diff --git a/pkg/schema/test/object_test.go b/schema/test/object_test.go
similarity index 99%
rename from pkg/schema/test/object_test.go
rename to schema/test/object_test.go
index 8bf3f820..dc1845da 100644
--- a/pkg/schema/test/object_test.go
+++ b/schema/test/object_test.go
@@ -8,10 +8,10 @@ import (
"time"
"git.perx.ru/perxis/perxis-go/pkg/data"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
- "git.perx.ru/perxis/perxis-go/pkg/schema/modify"
- "git.perx.ru/perxis/perxis-go/pkg/schema/validate"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/modify"
+ "git.perx.ru/perxis/perxis-go/schema/validate"
"github.com/hashicorp/go-multierror"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
diff --git a/pkg/schema/validate/array.go b/schema/validate/array.go
similarity index 95%
rename from pkg/schema/validate/array.go
rename to schema/validate/array.go
index 09e17e28..239a7894 100644
--- a/pkg/schema/validate/array.go
+++ b/schema/validate/array.go
@@ -5,7 +5,7 @@ import (
"fmt"
"reflect"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
type maxItems int
diff --git a/pkg/schema/validate/array_test.go b/schema/validate/array_test.go
similarity index 98%
rename from pkg/schema/validate/array_test.go
rename to schema/validate/array_test.go
index ec9e9d81..189c5101 100644
--- a/pkg/schema/validate/array_test.go
+++ b/schema/validate/array_test.go
@@ -4,7 +4,7 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/validate/enum.go b/schema/validate/enum.go
similarity index 96%
rename from pkg/schema/validate/enum.go
rename to schema/validate/enum.go
index 8df38c6d..3da6f214 100644
--- a/pkg/schema/validate/enum.go
+++ b/schema/validate/enum.go
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/pkg/errors"
)
diff --git a/pkg/schema/validate/enum_test.go b/schema/validate/enum_test.go
similarity index 97%
rename from pkg/schema/validate/enum_test.go
rename to schema/validate/enum_test.go
index a4c301e1..bd2b470d 100644
--- a/pkg/schema/validate/enum_test.go
+++ b/schema/validate/enum_test.go
@@ -4,7 +4,7 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/validate/number.go b/schema/validate/number.go
similarity index 98%
rename from pkg/schema/validate/number.go
rename to schema/validate/number.go
index 81ab150b..296775bc 100644
--- a/pkg/schema/validate/number.go
+++ b/schema/validate/number.go
@@ -7,7 +7,7 @@ import (
"reflect"
"strconv"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
type max float64
diff --git a/pkg/schema/validate/number_test.go b/schema/validate/number_test.go
similarity index 99%
rename from pkg/schema/validate/number_test.go
rename to schema/validate/number_test.go
index 08f69401..898859ef 100644
--- a/pkg/schema/validate/number_test.go
+++ b/schema/validate/number_test.go
@@ -4,7 +4,7 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/validate/readonly.go b/schema/validate/readonly.go
similarity index 89%
rename from pkg/schema/validate/readonly.go
rename to schema/validate/readonly.go
index 8738d747..041e2257 100644
--- a/pkg/schema/validate/readonly.go
+++ b/schema/validate/readonly.go
@@ -4,7 +4,7 @@ import (
"context"
"errors"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
type readonly bool
diff --git a/pkg/schema/validate/readonly_test.go b/schema/validate/readonly_test.go
similarity index 93%
rename from pkg/schema/validate/readonly_test.go
rename to schema/validate/readonly_test.go
index 379d906e..09fc7ccf 100644
--- a/pkg/schema/validate/readonly_test.go
+++ b/schema/validate/readonly_test.go
@@ -4,7 +4,7 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/validate/required.go b/schema/validate/required.go
similarity index 93%
rename from pkg/schema/validate/required.go
rename to schema/validate/required.go
index 96591e6e..c3179c9e 100644
--- a/pkg/schema/validate/required.go
+++ b/schema/validate/required.go
@@ -4,7 +4,7 @@ import (
"context"
"errors"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
type required bool
diff --git a/pkg/schema/validate/required_test.go b/schema/validate/required_test.go
similarity index 98%
rename from pkg/schema/validate/required_test.go
rename to schema/validate/required_test.go
index b22a3748..8e7d195a 100644
--- a/pkg/schema/validate/required_test.go
+++ b/schema/validate/required_test.go
@@ -5,7 +5,7 @@ import (
"testing"
"time"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/validate/string.go b/schema/validate/string.go
similarity index 97%
rename from pkg/schema/validate/string.go
rename to schema/validate/string.go
index 33fa453d..5dd857bf 100644
--- a/pkg/schema/validate/string.go
+++ b/schema/validate/string.go
@@ -6,7 +6,7 @@ import (
"reflect"
"unicode/utf8"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/pkg/errors"
)
diff --git a/pkg/schema/validate/string_test.go b/schema/validate/string_test.go
similarity index 99%
rename from pkg/schema/validate/string_test.go
rename to schema/validate/string_test.go
index 0fac9bb7..f563a3ad 100644
--- a/pkg/schema/validate/string_test.go
+++ b/schema/validate/string_test.go
@@ -4,7 +4,7 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/pkg/schema/validate/validate.go b/schema/validate/validate.go
similarity index 97%
rename from pkg/schema/validate/validate.go
rename to schema/validate/validate.go
index 65ac4c40..84129279 100644
--- a/pkg/schema/validate/validate.go
+++ b/schema/validate/validate.go
@@ -6,7 +6,7 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/errors"
"git.perx.ru/perxis/perxis-go/pkg/expr"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
const ValidatorPriority = 2000
diff --git a/pkg/schema/walk/fn.go b/schema/walk/fn.go
similarity index 100%
rename from pkg/schema/walk/fn.go
rename to schema/walk/fn.go
diff --git a/pkg/schema/walk/walk.go b/schema/walk/walk.go
similarity index 97%
rename from pkg/schema/walk/walk.go
rename to schema/walk/walk.go
index ab11ebe6..c9ab1663 100644
--- a/pkg/schema/walk/walk.go
+++ b/schema/walk/walk.go
@@ -5,8 +5,8 @@ import (
"fmt"
"strings"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
)
// DataFunc тип для функции обработки данных
@@ -154,7 +154,6 @@ func (m *Walker) datawalk(w *WalkContext) (err error) {
w.Dst = res
}
-
case *field.ArrayParameters:
d, _ := w.Dst.([]interface{})
s, _ := w.Src.([]interface{})
diff --git a/pkg/schema/walk/walk_test.go b/schema/walk/walk_test.go
similarity index 99%
rename from pkg/schema/walk/walk_test.go
rename to schema/walk/walk_test.go
index be33aa2f..3514ce55 100644
--- a/pkg/schema/walk/walk_test.go
+++ b/schema/walk/walk_test.go
@@ -4,8 +4,8 @@ import (
"context"
"testing"
- "git.perx.ru/perxis/perxis-go/pkg/schema"
- "git.perx.ru/perxis/perxis-go/pkg/schema/field"
+ "git.perx.ru/perxis/perxis-go/schema"
+ "git.perx.ru/perxis/perxis-go/schema/field"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
--
GitLab