From 97c4019ad4b84d3eb877fc53c1261fa1073c9b24 Mon Sep 17 00:00:00 2001
From: Alena Petraki <alena.petraki@gmail.com>
Date: Thu, 13 Apr 2023 18:03:55 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B8?=
=?UTF-8?q?=D0=BC=D0=BF=D0=BE=D1=80=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg/{role => roles}/mocks/Roles.go | 2 +-
pkg/{role => roles}/service.go | 21 ++++---------------
.../transport/client.microgen.go | 2 +-
.../transport/endpoints.microgen.go | 0
.../transport/exchanges.microgen.go | 2 +-
.../transport/grpc/client.microgen.go | 2 +-
.../protobuf_endpoint_converters.microgen.go | 2 +-
.../grpc/protobuf_type_converters.microgen.go | 4 ++--
.../transport/grpc/server.microgen.go | 2 +-
.../transport/server.microgen.go | 2 +-
10 files changed, 13 insertions(+), 26 deletions(-)
rename pkg/{role => roles}/mocks/Roles.go (98%)
rename pkg/{role => roles}/service.go (72%)
rename pkg/{role => roles}/transport/client.microgen.go (97%)
rename pkg/{role => roles}/transport/endpoints.microgen.go (100%)
rename pkg/{role => roles}/transport/exchanges.microgen.go (93%)
rename pkg/{role => roles}/transport/grpc/client.microgen.go (95%)
rename pkg/{role => roles}/transport/grpc/protobuf_endpoint_converters.microgen.go (98%)
rename pkg/{role => roles}/transport/grpc/protobuf_type_converters.microgen.go (96%)
rename pkg/{role => roles}/transport/grpc/server.microgen.go (97%)
rename pkg/{role => roles}/transport/server.microgen.go (97%)
diff --git a/pkg/role/mocks/Roles.go b/pkg/roles/mocks/Roles.go
similarity index 98%
rename from pkg/role/mocks/Roles.go
rename to pkg/roles/mocks/Roles.go
index 1520567e..d7e61236 100644
--- a/pkg/role/mocks/Roles.go
+++ b/pkg/roles/mocks/Roles.go
@@ -5,7 +5,7 @@ package mocks
import (
"context"
- roles "git.perx.ru/perxis/perxis-go/pkg/role"
+ roles "git.perx.ru/perxis/perxis-go/pkg/roles"
"github.com/stretchr/testify/mock"
)
diff --git a/pkg/role/service.go b/pkg/roles/service.go
similarity index 72%
rename from pkg/role/service.go
rename to pkg/roles/service.go
index a819f8b2..4606e3dd 100644
--- a/pkg/role/service.go
+++ b/pkg/roles/service.go
@@ -1,26 +1,17 @@
package roles
-//go:generate gowrap gen -i Roles -t ../../templates/middleware/middleware -o service/middleware.go
-//go:generate gowrap gen -i Roles -t ../../templates/middleware/error_log -o service/error_logging_middleware.go
-//go:generate gowrap gen -i Roles -t ../../templates/middleware/access_log -o service/logging_middleware.go
-//go:generate gowrap gen -i Roles -t ../../templates/middleware/recovery -o service/recovering_middleware.go
-//go:generate gowrap gen -i Roles -t ../../templates/middleware/telemetry -o service/telemetry_middleware.go
-
import (
"context"
+ "git.perx.ru/perxis/perxis-go/pkg/data"
"git.perx.ru/perxis/perxis-go/pkg/environments"
"git.perx.ru/perxis/perxis-go/pkg/permission"
- "git.perx.ru/perxis/perxis-go/pkg/util"
)
const (
AnonymousRole = "anonymous"
AuthorizedRole = "authorized"
ViewRole = "view"
-
- // Deprecated
- AuthorizedClientsRole = "authorized_clients"
)
type Role struct {
@@ -44,17 +35,13 @@ type Role struct {
}
// @microgen grpc
-// @protobuf git.perx.ru/perxis/perxis/proto/roles
+// @protobuf git.perx.ru/perxis/perxis-go/proto/roles
// @grpc-addr content.roles.Roles
type Roles interface {
Create(ctx context.Context, role *Role) (created *Role, err error)
-
Get(ctx context.Context, spaceId, roleId string) (role *Role, err error)
-
List(ctx context.Context, spaceId string) (roles []*Role, err error)
-
Update(ctx context.Context, role *Role) (err error)
-
Delete(ctx context.Context, spaceId, roleId string) (err error)
}
@@ -68,7 +55,7 @@ func (r Role) CanAccessEnvironment(ctx context.Context, service environments.Env
r.Environments = []string{environments.DefaultEnvironment}
}
- if util.Contains(envID, r.Environments) {
+ if data.Contains(envID, r.Environments) {
return true
}
@@ -80,7 +67,7 @@ func (r Role) CanAccessEnvironment(ctx context.Context, service environments.Env
aliases := append(e.Aliases, e.ID)
for _, ce := range r.Environments {
- if util.Contains(ce, aliases) {
+ if data.Contains(ce, aliases) {
return true
}
}
diff --git a/pkg/role/transport/client.microgen.go b/pkg/roles/transport/client.microgen.go
similarity index 97%
rename from pkg/role/transport/client.microgen.go
rename to pkg/roles/transport/client.microgen.go
index 2848241c..9635f619 100644
--- a/pkg/role/transport/client.microgen.go
+++ b/pkg/roles/transport/client.microgen.go
@@ -5,7 +5,7 @@ package transport
import (
"context"
"errors"
- roles "git.perx.ru/perxis/perxis/services/roles"
+ roles "git.perx.ru/perxis/perxis-go/pkg/roles"
codes "google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
)
diff --git a/pkg/role/transport/endpoints.microgen.go b/pkg/roles/transport/endpoints.microgen.go
similarity index 100%
rename from pkg/role/transport/endpoints.microgen.go
rename to pkg/roles/transport/endpoints.microgen.go
diff --git a/pkg/role/transport/exchanges.microgen.go b/pkg/roles/transport/exchanges.microgen.go
similarity index 93%
rename from pkg/role/transport/exchanges.microgen.go
rename to pkg/roles/transport/exchanges.microgen.go
index fe23ae36..bb7d8e50 100644
--- a/pkg/role/transport/exchanges.microgen.go
+++ b/pkg/roles/transport/exchanges.microgen.go
@@ -2,7 +2,7 @@
package transport
-import roles "git.perx.ru/perxis/perxis/services/roles"
+import roles "git.perx.ru/perxis/perxis-go/pkg/roles"
type (
CreateRequest struct {
diff --git a/pkg/role/transport/grpc/client.microgen.go b/pkg/roles/transport/grpc/client.microgen.go
similarity index 95%
rename from pkg/role/transport/grpc/client.microgen.go
rename to pkg/roles/transport/grpc/client.microgen.go
index 4b35d647..747b1a8c 100644
--- a/pkg/role/transport/grpc/client.microgen.go
+++ b/pkg/roles/transport/grpc/client.microgen.go
@@ -3,7 +3,7 @@
package transportgrpc
import (
- transport "git.perx.ru/perxis/perxis-go/pkg/role/transport"
+ transport "git.perx.ru/perxis/perxis-go/pkg/roles/transport"
pb "git.perx.ru/perxis/perxis-go/proto/roles"
grpckit "github.com/go-kit/kit/transport/grpc"
empty "github.com/golang/protobuf/ptypes/empty"
diff --git a/pkg/role/transport/grpc/protobuf_endpoint_converters.microgen.go b/pkg/roles/transport/grpc/protobuf_endpoint_converters.microgen.go
similarity index 98%
rename from pkg/role/transport/grpc/protobuf_endpoint_converters.microgen.go
rename to pkg/roles/transport/grpc/protobuf_endpoint_converters.microgen.go
index a8bbe1d1..aa66bf57 100644
--- a/pkg/role/transport/grpc/protobuf_endpoint_converters.microgen.go
+++ b/pkg/roles/transport/grpc/protobuf_endpoint_converters.microgen.go
@@ -7,8 +7,8 @@ import (
"context"
"errors"
+ transport "git.perx.ru/perxis/perxis-go/pkg/roles/transport"
pb "git.perx.ru/perxis/perxis-go/proto/roles"
- transport "git.perx.ru/perxis/perxis/services/roles/transport"
empty "github.com/golang/protobuf/ptypes/empty"
)
diff --git a/pkg/role/transport/grpc/protobuf_type_converters.microgen.go b/pkg/roles/transport/grpc/protobuf_type_converters.microgen.go
similarity index 96%
rename from pkg/role/transport/grpc/protobuf_type_converters.microgen.go
rename to pkg/roles/transport/grpc/protobuf_type_converters.microgen.go
index 7b849f67..10f207e5 100644
--- a/pkg/role/transport/grpc/protobuf_type_converters.microgen.go
+++ b/pkg/roles/transport/grpc/protobuf_type_converters.microgen.go
@@ -5,10 +5,10 @@
package transportgrpc
import (
+ permission "git.perx.ru/perxis/perxis-go/pkg/permission"
+ service "git.perx.ru/perxis/perxis-go/pkg/roles"
commonpb "git.perx.ru/perxis/perxis-go/proto/common"
pb "git.perx.ru/perxis/perxis-go/proto/roles"
- permission "git.perx.ru/perxis/perxis/pkg/permission"
- service "git.perx.ru/perxis/perxis/services/roles"
)
func PtrRoleToProto(role *service.Role) (*pb.Role, error) {
diff --git a/pkg/role/transport/grpc/server.microgen.go b/pkg/roles/transport/grpc/server.microgen.go
similarity index 97%
rename from pkg/role/transport/grpc/server.microgen.go
rename to pkg/roles/transport/grpc/server.microgen.go
index 1c808a29..dc012c75 100644
--- a/pkg/role/transport/grpc/server.microgen.go
+++ b/pkg/roles/transport/grpc/server.microgen.go
@@ -4,8 +4,8 @@
package transportgrpc
import (
+ transport "git.perx.ru/perxis/perxis-go/pkg/roles/transport"
pb "git.perx.ru/perxis/perxis-go/proto/roles"
- transport "git.perx.ru/perxis/perxis/services/roles/transport"
grpc "github.com/go-kit/kit/transport/grpc"
empty "github.com/golang/protobuf/ptypes/empty"
context "golang.org/x/net/context"
diff --git a/pkg/role/transport/server.microgen.go b/pkg/roles/transport/server.microgen.go
similarity index 97%
rename from pkg/role/transport/server.microgen.go
rename to pkg/roles/transport/server.microgen.go
index 9bb87682..88078336 100644
--- a/pkg/role/transport/server.microgen.go
+++ b/pkg/roles/transport/server.microgen.go
@@ -4,7 +4,7 @@ package transport
import (
"context"
- roles "git.perx.ru/perxis/perxis/services/roles"
+ roles "git.perx.ru/perxis/perxis-go/pkg/roles"
endpoint "github.com/go-kit/kit/endpoint"
)
--
GitLab