From 48faa88055f8377baecb8394f33b08e7c75607e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Rodr=C3=ADguez?= Date: Tue, 25 Jun 2024 11:31:53 +0200 Subject: [PATCH] chore(authz): Move authz to pkg (#1030) Signed-off-by: Javier Rodriguez --- app/controlplane/cmd/wire.go | 2 +- app/controlplane/cmd/wire_gen.go | 2 +- app/controlplane/internal/server/grpc.go | 4 ++-- app/controlplane/internal/service/cascredential.go | 2 +- app/controlplane/internal/service/organization.go | 2 +- app/controlplane/internal/service/user.go | 2 +- app/controlplane/internal/usercontext/apitoken_middleware.go | 2 +- .../usercontext/currentorganization_middleware_test.go | 2 +- app/controlplane/{internal => pkg}/authz/authz.go | 0 .../{internal => pkg}/authz/authz_integration_test.go | 2 +- app/controlplane/{internal => pkg}/authz/authz_test.go | 0 .../{internal => pkg}/authz/middleware/middleware.go | 2 +- .../{internal => pkg}/authz/middleware/middleware_test.go | 4 ++-- .../{internal => pkg}/authz/middleware/mocks/Enforcer.go | 2 +- app/controlplane/{internal => pkg}/authz/model.conf | 0 app/controlplane/pkg/biz/apitoken.go | 2 +- app/controlplane/pkg/biz/apitoken_integration_test.go | 2 +- app/controlplane/pkg/biz/membership.go | 2 +- app/controlplane/pkg/biz/membership_integration_test.go | 2 +- app/controlplane/pkg/biz/organization.go | 2 +- app/controlplane/pkg/biz/organization_integration_test.go | 2 +- app/controlplane/pkg/biz/orginvitation.go | 2 +- app/controlplane/pkg/biz/orginvitation_integration_test.go | 2 +- app/controlplane/pkg/biz/testhelpers/database.go | 2 +- app/controlplane/pkg/biz/testhelpers/wire.go | 2 +- app/controlplane/pkg/biz/testhelpers/wire_gen.go | 2 +- app/controlplane/pkg/biz/user.go | 2 +- app/controlplane/pkg/biz/user_integration_test.go | 2 +- app/controlplane/pkg/data/ent/membership.go | 2 +- app/controlplane/pkg/data/ent/membership/membership.go | 2 +- app/controlplane/pkg/data/ent/membership/where.go | 2 +- app/controlplane/pkg/data/ent/membership_create.go | 2 +- app/controlplane/pkg/data/ent/membership_update.go | 2 +- app/controlplane/pkg/data/ent/mutation.go | 2 +- app/controlplane/pkg/data/ent/orginvitation.go | 2 +- app/controlplane/pkg/data/ent/orginvitation/orginvitation.go | 2 +- app/controlplane/pkg/data/ent/orginvitation/where.go | 2 +- app/controlplane/pkg/data/ent/orginvitation_create.go | 2 +- app/controlplane/pkg/data/ent/orginvitation_update.go | 2 +- app/controlplane/pkg/data/ent/schema/membership.go | 2 +- app/controlplane/pkg/data/ent/schema/orginvitation.go | 2 +- app/controlplane/pkg/data/membership.go | 2 +- app/controlplane/pkg/data/orginvitation.go | 2 +- 43 files changed, 42 insertions(+), 42 deletions(-) rename app/controlplane/{internal => pkg}/authz/authz.go (100%) rename app/controlplane/{internal => pkg}/authz/authz_integration_test.go (97%) rename app/controlplane/{internal => pkg}/authz/authz_test.go (100%) rename app/controlplane/{internal => pkg}/authz/middleware/middleware.go (98%) rename app/controlplane/{internal => pkg}/authz/middleware/middleware_test.go (97%) rename app/controlplane/{internal => pkg}/authz/middleware/mocks/Enforcer.go (93%) rename app/controlplane/{internal => pkg}/authz/model.conf (100%) diff --git a/app/controlplane/cmd/wire.go b/app/controlplane/cmd/wire.go index 776c9c631..04bd1a01f 100644 --- a/app/controlplane/cmd/wire.go +++ b/app/controlplane/cmd/wire.go @@ -21,11 +21,11 @@ package main import ( - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1" "github.com/chainloop-dev/chainloop/app/controlplane/internal/dispatcher" "github.com/chainloop-dev/chainloop/app/controlplane/internal/server" "github.com/chainloop-dev/chainloop/app/controlplane/internal/service" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data" "github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1" diff --git a/app/controlplane/cmd/wire_gen.go b/app/controlplane/cmd/wire_gen.go index e7f17e699..c1195c0ba 100644 --- a/app/controlplane/cmd/wire_gen.go +++ b/app/controlplane/cmd/wire_gen.go @@ -7,11 +7,11 @@ package main import ( - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1" "github.com/chainloop-dev/chainloop/app/controlplane/internal/dispatcher" "github.com/chainloop-dev/chainloop/app/controlplane/internal/server" "github.com/chainloop-dev/chainloop/app/controlplane/internal/service" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data" "github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1" diff --git a/app/controlplane/internal/server/grpc.go b/app/controlplane/internal/server/grpc.go index 5754ff3fa..fef14a861 100644 --- a/app/controlplane/internal/server/grpc.go +++ b/app/controlplane/internal/server/grpc.go @@ -22,10 +22,10 @@ import ( "regexp" v1 "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" - authzMiddleware "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz/middleware" conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1" "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/attjwtmiddleware" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" + authzMiddleware "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz/middleware" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/jwt/user" diff --git a/app/controlplane/internal/service/cascredential.go b/app/controlplane/internal/service/cascredential.go index 83ef1db5d..816059aa0 100644 --- a/app/controlplane/internal/service/cascredential.go +++ b/app/controlplane/internal/service/cascredential.go @@ -19,9 +19,9 @@ import ( "context" pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" errors "github.com/go-kratos/kratos/v2/errors" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" casJWT "github.com/chainloop-dev/chainloop/internal/robotaccount/cas" ) diff --git a/app/controlplane/internal/service/organization.go b/app/controlplane/internal/service/organization.go index 9b848a7a7..d8acda16c 100644 --- a/app/controlplane/internal/service/organization.go +++ b/app/controlplane/internal/service/organization.go @@ -19,7 +19,7 @@ import ( "context" pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" ) diff --git a/app/controlplane/internal/service/user.go b/app/controlplane/internal/service/user.go index 9552b3ad7..2d55b17fd 100644 --- a/app/controlplane/internal/service/user.go +++ b/app/controlplane/internal/service/user.go @@ -21,7 +21,7 @@ import ( "google.golang.org/protobuf/types/known/timestamppb" pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" errors "github.com/go-kratos/kratos/v2/errors" ) diff --git a/app/controlplane/internal/usercontext/apitoken_middleware.go b/app/controlplane/internal/usercontext/apitoken_middleware.go index 974ed1d8e..466b99bf3 100644 --- a/app/controlplane/internal/usercontext/apitoken_middleware.go +++ b/app/controlplane/internal/usercontext/apitoken_middleware.go @@ -24,8 +24,8 @@ import ( "github.com/go-kratos/kratos/v2/log" "github.com/golang-jwt/jwt/v4" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/attjwtmiddleware" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/jwt/apitoken" "github.com/go-kratos/kratos/v2/middleware" diff --git a/app/controlplane/internal/usercontext/currentorganization_middleware_test.go b/app/controlplane/internal/usercontext/currentorganization_middleware_test.go index 8a4b6219f..19fac2a73 100644 --- a/app/controlplane/internal/usercontext/currentorganization_middleware_test.go +++ b/app/controlplane/internal/usercontext/currentorganization_middleware_test.go @@ -20,7 +20,7 @@ import ( "io" "testing" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" bizMocks "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz/mocks" userjwtbuilder "github.com/chainloop-dev/chainloop/app/controlplane/pkg/jwt/user" diff --git a/app/controlplane/internal/authz/authz.go b/app/controlplane/pkg/authz/authz.go similarity index 100% rename from app/controlplane/internal/authz/authz.go rename to app/controlplane/pkg/authz/authz.go diff --git a/app/controlplane/internal/authz/authz_integration_test.go b/app/controlplane/pkg/authz/authz_integration_test.go similarity index 97% rename from app/controlplane/internal/authz/authz_integration_test.go rename to app/controlplane/pkg/authz/authz_integration_test.go index 2fefd2c7c..cf061980c 100644 --- a/app/controlplane/internal/authz/authz_integration_test.go +++ b/app/controlplane/pkg/authz/authz_integration_test.go @@ -21,7 +21,7 @@ import ( "time" "github.com/cenkalti/backoff/v4" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz/testhelpers" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/app/controlplane/internal/authz/authz_test.go b/app/controlplane/pkg/authz/authz_test.go similarity index 100% rename from app/controlplane/internal/authz/authz_test.go rename to app/controlplane/pkg/authz/authz_test.go diff --git a/app/controlplane/internal/authz/middleware/middleware.go b/app/controlplane/pkg/authz/middleware/middleware.go similarity index 98% rename from app/controlplane/internal/authz/middleware/middleware.go rename to app/controlplane/pkg/authz/middleware/middleware.go index 06a59edb7..d90514ce9 100644 --- a/app/controlplane/internal/authz/middleware/middleware.go +++ b/app/controlplane/pkg/authz/middleware/middleware.go @@ -22,8 +22,8 @@ import ( errorsAPI "github.com/go-kratos/kratos/v2/errors" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/go-kratos/kratos/v2/log" "github.com/go-kratos/kratos/v2/middleware" "github.com/go-kratos/kratos/v2/transport" diff --git a/app/controlplane/internal/authz/middleware/middleware_test.go b/app/controlplane/pkg/authz/middleware/middleware_test.go similarity index 97% rename from app/controlplane/internal/authz/middleware/middleware_test.go rename to app/controlplane/pkg/authz/middleware/middleware_test.go index c9cd4a090..dc5887e0b 100644 --- a/app/controlplane/internal/authz/middleware/middleware_test.go +++ b/app/controlplane/pkg/authz/middleware/middleware_test.go @@ -20,9 +20,9 @@ import ( "io" "testing" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz/middleware/mocks" "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz/middleware/mocks" "github.com/go-kratos/kratos/v2/errors" "github.com/go-kratos/kratos/v2/log" "github.com/go-kratos/kratos/v2/transport" diff --git a/app/controlplane/internal/authz/middleware/mocks/Enforcer.go b/app/controlplane/pkg/authz/middleware/mocks/Enforcer.go similarity index 93% rename from app/controlplane/internal/authz/middleware/mocks/Enforcer.go rename to app/controlplane/pkg/authz/middleware/mocks/Enforcer.go index 98ae27f7a..511070d26 100644 --- a/app/controlplane/internal/authz/middleware/mocks/Enforcer.go +++ b/app/controlplane/pkg/authz/middleware/mocks/Enforcer.go @@ -3,7 +3,7 @@ package mocks import ( - authz "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" mock "github.com/stretchr/testify/mock" ) diff --git a/app/controlplane/internal/authz/model.conf b/app/controlplane/pkg/authz/model.conf similarity index 100% rename from app/controlplane/internal/authz/model.conf rename to app/controlplane/pkg/authz/model.conf diff --git a/app/controlplane/pkg/biz/apitoken.go b/app/controlplane/pkg/biz/apitoken.go index 3082ce73c..808d6f452 100644 --- a/app/controlplane/pkg/biz/apitoken.go +++ b/app/controlplane/pkg/biz/apitoken.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/jwt" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/jwt/apitoken" "github.com/chainloop-dev/chainloop/pkg/servicelogger" diff --git a/app/controlplane/pkg/biz/apitoken_integration_test.go b/app/controlplane/pkg/biz/apitoken_integration_test.go index b58ad0bc6..743fa2459 100644 --- a/app/controlplane/pkg/biz/apitoken_integration_test.go +++ b/app/controlplane/pkg/biz/apitoken_integration_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz/testhelpers" "github.com/golang-jwt/jwt/v4" diff --git a/app/controlplane/pkg/biz/membership.go b/app/controlplane/pkg/biz/membership.go index 7cfba7dde..421334818 100644 --- a/app/controlplane/pkg/biz/membership.go +++ b/app/controlplane/pkg/biz/membership.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/go-kratos/kratos/v2/log" "github.com/google/uuid" ) diff --git a/app/controlplane/pkg/biz/membership_integration_test.go b/app/controlplane/pkg/biz/membership_integration_test.go index 9164fc0c4..29b13837f 100644 --- a/app/controlplane/pkg/biz/membership_integration_test.go +++ b/app/controlplane/pkg/biz/membership_integration_test.go @@ -19,7 +19,7 @@ import ( "context" "testing" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz/testhelpers" diff --git a/app/controlplane/pkg/biz/organization.go b/app/controlplane/pkg/biz/organization.go index 1ffdf067b..bef631015 100644 --- a/app/controlplane/pkg/biz/organization.go +++ b/app/controlplane/pkg/biz/organization.go @@ -22,8 +22,8 @@ import ( "io" "time" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2/log" "github.com/google/uuid" diff --git a/app/controlplane/pkg/biz/organization_integration_test.go b/app/controlplane/pkg/biz/organization_integration_test.go index ab3331777..e5a753ce3 100644 --- a/app/controlplane/pkg/biz/organization_integration_test.go +++ b/app/controlplane/pkg/biz/organization_integration_test.go @@ -20,8 +20,8 @@ import ( "testing" v1 "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz/testhelpers" "github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1" diff --git a/app/controlplane/pkg/biz/orginvitation.go b/app/controlplane/pkg/biz/orginvitation.go index 482e12aa6..f3b493cc7 100644 --- a/app/controlplane/pkg/biz/orginvitation.go +++ b/app/controlplane/pkg/biz/orginvitation.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2/log" "github.com/google/uuid" diff --git a/app/controlplane/pkg/biz/orginvitation_integration_test.go b/app/controlplane/pkg/biz/orginvitation_integration_test.go index 9094efe8d..cf9434be2 100644 --- a/app/controlplane/pkg/biz/orginvitation_integration_test.go +++ b/app/controlplane/pkg/biz/orginvitation_integration_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz/testhelpers" "github.com/google/uuid" diff --git a/app/controlplane/pkg/biz/testhelpers/database.go b/app/controlplane/pkg/biz/testhelpers/database.go index 3a31a73b6..1d967633c 100644 --- a/app/controlplane/pkg/biz/testhelpers/database.go +++ b/app/controlplane/pkg/biz/testhelpers/database.go @@ -26,8 +26,8 @@ import ( // Required for the database waitFor strategy _ "github.com/lib/pq" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data" "github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1" diff --git a/app/controlplane/pkg/biz/testhelpers/wire.go b/app/controlplane/pkg/biz/testhelpers/wire.go index f4077f598..6bbc081b2 100644 --- a/app/controlplane/pkg/biz/testhelpers/wire.go +++ b/app/controlplane/pkg/biz/testhelpers/wire.go @@ -23,8 +23,8 @@ package testhelpers import ( "testing" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data" "github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1" diff --git a/app/controlplane/pkg/biz/testhelpers/wire_gen.go b/app/controlplane/pkg/biz/testhelpers/wire_gen.go index 52a3863f3..3c8c3b998 100644 --- a/app/controlplane/pkg/biz/testhelpers/wire_gen.go +++ b/app/controlplane/pkg/biz/testhelpers/wire_gen.go @@ -7,8 +7,8 @@ package testhelpers import ( - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data" "github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1" diff --git a/app/controlplane/pkg/biz/user.go b/app/controlplane/pkg/biz/user.go index ed4b5cd6e..4a81a358d 100644 --- a/app/controlplane/pkg/biz/user.go +++ b/app/controlplane/pkg/biz/user.go @@ -21,8 +21,8 @@ import ( "time" pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/go-kratos/kratos/v2/log" "github.com/google/uuid" ) diff --git a/app/controlplane/pkg/biz/user_integration_test.go b/app/controlplane/pkg/biz/user_integration_test.go index c48a9b792..040f19162 100644 --- a/app/controlplane/pkg/biz/user_integration_test.go +++ b/app/controlplane/pkg/biz/user_integration_test.go @@ -20,8 +20,8 @@ import ( "testing" v1 "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz/testhelpers" diff --git a/app/controlplane/pkg/data/ent/membership.go b/app/controlplane/pkg/data/ent/membership.go index b2f225aa1..4a6fff190 100644 --- a/app/controlplane/pkg/data/ent/membership.go +++ b/app/controlplane/pkg/data/ent/membership.go @@ -9,7 +9,7 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/membership" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/organization" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/user" diff --git a/app/controlplane/pkg/data/ent/membership/membership.go b/app/controlplane/pkg/data/ent/membership/membership.go index 8fc2c2c3f..4a7f38e65 100644 --- a/app/controlplane/pkg/data/ent/membership/membership.go +++ b/app/controlplane/pkg/data/ent/membership/membership.go @@ -8,7 +8,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/google/uuid" ) diff --git a/app/controlplane/pkg/data/ent/membership/where.go b/app/controlplane/pkg/data/ent/membership/where.go index 90ce0c803..2f42cd59e 100644 --- a/app/controlplane/pkg/data/ent/membership/where.go +++ b/app/controlplane/pkg/data/ent/membership/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/predicate" "github.com/google/uuid" ) diff --git a/app/controlplane/pkg/data/ent/membership_create.go b/app/controlplane/pkg/data/ent/membership_create.go index 12cc999ed..0072f3ffd 100644 --- a/app/controlplane/pkg/data/ent/membership_create.go +++ b/app/controlplane/pkg/data/ent/membership_create.go @@ -10,7 +10,7 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/membership" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/organization" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/user" diff --git a/app/controlplane/pkg/data/ent/membership_update.go b/app/controlplane/pkg/data/ent/membership_update.go index f57b7bf37..c81564784 100644 --- a/app/controlplane/pkg/data/ent/membership_update.go +++ b/app/controlplane/pkg/data/ent/membership_update.go @@ -11,7 +11,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/membership" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/organization" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/predicate" diff --git a/app/controlplane/pkg/data/ent/mutation.go b/app/controlplane/pkg/data/ent/mutation.go index b7e3340d8..e916f84e6 100644 --- a/app/controlplane/pkg/data/ent/mutation.go +++ b/app/controlplane/pkg/data/ent/mutation.go @@ -11,7 +11,7 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/apitoken" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/casbackend" diff --git a/app/controlplane/pkg/data/ent/orginvitation.go b/app/controlplane/pkg/data/ent/orginvitation.go index 593d1716e..e78d4bd9e 100644 --- a/app/controlplane/pkg/data/ent/orginvitation.go +++ b/app/controlplane/pkg/data/ent/orginvitation.go @@ -9,7 +9,7 @@ import ( "entgo.io/ent" "entgo.io/ent/dialect/sql" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/organization" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/orginvitation" diff --git a/app/controlplane/pkg/data/ent/orginvitation/orginvitation.go b/app/controlplane/pkg/data/ent/orginvitation/orginvitation.go index 32d48608f..6406ac6e5 100644 --- a/app/controlplane/pkg/data/ent/orginvitation/orginvitation.go +++ b/app/controlplane/pkg/data/ent/orginvitation/orginvitation.go @@ -8,7 +8,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/google/uuid" ) diff --git a/app/controlplane/pkg/data/ent/orginvitation/where.go b/app/controlplane/pkg/data/ent/orginvitation/where.go index d3db0bd12..dee76bc35 100644 --- a/app/controlplane/pkg/data/ent/orginvitation/where.go +++ b/app/controlplane/pkg/data/ent/orginvitation/where.go @@ -7,7 +7,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/predicate" "github.com/google/uuid" diff --git a/app/controlplane/pkg/data/ent/orginvitation_create.go b/app/controlplane/pkg/data/ent/orginvitation_create.go index aa4b9e09c..af34feaaa 100644 --- a/app/controlplane/pkg/data/ent/orginvitation_create.go +++ b/app/controlplane/pkg/data/ent/orginvitation_create.go @@ -10,7 +10,7 @@ import ( "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/organization" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/orginvitation" diff --git a/app/controlplane/pkg/data/ent/orginvitation_update.go b/app/controlplane/pkg/data/ent/orginvitation_update.go index ae6f12f99..214544949 100644 --- a/app/controlplane/pkg/data/ent/orginvitation_update.go +++ b/app/controlplane/pkg/data/ent/orginvitation_update.go @@ -11,7 +11,7 @@ import ( "entgo.io/ent/dialect/sql" "entgo.io/ent/dialect/sql/sqlgraph" "entgo.io/ent/schema/field" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/organization" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/orginvitation" diff --git a/app/controlplane/pkg/data/ent/schema/membership.go b/app/controlplane/pkg/data/ent/schema/membership.go index 7703d6de8..3f1611456 100644 --- a/app/controlplane/pkg/data/ent/schema/membership.go +++ b/app/controlplane/pkg/data/ent/schema/membership.go @@ -23,7 +23,7 @@ import ( "entgo.io/ent/schema/edge" "entgo.io/ent/schema/field" "entgo.io/ent/schema/index" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/google/uuid" ) diff --git a/app/controlplane/pkg/data/ent/schema/orginvitation.go b/app/controlplane/pkg/data/ent/schema/orginvitation.go index b6b2a821b..58b954514 100644 --- a/app/controlplane/pkg/data/ent/schema/orginvitation.go +++ b/app/controlplane/pkg/data/ent/schema/orginvitation.go @@ -22,7 +22,7 @@ import ( "entgo.io/ent/dialect/entsql" "entgo.io/ent/schema/edge" "entgo.io/ent/schema/field" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/google/uuid" ) diff --git a/app/controlplane/pkg/data/membership.go b/app/controlplane/pkg/data/membership.go index 71dea49ea..e38ebd442 100644 --- a/app/controlplane/pkg/data/membership.go +++ b/app/controlplane/pkg/data/membership.go @@ -19,7 +19,7 @@ import ( "context" "fmt" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/membership" diff --git a/app/controlplane/pkg/data/orginvitation.go b/app/controlplane/pkg/data/orginvitation.go index 64f123e46..a83a805a1 100644 --- a/app/controlplane/pkg/data/orginvitation.go +++ b/app/controlplane/pkg/data/orginvitation.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data/ent/orginvitation"