From 90269aff2bae12a05d5394eb223e08ff6c2bdb2f Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <krestyaninov@perx.ru>
Date: Tue, 2 Jul 2024 15:41:48 +0000
Subject: [PATCH] =?UTF-8?q?chore(api):=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?=
=?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA?=
=?UTF-8?q?=D0=B8=20linter`=D0=B0=20=D1=81=D0=B2=D1=8F=D0=B7=D0=B0=D0=BD?=
=?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D1=81=20=D0=BF=D1=80=D0=BE=D0=BF=D1=83?=
=?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=BD=D1=8B=D0=BC=D0=B8=20=D0=B8=D0=BC=D0=B5?=
=?UTF-8?q?=D0=BD=D0=B0=D0=BC=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?=
=?UTF-8?q?=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BF=D1=80=D0=B8=20=D0=BF=D0=BE?=
=?UTF-8?q?=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D0=B8=20=D1=80=D0=B5=D0=B7?=
=?UTF-8?q?=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Close #PRXS-2610
---
pkg/account/config.go | 1 -
pkg/auth/anonymous.go | 2 +-
pkg/auth/client.go | 8 ++-
pkg/auth/system.go | 2 +-
pkg/auth/user.go | 2 +-
pkg/cli/gracefull.go | 27 ++++-----
pkg/clients/middleware/caching_middleware.go | 30 +++++-----
.../middleware/caching_middleware_test.go | 1 +
.../middleware/caching_middleware.go | 16 ++---
.../middleware/caching_middleware_test.go | 2 +
.../middleware/caching_middleware.go | 36 ++++++------
pkg/data/data.go | 3 +-
pkg/data/data_test.go | 9 +--
pkg/data/translit.go | 2 +-
.../middleware/caching_middleware.go | 46 +++++++--------
pkg/errors/code.go | 2 +-
pkg/errors/detail.go | 2 +-
pkg/errors/domain.go | 2 +-
pkg/errors/field.go | 2 +-
pkg/errors/hint.go | 2 +-
pkg/errors/id.go | 2 +-
pkg/errors/multi.go | 2 +-
pkg/errors/source.go | 2 +-
pkg/errors/status.go | 2 +-
pkg/expr/context.go | 2 +-
pkg/extension/manager.go | 2 +-
pkg/extension/manager_client.go | 2 +-
pkg/extension/service/extension.go | 11 ++--
pkg/extension/service/registrar.go | 14 ++---
pkg/files/downloader.go | 4 +-
pkg/filter/filter.go | 13 ++---
.../middleware/caching_middleware.go | 6 +-
pkg/locales/middleware/caching_middleware.go | 6 +-
pkg/members/members.go | 4 +-
pkg/members/middleware/caching_middleware.go | 22 +++----
.../middleware/caching_middleware_test.go | 1 +
pkg/operation/service.go | 6 +-
.../middleware/caching_middleware.go | 6 +-
.../middleware/caching_middleware_test.go | 2 +
pkg/references/field.go | 4 +-
pkg/references/field_test.go | 8 +--
pkg/roles/middleware/caching_middleware.go | 14 ++---
pkg/schema/field/array_test.go | 4 +-
pkg/schema/field/boolean_test.go | 5 +-
pkg/schema/field/field.go | 4 +-
pkg/schema/field/field_json.go | 2 +-
pkg/schema/field/loader.go | 2 +-
pkg/schema/field/location_test.go | 5 +-
pkg/schema/field/object_test.go | 5 +-
pkg/schema/field/primary_key_test.go | 5 +-
pkg/schema/field/string_test.go | 5 +-
pkg/schema/field/time_test.go | 5 +-
pkg/schema/field/unknown.go | 3 +-
pkg/schema/modify/default.go | 2 +-
pkg/schema/modify/default_test.go | 5 +-
pkg/schema/modify/string_test.go | 5 +-
pkg/schema/modify/value_test.go | 3 +-
pkg/schema/schema.go | 2 +-
pkg/schema/test/object_test.go | 58 +++++++++----------
pkg/schema/validate/array_test.go | 7 ++-
pkg/schema/validate/enum_test.go | 5 +-
pkg/schema/validate/number_test.go | 7 ++-
pkg/schema/validate/readonly_test.go | 5 +-
pkg/schema/validate/required_test.go | 7 ++-
pkg/schema/validate/string_test.go | 7 ++-
pkg/schema/walk/walk.go | 2 +-
pkg/schemaloader/loader_test.go | 6 +-
pkg/setup/client.go | 2 +-
pkg/spaces/middleware/caching_middleware.go | 42 +++++++-------
pkg/users/middleware/caching_middleware.go | 16 ++---
70 files changed, 284 insertions(+), 274 deletions(-)
diff --git a/pkg/account/config.go b/pkg/account/config.go
index cfa3f088..b86eb543 100644
--- a/pkg/account/config.go
+++ b/pkg/account/config.go
@@ -9,7 +9,6 @@ type config struct {
noCache bool
noLog bool
accessLog bool
- debug bool
clientOptions []kitgrpc.ClientOption // todo: можно заменить на grpc-интерсепторы при соединении и избавиться здесь от go-kit
logger *zap.Logger
}
diff --git a/pkg/auth/anonymous.go b/pkg/auth/anonymous.go
index e000842a..9fffc863 100644
--- a/pkg/auth/anonymous.go
+++ b/pkg/auth/anonymous.go
@@ -80,7 +80,7 @@ func (a *Anonymous) HasEnvironmentAccess(ctx context.Context, space, env string)
}
func (Anonymous) Format(f fmt.State, verb rune) {
- f.Write([]byte("AnonymousPrincipal{}"))
+ _, _ = f.Write([]byte("AnonymousPrincipal{}"))
}
func (a Anonymous) HasAccess(ctx context.Context, spaceID, orgID string) error {
diff --git a/pkg/auth/client.go b/pkg/auth/client.go
index 1e22b4b9..9db7a568 100644
--- a/pkg/auth/client.go
+++ b/pkg/auth/client.go
@@ -52,7 +52,7 @@ func (c ClientPrincipal) Format(f fmt.State, verb rune) {
id = c.client.ID
}
- f.Write([]byte(fmt.Sprintf("ClientPrincipal{ID: '%s', Identity: {%s}}", id, identity)))
+ _, _ = f.Write([]byte(fmt.Sprintf("ClientPrincipal{ID: '%s', Identity: {%s}}", id, identity)))
}
func (c *ClientPrincipal) Space(spaceID string) SpaceAccessor {
@@ -63,6 +63,7 @@ func (c *ClientPrincipal) Space(spaceID string) SpaceAccessor {
return c
}
+// nolint:unused
func (c *ClientPrincipal) getSpace(ctx context.Context, spaceID string) *spaces.Space {
if spaceID == "" {
return nil
@@ -182,8 +183,8 @@ func (c *ClientPrincipal) Role(ctx context.Context, spaceID string) *roles.Role
role, err := c.roles.Get(WithSystem(ctx), spaceID, rID)
if err == nil {
- //c.hasRole = true
- //c.role = role
+ // c.hasRole = true
+ // c.role = role
return role
}
@@ -237,6 +238,7 @@ func (c *ClientPrincipal) HasAccess(ctx context.Context, spaceID, orgID string)
return service.ErrAccessDenied
}
+// nolint:unused
func (c *ClientPrincipal) hasRole(ctx context.Context, spaceID string) (bool, error) {
if c.spaceID == "" {
return false, nil
diff --git a/pkg/auth/system.go b/pkg/auth/system.go
index b602fe11..dd4d0398 100644
--- a/pkg/auth/system.go
+++ b/pkg/auth/system.go
@@ -35,5 +35,5 @@ func (SystemPrincipal) Rules(_ context.Context, _, _ string) permission.Ruleset
}
func (SystemPrincipal) Format(f fmt.State, verb rune) {
- f.Write([]byte("SystemPrincipal{}"))
+ _, _ = f.Write([]byte("SystemPrincipal{}"))
}
diff --git a/pkg/auth/user.go b/pkg/auth/user.go
index 00c817e2..29e87945 100644
--- a/pkg/auth/user.go
+++ b/pkg/auth/user.go
@@ -36,7 +36,7 @@ type UserPrincipal struct {
}
func (u UserPrincipal) Format(f fmt.State, verb rune) {
- f.Write([]byte(fmt.Sprintf("UserPrincipal{ID: '%s', Identity: '%s'}", u.id, u.identity)))
+ _, _ = f.Write([]byte(fmt.Sprintf("UserPrincipal{ID: '%s', Identity: '%s'}", u.id, u.identity)))
}
func (u *UserPrincipal) Space(spaceID string) SpaceAccessor {
diff --git a/pkg/cli/gracefull.go b/pkg/cli/gracefull.go
index 8fd64a3d..64ecc371 100644
--- a/pkg/cli/gracefull.go
+++ b/pkg/cli/gracefull.go
@@ -14,23 +14,20 @@ func WaitForQuit(logger *zap.Logger, finailizer func()) {
signal.Notify(sigc, syscall.SIGTERM, os.Interrupt)
var signalsReceived uint
go func() {
- for {
- select {
- case s := <-sigc:
- logger.Info("Signal received. Exiting", zap.String("Signal", s.String()))
- signalsReceived++
+ for s := range sigc {
+ logger.Info("Signal received. Exiting", zap.String("Signal", s.String()))
+ signalsReceived++
- if signalsReceived < 2 {
- // After first Ctrl+C start quitting the worker gracefully
- go func() {
- finailizer()
- close(donec)
- }()
- } else {
- // Abort the program when user hits Ctrl+C second time in a row
- logger.Info("Force exit")
+ if signalsReceived < 2 {
+ // After first Ctrl+C start quitting the worker gracefully
+ go func() {
+ finailizer()
close(donec)
- }
+ }()
+ } else {
+ // Abort the program when user hits Ctrl+C second time in a row
+ logger.Info("Force exit")
+ close(donec)
}
}
}()
diff --git a/pkg/clients/middleware/caching_middleware.go b/pkg/clients/middleware/caching_middleware.go
index 08af3a47..370061cc 100644
--- a/pkg/clients/middleware/caching_middleware.go
+++ b/pkg/clients/middleware/caching_middleware.go
@@ -30,7 +30,7 @@ func (m cachingMiddleware) Create(ctx context.Context, client *service.Client) (
cl, err = m.next.Create(ctx, client)
if err == nil {
- m.cache.Remove(cl.SpaceID)
+ _ = m.cache.Remove(cl.SpaceID)
}
return cl, err
}
@@ -44,9 +44,9 @@ func (m cachingMiddleware) Get(ctx context.Context, spaceId string, id string) (
}
cl, err = m.next.Get(ctx, spaceId, id)
if err == nil {
- m.cache.Set(key, cl)
+ _ = m.cache.Set(key, cl)
for _, key := range keysFromIdentities(spaceId, cl) {
- m.cache.Set(key, cl)
+ _ = m.cache.Set(key, cl)
}
}
return cl, err
@@ -64,9 +64,9 @@ func (m cachingMiddleware) GetBy(ctx context.Context, spaceId string, params *se
}
cl, err = m.next.GetBy(ctx, spaceId, params)
if err == nil {
- m.cache.Set(makeKey(spaceId, cl.ID), cl)
+ _ = m.cache.Set(makeKey(spaceId, cl.ID), cl)
for _, key := range keysFromIdentities(spaceId, cl) {
- m.cache.Set(key, cl)
+ _ = m.cache.Set(key, cl)
}
}
return cl, err
@@ -80,7 +80,7 @@ func (m cachingMiddleware) List(ctx context.Context, spaceId string) (clients []
}
clients, err = m.next.List(ctx, spaceId)
if err == nil {
- m.cache.Set(spaceId, clients)
+ _ = m.cache.Set(spaceId, clients)
}
return clients, err
}
@@ -90,13 +90,13 @@ func (m cachingMiddleware) Update(ctx context.Context, client *service.Client) (
err = m.next.Update(ctx, client)
if err == nil {
- m.cache.Remove(client.SpaceID)
+ _ = m.cache.Remove(client.SpaceID)
value, e := m.cache.Get(makeKey(client.SpaceID, client.ID))
if e == nil {
client := value.(*service.Client)
- m.cache.Remove(makeKey(client.SpaceID, client.ID))
+ _ = m.cache.Remove(makeKey(client.SpaceID, client.ID))
for _, key := range keysFromIdentities(client.SpaceID, client) {
- m.cache.Remove(key)
+ _ = m.cache.Remove(key)
}
}
}
@@ -110,12 +110,12 @@ func (m cachingMiddleware) Delete(ctx context.Context, spaceId string, id string
value, e := m.cache.Get(makeKey(spaceId, id))
if e == nil {
client := value.(*service.Client)
- m.cache.Remove(makeKey(client.SpaceID, client.ID))
+ _ = m.cache.Remove(makeKey(client.SpaceID, client.ID))
for _, key := range keysFromIdentities(client.SpaceID, client) {
- m.cache.Remove(key)
+ _ = m.cache.Remove(key)
}
}
- m.cache.Remove(spaceId)
+ _ = m.cache.Remove(spaceId)
}
return err
}
@@ -127,12 +127,12 @@ func (m cachingMiddleware) Enable(ctx context.Context, spaceId string, id string
value, e := m.cache.Get(makeKey(spaceId, id))
if e == nil {
client := value.(*service.Client)
- m.cache.Remove(makeKey(client.SpaceID, client.ID))
+ _ = m.cache.Remove(makeKey(client.SpaceID, client.ID))
for _, key := range keysFromIdentities(client.SpaceID, client) {
- m.cache.Remove(key)
+ _ = m.cache.Remove(key)
}
}
- m.cache.Remove(spaceId)
+ _ = m.cache.Remove(spaceId)
}
return err
}
diff --git a/pkg/clients/middleware/caching_middleware_test.go b/pkg/clients/middleware/caching_middleware_test.go
index 2a90c1db..02129d17 100644
--- a/pkg/clients/middleware/caching_middleware_test.go
+++ b/pkg/clients/middleware/caching_middleware_test.go
@@ -317,6 +317,7 @@ func TestClientsCache(t *testing.T) {
assert.NotSame(t, v2, v4, "Ожидается что после активации объект был удален из кэша и запрошен у сервиса.")
v5, err := svc.GetBy(ctx, spaceID, &clients.GetByParams{OAuthClientID: clientID})
+ require.NoError(t, err)
assert.NotSame(t, v3, v5, "Ожидается что после активации объект был удален из кеша и после запроса Get в кеш попал объект запрошенный заново из сервиса.")
vl3, err := svc.List(ctx, spaceID)
diff --git a/pkg/collaborators/middleware/caching_middleware.go b/pkg/collaborators/middleware/caching_middleware.go
index 7533ae55..25ae89c4 100644
--- a/pkg/collaborators/middleware/caching_middleware.go
+++ b/pkg/collaborators/middleware/caching_middleware.go
@@ -30,8 +30,8 @@ func (m cachingMiddleware) Set(ctx context.Context, spaceId, subject, role strin
err = m.next.Set(ctx, spaceId, subject, role)
if err == nil {
- m.cache.Remove(spaceId)
- m.cache.Remove(subject)
+ _ = m.cache.Remove(spaceId)
+ _ = m.cache.Remove(subject)
}
return err
}
@@ -45,7 +45,7 @@ func (m cachingMiddleware) Get(ctx context.Context, spaceId, subject string) (ro
}
role, err = m.next.Get(ctx, spaceId, subject)
if err == nil {
- m.cache.Set(key, role)
+ _ = m.cache.Set(key, role)
}
return role, err
}
@@ -54,9 +54,9 @@ func (m cachingMiddleware) Remove(ctx context.Context, spaceId, subject string)
err = m.next.Remove(ctx, spaceId, subject)
if err == nil {
- m.cache.Remove(makeKey(spaceId, subject))
- m.cache.Remove(spaceId)
- m.cache.Remove(subject)
+ _ = m.cache.Remove(makeKey(spaceId, subject))
+ _ = m.cache.Remove(spaceId)
+ _ = m.cache.Remove(subject)
}
return err
}
@@ -69,7 +69,7 @@ func (m cachingMiddleware) ListCollaborators(ctx context.Context, spaceId string
}
collaborators, err = m.next.ListCollaborators(ctx, spaceId)
if err == nil {
- m.cache.Set(spaceId, collaborators)
+ _ = m.cache.Set(spaceId, collaborators)
}
return collaborators, err
}
@@ -82,7 +82,7 @@ func (m cachingMiddleware) ListSpaces(ctx context.Context, subject string) (coll
}
collaborators, err = m.next.ListSpaces(ctx, subject)
if err == nil {
- m.cache.Set(subject, collaborators)
+ _ = m.cache.Set(subject, collaborators)
}
return collaborators, err
}
diff --git a/pkg/collaborators/middleware/caching_middleware_test.go b/pkg/collaborators/middleware/caching_middleware_test.go
index ea2ccadd..2e453ae6 100644
--- a/pkg/collaborators/middleware/caching_middleware_test.go
+++ b/pkg/collaborators/middleware/caching_middleware_test.go
@@ -113,6 +113,7 @@ func TestCollaboratorsCache(t *testing.T) {
cs.On("ListSpaces", mock.Anything, userID).Return(nil, errNotFound).Once()
err = svc.Remove(ctx, spaceID, userID)
+ require.NoError(t, err)
rl, err = svc.Get(ctx, spaceID, userID)
require.Error(t, err)
@@ -167,6 +168,7 @@ func TestCollaboratorsCache(t *testing.T) {
cs.On("ListSpaces", mock.Anything, userID).Return(nil, errNotFound).Once()
err = svc.Remove(ctx, spaceID, userID)
+ require.NoError(t, err)
rl, err = svc.Get(ctx, spaceID, userID)
require.Error(t, err)
diff --git a/pkg/collections/middleware/caching_middleware.go b/pkg/collections/middleware/caching_middleware.go
index de34d42a..0e329e80 100644
--- a/pkg/collections/middleware/caching_middleware.go
+++ b/pkg/collections/middleware/caching_middleware.go
@@ -52,9 +52,9 @@ func (m cachingMiddleware) Get(ctx context.Context, spaceId string, envId string
if err != nil {
return nil, err
}
- m.cache.Set(makeKey(coll.SpaceID, env.ID, coll.ID, opts.DisableSchemaIncludes), coll)
+ _ = m.cache.Set(makeKey(coll.SpaceID, env.ID, coll.ID, opts.DisableSchemaIncludes), coll)
for _, al := range env.Aliases {
- m.cache.Set(makeKey(coll.SpaceID, al, coll.ID, opts.DisableSchemaIncludes), coll)
+ _ = m.cache.Set(makeKey(coll.SpaceID, al, coll.ID, opts.DisableSchemaIncludes), coll)
}
}
@@ -73,11 +73,11 @@ func (m cachingMiddleware) Update(ctx context.Context, coll *service.Collection)
if err != nil {
return err
}
- m.cache.Remove(makeKey(env.SpaceID, env.ID, coll.ID, true))
- m.cache.Remove(makeKey(env.SpaceID, env.ID, coll.ID, false))
+ _ = m.cache.Remove(makeKey(env.SpaceID, env.ID, coll.ID, true))
+ _ = m.cache.Remove(makeKey(env.SpaceID, env.ID, coll.ID, false))
for _, al := range env.Aliases {
- m.cache.Remove(makeKey(env.SpaceID, al, coll.ID, true))
- m.cache.Remove(makeKey(env.SpaceID, al, coll.ID, false))
+ _ = m.cache.Remove(makeKey(env.SpaceID, al, coll.ID, true))
+ _ = m.cache.Remove(makeKey(env.SpaceID, al, coll.ID, false))
}
}
return err
@@ -90,11 +90,11 @@ func (m cachingMiddleware) SetSchema(ctx context.Context, spaceId, envId, collec
if err != nil {
return err
}
- m.cache.Remove(makeKey(env.SpaceID, env.ID, collectionId, true))
- m.cache.Remove(makeKey(env.SpaceID, env.ID, collectionId, false))
+ _ = m.cache.Remove(makeKey(env.SpaceID, env.ID, collectionId, true))
+ _ = m.cache.Remove(makeKey(env.SpaceID, env.ID, collectionId, false))
for _, al := range env.Aliases {
- m.cache.Remove(makeKey(env.SpaceID, al, collectionId, true))
- m.cache.Remove(makeKey(env.SpaceID, al, collectionId, false))
+ _ = m.cache.Remove(makeKey(env.SpaceID, al, collectionId, true))
+ _ = m.cache.Remove(makeKey(env.SpaceID, al, collectionId, false))
}
}
return err
@@ -107,11 +107,11 @@ func (m cachingMiddleware) SetState(ctx context.Context, spaceId, envId, collect
if err != nil {
return err
}
- m.cache.Remove(makeKey(env.SpaceID, env.ID, collectionId, true))
- m.cache.Remove(makeKey(env.SpaceID, env.ID, collectionId, false))
+ _ = m.cache.Remove(makeKey(env.SpaceID, env.ID, collectionId, true))
+ _ = m.cache.Remove(makeKey(env.SpaceID, env.ID, collectionId, false))
for _, al := range env.Aliases {
- m.cache.Remove(makeKey(env.SpaceID, al, collectionId, true))
- m.cache.Remove(makeKey(env.SpaceID, al, collectionId, false))
+ _ = m.cache.Remove(makeKey(env.SpaceID, al, collectionId, true))
+ _ = m.cache.Remove(makeKey(env.SpaceID, al, collectionId, false))
}
}
return err
@@ -125,11 +125,11 @@ func (m cachingMiddleware) Delete(ctx context.Context, spaceId string, envId str
if err != nil {
return err
}
- m.cache.Remove(makeKey(env.SpaceID, env.ID, collectionId, true))
- m.cache.Remove(makeKey(env.SpaceID, env.ID, collectionId, false))
+ _ = m.cache.Remove(makeKey(env.SpaceID, env.ID, collectionId, true))
+ _ = m.cache.Remove(makeKey(env.SpaceID, env.ID, collectionId, false))
for _, al := range env.Aliases {
- m.cache.Remove(makeKey(env.SpaceID, al, collectionId, true))
- m.cache.Remove(makeKey(env.SpaceID, al, collectionId, false))
+ _ = m.cache.Remove(makeKey(env.SpaceID, al, collectionId, true))
+ _ = m.cache.Remove(makeKey(env.SpaceID, al, collectionId, false))
}
}
return err
diff --git a/pkg/data/data.go b/pkg/data/data.go
index 0540055a..14528479 100644
--- a/pkg/data/data.go
+++ b/pkg/data/data.go
@@ -120,7 +120,7 @@ func DeleteMany(paths []string, value any, delim ...string) {
return
}
for _, path := range paths {
- Delete(path, value, delim...)
+ _ = Delete(path, value, delim...)
}
}
@@ -245,7 +245,6 @@ func get(path []string, data any) (any, bool) {
// The path is the sting with delim, for eg:, parent.child.key
func Keep(paths []string, data any, delim ...string) {
if len(paths) == 0 {
- data = nil
return
}
switch val := data.(type) {
diff --git a/pkg/data/data_test.go b/pkg/data/data_test.go
index 785eefbb..463a4cbc 100644
--- a/pkg/data/data_test.go
+++ b/pkg/data/data_test.go
@@ -63,22 +63,23 @@ func TestDelete(t *testing.T) {
}, "z": "2"},
},
// Решили что автоматически удалять пустые объекты/слайсы не нужно
- //{
+ // {
// "empty object",
// map[string]interface{}{"a": map[string]interface{}{"a": map[string]interface{}{}}},
// []string{"a", "a"},
// map[string]interface{}{},
- //}, {
+ // }, {
// "empty array",
// map[string]interface{}{"a": map[string]interface{}{"a": []interface{}{}}},
// []string{"a", "a"},
// map[string]interface{}{},
- //},
+ // },
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- Delete(tt.field, tt.in)
+ err := Delete(tt.field, tt.in)
+ assert.NoError(t, err)
assert.Equal(t, tt.out, tt.in)
})
}
diff --git a/pkg/data/translit.go b/pkg/data/translit.go
index 654ae90d..11679e37 100644
--- a/pkg/data/translit.go
+++ b/pkg/data/translit.go
@@ -45,7 +45,7 @@ func TableEncode(s string, tlm map[rune]string) string {
}
if unicode.IsUpper(r) {
- tr = strings.Title(tr)
+ tr = strings.Title(tr) //nolint:staticcheck // Для обработки основных языков достаточно правил работы функции strings.Title
}
out.WriteString(tr)
diff --git a/pkg/environments/middleware/caching_middleware.go b/pkg/environments/middleware/caching_middleware.go
index 0801730a..7e4f46d2 100644
--- a/pkg/environments/middleware/caching_middleware.go
+++ b/pkg/environments/middleware/caching_middleware.go
@@ -30,7 +30,7 @@ func (m cachingMiddleware) Create(ctx context.Context, env *service.Environment)
environment, err = m.next.Create(ctx, env)
if err == nil {
- m.cache.Remove(environment.SpaceID)
+ _ = m.cache.Remove(environment.SpaceID)
}
return environment, err
}
@@ -43,9 +43,9 @@ func (m cachingMiddleware) Get(ctx context.Context, spaceId string, envId string
}
environment, err = m.next.Get(ctx, spaceId, envId)
if err == nil {
- m.cache.Set(makeKey(spaceId, environment.ID), environment)
+ _ = m.cache.Set(makeKey(spaceId, environment.ID), environment)
for _, a := range environment.Aliases {
- m.cache.Set(makeKey(spaceId, a), environment)
+ _ = m.cache.Set(makeKey(spaceId, a), environment)
}
}
return environment, err
@@ -59,7 +59,7 @@ func (m cachingMiddleware) List(ctx context.Context, spaceId string) (environmen
}
environments, err = m.next.List(ctx, spaceId)
if err == nil {
- m.cache.Set(spaceId, environments)
+ _ = m.cache.Set(spaceId, environments)
}
return environments, err
}
@@ -71,12 +71,12 @@ func (m cachingMiddleware) Update(ctx context.Context, env *service.Environment)
value, e := m.cache.Get(makeKey(env.SpaceID, env.ID))
if e == nil {
env := value.(*service.Environment)
- m.cache.Remove(makeKey(env.SpaceID, env.ID))
+ _ = m.cache.Remove(makeKey(env.SpaceID, env.ID))
for _, a := range env.Aliases {
- m.cache.Remove(makeKey(env.SpaceID, a))
+ _ = m.cache.Remove(makeKey(env.SpaceID, a))
}
}
- m.cache.Remove(env.SpaceID)
+ _ = m.cache.Remove(env.SpaceID)
}
return err
}
@@ -88,12 +88,12 @@ func (m cachingMiddleware) Delete(ctx context.Context, spaceId string, envId str
value, e := m.cache.Get(makeKey(spaceId, envId))
if e == nil {
env := value.(*service.Environment)
- m.cache.Remove(makeKey(env.SpaceID, env.ID))
+ _ = m.cache.Remove(makeKey(env.SpaceID, env.ID))
for _, a := range env.Aliases {
- m.cache.Remove(makeKey(env.SpaceID, a))
+ _ = m.cache.Remove(makeKey(env.SpaceID, a))
}
}
- m.cache.Remove(spaceId)
+ _ = m.cache.Remove(spaceId)
}
return err
}
@@ -105,21 +105,21 @@ func (m cachingMiddleware) SetAlias(ctx context.Context, spaceId string, envId s
value, e := m.cache.Get(makeKey(spaceId, alias))
if e == nil {
env := value.(*service.Environment)
- m.cache.Remove(makeKey(env.SpaceID, env.ID))
+ _ = m.cache.Remove(makeKey(env.SpaceID, env.ID))
for _, a := range env.Aliases {
- m.cache.Remove(makeKey(env.SpaceID, a))
+ _ = m.cache.Remove(makeKey(env.SpaceID, a))
}
}
value, e = m.cache.Get(makeKey(spaceId, envId))
if e == nil {
env := value.(*service.Environment)
- m.cache.Remove(makeKey(env.SpaceID, env.ID))
+ _ = m.cache.Remove(makeKey(env.SpaceID, env.ID))
for _, a := range env.Aliases {
- m.cache.Remove(makeKey(env.SpaceID, a))
+ _ = m.cache.Remove(makeKey(env.SpaceID, a))
}
}
- m.cache.Remove(spaceId)
+ _ = m.cache.Remove(spaceId)
}
return err
}
@@ -128,22 +128,22 @@ func (m cachingMiddleware) RemoveAlias(ctx context.Context, spaceId string, envI
err = m.next.RemoveAlias(ctx, spaceId, envId, alias)
if err == nil {
- m.cache.Remove(spaceId)
+ _ = m.cache.Remove(spaceId)
value, e := m.cache.Get(makeKey(spaceId, alias))
if e == nil {
env := value.(*service.Environment)
- m.cache.Remove(makeKey(env.SpaceID, env.ID))
+ _ = m.cache.Remove(makeKey(env.SpaceID, env.ID))
for _, a := range env.Aliases {
- m.cache.Remove(makeKey(env.SpaceID, a))
+ _ = m.cache.Remove(makeKey(env.SpaceID, a))
}
}
value, e = m.cache.Get(makeKey(spaceId, envId))
if e == nil {
env := value.(*service.Environment)
- m.cache.Remove(makeKey(env.SpaceID, env.ID))
+ _ = m.cache.Remove(makeKey(env.SpaceID, env.ID))
for _, a := range env.Aliases {
- m.cache.Remove(makeKey(env.SpaceID, a))
+ _ = m.cache.Remove(makeKey(env.SpaceID, a))
}
}
}
@@ -157,11 +157,11 @@ func (m cachingMiddleware) Migrate(ctx context.Context, spaceId, envId string, o
value, e := m.cache.Get(makeKey(spaceId, envId))
if e == nil {
env := value.(*service.Environment)
- m.cache.Remove(makeKey(env.SpaceID, env.ID))
+ _ = m.cache.Remove(makeKey(env.SpaceID, env.ID))
for _, a := range env.Aliases {
- m.cache.Remove(makeKey(env.SpaceID, a))
+ _ = m.cache.Remove(makeKey(env.SpaceID, a))
}
}
- m.cache.Remove(spaceId)
+ _ = m.cache.Remove(spaceId)
return err
}
diff --git a/pkg/errors/code.go b/pkg/errors/code.go
index fdb94194..08a87d47 100644
--- a/pkg/errors/code.go
+++ b/pkg/errors/code.go
@@ -30,7 +30,7 @@ func (e *codeError) Format(s fmt.State, verb rune) {
}
fallthrough
case 's':
- io.WriteString(s, e.Error())
+ _, _ = io.WriteString(s, e.Error())
case 'q':
fmt.Fprintf(s, "%q", e.Error())
}
diff --git a/pkg/errors/detail.go b/pkg/errors/detail.go
index a82ec3f8..556bf443 100644
--- a/pkg/errors/detail.go
+++ b/pkg/errors/detail.go
@@ -27,7 +27,7 @@ func (w *withDetail) Format(s fmt.State, verb rune) {
}
fallthrough
case 's':
- io.WriteString(s, w.Error())
+ _, _ = io.WriteString(s, w.Error())
case 'q':
fmt.Fprintf(s, "%q", w.Error())
}
diff --git a/pkg/errors/domain.go b/pkg/errors/domain.go
index 35642c34..20e3a25f 100644
--- a/pkg/errors/domain.go
+++ b/pkg/errors/domain.go
@@ -31,7 +31,7 @@ func (w *withDomain) Format(s fmt.State, verb rune) {
}
fallthrough
case 's':
- io.WriteString(s, w.Error())
+ _, _ = io.WriteString(s, w.Error())
case 'q':
fmt.Fprintf(s, "%q", w.Error())
}
diff --git a/pkg/errors/field.go b/pkg/errors/field.go
index 891863f0..2c40756a 100644
--- a/pkg/errors/field.go
+++ b/pkg/errors/field.go
@@ -31,7 +31,7 @@ func (w *withField) Format(s fmt.State, verb rune) {
}
fallthrough
case 's':
- io.WriteString(s, w.Error())
+ _, _ = io.WriteString(s, w.Error())
case 'q':
fmt.Fprintf(s, "%q", w.Error())
}
diff --git a/pkg/errors/hint.go b/pkg/errors/hint.go
index f654d402..f327cd07 100644
--- a/pkg/errors/hint.go
+++ b/pkg/errors/hint.go
@@ -27,7 +27,7 @@ func (w *withHint) Format(s fmt.State, verb rune) {
}
fallthrough
case 's':
- io.WriteString(s, w.Error())
+ _, _ = io.WriteString(s, w.Error())
case 'q':
fmt.Fprintf(s, "%q", w.Error())
}
diff --git a/pkg/errors/id.go b/pkg/errors/id.go
index 9d980488..6483ced3 100644
--- a/pkg/errors/id.go
+++ b/pkg/errors/id.go
@@ -29,7 +29,7 @@ func (w *withId) Format(s fmt.State, verb rune) {
}
fallthrough
case 's':
- io.WriteString(s, w.Error())
+ _, _ = io.WriteString(s, w.Error())
case 'q':
fmt.Fprintf(s, "%q", w.Error())
}
diff --git a/pkg/errors/multi.go b/pkg/errors/multi.go
index d27392c7..f804cbd4 100644
--- a/pkg/errors/multi.go
+++ b/pkg/errors/multi.go
@@ -35,7 +35,7 @@ func (w *withMultiError) Format(s fmt.State, verb rune) {
}
fallthrough
case 's':
- io.WriteString(s, w.Error())
+ _, _ = io.WriteString(s, w.Error())
case 'q':
fmt.Fprintf(s, "%q", w.Error())
}
diff --git a/pkg/errors/source.go b/pkg/errors/source.go
index c43df751..dd5b6354 100644
--- a/pkg/errors/source.go
+++ b/pkg/errors/source.go
@@ -47,7 +47,7 @@ func (w *withSource) Format(s fmt.State, verb rune) {
}
fallthrough
case 's':
- io.WriteString(s, w.Error())
+ _, _ = io.WriteString(s, w.Error())
case 'q':
fmt.Fprintf(s, "%q", w.Error())
}
diff --git a/pkg/errors/status.go b/pkg/errors/status.go
index 04b82612..952995a7 100644
--- a/pkg/errors/status.go
+++ b/pkg/errors/status.go
@@ -32,7 +32,7 @@ func (w *withStatusError) Format(s fmt.State, verb rune) {
}
fallthrough
case 's':
- io.WriteString(s, w.Error())
+ _, _ = io.WriteString(s, w.Error())
case 'q':
fmt.Fprintf(s, "%q", w.Error())
}
diff --git a/pkg/expr/context.go b/pkg/expr/context.go
index 4049d96f..ef653f65 100644
--- a/pkg/expr/context.go
+++ b/pkg/expr/context.go
@@ -51,6 +51,6 @@ func WithEnvKV(ctx context.Context, kv ...interface{}) context.Context {
}
func GetEnv(ctx context.Context) map[string]interface{} {
- ctx, c := getContext(ctx)
+ _, c := getContext(ctx)
return c.Env
}
diff --git a/pkg/extension/manager.go b/pkg/extension/manager.go
index 9de5dc4e..9d4def7c 100644
--- a/pkg/extension/manager.go
+++ b/pkg/extension/manager.go
@@ -55,7 +55,7 @@ func (e *ExtensionConnector) Connect() error {
return nil
}
- conn, err := grpc.Dial(
+ conn, err := grpc.NewClient(
e.Descriptor.Url,
grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithChainUnaryInterceptor(
diff --git a/pkg/extension/manager_client.go b/pkg/extension/manager_client.go
index d15d0dd0..3adbf804 100644
--- a/pkg/extension/manager_client.go
+++ b/pkg/extension/manager_client.go
@@ -16,7 +16,7 @@ type ManagerClient struct {
}
func NewManagerClientWithAddr(addr string) (*ManagerClient, error) {
- cc, err := grpc.Dial(addr,
+ cc, err := grpc.NewClient(addr,
grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithUnaryInterceptor(auth.PrincipalClientInterceptor()),
)
diff --git a/pkg/extension/service/extension.go b/pkg/extension/service/extension.go
index 45ed0524..d64590e3 100644
--- a/pkg/extension/service/extension.go
+++ b/pkg/extension/service/extension.go
@@ -29,7 +29,6 @@ type Extension struct {
setupFunc SetupFunc
Content *content.Content
Logger *zap.Logger
- manager extension.Manager
router extension.ActionRouter
withClient bool
@@ -184,13 +183,13 @@ func (s *Extension) Action(ctx context.Context, in *extension.ActionRequest) (*e
// мы так и не договорились, но проверка появилась
// пусть решает каждое расширение само
//
- //ok, err := extension.CheckInstalled(ctx, s.Content, in.SpaceId, in.EnvId, ext)
- //if err != nil {
+ // ok, err := extension.CheckInstalled(ctx, s.Content, in.SpaceId, in.EnvId, ext)
+ // if err != nil {
// return nil, errors.Wrap(err, "check extension installed")
- //}
- //if !ok {
+ // }
+ // if !ok {
// return nil, errors.New("extension not installed")
- //}
+ // }
if url, err := extension.NewActionURL(in.Action); s.router != nil && err == nil && url != nil && s.isCorrectExtension(ctx, url, in) {
if h, err := s.router(ctx, url, in); err == nil && h != nil {
diff --git a/pkg/extension/service/registrar.go b/pkg/extension/service/registrar.go
index 8a096ef2..28da7d37 100644
--- a/pkg/extension/service/registrar.go
+++ b/pkg/extension/service/registrar.go
@@ -8,7 +8,6 @@ import (
"git.perx.ru/perxis/perxis-go/pkg/extension"
retry "github.com/avast/retry-go/v4"
"go.uber.org/zap"
- "google.golang.org/grpc"
)
const RegistrationDelay = time.Minute
@@ -16,12 +15,11 @@ const RegistrationDelay = time.Minute
// Registrar выполняет действия по регистрации и обновления регистрации расширений в менеджере расширений. Одновременно
// выполняется регистрация одного или нескольких расширений
type Registrar struct {
- addr string
- managerConn *grpc.ClientConn
- manager extension.Manager
- exts []extension.Extension
- logger *zap.Logger
- stopFn func() error
+ addr string
+ manager extension.Manager
+ exts []extension.Extension
+ logger *zap.Logger
+ stopFn func() error
}
func NewRegistrar(addr string, man extension.Manager, exts []extension.Extension, logger *zap.Logger) *Registrar {
@@ -86,7 +84,7 @@ func (reg *Registrar) Start() error {
for {
select {
case <-time.After(registrationDelay):
- reg.register(regCtx, reg.manager, extList)
+ _ = reg.register(regCtx, reg.manager, extList)
registrationDelay = RegistrationDelay
case <-regCtx.Done():
reg.logger.Debug("Stop registration process")
diff --git a/pkg/files/downloader.go b/pkg/files/downloader.go
index 74aa9102..2ec9f00d 100644
--- a/pkg/files/downloader.go
+++ b/pkg/files/downloader.go
@@ -50,7 +50,7 @@ func NewDummyDownloader() Downloader {
func (d *dummyDownloader) Download(dst io.Writer, file *File) error {
// png pixel 10x10
- pixel, err := base64.StdEncoding.DecodeString("iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAFUlEQVR42mNkYPhfz0AEYBxVSF+FAP5FDvcfRYWgAAAAAElFTkSuQmCC")
- _, err = dst.Write(pixel)
+ pixel, _ := base64.StdEncoding.DecodeString("iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAAFUlEQVR42mNkYPhfz0AEYBxVSF+FAP5FDvcfRYWgAAAAAElFTkSuQmCC")
+ _, err := dst.Write(pixel)
return err
}
diff --git a/pkg/filter/filter.go b/pkg/filter/filter.go
index 04ebf36d..d75dc998 100644
--- a/pkg/filter/filter.go
+++ b/pkg/filter/filter.go
@@ -1,6 +1,7 @@
package filter
import (
+ "context"
"fmt"
"reflect"
"strings"
@@ -60,7 +61,7 @@ type FilterHandler struct {
func NewFilterHandler(sch ...*schema.Schema) *FilterHandler {
return &FilterHandler{
schemas: sch,
- //qbuilder: qb,
+ // qbuilder: qb,
}
}
@@ -77,9 +78,7 @@ func (h *FilterHandler) removeFieldPrefix(f string) string {
}
func (h *FilterHandler) AddSchema(sch ...*schema.Schema) *FilterHandler {
- for _, s := range sch {
- h.schemas = append(h.schemas, s)
- }
+ h.schemas = append(h.schemas, sch...)
return h
}
@@ -129,7 +128,7 @@ func (h *FilterHandler) validate(sch *schema.Schema, f *Filter) (err error) {
if f.Value, err = schema.Decode(nil, fld, f.Value); err != nil {
return h.formatErr(f.Field, f.Op, err)
}
- if err = validate.Validate(nil, fld, f.Value); err != nil {
+ if err = validate.Validate(context.Background(), fld, f.Value); err != nil {
return h.formatErr(f.Field, f.Op, err)
}
case In, NotIn:
@@ -377,7 +376,7 @@ func (b *mongoQueryBuilder) field(f string) string {
}
// $text search ??
-//func (b *mongoQueryBuilder) textSearchQuery(filters ...*Filter) string {
+// func (b *mongoQueryBuilder) textSearchQuery(filters ...*Filter) string {
// cnt, notcnt := "", ""
// for _, f := range filters {
// val, ok := f.Value.(string)
@@ -407,4 +406,4 @@ func (b *mongoQueryBuilder) field(f string) string {
// cnt += " " + notcnt
// }
// return cnt
-//}
+// }
diff --git a/pkg/invitations/middleware/caching_middleware.go b/pkg/invitations/middleware/caching_middleware.go
index 5f2a1086..698ee511 100644
--- a/pkg/invitations/middleware/caching_middleware.go
+++ b/pkg/invitations/middleware/caching_middleware.go
@@ -34,7 +34,7 @@ func (m cachingMiddleware) Get(ctx context.Context, invitationId string) (inv *s
}
inv, err = m.next.Get(ctx, invitationId)
if err == nil {
- m.cache.Set(invitationId, inv)
+ _ = m.cache.Set(invitationId, inv)
}
return inv, err
}
@@ -43,7 +43,7 @@ func (m cachingMiddleware) Accept(ctx context.Context, invitationId string, user
err = m.next.Accept(ctx, invitationId, userId)
if err == nil {
- m.cache.Remove(invitationId)
+ _ = m.cache.Remove(invitationId)
}
return err
}
@@ -56,7 +56,7 @@ func (m cachingMiddleware) Delete(ctx context.Context, invitationId string) (err
err = m.next.Delete(ctx, invitationId)
if err == nil {
- m.cache.Remove(invitationId)
+ _ = m.cache.Remove(invitationId)
}
return err
}
diff --git a/pkg/locales/middleware/caching_middleware.go b/pkg/locales/middleware/caching_middleware.go
index 5b370b99..8a79a152 100644
--- a/pkg/locales/middleware/caching_middleware.go
+++ b/pkg/locales/middleware/caching_middleware.go
@@ -25,7 +25,7 @@ func (m cachingMiddleware) Create(ctx context.Context, locale *service.Locale) (
loc, err = m.next.Create(ctx, locale)
if err == nil {
- m.cache.Remove(loc.SpaceID)
+ _ = m.cache.Remove(loc.SpaceID)
}
return loc, err
}
@@ -47,7 +47,7 @@ func (m cachingMiddleware) List(ctx context.Context, spaceId string) (locales []
}
locales, err = m.next.List(ctx, spaceId)
if err == nil {
- m.cache.Set(spaceId, locales)
+ _ = m.cache.Set(spaceId, locales)
}
return locales, err
}
@@ -56,7 +56,7 @@ func (m cachingMiddleware) Delete(ctx context.Context, spaceId string, localeId
err = m.next.Delete(ctx, spaceId, localeId)
if err == nil {
- m.cache.Remove(spaceId)
+ _ = m.cache.Remove(spaceId)
}
return err
}
diff --git a/pkg/members/members.go b/pkg/members/members.go
index 77d5b1c4..3013b1ff 100644
--- a/pkg/members/members.go
+++ b/pkg/members/members.go
@@ -27,9 +27,9 @@ func (r Role) IsPrivileged() bool {
func (r Role) Format(s fmt.State, verb rune) {
switch verb {
case 's':
- s.Write([]byte(r.String()))
+ _, _ = s.Write([]byte(r.String()))
default:
- s.Write([]byte(strconv.Itoa(int(r))))
+ _, _ = s.Write([]byte(strconv.Itoa(int(r))))
}
}
diff --git a/pkg/members/middleware/caching_middleware.go b/pkg/members/middleware/caching_middleware.go
index 0af3f76f..00ddb61a 100644
--- a/pkg/members/middleware/caching_middleware.go
+++ b/pkg/members/middleware/caching_middleware.go
@@ -30,9 +30,9 @@ func (m cachingMiddleware) Set(ctx context.Context, orgId string, userId string,
err = m.next.Set(ctx, orgId, userId, role)
if err == nil {
- m.cache.Remove(makeKey(orgId, userId))
- m.cache.Remove(makeKey(orgId))
- m.cache.Remove(makeKey(userId))
+ _ = m.cache.Remove(makeKey(orgId, userId))
+ _ = m.cache.Remove(makeKey(orgId))
+ _ = m.cache.Remove(makeKey(userId))
}
return err
}
@@ -46,7 +46,7 @@ func (m cachingMiddleware) Get(ctx context.Context, orgId string, userId string)
}
role, err = m.next.Get(ctx, orgId, userId)
if err == nil {
- m.cache.Set(key, role)
+ _ = m.cache.Set(key, role)
}
return role, err
}
@@ -55,9 +55,9 @@ func (m cachingMiddleware) Remove(ctx context.Context, orgId string, userId stri
err = m.next.Remove(ctx, orgId, userId)
if err == nil {
- m.cache.Remove(makeKey(orgId, userId))
- m.cache.Remove(makeKey(orgId))
- m.cache.Remove(makeKey(userId))
+ _ = m.cache.Remove(makeKey(orgId, userId))
+ _ = m.cache.Remove(makeKey(orgId))
+ _ = m.cache.Remove(makeKey(userId))
}
return err
}
@@ -68,8 +68,8 @@ func (m cachingMiddleware) RemoveAll(ctx context.Context, orgId string) (err err
if err == nil {
members, _ := m.ListMembers(ctx, orgId)
for _, member := range members {
- m.cache.Remove(member.UserId)
- m.cache.Remove(makeKey(orgId, member.UserId))
+ _ = m.cache.Remove(member.UserId)
+ _ = m.cache.Remove(makeKey(orgId, member.UserId))
}
}
return err
@@ -83,7 +83,7 @@ func (m cachingMiddleware) ListMembers(ctx context.Context, orgId string) (membe
}
members, err = m.next.ListMembers(ctx, orgId)
if err == nil {
- m.cache.Set(makeKey(orgId), members)
+ _ = m.cache.Set(makeKey(orgId), members)
}
return members, err
}
@@ -96,7 +96,7 @@ func (m cachingMiddleware) ListOrganizations(ctx context.Context, userId string)
}
members, err = m.next.ListOrganizations(ctx, userId)
if err == nil {
- m.cache.Set(makeKey(userId), members)
+ _ = m.cache.Set(makeKey(userId), members)
}
return members, err
}
diff --git a/pkg/members/middleware/caching_middleware_test.go b/pkg/members/middleware/caching_middleware_test.go
index eda7eb3a..ea09d522 100644
--- a/pkg/members/middleware/caching_middleware_test.go
+++ b/pkg/members/middleware/caching_middleware_test.go
@@ -129,6 +129,7 @@ func TestMembersCache(t *testing.T) {
mbrs.On("Get", mock.Anything, orgId, userId).Return(members.RoleOwner, nil).Once()
v1, err := svc.Get(ctx, orgId, userId)
+ require.NoError(t, err)
v2, err := svc.Get(ctx, orgId, userId)
require.NoError(t, err)
diff --git a/pkg/operation/service.go b/pkg/operation/service.go
index 7561b52a..5456e56a 100644
--- a/pkg/operation/service.go
+++ b/pkg/operation/service.go
@@ -129,7 +129,7 @@ func (s *service) Create(ctx context.Context, desc string, fn func(ctx context.C
// Создаем новый контекст для фоновой операции без Deadline
opCtx, cancel := context.WithCancel(auth.WithPrincipal(context.Background(), principal))
op.SetCancelFunc(cancel)
- s.Set(opCtx, op)
+ _ = s.Set(opCtx, op)
go func() {
response, err := fn(opCtx)
@@ -137,11 +137,11 @@ func (s *service) Create(ctx context.Context, desc string, fn func(ctx context.C
op.SetError(err)
}
if response != nil {
- op.SetResponse(response)
+ _ = op.SetResponse(response)
}
op.SetModifiedAt(time.Now())
op.SetDone(true)
- s.Set(opCtx, op)
+ _ = s.Set(opCtx, op)
}()
return op, nil
diff --git a/pkg/organizations/middleware/caching_middleware.go b/pkg/organizations/middleware/caching_middleware.go
index 18649df9..ecee2727 100644
--- a/pkg/organizations/middleware/caching_middleware.go
+++ b/pkg/organizations/middleware/caching_middleware.go
@@ -34,7 +34,7 @@ func (m cachingMiddleware) Get(ctx context.Context, orgId string) (organization
}
organization, err = m.next.Get(ctx, orgId)
if err == nil {
- m.cache.Set(orgId, organization)
+ _ = m.cache.Set(orgId, organization)
}
return organization, err
}
@@ -43,7 +43,7 @@ func (m cachingMiddleware) Update(ctx context.Context, org *service.Organization
err = m.next.Update(ctx, org)
if err == nil {
- m.cache.Remove(org.ID)
+ _ = m.cache.Remove(org.ID)
}
return err
}
@@ -52,7 +52,7 @@ func (m cachingMiddleware) Delete(ctx context.Context, orgId string) (err error)
err = m.next.Delete(ctx, orgId)
if err == nil {
- m.cache.Remove(orgId)
+ _ = m.cache.Remove(orgId)
}
return err
}
diff --git a/pkg/organizations/middleware/caching_middleware_test.go b/pkg/organizations/middleware/caching_middleware_test.go
index 19cd14d5..3f302620 100644
--- a/pkg/organizations/middleware/caching_middleware_test.go
+++ b/pkg/organizations/middleware/caching_middleware_test.go
@@ -58,6 +58,7 @@ func TestOrganizationsCache(t *testing.T) {
orgs.On("Update", mock.Anything, mock.Anything).Return(nil).Once()
err = svc.Update(ctx, &organizations.Organization{ID: orgId, Name: "OrganizationUPD"})
+ require.NoError(t, err)
orgs.On("Get", mock.Anything, orgId).Return(&organizations.Organization{ID: orgId, Name: "OrganizationUPD"}, nil).Once()
@@ -83,6 +84,7 @@ func TestOrganizationsCache(t *testing.T) {
orgs.On("Delete", mock.Anything, mock.Anything).Return(nil).Once()
err = svc.Delete(ctx, orgId)
+ require.NoError(t, err)
orgs.On("Get", mock.Anything, orgId).Return(nil, errNotFound).Once()
diff --git a/pkg/references/field.go b/pkg/references/field.go
index c98ed229..85482b9e 100644
--- a/pkg/references/field.go
+++ b/pkg/references/field.go
@@ -22,9 +22,7 @@ func (p ReferenceParameters) Type() field.Type { return &ReferenceType{} }
func (p ReferenceParameters) Clone(reset bool) field.Parameters {
if p.AllowedCollections != nil {
cols := make([]string, 0, len(p.AllowedCollections))
- for _, c := range p.AllowedCollections {
- cols = append(cols, c)
- }
+ cols = append(cols, p.AllowedCollections...)
p.AllowedCollections = cols
}
return &p
diff --git a/pkg/references/field_test.go b/pkg/references/field_test.go
index a51cb2ac..8891c5a4 100644
--- a/pkg/references/field_test.go
+++ b/pkg/references/field_test.go
@@ -255,7 +255,7 @@ func TestReferenceField_Validate(t *testing.T) {
refs := []*Reference{
{ID: "111", CollectionID: "media"},
}
- err := validate.Validate(nil, f, refs)
+ err := validate.Validate(context.Background(), f, refs)
require.NoError(t, err)
})
t.Run("Limit exceeded", func(t *testing.T) {
@@ -264,7 +264,7 @@ func TestReferenceField_Validate(t *testing.T) {
{ID: "111", CollectionID: "media"},
{ID: "222", CollectionID: "media"},
}
- err := validate.Validate(nil, f, refs)
+ err := validate.Validate(context.Background(), f, refs)
require.Error(t, err)
require.Contains(t, err.Error(), "validation error: maximum elements number is 1")
})
@@ -273,13 +273,13 @@ func TestReferenceField_Validate(t *testing.T) {
t.Run("Correct", func(t *testing.T) {
f := Field(nil, validate.Required())
ref := &Reference{ID: "111", CollectionID: "media"}
- err := validate.Validate(nil, f, ref)
+ err := validate.Validate(context.Background(), f, ref)
require.NoError(t, err)
})
t.Run("Empty", func(t *testing.T) {
f := Field(nil, validate.Required())
ref := &Reference{}
- err := validate.Validate(nil, f, ref)
+ err := validate.Validate(context.Background(), f, ref)
require.Error(t, err)
require.Contains(t, err.Error(), "validation error: value is required")
})
diff --git a/pkg/roles/middleware/caching_middleware.go b/pkg/roles/middleware/caching_middleware.go
index 3f46087e..8537544f 100644
--- a/pkg/roles/middleware/caching_middleware.go
+++ b/pkg/roles/middleware/caching_middleware.go
@@ -29,7 +29,7 @@ type cachingMiddleware struct {
func (m cachingMiddleware) Create(ctx context.Context, role *service.Role) (rl *service.Role, err error) {
rl, err = m.next.Create(ctx, role)
if err == nil {
- m.cache.Remove(rl.SpaceID)
+ _ = m.cache.Remove(rl.SpaceID)
}
return rl, err
}
@@ -42,7 +42,7 @@ func (m cachingMiddleware) Get(ctx context.Context, spaceId string, roleId strin
}
rl, err = m.next.Get(ctx, spaceId, roleId)
if err == nil {
- m.cache.Set(key, rl)
+ _ = m.cache.Set(key, rl)
}
return rl, err
}
@@ -54,7 +54,7 @@ func (m cachingMiddleware) List(ctx context.Context, spaceId string) (roles []*s
}
roles, err = m.next.List(ctx, spaceId)
if err == nil {
- m.cache.Set(spaceId, roles)
+ _ = m.cache.Set(spaceId, roles)
}
return roles, err
}
@@ -63,8 +63,8 @@ func (m cachingMiddleware) Update(ctx context.Context, role *service.Role) (err
err = m.next.Update(ctx, role)
if err == nil {
key := makeKey(role.SpaceID, role.ID)
- m.cache.Remove(key)
- m.cache.Remove(role.SpaceID)
+ _ = m.cache.Remove(key)
+ _ = m.cache.Remove(role.SpaceID)
}
return err
}
@@ -73,8 +73,8 @@ func (m cachingMiddleware) Delete(ctx context.Context, spaceId string, roleId st
err = m.next.Delete(ctx, spaceId, roleId)
if err == nil {
key := makeKey(spaceId, roleId)
- m.cache.Remove(key)
- m.cache.Remove(spaceId)
+ _ = m.cache.Remove(key)
+ _ = m.cache.Remove(spaceId)
}
return err
}
diff --git a/pkg/schema/field/array_test.go b/pkg/schema/field/array_test.go
index 964075c3..b2948e1b 100644
--- a/pkg/schema/field/array_test.go
+++ b/pkg/schema/field/array_test.go
@@ -54,7 +54,7 @@ func TestArrayField_Decode(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := Decode(nil, tt.field, tt.data)
+ got, err := Decode(context.Background(), tt.field, tt.data)
if tt.wantErr {
require.Error(t, err)
assert.EqualError(t, err, tt.want.(string), fmt.Sprintf("Decode() error = %v, want %v", err, tt.want.(string)))
@@ -92,7 +92,7 @@ func TestArrayField_Encode(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := Encode(nil, tt.field, tt.data)
+ got, err := Encode(context.Background(), tt.field, tt.data)
if tt.wantErr {
require.Error(t, err)
assert.EqualError(t, err, tt.want.(string), fmt.Sprintf("Decode() error = %v, want %v", err, tt.want.(string)))
diff --git a/pkg/schema/field/boolean_test.go b/pkg/schema/field/boolean_test.go
index aaa09dce..857201f3 100644
--- a/pkg/schema/field/boolean_test.go
+++ b/pkg/schema/field/boolean_test.go
@@ -1,6 +1,7 @@
package field
import (
+ "context"
"fmt"
"testing"
@@ -27,7 +28,7 @@ func TestBooleanField_Decode(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := Decode(nil, tt.field, tt.data)
+ got, err := Decode(context.Background(), tt.field, tt.data)
if tt.wantErr {
require.Error(t, err)
assert.EqualError(t, err, tt.want.(string), fmt.Sprintf("Decode() error = %v, want %v", err, tt.want.(string)))
@@ -59,7 +60,7 @@ func TestBooleanField_Encode(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := Encode(nil, tt.field, tt.data)
+ got, err := Encode(context.Background(), tt.field, tt.data)
if tt.wantErr {
require.Error(t, err)
assert.EqualError(t, err, tt.want.(string), fmt.Sprintf("Encode() error = %v, want %v", err, tt.want.(string)))
diff --git a/pkg/schema/field/field.go b/pkg/schema/field/field.go
index 32b17574..6edf18f5 100644
--- a/pkg/schema/field/field.go
+++ b/pkg/schema/field/field.go
@@ -63,8 +63,6 @@ type Field struct {
Options Options `json:"options,omitempty"` // Дополнительные опции
Condition string `json:"condition,omitempty"` // Условие отображения поля
AdditionalValues bool `json:"additional_values,omitempty"` // Разрешает дополнительные значения вне ограничений правил
-
- prepared bool
}
// TODO: Replace with Named field???
@@ -477,7 +475,7 @@ func (f *Field) mergeField(fld *Field) error {
func (f *Field) Merge(fields ...*Field) error {
for _, fld := range fields {
- f.mergeField(fld)
+ _ = f.mergeField(fld)
}
return nil
}
diff --git a/pkg/schema/field/field_json.go b/pkg/schema/field/field_json.go
index dfb21204..dfd7f85a 100644
--- a/pkg/schema/field/field_json.go
+++ b/pkg/schema/field/field_json.go
@@ -63,7 +63,7 @@ func (f *Field) UnmarshalJSON(b []byte) error {
*f = Field(j.FieldData)
f.Params = params
- f.Prepare()
+ _ = f.Prepare()
return nil
}
diff --git a/pkg/schema/field/loader.go b/pkg/schema/field/loader.go
index 583ecc2c..3beb0dde 100644
--- a/pkg/schema/field/loader.go
+++ b/pkg/schema/field/loader.go
@@ -22,7 +22,7 @@ type multiLoader struct {
func (c *multiLoader) Load(ctx context.Context, ref string) (fs []*Field, err error) {
for _, l := range c.loaders {
- if f, err := l.Load(nil, ref); err == nil {
+ if f, err := l.Load(ctx, ref); err == nil {
return f, nil
}
}
diff --git a/pkg/schema/field/location_test.go b/pkg/schema/field/location_test.go
index 5b8206b6..2680dec7 100644
--- a/pkg/schema/field/location_test.go
+++ b/pkg/schema/field/location_test.go
@@ -1,6 +1,7 @@
package field
import (
+ "context"
"reflect"
"testing"
)
@@ -114,7 +115,7 @@ func TestLocationField_Decode(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := Decode(nil, tt.field, tt.data)
+ got, err := Decode(context.Background(), tt.field, tt.data)
if (err != nil) != tt.wantErr {
t.Errorf("Decode() error = %v, wantErr %v", err, tt.wantErr)
return
@@ -196,7 +197,7 @@ func TestLocationField_Encode(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := Encode(nil, tt.field, tt.data)
+ got, err := Encode(context.Background(), tt.field, tt.data)
if (err != nil) != tt.wantErr {
t.Errorf("Encode() error = %v, wantErr %v", err, tt.wantErr)
return
diff --git a/pkg/schema/field/object_test.go b/pkg/schema/field/object_test.go
index 2ada594b..a85d4488 100644
--- a/pkg/schema/field/object_test.go
+++ b/pkg/schema/field/object_test.go
@@ -1,6 +1,7 @@
package field
import (
+ "context"
"fmt"
"testing"
"time"
@@ -77,7 +78,7 @@ func TestObjectField_Decode(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := Decode(nil, tt.field, tt.data)
+ got, err := Decode(context.Background(), tt.field, tt.data)
if tt.wantErr {
require.Error(t, err)
assert.EqualError(t, err, tt.want.(string), fmt.Sprintf("Decode() error = %v, want %v", err, tt.want.(string)))
@@ -152,7 +153,7 @@ func TestObjectField_Encode(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := Encode(nil, tt.field, tt.data)
+ got, err := Encode(context.Background(), tt.field, tt.data)
if tt.wantErr {
require.Error(t, err)
assert.EqualError(t, err, tt.want.(string), fmt.Sprintf("Encode() error = %v, want %v", err, tt.want.(string)))
diff --git a/pkg/schema/field/primary_key_test.go b/pkg/schema/field/primary_key_test.go
index f74f32ca..5e11ff00 100644
--- a/pkg/schema/field/primary_key_test.go
+++ b/pkg/schema/field/primary_key_test.go
@@ -1,6 +1,7 @@
package field
import (
+ "context"
"reflect"
"testing"
)
@@ -18,7 +19,7 @@ func TestPrimaryKeyField_Decode(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := Decode(nil, tt.field, tt.data)
+ got, err := Decode(context.Background(), tt.field, tt.data)
if (err != nil) != tt.wantErr {
t.Errorf("Decode() error = %v, wantErr %v", err, tt.wantErr)
return
@@ -43,7 +44,7 @@ func TestPrimaryKeyField_Encode(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := Encode(nil, tt.field, tt.data)
+ got, err := Encode(context.Background(), tt.field, tt.data)
if (err != nil) != tt.wantErr {
t.Errorf("Decode() error = %v, wantErr %v", err, tt.wantErr)
return
diff --git a/pkg/schema/field/string_test.go b/pkg/schema/field/string_test.go
index d0fca29b..16b7538f 100644
--- a/pkg/schema/field/string_test.go
+++ b/pkg/schema/field/string_test.go
@@ -1,6 +1,7 @@
package field
import (
+ "context"
"reflect"
"testing"
)
@@ -18,7 +19,7 @@ func TestStringField_Decode(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := Decode(nil, tt.field, tt.data)
+ got, err := Decode(context.Background(), tt.field, tt.data)
if (err != nil) != tt.wantErr {
t.Errorf("Decode() error = %v, wantErr %v", err, tt.wantErr)
return
@@ -43,7 +44,7 @@ func TestStringField_Encode(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := Encode(nil, tt.field, tt.data)
+ got, err := Encode(context.Background(), tt.field, tt.data)
if (err != nil) != tt.wantErr {
t.Errorf("Decode() error = %v, wantErr %v", err, tt.wantErr)
return
diff --git a/pkg/schema/field/time_test.go b/pkg/schema/field/time_test.go
index f9a8fb44..d315850f 100644
--- a/pkg/schema/field/time_test.go
+++ b/pkg/schema/field/time_test.go
@@ -1,6 +1,7 @@
package field
import (
+ "context"
"reflect"
"testing"
"time"
@@ -21,7 +22,7 @@ func TestTimeField_Decode(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := Decode(nil, tt.field, tt.data)
+ got, err := Decode(context.Background(), tt.field, tt.data)
if (err != nil) != tt.wantErr {
t.Errorf("Decode() error = %v, wantErr %v", err, tt.wantErr)
return
@@ -48,7 +49,7 @@ func TestTimeField_Encode(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := Encode(nil, tt.field, tt.data)
+ got, err := Encode(context.Background(), tt.field, tt.data)
if (err != nil) != tt.wantErr {
t.Errorf("Encode() error = %v, wantErr %v", err, tt.wantErr)
return
diff --git a/pkg/schema/field/unknown.go b/pkg/schema/field/unknown.go
index f28a51cd..ffe41226 100644
--- a/pkg/schema/field/unknown.go
+++ b/pkg/schema/field/unknown.go
@@ -50,8 +50,7 @@ func (UnknownType) ConvertParameters(p Parameters) (Parameters, error) {
}
func Unknown(typ string, params json.RawMessage, o ...interface{}) *Field {
- var pc ParametersConverter
- pc = unknownType
+ pc := unknownType
_ = pc
return NewField(&UnknownParameters{Typ: typ, Params: params}, o...)
}
diff --git a/pkg/schema/modify/default.go b/pkg/schema/modify/default.go
index 66ce6b89..637a0ff8 100644
--- a/pkg/schema/modify/default.go
+++ b/pkg/schema/modify/default.go
@@ -14,7 +14,7 @@ type defaultValue struct {
func (d *defaultValue) Prepare(f *field.Field) error {
var err error
- d.Value, err = field.Decode(nil, f, d.Value)
+ d.Value, err = field.Decode(context.Background(), f, d.Value)
return err
}
diff --git a/pkg/schema/modify/default_test.go b/pkg/schema/modify/default_test.go
index b99630dc..6ea9d110 100644
--- a/pkg/schema/modify/default_test.go
+++ b/pkg/schema/modify/default_test.go
@@ -1,6 +1,7 @@
package modify
import (
+ "context"
"testing"
"time"
@@ -45,9 +46,9 @@ func TestDefault(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := field.Decode(nil, tt.field, tt.data)
+ got, err := field.Decode(context.Background(), tt.field, tt.data)
require.NoError(t, err)
- got, _, err = Modify(nil, tt.field, got)
+ got, _, err = Modify(context.Background(), tt.field, got)
if (err != nil) != tt.wantErr {
t.Errorf("Modify() error = %v, wantErr %v", err, tt.wantErr)
return
diff --git a/pkg/schema/modify/string_test.go b/pkg/schema/modify/string_test.go
index ef90f7f6..2f645126 100644
--- a/pkg/schema/modify/string_test.go
+++ b/pkg/schema/modify/string_test.go
@@ -1,6 +1,7 @@
package modify
import (
+ "context"
"reflect"
"testing"
@@ -25,7 +26,7 @@ func TestTrimSpace(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, _, err := Modify(nil, tt.field, tt.data)
+ got, _, err := Modify(context.Background(), tt.field, tt.data)
if (err != nil) != tt.wantErr {
t.Errorf("Modify() error = %v, wantErr %v", err, tt.wantErr)
return
@@ -65,7 +66,7 @@ func TestModify(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- _, _, err := Modify(nil, tt.field, tt.data)
+ _, _, err := Modify(context.Background(), tt.field, tt.data)
if tt.wantErr {
require.Error(t, err)
assert.EqualError(t, err, tt.error)
diff --git a/pkg/schema/modify/value_test.go b/pkg/schema/modify/value_test.go
index 9878fc70..eb3b9a99 100644
--- a/pkg/schema/modify/value_test.go
+++ b/pkg/schema/modify/value_test.go
@@ -1,6 +1,7 @@
package modify
import (
+ "context"
"reflect"
"testing"
@@ -50,7 +51,7 @@ func TestValue(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, _, err := Modify(nil, tt.field, tt.data)
+ got, _, err := Modify(context.Background(), tt.field, tt.data)
if (err != nil) != tt.wantErr {
t.Errorf("Modify() error = %v, wantErr %v", err, tt.wantErr)
return
diff --git a/pkg/schema/schema.go b/pkg/schema/schema.go
index e4529824..a99f7b53 100644
--- a/pkg/schema/schema.go
+++ b/pkg/schema/schema.go
@@ -222,7 +222,7 @@ func (s *Schema) Introspect(ctx context.Context, data map[string]interface{}) (m
}
if parent != nil && name != "" {
- field.AddField(parent, name, fld)
+ _ = field.AddField(parent, name, fld)
}
ctx = context.WithValue(ctx, parentFieldCtxKey{}, fld)
diff --git a/pkg/schema/test/object_test.go b/pkg/schema/test/object_test.go
index 8ba60d9d..f17b6451 100644
--- a/pkg/schema/test/object_test.go
+++ b/pkg/schema/test/object_test.go
@@ -65,7 +65,7 @@ func TestNumberField_JSON(t *testing.T) {
b, err := json.MarshalIndent(fld, "", " ")
require.NoError(t, err)
- //fmt.Println(string(b))
+ // fmt.Println(string(b))
res := field.NewField(nil)
err = json.Unmarshal(b, res)
@@ -187,7 +187,7 @@ func TestSchema_JSON(t *testing.T) {
b, err := json.MarshalIndent(sch, "", " ")
require.NoError(t, err)
- //fmt.Println(string(b))
+ // fmt.Println(string(b))
res := schema.New()
err = json.Unmarshal(b, res)
@@ -703,7 +703,7 @@ func TestSchema_Modify(t *testing.T) {
)
in := map[string]interface{}{"last_name": "Curie", "name": "Marie"}
- _, _, err := modify.Modify(nil, sch, in)
+ _, _, err := modify.Modify(context.Background(), sch, in)
require.NoError(t, err)
}
@@ -724,7 +724,7 @@ func TestSchema_Validate(t *testing.T) {
)
in := map[string]interface{}{"info": map[string]interface{}{"time": time.Now()}, "name": "Name"}
- err := validate.Validate(nil, sch, in)
+ err := validate.Validate(context.Background(), sch, in)
require.NoError(t, err)
}
@@ -768,9 +768,9 @@ func TestSchema_ValidateErrors(t *testing.T) {
)
in := map[string]interface{}{"a": map[string]interface{}{"num2": 20, "num3": 5, "str1": "123456", "str2": "123", "str3": "some"}}
- decoded, err := schema.Decode(nil, sch, in)
+ decoded, err := schema.Decode(context.Background(), sch, in)
require.NoError(t, err)
- err = validate.Validate(nil, sch, decoded)
+ err = validate.Validate(context.Background(), sch, decoded)
require.Error(t, err)
require.Contains(t, err.Error(), "validation error")
var merr *multierror.Error
@@ -784,11 +784,11 @@ func TestSchema_ValidateEmptyObject(t *testing.T) {
"num1", field.Number(field.NumberFormatInt, validate.Required()),
)
- res, err := schema.Decode(nil, sch, nil)
+ res, err := schema.Decode(context.Background(), sch, nil)
require.NoError(t, err)
- res, _, err = modify.Modify(nil, sch, res)
+ res, _, err = modify.Modify(context.Background(), sch, res)
require.NoError(t, err)
- err = validate.Validate(nil, sch, res)
+ err = validate.Validate(context.Background(), sch, res)
require.NoError(t, err, "поля объекта nil не проверяются")
}
{
@@ -796,11 +796,11 @@ func TestSchema_ValidateEmptyObject(t *testing.T) {
"num1", field.Number(field.NumberFormatInt, validate.Required()),
)
- res, err := schema.Decode(nil, sch, map[string]interface{}{})
+ res, err := schema.Decode(context.Background(), sch, map[string]interface{}{})
require.NoError(t, err)
- res, _, err = modify.Modify(nil, sch, res)
+ res, _, err = modify.Modify(context.Background(), sch, res)
require.NoError(t, err)
- err = validate.Validate(nil, sch, res)
+ err = validate.Validate(context.Background(), sch, res)
require.Error(t, err, "поля пустого объекта проверяются")
}
{
@@ -808,11 +808,11 @@ func TestSchema_ValidateEmptyObject(t *testing.T) {
"num1", field.Number(field.NumberFormatInt, validate.Required()),
)
- res, err := schema.Decode(nil, sch, map[string]interface{}{"a": "sss"})
+ res, err := schema.Decode(context.Background(), sch, map[string]interface{}{"a": "sss"})
require.NoError(t, err)
- res, _, err = modify.Modify(nil, sch, res)
+ res, _, err = modify.Modify(context.Background(), sch, res)
require.NoError(t, err)
- err = validate.Validate(nil, sch, res)
+ err = validate.Validate(context.Background(), sch, res)
require.Error(t, err, "поля объекта с некорректными данными проверяются")
}
@@ -821,11 +821,11 @@ func TestSchema_ValidateEmptyObject(t *testing.T) {
"num1", field.Number(field.NumberFormatInt, validate.Required()),
).AddOptions(modify.Default(map[string]interface{}{}))
- res, err := schema.Decode(nil, sch, nil)
+ res, err := schema.Decode(context.Background(), sch, nil)
require.NoError(t, err)
- res, _, err = modify.Modify(nil, sch, res)
+ res, _, err = modify.Modify(context.Background(), sch, res)
require.NoError(t, err)
- err = validate.Validate(nil, sch, res)
+ err = validate.Validate(context.Background(), sch, res)
require.Error(t, err, "поля nil объекта Default данными проверяются")
}
}
@@ -839,9 +839,9 @@ func TestSchema_ModificationErrors(t *testing.T) {
)
in := map[string]interface{}{"a": map[string]interface{}{"num1": 20, "num3": 5, "str1": "123456", "str2": "123", "str3": "some"}}
- decoded, err := schema.Decode(nil, sch, in)
+ decoded, err := schema.Decode(context.Background(), sch, in)
require.NoError(t, err)
- _, _, err = modify.Modify(nil, sch, decoded)
+ _, _, err = modify.Modify(context.Background(), sch, decoded)
require.Error(t, err)
require.Contains(t, err.Error(), "modification error")
var merr *multierror.Error
@@ -868,10 +868,10 @@ func TestSchema_UnknownJSON(t *testing.T) {
assert.Equal(t, "unknown", s1.GetType().Name(), "Схема неизвестного типа должна определяться как unknown")
in := map[string]interface{}{"info": map[string]interface{}{"time": time.Now()}, "name": "Name"}
- out, err := field.Decode(nil, s1, in)
+ out, err := field.Decode(context.Background(), s1, in)
require.NoError(t, err)
assert.Equal(t, in, out, "Данные неизвестного типа не изменяются при декодировании")
- err = validate.Validate(nil, s1, in)
+ err = validate.Validate(context.Background(), s1, in)
require.NoError(t, err, "Данные неизвестного типа не валидируются вглубь")
b, err = json.Marshal(s1)
@@ -1421,9 +1421,9 @@ func TestSchema_Introspect(t *testing.T) {
assert.Nil(t, fld, fmt.Sprintf("поле '%s' должно отсутствовать в схеме", f))
}
- //b, err := json.MarshalIndent(got.Schema, "", " ")
- //require.NoError(t, err)
- //fmt.Printf("---\n%s\n---\n", b)
+ // b, err := json.MarshalIndent(got.Schema, "", " ")
+ // require.NoError(t, err)
+ // fmt.Printf("---\n%s\n---\n", b)
assert.Equal(t, tt.want, gotValue)
})
}
@@ -1526,11 +1526,11 @@ func TestSchema_Load(t *testing.T) {
)
schema.SetDefaultLoader(loader)
- err := sch.Load(nil)
+ err := sch.Load(context.Background())
require.NoError(t, err)
- //b, _ := json.MarshalIndent(sch, "", " ")
- //fmt.Println(string(b))
+ // b, _ := json.MarshalIndent(sch, "", " ")
+ // fmt.Println(string(b))
assert.NotNil(t, sch.GetField("s1"))
assert.NotNil(t, sch.GetField("s2"))
@@ -1579,7 +1579,7 @@ func TestSchema_WithIncludesCircle(t *testing.T) {
schema.SetDefaultLoader(loader)
sch := schema.NewFromField(field.Object().WithIncludes("f1"))
- err := sch.Load(nil)
+ err := sch.Load(context.Background())
require.Error(t, err)
assert.EqualError(t, err, "limit for included fields exceeded")
}
diff --git a/pkg/schema/validate/array_test.go b/pkg/schema/validate/array_test.go
index 57b99445..ec9e9d81 100644
--- a/pkg/schema/validate/array_test.go
+++ b/pkg/schema/validate/array_test.go
@@ -1,6 +1,7 @@
package validate
import (
+ "context"
"testing"
"git.perx.ru/perxis/perxis-go/pkg/schema/field"
@@ -28,9 +29,9 @@ func TestArray(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := field.Decode(nil, tt.field, tt.data)
+ got, err := field.Decode(context.Background(), tt.field, tt.data)
require.NoError(t, err)
- err = Validate(nil, tt.field, got)
+ err = Validate(context.Background(), tt.field, got)
if (err != nil) != tt.wantErr {
t.Errorf("Validate() error = %v, wantErr %v", err, tt.wantErr)
return
@@ -67,7 +68,7 @@ func TestArrayValidate(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- err := Validate(nil, tt.field, tt.data)
+ err := Validate(context.Background(), tt.field, tt.data)
if tt.wantErr {
require.Error(t, err)
assert.EqualError(t, err, tt.error)
diff --git a/pkg/schema/validate/enum_test.go b/pkg/schema/validate/enum_test.go
index a473dc01..a4c301e1 100644
--- a/pkg/schema/validate/enum_test.go
+++ b/pkg/schema/validate/enum_test.go
@@ -1,6 +1,7 @@
package validate
import (
+ "context"
"testing"
"git.perx.ru/perxis/perxis-go/pkg/schema/field"
@@ -57,9 +58,9 @@ func TestEnum(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := field.Decode(nil, tt.field, tt.data)
+ got, err := field.Decode(context.Background(), tt.field, tt.data)
require.NoError(t, err)
- err = Validate(nil, tt.field, got)
+ err = Validate(context.Background(), tt.field, got)
if (err != nil) != tt.wantErr {
t.Errorf("Validate() error = %v, wantErr %v", err, tt.wantErr)
return
diff --git a/pkg/schema/validate/number_test.go b/pkg/schema/validate/number_test.go
index edbd218c..08f69401 100644
--- a/pkg/schema/validate/number_test.go
+++ b/pkg/schema/validate/number_test.go
@@ -1,6 +1,7 @@
package validate
import (
+ "context"
"testing"
"git.perx.ru/perxis/perxis-go/pkg/schema/field"
@@ -40,9 +41,9 @@ func TestNumber(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := field.Decode(nil, tt.field, tt.data)
+ got, err := field.Decode(context.Background(), tt.field, tt.data)
require.NoError(t, err)
- err = Validate(nil, tt.field, got)
+ err = Validate(context.Background(), tt.field, got)
if (err != nil) != tt.wantErr {
t.Errorf("Validate() error = %v, wantErr %v", err, tt.wantErr)
return
@@ -86,7 +87,7 @@ func TestNumberValidate(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- err := Validate(nil, tt.field, tt.data)
+ err := Validate(context.Background(), tt.field, tt.data)
if tt.wantErr {
require.Error(t, err)
assert.EqualError(t, err, tt.error)
diff --git a/pkg/schema/validate/readonly_test.go b/pkg/schema/validate/readonly_test.go
index ee8ca9ba..379d906e 100644
--- a/pkg/schema/validate/readonly_test.go
+++ b/pkg/schema/validate/readonly_test.go
@@ -1,6 +1,7 @@
package validate
import (
+ "context"
"testing"
"git.perx.ru/perxis/perxis-go/pkg/schema/field"
@@ -20,9 +21,9 @@ func TestReadonly(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := field.Decode(nil, tt.field, tt.data)
+ got, err := field.Decode(context.Background(), tt.field, tt.data)
require.NoError(t, err)
- err = Validate(nil, tt.field, got)
+ err = Validate(context.Background(), tt.field, got)
if (err != nil) != tt.wantErr {
t.Errorf("Validate() error = %v, wantErr %v", err, tt.wantErr)
return
diff --git a/pkg/schema/validate/required_test.go b/pkg/schema/validate/required_test.go
index 41a03ab5..b22a3748 100644
--- a/pkg/schema/validate/required_test.go
+++ b/pkg/schema/validate/required_test.go
@@ -1,6 +1,7 @@
package validate
import (
+ "context"
"testing"
"time"
@@ -21,7 +22,7 @@ func TestRequired(t *testing.T) {
{"Boolean no value", field.Bool(Required()), nil, true},
{"Boolean", field.Bool(Required()), false, false},
{"Location: no value", field.Location(Required()), nil, true},
- //{"Location: empty", field.Location(Required()), map[string]interface{}{}, true}, // не имеет смысла, при Decode вернется ошибка если объект пустой
+ // {"Location: empty", field.Location(Required()), map[string]interface{}{}, true}, // не имеет смысла, при Decode вернется ошибка если объект пустой
{"Location: not empty", field.Location(Required()), &field.GeoObject{Address: "addr"}, false},
{"Number (int) no value", field.Number(field.NumberFormatInt, Required()), nil, true},
{"Number (int) empty", field.Number(field.NumberFormatInt, Required()), 0, false},
@@ -41,9 +42,9 @@ func TestRequired(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := field.Decode(nil, tt.field, tt.data)
+ got, err := field.Decode(context.Background(), tt.field, tt.data)
require.NoError(t, err)
- err = Validate(nil, tt.field, got)
+ err = Validate(context.Background(), tt.field, got)
if (err != nil) != tt.wantErr {
t.Errorf("Validate() error = %v, wantErr %v", err, tt.wantErr)
return
diff --git a/pkg/schema/validate/string_test.go b/pkg/schema/validate/string_test.go
index 9d48cf4d..0fac9bb7 100644
--- a/pkg/schema/validate/string_test.go
+++ b/pkg/schema/validate/string_test.go
@@ -1,6 +1,7 @@
package validate
import (
+ "context"
"testing"
"git.perx.ru/perxis/perxis-go/pkg/schema/field"
@@ -112,9 +113,9 @@ func TestString(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- got, err := field.Decode(nil, tt.field, tt.data)
+ got, err := field.Decode(context.Background(), tt.field, tt.data)
require.NoError(t, err)
- err = Validate(nil, tt.field, got)
+ err = Validate(context.Background(), tt.field, got)
if tt.wantErr {
require.Error(t, err)
}
@@ -151,7 +152,7 @@ func TestStringValidate(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
- err := Validate(nil, tt.field, tt.data)
+ err := Validate(context.Background(), tt.field, tt.data)
if tt.wantErr {
require.Error(t, err)
assert.EqualError(t, err, tt.error)
diff --git a/pkg/schema/walk/walk.go b/pkg/schema/walk/walk.go
index 4757742f..73bd1f92 100644
--- a/pkg/schema/walk/walk.go
+++ b/pkg/schema/walk/walk.go
@@ -93,7 +93,7 @@ func (m *Walker) datawalk(w *WalkContext) (err error) {
path := w.GetPath()
fn := m.DefaultFn
- fieldCfg, _ := m.config.Fields[path]
+ fieldCfg := m.config.Fields[path]
if fieldCfg.Fn != nil {
fn = fieldCfg.Fn
diff --git a/pkg/schemaloader/loader_test.go b/pkg/schemaloader/loader_test.go
index f796fd8f..b7cc32b2 100644
--- a/pkg/schemaloader/loader_test.go
+++ b/pkg/schemaloader/loader_test.go
@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/assert"
)
-//func Test_Load(t *testing.T) {
+// func Test_Load(t *testing.T) {
//
// const (
// spaceID = "SpaceID"
@@ -107,10 +107,10 @@ import (
// require.Nil(t, schemas, "Метод должен вернуть nil")
// collSvs.AssertExpectations(t)
// })
-//}
+// }
func Test_parseRef(t *testing.T) {
- ctx := WithContext(nil, &LoaderContext{SpaceID: "spc", EnvID: "env"})
+ ctx := WithContext(context.Background(), &LoaderContext{SpaceID: "spc", EnvID: "env"})
tests := []struct {
ref string
ctx context.Context
diff --git a/pkg/setup/client.go b/pkg/setup/client.go
index cc103faf..d465670e 100644
--- a/pkg/setup/client.go
+++ b/pkg/setup/client.go
@@ -115,7 +115,7 @@ func (s *Setup) InstallClient(ctx context.Context, c ClientConfig) error {
client.SpaceID = s.SpaceID
if s.IsForce() {
- s.content.Clients.Delete(ctx, s.SpaceID, c.client.ID)
+ _ = s.content.Clients.Delete(ctx, s.SpaceID, c.client.ID)
_, err := s.content.Clients.Create(ctx, c.client)
return err
}
diff --git a/pkg/spaces/middleware/caching_middleware.go b/pkg/spaces/middleware/caching_middleware.go
index 03e220e2..46c9ef46 100644
--- a/pkg/spaces/middleware/caching_middleware.go
+++ b/pkg/spaces/middleware/caching_middleware.go
@@ -30,7 +30,7 @@ func (m cachingMiddleware) Create(ctx context.Context, space *service.Space) (sp
sp, err = m.next.Create(ctx, space)
if err == nil {
- m.cache.Remove(orgKey(sp.OrgID))
+ _ = m.cache.Remove(orgKey(sp.OrgID))
}
return sp, err
}
@@ -43,7 +43,7 @@ func (m cachingMiddleware) Get(ctx context.Context, spaceId string) (sp *service
}
sp, err = m.next.Get(ctx, spaceId)
if err == nil {
- m.cache.Set(spaceId, sp)
+ _ = m.cache.Set(spaceId, sp)
}
return sp, err
}
@@ -56,9 +56,9 @@ func (m cachingMiddleware) List(ctx context.Context, orgId string) (spaces []*se
}
spaces, err = m.next.List(ctx, orgId)
if err == nil {
- m.cache.Set(orgKey(orgId), spaces)
+ _ = m.cache.Set(orgKey(orgId), spaces)
for _, s := range spaces {
- m.cache.Set(s.ID, s)
+ _ = m.cache.Set(s.ID, s)
}
}
return spaces, err
@@ -75,9 +75,9 @@ func (m cachingMiddleware) Update(ctx context.Context, space *service.Space) (er
value, e := m.cache.Get(space.ID)
if e == nil {
space := value.(*service.Space)
- m.cache.Remove(orgKey(space.OrgID))
+ _ = m.cache.Remove(orgKey(space.OrgID))
}
- m.cache.Remove(space.ID)
+ _ = m.cache.Remove(space.ID)
}
return err
}
@@ -89,9 +89,9 @@ func (m cachingMiddleware) UpdateConfig(ctx context.Context, spaceId string, con
value, e := m.cache.Get(spaceId)
if e == nil {
space := value.(*service.Space)
- m.cache.Remove(orgKey(space.OrgID))
+ _ = m.cache.Remove(orgKey(space.OrgID))
}
- m.cache.Remove(spaceId)
+ _ = m.cache.Remove(spaceId)
}
return err
}
@@ -117,9 +117,9 @@ func (m cachingMiddleware) Delete(ctx context.Context, spaceId string) (err erro
value, e := m.cache.Get(spaceId)
if e == nil {
space := value.(*service.Space)
- m.cache.Remove(orgKey(space.OrgID))
+ _ = m.cache.Remove(orgKey(space.OrgID))
}
- m.cache.Remove(spaceId)
+ _ = m.cache.Remove(spaceId)
}
return err
}
@@ -130,11 +130,11 @@ func (m cachingMiddleware) Transfer(ctx context.Context, spaceID, transferToOrg
value, e := m.cache.Get(spaceID)
if e == nil {
space := value.(*service.Space)
- m.cache.Remove(orgKey(space.OrgID))
- m.cache.Remove(orgKey(space.TransferToOrg))
+ _ = m.cache.Remove(orgKey(space.OrgID))
+ _ = m.cache.Remove(orgKey(space.TransferToOrg))
}
- m.cache.Remove(spaceID)
- m.cache.Remove(transferToOrg)
+ _ = m.cache.Remove(spaceID)
+ _ = m.cache.Remove(transferToOrg)
}
return err
}
@@ -145,10 +145,10 @@ func (m cachingMiddleware) AbortTransfer(ctx context.Context, spaceID string) er
value, e := m.cache.Get(spaceID)
if e == nil {
space := value.(*service.Space)
- m.cache.Remove(orgKey(space.OrgID))
- m.cache.Remove(orgKey(space.TransferToOrg))
+ _ = m.cache.Remove(orgKey(space.OrgID))
+ _ = m.cache.Remove(orgKey(space.TransferToOrg))
}
- m.cache.Remove(spaceID)
+ _ = m.cache.Remove(spaceID)
}
return err
}
@@ -163,11 +163,11 @@ func (m cachingMiddleware) Move(ctx context.Context, spaceID, orgID string) erro
value, e := m.cache.Get(spaceID)
if e == nil {
space := value.(*service.Space)
- m.cache.Remove(orgKey(space.OrgID))
- m.cache.Remove(orgKey(space.TransferToOrg))
+ _ = m.cache.Remove(orgKey(space.OrgID))
+ _ = m.cache.Remove(orgKey(space.TransferToOrg))
}
- m.cache.Remove(spaceID)
- m.cache.Remove(orgID)
+ _ = m.cache.Remove(spaceID)
+ _ = m.cache.Remove(orgID)
}
return err
}
diff --git a/pkg/users/middleware/caching_middleware.go b/pkg/users/middleware/caching_middleware.go
index 8397bfd3..ee0bf4a0 100644
--- a/pkg/users/middleware/caching_middleware.go
+++ b/pkg/users/middleware/caching_middleware.go
@@ -34,9 +34,9 @@ func (m cachingMiddleware) Get(ctx context.Context, userId string) (user *servic
}
user, err = m.next.Get(ctx, userId)
if err == nil {
- m.cache.Set(user.ID, user)
+ _ = m.cache.Set(user.ID, user)
for _, i := range user.Identities {
- m.cache.Set(i, user)
+ _ = m.cache.Set(i, user)
}
}
return user, err
@@ -52,9 +52,9 @@ func (m cachingMiddleware) Update(ctx context.Context, update *service.User) (er
value, e := m.cache.Get(update.ID)
if err == nil && e == nil {
usr := value.(*service.User)
- m.cache.Remove(usr.ID)
+ _ = m.cache.Remove(usr.ID)
for _, i := range usr.Identities {
- m.cache.Remove(i)
+ _ = m.cache.Remove(i)
}
}
return err
@@ -66,9 +66,9 @@ func (m cachingMiddleware) Delete(ctx context.Context, userId string) (err error
value, e := m.cache.Get(userId)
if err == nil && e == nil {
usr := value.(*service.User)
- m.cache.Remove(usr.ID)
+ _ = m.cache.Remove(usr.ID)
for _, i := range usr.Identities {
- m.cache.Remove(i)
+ _ = m.cache.Remove(i)
}
}
return err
@@ -82,9 +82,9 @@ func (m cachingMiddleware) GetByIdentity(ctx context.Context, identity string) (
}
user, err = m.next.GetByIdentity(ctx, identity)
if err == nil {
- m.cache.Set(user.ID, user)
+ _ = m.cache.Set(user.ID, user)
for _, i := range user.Identities {
- m.cache.Set(i, user)
+ _ = m.cache.Set(i, user)
}
}
return user, err
--
GitLab