From 28d800792e347fcffe390776701c4f37da2553c2 Mon Sep 17 00:00:00 2001
From: Alena Petraki <alena.petraki@gmail.com>
Date: Fri, 14 Apr 2023 11:41:49 +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/auth/principal.go | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pkg/auth/principal.go b/pkg/auth/principal.go
index f2a3948f..78da09cb 100644
--- a/pkg/auth/principal.go
+++ b/pkg/auth/principal.go
@@ -3,11 +3,11 @@ package auth
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/members"
"git.perx.ru/perxis/perxis-go/pkg/permission"
"git.perx.ru/perxis/perxis-go/pkg/roles"
- "git.perx.ru/perxis/perxis/util"
)
type Principal interface {
@@ -62,7 +62,7 @@ func hasEnvironmentAccess(ctx context.Context, envsrv environments.Environments,
}
for _, ce := range envs {
- if envID == ce || util.GlobMatch(envID, ce) {
+ if envID == ce || data.GlobMatch(envID, ce) {
return true
}
}
@@ -76,7 +76,7 @@ func hasEnvironmentAccess(ctx context.Context, envsrv environments.Environments,
for _, ce := range envs {
for _, al := range aliases {
- if al == ce || util.GlobMatch(al, ce) {
+ if al == ce || data.GlobMatch(al, ce) {
return true
}
}
--
GitLab