структура Cache была заменена на интерфейс

pkg/clients/middleware/caching_middleware.go

@@ -12,7 +12,7 @@ func makeKey(ss ...string) string {
 	return strings.Join(ss, "-")
 }
 
-func CachingMiddleware(cache *cache.Cache) Middleware {
+func CachingMiddleware(cache cache.Cache) Middleware {
 	return func(next service.Clients) service.Clients {
 		return &cachingMiddleware{
 			cache: cache,
@@ -22,7 +22,7 @@ func CachingMiddleware(cache *cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache *cache.Cache
+	cache cache.Cache
 	next  service.Clients
 }
 

pkg/collaborators/middleware/caching_middleware.go

@@ -12,7 +12,7 @@ func makeKey(ss ...string) string {
 	return strings.Join(ss, "-")
 }
 
-func CachingMiddleware(cache *cache.Cache) Middleware {
+func CachingMiddleware(cache cache.Cache) Middleware {
 	return func(next service.Collaborators) service.Collaborators {
 		return &cachingMiddleware{
 			cache: cache,
@@ -22,7 +22,7 @@ func CachingMiddleware(cache *cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache *cache.Cache
+	cache cache.Cache
 	next  service.Collaborators
 }
 

pkg/collections/middleware/caching_middleware.go

@@ -19,7 +19,7 @@ func makeKey(spaceId, envId, collectionId string, disableSchemaIncludes bool) st
 	return s
 }
 
-func CachingMiddleware(cache *cache.Cache, envs envService.Environments) Middleware {
+func CachingMiddleware(cache cache.Cache, envs envService.Environments) Middleware {
 	return func(next service.Collections) service.Collections {
 		return &cachingMiddleware{
 			cache: cache,
@@ -30,7 +30,7 @@ func CachingMiddleware(cache *cache.Cache, envs envService.Environments) Middlew
 }
 
 type cachingMiddleware struct {
-	cache *cache.Cache
+	cache cache.Cache
 	next  service.Collections
 	envs  envService.Environments
 }

pkg/environments/middleware/caching_middleware.go

@@ -12,7 +12,7 @@ func makeKey(ss ...string) string {
 	return strings.Join(ss, "-")
 }
 
-func CachingMiddleware(cache *cache.Cache) Middleware {
+func CachingMiddleware(cache cache.Cache) Middleware {
 	return func(next service.Environments) service.Environments {
 		return &cachingMiddleware{
 			cache: cache,
@@ -22,7 +22,7 @@ func CachingMiddleware(cache *cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache *cache.Cache
+	cache cache.Cache
 	next  service.Environments
 }
 

pkg/invitations/middleware/caching_middleware.go

@@ -8,7 +8,7 @@ import (
 	services "git.perx.ru/perxis/perxis-go/pkg/options"
 )
 
-func CachingMiddleware(cache *cache.Cache) Middleware {
+func CachingMiddleware(cache cache.Cache) Middleware {
 	return func(next service.Invitations) service.Invitations {
 		return &cachingMiddleware{
 			cache: cache,
@@ -18,7 +18,7 @@ func CachingMiddleware(cache *cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache *cache.Cache
+	cache cache.Cache
 	next  service.Invitations
 }
 

pkg/items/middleware/caching_middleware.go

@@ -13,7 +13,7 @@ func makeKey(ss ...string) string {
 	return strings.Join(ss, "-")
 }
 
-func CachingMiddleware(cache, cachePublished *cache.Cache, envs envService.Environments) Middleware {
+func CachingMiddleware(cache, cachePublished cache.Cache, envs envService.Environments) Middleware {
 	return func(next service.Items) service.Items {
 		return &cachingMiddleware{
 			cache:          cache,
@@ -25,8 +25,8 @@ func CachingMiddleware(cache, cachePublished *cache.Cache, envs envService.Envir
 }
 
 type cachingMiddleware struct {
-	cache          *cache.Cache
-	cachePublished *cache.Cache
+	cache          cache.Cache
+	cachePublished cache.Cache
 	envs           envService.Environments
 	service.Items
 }

pkg/locales/middleware/caching_middleware.go

@@ -7,7 +7,7 @@ import (
 	service "git.perx.ru/perxis/perxis-go/pkg/locales"
 )
 
-func CachingMiddleware(cache *cache.Cache) Middleware {
+func CachingMiddleware(cache cache.Cache) Middleware {
 	return func(next service.Locales) service.Locales {
 		return &cachingMiddleware{
 			cache: cache,
@@ -17,7 +17,7 @@ func CachingMiddleware(cache *cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache *cache.Cache
+	cache cache.Cache
 	next  service.Locales
 }
 

pkg/members/middleware/caching_middleware.go

@@ -12,7 +12,7 @@ func makeKey(ss ...string) string {
 	return strings.Join(ss, "-")
 }
 
-func CachingMiddleware(cache *cache.Cache) Middleware {
+func CachingMiddleware(cache cache.Cache) Middleware {
 	return func(next service.Members) service.Members {
 		return &cachingMiddleware{
 			cache: cache,
@@ -22,7 +22,7 @@ func CachingMiddleware(cache *cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache *cache.Cache
+	cache cache.Cache
 	next  service.Members
 }
 

pkg/organizations/middleware/caching_middleware.go

@@ -8,7 +8,7 @@ import (
 	service "git.perx.ru/perxis/perxis-go/pkg/organizations"
 )
 
-func CachingMiddleware(cache *cache.Cache) Middleware {
+func CachingMiddleware(cache cache.Cache) Middleware {
 	return func(next service.Organizations) service.Organizations {
 		return &cachingMiddleware{
 			cache: cache,
@@ -18,7 +18,7 @@ func CachingMiddleware(cache *cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache *cache.Cache
+	cache cache.Cache
 	next  service.Organizations
 }
 

pkg/roles/middleware/caching_middleware.go

@@ -12,7 +12,7 @@ func makeKey(ss ...string) string {
 	return strings.Join(ss, "-")
 }
 
-func CachingMiddleware(cache *cache.Cache) Middleware {
+func CachingMiddleware(cache cache.Cache) Middleware {
 	return func(next service.Roles) service.Roles {
 		return &cachingMiddleware{
 			cache: cache,
@@ -22,7 +22,7 @@ func CachingMiddleware(cache *cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache *cache.Cache
+	cache cache.Cache
 	next  service.Roles
 }
 

pkg/spaces/middleware/caching_middleware.go

@@ -9,7 +9,7 @@ import (
 
 func orgKey(orgID string) string { return "org-" + orgID }
 
-func CachingMiddleware(cache *cache.Cache) Middleware {
+func CachingMiddleware(cache cache.Cache) Middleware {
 	return func(next service.Spaces) service.Spaces {
 		m := &cachingMiddleware{
 			cache: cache,
@@ -21,7 +21,7 @@ func CachingMiddleware(cache *cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache *cache.Cache
+	cache cache.Cache
 	next  service.Spaces
 }
 

pkg/users/middleware/caching_middleware.go

@@ -8,7 +8,7 @@ import (
 	service "git.perx.ru/perxis/perxis-go/pkg/users"
 )
 
-func CachingMiddleware(cache *cache.Cache) Middleware {
+func CachingMiddleware(cache cache.Cache) Middleware {
 	return func(next service.Users) service.Users {
 		return &cachingMiddleware{
 			cache: cache,
@@ -18,7 +18,7 @@ func CachingMiddleware(cache *cache.Cache) Middleware {
 }
 
 type cachingMiddleware struct {
-	cache *cache.Cache
+	cache cache.Cache
 	next  service.Users
 }