From a93722377698bb7eff1ea852cc99cb6ddf73f723 Mon Sep 17 00:00:00 2001 From: "Jose I. Paris" Date: Tue, 4 Aug 2026 23:07:00 +0200 Subject: [PATCH] refactor(controlplane): publish usercontext/entities under pkg/ The identity context helpers (CurrentUser, CurrentAPIToken, CurrentOrg, CurrentMembership) lived under app/controlplane/internal/, yet the public app/controlplane/pkg/biz depends on them: AuditorUseCase.Dispatch resolves the audit actor from those context values. Downstream modules that embed pkg/biz therefore cannot populate the actor, and every audit entry that requires one is dropped with "failed to get actor information". Move the package to app/controlplane/pkg/usercontext/entities so it is importable by those consumers. Import-path change only, no behaviour change. Signed-off-by: Jose I. Paris Chainloop-Trace-Sessions: e6906bba-e9a1-468f-8d04-e3fe7ae231df Signed-off-by: Jose I. Paris --- app/controlplane/cmd/wire.go | 2 +- app/controlplane/cmd/wire_gen.go | 2 +- app/controlplane/internal/sentrycontext/sentry_context.go | 2 +- app/controlplane/internal/sentrycontext/sentry_context_test.go | 2 +- app/controlplane/internal/server/grpc.go | 2 +- app/controlplane/internal/service/apitoken.go | 2 +- app/controlplane/internal/service/apitoken_test.go | 2 +- app/controlplane/internal/service/attestation.go | 2 +- app/controlplane/internal/service/cascredential.go | 2 +- app/controlplane/internal/service/cascredential_test.go | 2 +- app/controlplane/internal/service/context.go | 2 +- app/controlplane/internal/service/group.go | 2 +- app/controlplane/internal/service/organization.go | 2 +- app/controlplane/internal/service/organization_test.go | 2 +- app/controlplane/internal/service/service.go | 2 +- app/controlplane/internal/service/service_test.go | 2 +- app/controlplane/internal/service/workflow.go | 2 +- app/controlplane/internal/service/workflowcontract.go | 2 +- .../internal/service/workflowcontract_integration_test.go | 2 +- app/controlplane/internal/usercontext/allowlist_middleware.go | 2 +- .../internal/usercontext/allowlist_middleware_test.go | 2 +- app/controlplane/internal/usercontext/apitoken_middleware.go | 2 +- .../internal/usercontext/apitoken_middleware_test.go | 2 +- .../internal/usercontext/attjwtmiddleware/attmiddleware.go | 2 +- .../internal/usercontext/currentorganization_middleware.go | 2 +- .../internal/usercontext/currentorganization_middleware_test.go | 2 +- app/controlplane/internal/usercontext/currentuser_middleware.go | 2 +- .../internal/usercontext/currentuser_middleware_test.go | 2 +- app/controlplane/internal/usercontext/federated_middleware.go | 2 +- .../internal/usercontext/operation_authorization_middleware.go | 2 +- .../internal/usercontext/orgrequirements_middleware.go | 2 +- .../internal/usercontext/robotaccount_middleware.go | 2 +- app/controlplane/internal/usercontext/suspension_middleware.go | 2 +- .../internal/usercontext/suspension_middleware_test.go | 2 +- app/controlplane/pkg/authz/middleware/middleware_test.go | 2 +- app/controlplane/pkg/biz/auditor.go | 2 +- app/controlplane/pkg/biz/auditor_test.go | 2 +- app/controlplane/pkg/biz/orginvitation.go | 2 +- app/controlplane/pkg/biz/user.go | 2 +- app/controlplane/pkg/biz/workflowcontract.go | 2 +- .../{internal => pkg}/usercontext/entities/apitoken.go | 0 .../{internal => pkg}/usercontext/entities/entitites.go | 0 .../{internal => pkg}/usercontext/entities/entitites_test.go | 0 .../{internal => pkg}/usercontext/entities/memberships.go | 0 .../{internal => pkg}/usercontext/entities/organization.go | 0 app/controlplane/{internal => pkg}/usercontext/entities/user.go | 0 46 files changed, 40 insertions(+), 40 deletions(-) rename app/controlplane/{internal => pkg}/usercontext/entities/apitoken.go (100%) rename app/controlplane/{internal => pkg}/usercontext/entities/entitites.go (100%) rename app/controlplane/{internal => pkg}/usercontext/entities/entitites_test.go (100%) rename app/controlplane/{internal => pkg}/usercontext/entities/memberships.go (100%) rename app/controlplane/{internal => pkg}/usercontext/entities/organization.go (100%) rename app/controlplane/{internal => pkg}/usercontext/entities/user.go (100%) diff --git a/app/controlplane/cmd/wire.go b/app/controlplane/cmd/wire.go index ab5903af0..7f8f3913b 100644 --- a/app/controlplane/cmd/wire.go +++ b/app/controlplane/cmd/wire.go @@ -28,13 +28,13 @@ import ( "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/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/auditor" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" pkgConf "github.com/chainloop-dev/chainloop/app/controlplane/pkg/conf/controlplane/config/v1" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/policies" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1" "github.com/chainloop-dev/chainloop/pkg/blobmanager/loader" "github.com/chainloop-dev/chainloop/pkg/cache" diff --git a/app/controlplane/cmd/wire_gen.go b/app/controlplane/cmd/wire_gen.go index b10e0e01c..1b99a5f35 100644 --- a/app/controlplane/cmd/wire_gen.go +++ b/app/controlplane/cmd/wire_gen.go @@ -12,13 +12,13 @@ import ( "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/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/auditor" "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/conf/controlplane/config/v1" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/data" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/policies" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/plugins/sdk/v1" "github.com/chainloop-dev/chainloop/pkg/blobmanager/loader" "github.com/chainloop-dev/chainloop/pkg/cache" diff --git a/app/controlplane/internal/sentrycontext/sentry_context.go b/app/controlplane/internal/sentrycontext/sentry_context.go index 29554366e..402b552dc 100644 --- a/app/controlplane/internal/sentrycontext/sentry_context.go +++ b/app/controlplane/internal/sentrycontext/sentry_context.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/getsentry/sentry-go" "github.com/go-kratos/kratos/v2/middleware" diff --git a/app/controlplane/internal/sentrycontext/sentry_context_test.go b/app/controlplane/internal/sentrycontext/sentry_context_test.go index 15b9cb4a4..8c78cf82f 100644 --- a/app/controlplane/internal/sentrycontext/sentry_context_test.go +++ b/app/controlplane/internal/sentrycontext/sentry_context_test.go @@ -19,7 +19,7 @@ import ( "context" "testing" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/go-kratos/kratos/v2/transport" "github.com/stretchr/testify/assert" diff --git a/app/controlplane/internal/server/grpc.go b/app/controlplane/internal/server/grpc.go index 38711d932..fe5987ffe 100644 --- a/app/controlplane/internal/server/grpc.go +++ b/app/controlplane/internal/server/grpc.go @@ -25,10 +25,10 @@ import ( conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1" "github.com/chainloop-dev/chainloop/app/controlplane/internal/sentrycontext" "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/attjwtmiddleware" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" 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" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/chainloop-dev/chainloop/pkg/cache" "buf.build/go/protovalidate" diff --git a/app/controlplane/internal/service/apitoken.go b/app/controlplane/internal/service/apitoken.go index a129e3220..4642d6484 100644 --- a/app/controlplane/internal/service/apitoken.go +++ b/app/controlplane/internal/service/apitoken.go @@ -20,9 +20,9 @@ import ( "time" pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "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/usercontext/entities" errors "github.com/go-kratos/kratos/v2/errors" "github.com/google/uuid" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/app/controlplane/internal/service/apitoken_test.go b/app/controlplane/internal/service/apitoken_test.go index 7483db50a..f148d5284 100644 --- a/app/controlplane/internal/service/apitoken_test.go +++ b/app/controlplane/internal/service/apitoken_test.go @@ -20,8 +20,8 @@ import ( "testing" pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/google/uuid" "github.com/stretchr/testify/assert" ) diff --git a/app/controlplane/internal/service/attestation.go b/app/controlplane/internal/service/attestation.go index d42148509..b6dd1e128 100644 --- a/app/controlplane/internal/service/attestation.go +++ b/app/controlplane/internal/service/attestation.go @@ -30,9 +30,9 @@ import ( "github.com/chainloop-dev/chainloop/app/controlplane/internal/dispatcher" "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext" "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/attjwtmiddleware" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "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/usercontext/entities" casJWT "github.com/chainloop-dev/chainloop/internal/robotaccount/cas" "github.com/chainloop-dev/chainloop/pkg/attestation" "github.com/chainloop-dev/chainloop/pkg/attestation/renderer/chainloop" diff --git a/app/controlplane/internal/service/cascredential.go b/app/controlplane/internal/service/cascredential.go index 4ec74786d..48024e480 100644 --- a/app/controlplane/internal/service/cascredential.go +++ b/app/controlplane/internal/service/cascredential.go @@ -19,8 +19,8 @@ import ( "context" pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" errors "github.com/go-kratos/kratos/v2/errors" "github.com/google/uuid" diff --git a/app/controlplane/internal/service/cascredential_test.go b/app/controlplane/internal/service/cascredential_test.go index df08a58a8..4fc491daf 100644 --- a/app/controlplane/internal/service/cascredential_test.go +++ b/app/controlplane/internal/service/cascredential_test.go @@ -18,7 +18,7 @@ package service import ( "testing" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/stretchr/testify/assert" ) diff --git a/app/controlplane/internal/service/context.go b/app/controlplane/internal/service/context.go index 2874157ae..13adcd5d6 100644 --- a/app/controlplane/internal/service/context.go +++ b/app/controlplane/internal/service/context.go @@ -20,9 +20,9 @@ import ( "slices" pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "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/usercontext/entities" errors "github.com/go-kratos/kratos/v2/errors" "google.golang.org/protobuf/types/known/timestamppb" ) diff --git a/app/controlplane/internal/service/group.go b/app/controlplane/internal/service/group.go index 0ba45abda..c71663264 100644 --- a/app/controlplane/internal/service/group.go +++ b/app/controlplane/internal/service/group.go @@ -21,9 +21,9 @@ import ( pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "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/usercontext/entities" "github.com/go-kratos/kratos/v2/errors" "github.com/google/uuid" diff --git a/app/controlplane/internal/service/organization.go b/app/controlplane/internal/service/organization.go index 7bd462118..3554cc6eb 100644 --- a/app/controlplane/internal/service/organization.go +++ b/app/controlplane/internal/service/organization.go @@ -20,9 +20,9 @@ import ( pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "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/usercontext/entities" errors "github.com/go-kratos/kratos/v2/errors" "github.com/google/uuid" diff --git a/app/controlplane/internal/service/organization_test.go b/app/controlplane/internal/service/organization_test.go index 901d76a8a..74daf7d42 100644 --- a/app/controlplane/internal/service/organization_test.go +++ b/app/controlplane/internal/service/organization_test.go @@ -20,7 +20,7 @@ import ( "testing" pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/go-kratos/kratos/v2/errors" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/app/controlplane/internal/service/service.go b/app/controlplane/internal/service/service.go index 40e613b5e..e2517cb35 100644 --- a/app/controlplane/internal/service/service.go +++ b/app/controlplane/internal/service/service.go @@ -23,10 +23,10 @@ import ( pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "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/pagination" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/chainloop-dev/chainloop/pkg/servicelogger" "github.com/go-kratos/kratos/v2/errors" "github.com/go-kratos/kratos/v2/log" diff --git a/app/controlplane/internal/service/service_test.go b/app/controlplane/internal/service/service_test.go index 4b294aa30..d0ca08689 100644 --- a/app/controlplane/internal/service/service_test.go +++ b/app/controlplane/internal/service/service_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" kerrors "github.com/go-kratos/kratos/v2/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/app/controlplane/internal/service/workflow.go b/app/controlplane/internal/service/workflow.go index 808b8637c..5ac837509 100644 --- a/app/controlplane/internal/service/workflow.go +++ b/app/controlplane/internal/service/workflow.go @@ -21,8 +21,8 @@ import ( "time" v1 "github.com/chainloop-dev/chainloop/app/controlplane/api/jsonfilter/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/chainloop-dev/chainloop/pkg/jsonfilter" pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" diff --git a/app/controlplane/internal/service/workflowcontract.go b/app/controlplane/internal/service/workflowcontract.go index 6769b8908..e0b44e1fb 100644 --- a/app/controlplane/internal/service/workflowcontract.go +++ b/app/controlplane/internal/service/workflowcontract.go @@ -21,10 +21,10 @@ import ( pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" schemav1 "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "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/unmarshal" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/go-kratos/kratos/v2/errors" "github.com/google/uuid" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/app/controlplane/internal/service/workflowcontract_integration_test.go b/app/controlplane/internal/service/workflowcontract_integration_test.go index b6eb69ebd..d411d1c83 100644 --- a/app/controlplane/internal/service/workflowcontract_integration_test.go +++ b/app/controlplane/internal/service/workflowcontract_integration_test.go @@ -20,9 +20,9 @@ import ( "testing" pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "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/pkg/usercontext/entities" "github.com/go-kratos/kratos/v2/transport" "github.com/stretchr/testify/suite" ) diff --git a/app/controlplane/internal/usercontext/allowlist_middleware.go b/app/controlplane/internal/usercontext/allowlist_middleware.go index 7e0a54fae..1eaf5467b 100644 --- a/app/controlplane/internal/usercontext/allowlist_middleware.go +++ b/app/controlplane/internal/usercontext/allowlist_middleware.go @@ -20,9 +20,9 @@ import ( "fmt" v1 "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" conf "github.com/chainloop-dev/chainloop/app/controlplane/pkg/conf/controlplane/config/v1" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/chainloop-dev/chainloop/pkg/otelx" "github.com/go-kratos/kratos/v2/middleware" diff --git a/app/controlplane/internal/usercontext/allowlist_middleware_test.go b/app/controlplane/internal/usercontext/allowlist_middleware_test.go index 94adab435..278ed062e 100644 --- a/app/controlplane/internal/usercontext/allowlist_middleware_test.go +++ b/app/controlplane/internal/usercontext/allowlist_middleware_test.go @@ -20,10 +20,10 @@ import ( "testing" v1 "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" bizMocks "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz/mocks" conf "github.com/chainloop-dev/chainloop/app/controlplane/pkg/conf/controlplane/config/v1" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/go-kratos/kratos/v2/transport" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/app/controlplane/internal/usercontext/apitoken_middleware.go b/app/controlplane/internal/usercontext/apitoken_middleware.go index 4b36cf861..6e75ece12 100644 --- a/app/controlplane/internal/usercontext/apitoken_middleware.go +++ b/app/controlplane/internal/usercontext/apitoken_middleware.go @@ -24,10 +24,10 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/attjwtmiddleware" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "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/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/chainloop-dev/chainloop/pkg/otelx" "github.com/go-kratos/kratos/v2/middleware" jwtMiddleware "github.com/go-kratos/kratos/v2/middleware/auth/jwt" diff --git a/app/controlplane/internal/usercontext/apitoken_middleware_test.go b/app/controlplane/internal/usercontext/apitoken_middleware_test.go index d7ae350ab..2e5d7de79 100644 --- a/app/controlplane/internal/usercontext/apitoken_middleware_test.go +++ b/app/controlplane/internal/usercontext/apitoken_middleware_test.go @@ -22,10 +22,10 @@ import ( "testing" "time" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz/mocks" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/jwt/apitoken" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/go-kratos/kratos/v2/log" jwtmiddleware "github.com/go-kratos/kratos/v2/middleware/auth/jwt" "github.com/golang-jwt/jwt/v5" diff --git a/app/controlplane/internal/usercontext/attjwtmiddleware/attmiddleware.go b/app/controlplane/internal/usercontext/attjwtmiddleware/attmiddleware.go index b7dffddca..29e7a65f3 100644 --- a/app/controlplane/internal/usercontext/attjwtmiddleware/attmiddleware.go +++ b/app/controlplane/internal/usercontext/attjwtmiddleware/attmiddleware.go @@ -27,10 +27,10 @@ import ( v1 "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/jwt/apitoken" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/jwt/robotaccount" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/jwt/user" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/chainloop-dev/chainloop/pkg/cache" errorsAPI "github.com/go-kratos/kratos/v2/errors" "github.com/go-kratos/kratos/v2/log" diff --git a/app/controlplane/internal/usercontext/currentorganization_middleware.go b/app/controlplane/internal/usercontext/currentorganization_middleware.go index 59d1b778f..6348a76ad 100644 --- a/app/controlplane/internal/usercontext/currentorganization_middleware.go +++ b/app/controlplane/internal/usercontext/currentorganization_middleware.go @@ -23,10 +23,10 @@ import ( "slices" v1 "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "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/unmarshal" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/chainloop-dev/chainloop/pkg/cache" "github.com/chainloop-dev/chainloop/pkg/otelx" "github.com/go-kratos/kratos/v2/log" diff --git a/app/controlplane/internal/usercontext/currentorganization_middleware_test.go b/app/controlplane/internal/usercontext/currentorganization_middleware_test.go index d66b3b013..f81aa58c9 100644 --- a/app/controlplane/internal/usercontext/currentorganization_middleware_test.go +++ b/app/controlplane/internal/usercontext/currentorganization_middleware_test.go @@ -21,11 +21,11 @@ import ( "testing" v1 "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "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" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/go-kratos/kratos/v2/log" "github.com/google/uuid" diff --git a/app/controlplane/internal/usercontext/currentuser_middleware.go b/app/controlplane/internal/usercontext/currentuser_middleware.go index ca23c81ae..5e214f831 100644 --- a/app/controlplane/internal/usercontext/currentuser_middleware.go +++ b/app/controlplane/internal/usercontext/currentuser_middleware.go @@ -24,10 +24,10 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/attjwtmiddleware" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "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/user" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/chainloop-dev/chainloop/pkg/otelx" "github.com/go-kratos/kratos/v2/middleware" jwtMiddleware "github.com/go-kratos/kratos/v2/middleware/auth/jwt" diff --git a/app/controlplane/internal/usercontext/currentuser_middleware_test.go b/app/controlplane/internal/usercontext/currentuser_middleware_test.go index e958bfa1d..4c9967945 100644 --- a/app/controlplane/internal/usercontext/currentuser_middleware_test.go +++ b/app/controlplane/internal/usercontext/currentuser_middleware_test.go @@ -20,10 +20,10 @@ import ( "io" "testing" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "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" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/go-kratos/kratos/v2/log" jwtmiddleware "github.com/go-kratos/kratos/v2/middleware/auth/jwt" "github.com/golang-jwt/jwt/v5" diff --git a/app/controlplane/internal/usercontext/federated_middleware.go b/app/controlplane/internal/usercontext/federated_middleware.go index ad46ba9ca..a60db4c33 100644 --- a/app/controlplane/internal/usercontext/federated_middleware.go +++ b/app/controlplane/internal/usercontext/federated_middleware.go @@ -24,8 +24,8 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/attjwtmiddleware" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/go-kratos/kratos/v2/middleware" ) diff --git a/app/controlplane/internal/usercontext/operation_authorization_middleware.go b/app/controlplane/internal/usercontext/operation_authorization_middleware.go index 425f893bd..b4137d60e 100644 --- a/app/controlplane/internal/usercontext/operation_authorization_middleware.go +++ b/app/controlplane/internal/usercontext/operation_authorization_middleware.go @@ -25,7 +25,7 @@ import ( "time" conf "github.com/chainloop-dev/chainloop/app/controlplane/internal/conf/controlplane/config/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" errorsAPI "github.com/go-kratos/kratos/v2/errors" "github.com/go-kratos/kratos/v2/log" "github.com/go-kratos/kratos/v2/middleware" diff --git a/app/controlplane/internal/usercontext/orgrequirements_middleware.go b/app/controlplane/internal/usercontext/orgrequirements_middleware.go index 06da5a2c4..a29318531 100644 --- a/app/controlplane/internal/usercontext/orgrequirements_middleware.go +++ b/app/controlplane/internal/usercontext/orgrequirements_middleware.go @@ -22,8 +22,8 @@ import ( "time" v1 "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/chainloop-dev/chainloop/pkg/otelx" "github.com/go-kratos/kratos/v2/middleware" ) diff --git a/app/controlplane/internal/usercontext/robotaccount_middleware.go b/app/controlplane/internal/usercontext/robotaccount_middleware.go index 3cd28478e..e547aa9a3 100644 --- a/app/controlplane/internal/usercontext/robotaccount_middleware.go +++ b/app/controlplane/internal/usercontext/robotaccount_middleware.go @@ -21,9 +21,9 @@ import ( "fmt" "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/attjwtmiddleware" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/biz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/jwt/robotaccount" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/go-kratos/kratos/v2/log" "github.com/go-kratos/kratos/v2/middleware" ) diff --git a/app/controlplane/internal/usercontext/suspension_middleware.go b/app/controlplane/internal/usercontext/suspension_middleware.go index d3f29c185..067eb954d 100644 --- a/app/controlplane/internal/usercontext/suspension_middleware.go +++ b/app/controlplane/internal/usercontext/suspension_middleware.go @@ -18,7 +18,7 @@ package usercontext import ( "context" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/chainloop-dev/chainloop/pkg/otelx" errorsAPI "github.com/go-kratos/kratos/v2/errors" "github.com/go-kratos/kratos/v2/middleware" diff --git a/app/controlplane/internal/usercontext/suspension_middleware_test.go b/app/controlplane/internal/usercontext/suspension_middleware_test.go index 4680c4194..779f31066 100644 --- a/app/controlplane/internal/usercontext/suspension_middleware_test.go +++ b/app/controlplane/internal/usercontext/suspension_middleware_test.go @@ -19,7 +19,7 @@ import ( "context" "testing" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/app/controlplane/pkg/authz/middleware/middleware_test.go b/app/controlplane/pkg/authz/middleware/middleware_test.go index 3d19cb57a..1d654f85a 100644 --- a/app/controlplane/pkg/authz/middleware/middleware_test.go +++ b/app/controlplane/pkg/authz/middleware/middleware_test.go @@ -21,8 +21,8 @@ import ( "testing" "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "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/pkg/biz/auditor.go b/app/controlplane/pkg/biz/auditor.go index 831c3f7ca..37cb4a1e3 100644 --- a/app/controlplane/pkg/biz/auditor.go +++ b/app/controlplane/pkg/biz/auditor.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/auditor" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/chainloop-dev/chainloop/pkg/otelx" "github.com/go-kratos/kratos/v2/log" "github.com/google/uuid" diff --git a/app/controlplane/pkg/biz/auditor_test.go b/app/controlplane/pkg/biz/auditor_test.go index 3590c40bc..60b6c3a36 100644 --- a/app/controlplane/pkg/biz/auditor_test.go +++ b/app/controlplane/pkg/biz/auditor_test.go @@ -21,8 +21,8 @@ import ( "io" "testing" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/auditor" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/go-kratos/kratos/v2/log" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/app/controlplane/pkg/biz/orginvitation.go b/app/controlplane/pkg/biz/orginvitation.go index 9c16e3302..8851f4b4f 100644 --- a/app/controlplane/pkg/biz/orginvitation.go +++ b/app/controlplane/pkg/biz/orginvitation.go @@ -22,10 +22,10 @@ import ( "strings" "time" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/auditor/events" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/pagination" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/chainloop-dev/chainloop/pkg/otelx" "github.com/chainloop-dev/chainloop/pkg/servicelogger" diff --git a/app/controlplane/pkg/biz/user.go b/app/controlplane/pkg/biz/user.go index 8a13c6896..d9e5d5662 100644 --- a/app/controlplane/pkg/biz/user.go +++ b/app/controlplane/pkg/biz/user.go @@ -22,11 +22,11 @@ import ( "time" pb "github.com/chainloop-dev/chainloop/app/controlplane/api/controlplane/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/auditor/events" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/authz" config "github.com/chainloop-dev/chainloop/app/controlplane/pkg/conf/controlplane/config/v1" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/pagination" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" "github.com/chainloop-dev/chainloop/pkg/otelx" "github.com/go-kratos/kratos/v2/log" diff --git a/app/controlplane/pkg/biz/workflowcontract.go b/app/controlplane/pkg/biz/workflowcontract.go index 61e5992b1..210f2312d 100644 --- a/app/controlplane/pkg/biz/workflowcontract.go +++ b/app/controlplane/pkg/biz/workflowcontract.go @@ -29,9 +29,9 @@ import ( "github.com/chainloop-dev/chainloop/pkg/otelx" schemav1 "github.com/chainloop-dev/chainloop/app/controlplane/api/workflowcontract/v1" - "github.com/chainloop-dev/chainloop/app/controlplane/internal/usercontext/entities" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/policies" "github.com/chainloop-dev/chainloop/app/controlplane/pkg/unmarshal" + "github.com/chainloop-dev/chainloop/app/controlplane/pkg/usercontext/entities" loader "github.com/chainloop-dev/chainloop/pkg/policies" "github.com/go-kratos/kratos/v2/log" "github.com/google/uuid" diff --git a/app/controlplane/internal/usercontext/entities/apitoken.go b/app/controlplane/pkg/usercontext/entities/apitoken.go similarity index 100% rename from app/controlplane/internal/usercontext/entities/apitoken.go rename to app/controlplane/pkg/usercontext/entities/apitoken.go diff --git a/app/controlplane/internal/usercontext/entities/entitites.go b/app/controlplane/pkg/usercontext/entities/entitites.go similarity index 100% rename from app/controlplane/internal/usercontext/entities/entitites.go rename to app/controlplane/pkg/usercontext/entities/entitites.go diff --git a/app/controlplane/internal/usercontext/entities/entitites_test.go b/app/controlplane/pkg/usercontext/entities/entitites_test.go similarity index 100% rename from app/controlplane/internal/usercontext/entities/entitites_test.go rename to app/controlplane/pkg/usercontext/entities/entitites_test.go diff --git a/app/controlplane/internal/usercontext/entities/memberships.go b/app/controlplane/pkg/usercontext/entities/memberships.go similarity index 100% rename from app/controlplane/internal/usercontext/entities/memberships.go rename to app/controlplane/pkg/usercontext/entities/memberships.go diff --git a/app/controlplane/internal/usercontext/entities/organization.go b/app/controlplane/pkg/usercontext/entities/organization.go similarity index 100% rename from app/controlplane/internal/usercontext/entities/organization.go rename to app/controlplane/pkg/usercontext/entities/organization.go diff --git a/app/controlplane/internal/usercontext/entities/user.go b/app/controlplane/pkg/usercontext/entities/user.go similarity index 100% rename from app/controlplane/internal/usercontext/entities/user.go rename to app/controlplane/pkg/usercontext/entities/user.go