diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 3adb043..f76264e 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -13,7 +13,7 @@ jobs: concurrency: group: ${{ github.ref }} cancel-in-progress: true - uses: openmfp/gha/.github/workflows/pipeline-golang-module.yml@main + uses: platform-mesh/.github/.github/workflows/pipeline-golang-module.yml@main secrets: inherit with: useLocalCoverageConfig: true diff --git a/.mockery.yaml b/.mockery.yaml index 6eb0abb..326de8c 100644 --- a/.mockery.yaml +++ b/.mockery.yaml @@ -9,7 +9,7 @@ packages: OpenFGAServiceClient: config: structname: OpenFGAServiceClient - github.com/openmfp/golang-commons/fga/store: + github.com/platform-mesh/golang-commons/fga/store: config: dir: fga/store/mocks pkgname: mocks @@ -18,7 +18,7 @@ packages: FGAStoreHelper: config: structname: FGAStoreHelper - github.com/openmfp/golang-commons/policy_services: + github.com/platform-mesh/golang-commons/policy_services: config: dir: fga/policy_services/mocks pkgname: mocks diff --git a/.reuse/dep5 b/.reuse/dep5 deleted file mode 100644 index 8dcc63e..0000000 --- a/.reuse/dep5 +++ /dev/null @@ -1,9 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: golang-commons -Upstream-Contact: -Source: https://github.com/openmfp/golang-commons - -Files: * -Copyright: 2024 SAP SE or an SAP affiliate company and openMFP contributors and golang-commons contributors. -License: Apache-2.0 - diff --git a/CODEOWNERS b/CODEOWNERS index 0fd49e1..b30c1ae 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -1,4 +1,4 @@ # Default code owners -* @openmfp/frame +* @platform-mesh/frame @platform-mesh/tsc go.mod go.sum \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9a19699..9275bbb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ ## Overview -# Contributing to openMFP +# Contributing to Platform Mesh We want to make contributing to this project as easy and transparent as possible. ## Our development process @@ -26,5 +26,5 @@ We use GitHub issues to track bugs. Please ensure your description is clear and includes sufficient instructions to reproduce the issue. ## License -By contributing to openMFP, you agree that your contributions will be licensed +By contributing to Platform Mesh, you agree that your contributions will be licensed under its [Apache-2.0 license](LICENSE). diff --git a/README.md b/README.md index 423d762..e1500b4 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# openMFP - golang-commons -![Build Status](https://github.com/openmfp/golang-commons/actions/workflows/pipeline.yml/badge.svg) +****# Platform Mesh - golang-commons +![Build Status](https://github.com/platform-mesh/golang-commons/actions/workflows/pipeline.yml/badge.svg) [![REUSE status]( -https://api.reuse.software/badge/github.com/openmfp/golang-commons)](https://api.reuse.software/info/github.com/openmfp/golang-commons) +https://api.reuse.software/badge/github.com/platform-mesh/golang-commons)](https://api.reuse.software/info/github.com/platform-mesh/golang-commons) ## Description golang-commons contains golang library packages to be reused across microservices and operators/controllers. The scope includes, but is not limited to: @@ -12,13 +12,12 @@ golang-commons contains golang library packages to be reused across microservice - Logging - [Controllers](./controller/README.md) - ## Getting started Add the dependency to your go module based project like so: ``` -go get github.com/openmfp/golang-commons +go get github.com/platform-mesh/golang-commons ``` ## Releasing @@ -41,12 +40,12 @@ P.S. If you have golang installed, it automatically installs the mockery binary ## Contributing -Please refer to the [CONTRIBUTING.md](CONTRIBUTING.md) file in this repository for instructions on how to contribute to openMFP. +Please refer to the [CONTRIBUTING.md](CONTRIBUTING.md) file in this repository for instructions on how to contribute to Platform Mesh. ## Code of Conduct -Please refer to the [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md) file in this repository informations on the expected Code of Conduct for contributing to openMFP. +Please refer to the [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md) file in this repository informations on the expected Code of Conduct for contributing to Platform Mesh. ## Licensing -Copyright 2024 SAP SE or an SAP affiliate company and openMFP contributors. Please see our [LICENSE](LICENSE) for copyright and license information. Detailed information including third-party components and their licensing/copyright information is available [via the REUSE tool](https://api.reuse.software/info/github.com/openmfp/golang-commons). +Copyright 2024 SAP SE or an SAP affiliate company and Platform Mesh contributors. Please see our [LICENSE](LICENSE) for copyright and license information. Detailed information including third-party components and their licensing/copyright information is available [via the REUSE tool](https://api.reuse.software/info/github.com/platform-mesh/golang-commons). diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 0000000..a1c7cf5 --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,9 @@ +version = 1 +SPDX-PackageName = "golang-commons" +SPDX-PackageDownloadLocation = "https://github.com/platform-mesh/golang-commons" + +[[annotations]] +path = "**" +precedence = "aggregate" +SPDX-FileCopyrightText = "2025 SAP SE or an SAP affiliate company and Platform Mesh contributors and golang-commons contributors." +SPDX-License-Identifier = "Apache-2.0" diff --git a/config/config.go b/config/config.go index ff75ef6..78e9fda 100644 --- a/config/config.go +++ b/config/config.go @@ -13,8 +13,8 @@ import ( "github.com/spf13/pflag" "github.com/spf13/viper" - "github.com/openmfp/golang-commons/context/keys" - "github.com/openmfp/golang-commons/traces" + "github.com/platform-mesh/golang-commons/context/keys" + "github.com/platform-mesh/golang-commons/traces" ) func SetConfigInContext(ctx context.Context, config any) context.Context { diff --git a/config/config_test.go b/config/config_test.go index 50e349c..2586946 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/viper" "github.com/stretchr/testify/assert" - "github.com/openmfp/golang-commons/config" + "github.com/platform-mesh/golang-commons/config" ) func TestSetConfigInContext(t *testing.T) { diff --git a/context/context.go b/context/context.go index e459955..3e01485 100644 --- a/context/context.go +++ b/context/context.go @@ -8,8 +8,8 @@ import ( "context" "time" - "github.com/openmfp/golang-commons/config" - "github.com/openmfp/golang-commons/logger" + "github.com/platform-mesh/golang-commons/config" + "github.com/platform-mesh/golang-commons/logger" ) // Can be used in StartContext to have a sane default timeout diff --git a/context/context_test.go b/context/context_test.go index 55d4a6a..248f54f 100644 --- a/context/context_test.go +++ b/context/context_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/openmfp/golang-commons/logger" + "github.com/platform-mesh/golang-commons/logger" ) type TestConfig struct { diff --git a/context/keys/keys.go b/context/keys/keys.go index 7e9ca57..8ec3d5e 100644 --- a/context/keys/keys.go +++ b/context/keys/keys.go @@ -1,6 +1,6 @@ package keys -import "github.com/openmfp/golang-commons/jwt" +import "github.com/platform-mesh/golang-commons/jwt" type ContextKey string diff --git a/context/sentry.go b/context/sentry.go index 2041f98..1fa8e83 100644 --- a/context/sentry.go +++ b/context/sentry.go @@ -6,7 +6,7 @@ import ( "github.com/getsentry/sentry-go" - "github.com/openmfp/golang-commons/logger" + "github.com/platform-mesh/golang-commons/logger" ) // Recover can be used as deferred function to catch panics diff --git a/context/sentry_test.go b/context/sentry_test.go index 9199c65..6648bb4 100644 --- a/context/sentry_test.go +++ b/context/sentry_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - testlogger "github.com/openmfp/golang-commons/logger/testlogger" + testlogger "github.com/platform-mesh/golang-commons/logger/testlogger" ) func TestRecover(t *testing.T) { diff --git a/context/service_context.go b/context/service_context.go index 58aa498..92a25b8 100644 --- a/context/service_context.go +++ b/context/service_context.go @@ -6,9 +6,9 @@ import ( "github.com/go-jose/go-jose/v4" - "github.com/openmfp/golang-commons/context/keys" - "github.com/openmfp/golang-commons/jwt" - "github.com/openmfp/golang-commons/logger" + "github.com/platform-mesh/golang-commons/context/keys" + "github.com/platform-mesh/golang-commons/jwt" + "github.com/platform-mesh/golang-commons/logger" ) type ContextKey string @@ -104,4 +104,3 @@ func HasUserIDInContext(ctx context.Context) bool { _, ok := ctx.Value(keys.UserIDCtxKey).(string) return ok } - diff --git a/context/service_context_test.go b/context/service_context_test.go index 5e16848..fedaeec 100644 --- a/context/service_context_test.go +++ b/context/service_context_test.go @@ -9,9 +9,9 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/assert" - openmfpctx "github.com/openmfp/golang-commons/context" - "github.com/openmfp/golang-commons/context/keys" - openmfpjwt "github.com/openmfp/golang-commons/jwt" + pmcontext "github.com/platform-mesh/golang-commons/context" + "github.com/platform-mesh/golang-commons/context/keys" + pmjwt "github.com/platform-mesh/golang-commons/jwt" ) type astruct struct{} @@ -22,9 +22,9 @@ func TestAddSpiffeToContext(t *testing.T) { t.Parallel() ctx := context.Background() - ctx = openmfpctx.AddSpiffeToContext(ctx, "spiffe") + ctx = pmcontext.AddSpiffeToContext(ctx, "spiffe") - spiffe, err := openmfpctx.GetSpiffeFromContext(ctx) + spiffe, err := pmcontext.GetSpiffeFromContext(ctx) assert.Nil(t, err) assert.Equal(t, "spiffe", spiffe) } @@ -33,10 +33,10 @@ func TestWrongSpiffeToContext(t *testing.T) { t.Parallel() ctx := context.Background() - key := openmfpctx.ContextKey(openmfpjwt.SpiffeCtxKey) + key := pmcontext.ContextKey(pmjwt.SpiffeCtxKey) ctx = context.WithValue(ctx, key, astruct{}) - _, err := openmfpctx.GetSpiffeFromContext(ctx) + _, err := pmcontext.GetSpiffeFromContext(ctx) assert.Error(t, err, "someone stored a wrong value in the [spiffe] key with type [context.astruct], expected [string]") } @@ -44,9 +44,9 @@ func TestAddTenantToContext(t *testing.T) { t.Parallel() ctx := context.Background() - ctx = openmfpctx.AddTenantToContext(ctx, "tenant") + ctx = pmcontext.AddTenantToContext(ctx, "tenant") - tenant, err := openmfpctx.GetTenantFromContext(ctx) + tenant, err := pmcontext.GetTenantFromContext(ctx) assert.Nil(t, err) assert.Equal(t, "tenant", tenant) } @@ -55,10 +55,10 @@ func TestAddTenantToContextNegative(t *testing.T) { t.Parallel() ctx := context.Background() - key := openmfpctx.ContextKey(openmfpjwt.TenantIdCtxKey) + key := pmcontext.ContextKey(pmjwt.TenantIdCtxKey) ctx = context.WithValue(ctx, key, astruct{}) - _, err := openmfpctx.GetTenantFromContext(ctx) + _, err := pmcontext.GetTenantFromContext(ctx) assert.Error(t, err, "someone stored a wrong value in the [tenant] key with type [context.astruct], expected [string]") } @@ -95,7 +95,7 @@ func TestAddAndGetAuthHeaderToContext(t *testing.T) { t.Run(test.name, func(t *testing.T) { ctx := context.WithValue(context.Background(), keys.AuthHeaderCtxKey, test.authHeader) - val, err := openmfpctx.GetAuthHeaderFromContext(ctx) + val, err := pmcontext.GetAuthHeaderFromContext(ctx) if test.expectError { assert.Error(t, err) return @@ -117,9 +117,9 @@ func TestAddWebTokenToContext(t *testing.T) { tokenString, err := generateJWT(issuer) assert.NoError(t, err) - ctx = openmfpctx.AddWebTokenToContext(ctx, tokenString, signatureAlgorithms) + ctx = pmcontext.AddWebTokenToContext(ctx, tokenString, signatureAlgorithms) - token, err := openmfpctx.GetWebTokenFromContext(ctx) + token, err := pmcontext.GetWebTokenFromContext(ctx) assert.Nil(t, err) assert.Equal(t, issuer, token.Issuer) } @@ -130,7 +130,7 @@ func TestAddWebTokenToContextNegative(t *testing.T) { ctx := context.Background() ctx = context.WithValue(ctx, keys.WebTokenCtxKey, nil) - _, err := openmfpctx.GetWebTokenFromContext(ctx) + _, err := pmcontext.GetWebTokenFromContext(ctx) assert.ErrorContains(t, err, "someone stored a wrong value in the [webToken] key with type [], expected [jwt.WebToken]") } @@ -140,7 +140,7 @@ func TestAddWebTokenToContextWrongToken(t *testing.T) { initialContext := context.Background() tokenString := "not-a-token" - ctx := openmfpctx.AddWebTokenToContext(initialContext, tokenString, signatureAlgorithms) + ctx := pmcontext.AddWebTokenToContext(initialContext, tokenString, signatureAlgorithms) assert.Equal(t, initialContext, ctx) } @@ -164,9 +164,9 @@ func TestAddIsTechnicalIssuerToContext(t *testing.T) { t.Parallel() ctx := context.Background() - ctx = openmfpctx.AddIsTechnicalIssuerToContext(ctx) + ctx = pmcontext.AddIsTechnicalIssuerToContext(ctx) - isTechnicalIssuer := openmfpctx.GetIsTechnicalIssuerFromContext(ctx) + isTechnicalIssuer := pmcontext.GetIsTechnicalIssuerFromContext(ctx) assert.True(t, isTechnicalIssuer) } @@ -175,7 +175,7 @@ func TestAddIsTechnicalIssuerToContextNegative(t *testing.T) { ctx := context.Background() - isTechnicalIssuer := openmfpctx.GetIsTechnicalIssuerFromContext(ctx) + isTechnicalIssuer := pmcontext.GetIsTechnicalIssuerFromContext(ctx) assert.False(t, isTechnicalIssuer) } @@ -183,9 +183,9 @@ func TestHasTenantInContext(t *testing.T) { t.Parallel() ctx := context.Background() - ctx = openmfpctx.AddTenantToContext(ctx, "tenant") + ctx = pmcontext.AddTenantToContext(ctx, "tenant") - hasTenant := openmfpctx.HasTenantInContext(ctx) + hasTenant := pmcontext.HasTenantInContext(ctx) assert.True(t, hasTenant) } @@ -194,7 +194,7 @@ func TestHasTenantInContextNegative(t *testing.T) { ctx := context.Background() - hasTenant := openmfpctx.HasTenantInContext(ctx) + hasTenant := pmcontext.HasTenantInContext(ctx) assert.False(t, hasTenant) } @@ -202,9 +202,9 @@ func TestAddUserIDToContextAndGetUserIDFromContext(t *testing.T) { baseCtx := context.Background() userID := "testUser123" - ctxWithUserID := openmfpctx.AddUserIDToContext(baseCtx, userID) + ctxWithUserID := pmcontext.AddUserIDToContext(baseCtx, userID) - retrievedUserID, err := openmfpctx.GetUserIDFromContext(ctxWithUserID) + retrievedUserID, err := pmcontext.GetUserIDFromContext(ctxWithUserID) assert.NoError(t, err, "Expected no error when retrieving userID") assert.Equal(t, userID, retrievedUserID, "Retrieved userID should match the added value") } @@ -214,7 +214,7 @@ func TestGetUserIDFromContextWrongType(t *testing.T) { ctxWithWrongType := context.WithValue(baseCtx, keys.UserIDCtxKey, 123) - retrievedUserID, err := openmfpctx.GetUserIDFromContext(ctxWithWrongType) + retrievedUserID, err := pmcontext.GetUserIDFromContext(ctxWithWrongType) assert.Error(t, err, "Expected an error when retrieving userID with the wrong type") expectedErrorMsg := fmt.Sprintf("someone stored a wrong value in the [%s] key with type [%T], expected [string]", keys.UserIDCtxKey, ctxWithWrongType.Value(keys.UserIDCtxKey)) assert.Equal(t, expectedErrorMsg, err.Error(), "Error message should match the expected message") @@ -224,12 +224,11 @@ func TestGetUserIDFromContextWrongType(t *testing.T) { func TestHasUserIDInContext(t *testing.T) { baseCtx := context.Background() - assert.False(t, openmfpctx.HasUserIDInContext(baseCtx), "Expected false when userID is not set in context") + assert.False(t, pmcontext.HasUserIDInContext(baseCtx), "Expected false when userID is not set in context") - ctxWithUserID := openmfpctx.AddUserIDToContext(baseCtx, "user123") - assert.True(t, openmfpctx.HasUserIDInContext(ctxWithUserID), "Expected true when a valid userID is set in context") + ctxWithUserID := pmcontext.AddUserIDToContext(baseCtx, "user123") + assert.True(t, pmcontext.HasUserIDInContext(ctxWithUserID), "Expected true when a valid userID is set in context") ctxWithWrongType := context.WithValue(baseCtx, keys.UserIDCtxKey, 456) - assert.False(t, openmfpctx.HasUserIDInContext(ctxWithWrongType), "Expected false when the value stored is of the wrong type") + assert.False(t, pmcontext.HasUserIDInContext(ctxWithWrongType), "Expected false when the value stored is of the wrong type") } - diff --git a/controller/README.md b/controller/README.md index 3a91a23..b48ceb0 100644 --- a/controller/README.md +++ b/controller/README.md @@ -128,7 +128,7 @@ Features of the `lifecycle` package: func (l *LifecycleManager) SetupWithManager(mgr ctrl.Manager, maxReconciles int, reconcilerName string, instance RuntimeObject, debugLabelValue string, r reconcile.Reconciler, log *logger.Logger, eventPredicates ...predicate.Predicate) error ``` -The **debugLabelValue** parameter enables filtering of the resources based on a `debug.openmfp.io` label. If the label has the value passed in **debugLabelValue**, the resource will be reconciled in the `Process` function of the subroutine and all other resources will be skipped. If the value is empty string, all resources will be reconciled. This could be useful in debuging situations. +The **debugLabelValue** parameter enables filtering of the resources based on a `debug.platform-mesh.io` label. If the label has the value passed in **debugLabelValue**, the resource will be reconciled in the `Process` function of the subroutine and all other resources will be skipped. If the value is empty string, all resources will be reconciled. This could be useful in debuging situations. ```yaml apiVersion: myorg.com/v1alpha1 @@ -137,5 +137,5 @@ metadata: name: resource1 namespace: mynamespace labels: - debug.openmfp.io: test + debug.platform-mesh.io: test ``` diff --git a/controller/client/retry_test.go b/controller/client/retry_test.go index 77227d5..031e8b7 100644 --- a/controller/client/retry_test.go +++ b/controller/client/retry_test.go @@ -9,7 +9,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/openmfp/golang-commons/controller/testSupport" + "github.com/platform-mesh/golang-commons/controller/testSupport" ) func TestRetry(t *testing.T) { diff --git a/controller/filter/filter.go b/controller/filter/filter.go index deeebec..b817e41 100644 --- a/controller/filter/filter.go +++ b/controller/filter/filter.go @@ -6,7 +6,7 @@ import ( ) const ( - DebugLabel = "debug.openmfp.io" + DebugLabel = "debug.platform-mesh.io" ) // DebugResourcesBehaviourPredicate returns whether a resource should be digested diff --git a/controller/filter/filter_test.go b/controller/filter/filter_test.go index 2be9acd..a3eba8b 100644 --- a/controller/filter/filter_test.go +++ b/controller/filter/filter_test.go @@ -3,7 +3,7 @@ package filter import ( "testing" - "github.com/openmfp/golang-commons/controller/testSupport" + "github.com/platform-mesh/golang-commons/controller/testSupport" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/event" diff --git a/controller/lifecycle/conditions.go b/controller/lifecycle/conditions.go index 9f0c66b..a1b134b 100644 --- a/controller/lifecycle/conditions.go +++ b/controller/lifecycle/conditions.go @@ -7,8 +7,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrl "sigs.k8s.io/controller-runtime" - "github.com/openmfp/golang-commons/logger" - "github.com/openmfp/golang-commons/sentry" + "github.com/platform-mesh/golang-commons/logger" + "github.com/platform-mesh/golang-commons/sentry" ) const ( diff --git a/controller/lifecycle/conditions_test.go b/controller/lifecycle/conditions_test.go index 9b9f8f2..5705778 100644 --- a/controller/lifecycle/conditions_test.go +++ b/controller/lifecycle/conditions_test.go @@ -10,8 +10,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" controllerruntime "sigs.k8s.io/controller-runtime" - "github.com/openmfp/golang-commons/controller/testSupport" - "github.com/openmfp/golang-commons/logger" + "github.com/platform-mesh/golang-commons/controller/testSupport" + "github.com/platform-mesh/golang-commons/logger" ) // Test LifecycleManager.WithConditionManagement diff --git a/controller/lifecycle/finalizerSubroutine_test.go b/controller/lifecycle/finalizerSubroutine_test.go index 6325cd7..42a344c 100644 --- a/controller/lifecycle/finalizerSubroutine_test.go +++ b/controller/lifecycle/finalizerSubroutine_test.go @@ -7,8 +7,8 @@ import ( controllerruntime "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/openmfp/golang-commons/controller/testSupport" - openMfpErrors "github.com/openmfp/golang-commons/errors" + "github.com/platform-mesh/golang-commons/controller/testSupport" + "github.com/platform-mesh/golang-commons/errors" ) const subroutineFinalizer = "finalizer" @@ -20,15 +20,15 @@ type finalizerSubroutine struct { requeueAfter time.Duration } -func (c finalizerSubroutine) Process(_ context.Context, runtimeObj RuntimeObject) (controllerruntime.Result, openMfpErrors.OperatorError) { +func (c finalizerSubroutine) Process(_ context.Context, runtimeObj RuntimeObject) (controllerruntime.Result, errors.OperatorError) { instance := runtimeObj.(*testSupport.TestApiObject) instance.Status.Some = "other string" return controllerruntime.Result{}, nil } -func (c finalizerSubroutine) Finalize(_ context.Context, _ RuntimeObject) (controllerruntime.Result, openMfpErrors.OperatorError) { +func (c finalizerSubroutine) Finalize(_ context.Context, _ RuntimeObject) (controllerruntime.Result, errors.OperatorError) { if c.err != nil { - return controllerruntime.Result{}, openMfpErrors.NewOperatorError(c.err, true, true) + return controllerruntime.Result{}, errors.NewOperatorError(c.err, true, true) } if c.requeue { return controllerruntime.Result{Requeue: true}, nil diff --git a/controller/lifecycle/lifecycle.go b/controller/lifecycle/lifecycle.go index 4de5d87..4744ee0 100644 --- a/controller/lifecycle/lifecycle.go +++ b/controller/lifecycle/lifecycle.go @@ -21,10 +21,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/openmfp/golang-commons/controller/filter" - "github.com/openmfp/golang-commons/errors" - "github.com/openmfp/golang-commons/logger" - "github.com/openmfp/golang-commons/sentry" + "github.com/platform-mesh/golang-commons/controller/filter" + "github.com/platform-mesh/golang-commons/errors" + "github.com/platform-mesh/golang-commons/logger" + "github.com/platform-mesh/golang-commons/sentry" ) type LifecycleManager struct { diff --git a/controller/lifecycle/lifecycle_test.go b/controller/lifecycle/lifecycle_test.go index 81ca75d..fb331d1 100644 --- a/controller/lifecycle/lifecycle_test.go +++ b/controller/lifecycle/lifecycle_test.go @@ -19,13 +19,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/manager" - operrors "github.com/openmfp/golang-commons/errors" + operrors "github.com/platform-mesh/golang-commons/errors" - "github.com/openmfp/golang-commons/controller/lifecycle/mocks" - "github.com/openmfp/golang-commons/controller/testSupport" - "github.com/openmfp/golang-commons/logger" - "github.com/openmfp/golang-commons/logger/testlogger" - "github.com/openmfp/golang-commons/sentry" + "github.com/platform-mesh/golang-commons/controller/lifecycle/mocks" + "github.com/platform-mesh/golang-commons/controller/testSupport" + "github.com/platform-mesh/golang-commons/logger" + "github.com/platform-mesh/golang-commons/logger/testlogger" + "github.com/platform-mesh/golang-commons/sentry" ) func TestLifecycle(t *testing.T) { diff --git a/controller/lifecycle/spread.go b/controller/lifecycle/spread.go index dde9dda..19ad737 100644 --- a/controller/lifecycle/spread.go +++ b/controller/lifecycle/spread.go @@ -8,11 +8,11 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrl "sigs.k8s.io/controller-runtime" - "github.com/openmfp/golang-commons/logger" - "github.com/openmfp/golang-commons/sentry" + "github.com/platform-mesh/golang-commons/logger" + "github.com/platform-mesh/golang-commons/sentry" ) -const SpreadReconcileRefreshLabel = "openmfp.io/refresh-reconcile" +const SpreadReconcileRefreshLabel = "platform-mesh.io/refresh-reconcile" // WithSpreadingReconciles sets the LifecycleManager to spread out the reconciles func (l *LifecycleManager) WithSpreadingReconciles() *LifecycleManager { diff --git a/controller/lifecycle/spread_test.go b/controller/lifecycle/spread_test.go index 5991795..309f724 100644 --- a/controller/lifecycle/spread_test.go +++ b/controller/lifecycle/spread_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/mock" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/openmfp/golang-commons/controller/testSupport" - "github.com/openmfp/golang-commons/logger/testlogger" + "github.com/platform-mesh/golang-commons/controller/testSupport" + "github.com/platform-mesh/golang-commons/logger/testlogger" ) func TestGetNextReconcilationTime(t *testing.T) { diff --git a/controller/lifecycle/testSupport_test.go b/controller/lifecycle/testSupport_test.go index 4eeea99..16623ed 100644 --- a/controller/lifecycle/testSupport_test.go +++ b/controller/lifecycle/testSupport_test.go @@ -7,15 +7,15 @@ import ( "k8s.io/apimachinery/pkg/api/meta" - "github.com/openmfp/golang-commons/context/keys" + "github.com/platform-mesh/golang-commons/context/keys" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" controllerruntime "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/openmfp/golang-commons/controller/testSupport" - "github.com/openmfp/golang-commons/errors" + "github.com/platform-mesh/golang-commons/controller/testSupport" + "github.com/platform-mesh/golang-commons/errors" ) const failureScenarioSubroutineFinalizer = "failuresubroutine" diff --git a/controller/testSupport/client.go b/controller/testSupport/client.go index 4141f34..377f57f 100644 --- a/controller/testSupport/client.go +++ b/controller/testSupport/client.go @@ -14,7 +14,7 @@ import ( func CreateFakeClient(t *testing.T, objects ...client.Object) client.WithWatch { builder := fake.NewClientBuilder() s := runtime.NewScheme() - sBuilder := scheme.Builder{GroupVersion: schema.GroupVersion{Group: "test.openmfp.io", Version: "v1alpha1"}} + sBuilder := scheme.Builder{GroupVersion: schema.GroupVersion{Group: "test.platform-mesh.io", Version: "v1alpha1"}} sBuilder.Register(&TestApiObject{}) for _, obj := range objects { sBuilder.Register(obj) diff --git a/directive/authorized.go b/directive/authorized.go index 9e26edb..89efc60 100644 --- a/directive/authorized.go +++ b/directive/authorized.go @@ -9,9 +9,9 @@ import ( "github.com/99designs/gqlgen/graphql" openfgav1 "github.com/openfga/api/proto/openfga/v1" - openmfpcontext "github.com/openmfp/golang-commons/context" - "github.com/openmfp/golang-commons/fga/helpers" - "github.com/openmfp/golang-commons/logger" + pmcontext "github.com/platform-mesh/golang-commons/context" + "github.com/platform-mesh/golang-commons/fga/helpers" + "github.com/platform-mesh/golang-commons/logger" "github.com/vektah/gqlparser/v2/gqlerror" "google.golang.org/grpc/metadata" ) @@ -72,7 +72,7 @@ func Authorized(openfgaClient openfgav1.OpenFGAServiceClient, log *logger.Logger return nil, err } - token, err := openmfpcontext.GetAuthHeaderFromContext(ctx) + token, err := pmcontext.GetAuthHeaderFromContext(ctx) hasToken := err == nil if hasToken { @@ -86,7 +86,7 @@ func Authorized(openfgaClient openfgav1.OpenFGAServiceClient, log *logger.Logger return nil, err } - tenantID, err := openmfpcontext.GetTenantFromContext(ctx) + tenantID, err := pmcontext.GetTenantFromContext(ctx) if err != nil { return nil, err } @@ -116,13 +116,13 @@ func Authorized(openfgaClient openfgav1.OpenFGAServiceClient, log *logger.Logger var userID string if hasToken { - user, err := openmfpcontext.GetWebTokenFromContext(ctx) + user, err := pmcontext.GetWebTokenFromContext(ctx) if err != nil { return nil, err } userID = user.Subject } else { - spiffe, err := openmfpcontext.GetSpiffeFromContext(ctx) + spiffe, err := pmcontext.GetSpiffeFromContext(ctx) if err != nil { return nil, fmt.Errorf("authorized was invoked without a user token or a spiffe header") } diff --git a/directive/authorized_test.go b/directive/authorized_test.go index 881f83c..4428b18 100644 --- a/directive/authorized_test.go +++ b/directive/authorized_test.go @@ -9,14 +9,14 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/go-jose/go-jose/v4" openfgav1 "github.com/openfga/api/proto/openfga/v1" - openmfpcontext "github.com/openmfp/golang-commons/context" - "github.com/openmfp/golang-commons/context/keys" - logger "github.com/openmfp/golang-commons/logger/testlogger" + pmcontext "github.com/platform-mesh/golang-commons/context" + "github.com/platform-mesh/golang-commons/context/keys" + logger "github.com/platform-mesh/golang-commons/logger/testlogger" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/vektah/gqlparser/v2/gqlerror" - "github.com/openmfp/golang-commons/directive/mocks" + "github.com/platform-mesh/golang-commons/directive/mocks" ) const token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c" @@ -231,12 +231,12 @@ func TestAuthorized(t *testing.T) { }) if test.isTechnicalUser { - ctx = openmfpcontext.AddIsTechnicalIssuerToContext(ctx) + ctx = pmcontext.AddIsTechnicalIssuerToContext(ctx) } else { - ctx = openmfpcontext.AddTenantToContext(ctx, "tenant-id") + ctx = pmcontext.AddTenantToContext(ctx, "tenant-id") } - ctx = openmfpcontext.AddWebTokenToContext(ctx, token, signatureAlgorithms) - ctx = openmfpcontext.AddAuthHeaderToContext(ctx, fmt.Sprintf("Bearer %s", token)) + ctx = pmcontext.AddWebTokenToContext(ctx, token, signatureAlgorithms) + ctx = pmcontext.AddAuthHeaderToContext(ctx, fmt.Sprintf("Bearer %s", token)) _, err := Authorized(openfgaMock, log.Logger)(ctx, nil, nextFn, test.relation, test.entityType, test.entityTypeParamName, test.entityParamName) assert.Equal(t, test.expectedError, err) @@ -267,7 +267,7 @@ func TestAuthorizedWithSpiffeeHeader(t *testing.T) { ctx := context.Background() - ctx = openmfpcontext.AddSpiffeToContext(ctx, "spiffe://cluster.local/test-spiffee") + ctx = pmcontext.AddSpiffeToContext(ctx, "spiffe://cluster.local/test-spiffee") ctx = graphql.WithFieldContext(ctx, &graphql.FieldContext{ Args: map[string]any{ "tenantId": "test", @@ -349,12 +349,12 @@ func TestAuthorizedEdgeCases2(t *testing.T) { }) if test.isTechnicalUser { - ctx = openmfpcontext.AddIsTechnicalIssuerToContext(ctx) + ctx = pmcontext.AddIsTechnicalIssuerToContext(ctx) } else { ctx = context.WithValue(ctx, keys.WebTokenCtxKey, "tenantId") } - ctx = openmfpcontext.AddWebTokenToContext(ctx, token, signatureAlgorithms) - ctx = openmfpcontext.AddAuthHeaderToContext(ctx, fmt.Sprintf("Bearer %s", token)) + ctx = pmcontext.AddWebTokenToContext(ctx, token, signatureAlgorithms) + ctx = pmcontext.AddAuthHeaderToContext(ctx, fmt.Sprintf("Bearer %s", token)) _, err := Authorized(openfgaMock, log.Logger)(ctx, nil, nextFn, test.relation, test.entityType, test.entityTypeParamName, test.entityParamName) assert.Equal(t, test.expectedError, err) @@ -407,12 +407,12 @@ func TestAuthorizedEdgeCases(t *testing.T) { }) if test.isTechnicalUser { - ctx = openmfpcontext.AddIsTechnicalIssuerToContext(ctx) + ctx = pmcontext.AddIsTechnicalIssuerToContext(ctx) } else { - ctx = openmfpcontext.AddTenantToContext(ctx, "tenant-id") + ctx = pmcontext.AddTenantToContext(ctx, "tenant-id") } - ctx = openmfpcontext.AddWebTokenToContext(ctx, token, signatureAlgorithms) - ctx = openmfpcontext.AddAuthHeaderToContext(ctx, fmt.Sprintf("Bearer %s", token)) + ctx = pmcontext.AddWebTokenToContext(ctx, token, signatureAlgorithms) + ctx = pmcontext.AddAuthHeaderToContext(ctx, fmt.Sprintf("Bearer %s", token)) _, err := Authorized(openfgaMock, log.Logger)(ctx, nil, nextFn, test.relation, test.entityType, test.entityTypeParamName, test.entityParamName) assert.Equal(t, test.expectedError, err) @@ -475,12 +475,12 @@ func TestAuthorizedEdgeCases(t *testing.T) { }) if test.isTechnicalUser { - ctx = openmfpcontext.AddIsTechnicalIssuerToContext(ctx) + ctx = pmcontext.AddIsTechnicalIssuerToContext(ctx) } else { - ctx = openmfpcontext.AddTenantToContext(ctx, "tenant-id") + ctx = pmcontext.AddTenantToContext(ctx, "tenant-id") } - ctx = openmfpcontext.AddWebTokenToContext(ctx, token, signatureAlgorithms) - ctx = openmfpcontext.AddAuthHeaderToContext(ctx, fmt.Sprintf("Bearer %s", token)) + ctx = pmcontext.AddWebTokenToContext(ctx, token, signatureAlgorithms) + ctx = pmcontext.AddAuthHeaderToContext(ctx, fmt.Sprintf("Bearer %s", token)) _, err := Authorized(nil, log.Logger)(ctx, nil, nextFn, test.relation, test.entityType, test.entityTypeParamName, test.entityParamName) assert.Equal(t, test.expectedError.Error(), err.Error()) diff --git a/directive/mocks/mock_OpenFGAServiceClient.go b/directive/mocks/mock_OpenFGAServiceClient.go index 017db35..cdc48ac 100644 --- a/directive/mocks/mock_OpenFGAServiceClient.go +++ b/directive/mocks/mock_OpenFGAServiceClient.go @@ -79,9 +79,9 @@ type OpenFGAServiceClient_BatchCheck_Call struct { } // BatchCheck is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.BatchCheckRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) BatchCheck(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_BatchCheck_Call { return &OpenFGAServiceClient_BatchCheck_Call{Call: _e.mock.On("BatchCheck", append([]interface{}{ctx, in}, opts...)...)} @@ -89,8 +89,25 @@ func (_e *OpenFGAServiceClient_Expecter) BatchCheck(ctx interface{}, in interfac func (_c *OpenFGAServiceClient_BatchCheck_Call) Run(run func(ctx context.Context, in *openfgav1.BatchCheckRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_BatchCheck_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.BatchCheckRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.BatchCheckRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.BatchCheckRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -145,9 +162,9 @@ type OpenFGAServiceClient_Check_Call struct { } // Check is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.CheckRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) Check(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_Check_Call { return &OpenFGAServiceClient_Check_Call{Call: _e.mock.On("Check", append([]interface{}{ctx, in}, opts...)...)} @@ -155,8 +172,25 @@ func (_e *OpenFGAServiceClient_Expecter) Check(ctx interface{}, in interface{}, func (_c *OpenFGAServiceClient_Check_Call) Run(run func(ctx context.Context, in *openfgav1.CheckRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_Check_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.CheckRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.CheckRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.CheckRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -211,9 +245,9 @@ type OpenFGAServiceClient_CreateStore_Call struct { } // CreateStore is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.CreateStoreRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) CreateStore(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_CreateStore_Call { return &OpenFGAServiceClient_CreateStore_Call{Call: _e.mock.On("CreateStore", append([]interface{}{ctx, in}, opts...)...)} @@ -221,8 +255,25 @@ func (_e *OpenFGAServiceClient_Expecter) CreateStore(ctx interface{}, in interfa func (_c *OpenFGAServiceClient_CreateStore_Call) Run(run func(ctx context.Context, in *openfgav1.CreateStoreRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_CreateStore_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.CreateStoreRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.CreateStoreRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.CreateStoreRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -277,9 +328,9 @@ type OpenFGAServiceClient_DeleteStore_Call struct { } // DeleteStore is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.DeleteStoreRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) DeleteStore(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_DeleteStore_Call { return &OpenFGAServiceClient_DeleteStore_Call{Call: _e.mock.On("DeleteStore", append([]interface{}{ctx, in}, opts...)...)} @@ -287,8 +338,25 @@ func (_e *OpenFGAServiceClient_Expecter) DeleteStore(ctx interface{}, in interfa func (_c *OpenFGAServiceClient_DeleteStore_Call) Run(run func(ctx context.Context, in *openfgav1.DeleteStoreRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_DeleteStore_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.DeleteStoreRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.DeleteStoreRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.DeleteStoreRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -343,9 +411,9 @@ type OpenFGAServiceClient_Expand_Call struct { } // Expand is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.ExpandRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) Expand(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_Expand_Call { return &OpenFGAServiceClient_Expand_Call{Call: _e.mock.On("Expand", append([]interface{}{ctx, in}, opts...)...)} @@ -353,8 +421,25 @@ func (_e *OpenFGAServiceClient_Expecter) Expand(ctx interface{}, in interface{}, func (_c *OpenFGAServiceClient_Expand_Call) Run(run func(ctx context.Context, in *openfgav1.ExpandRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_Expand_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.ExpandRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.ExpandRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.ExpandRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -409,9 +494,9 @@ type OpenFGAServiceClient_GetStore_Call struct { } // GetStore is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.GetStoreRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) GetStore(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_GetStore_Call { return &OpenFGAServiceClient_GetStore_Call{Call: _e.mock.On("GetStore", append([]interface{}{ctx, in}, opts...)...)} @@ -419,8 +504,25 @@ func (_e *OpenFGAServiceClient_Expecter) GetStore(ctx interface{}, in interface{ func (_c *OpenFGAServiceClient_GetStore_Call) Run(run func(ctx context.Context, in *openfgav1.GetStoreRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_GetStore_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.GetStoreRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.GetStoreRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.GetStoreRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -475,9 +577,9 @@ type OpenFGAServiceClient_ListObjects_Call struct { } // ListObjects is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.ListObjectsRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) ListObjects(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_ListObjects_Call { return &OpenFGAServiceClient_ListObjects_Call{Call: _e.mock.On("ListObjects", append([]interface{}{ctx, in}, opts...)...)} @@ -485,8 +587,25 @@ func (_e *OpenFGAServiceClient_Expecter) ListObjects(ctx interface{}, in interfa func (_c *OpenFGAServiceClient_ListObjects_Call) Run(run func(ctx context.Context, in *openfgav1.ListObjectsRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_ListObjects_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.ListObjectsRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.ListObjectsRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.ListObjectsRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -541,9 +660,9 @@ type OpenFGAServiceClient_ListStores_Call struct { } // ListStores is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.ListStoresRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) ListStores(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_ListStores_Call { return &OpenFGAServiceClient_ListStores_Call{Call: _e.mock.On("ListStores", append([]interface{}{ctx, in}, opts...)...)} @@ -551,8 +670,25 @@ func (_e *OpenFGAServiceClient_Expecter) ListStores(ctx interface{}, in interfac func (_c *OpenFGAServiceClient_ListStores_Call) Run(run func(ctx context.Context, in *openfgav1.ListStoresRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_ListStores_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.ListStoresRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.ListStoresRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.ListStoresRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -607,9 +743,9 @@ type OpenFGAServiceClient_ListUsers_Call struct { } // ListUsers is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.ListUsersRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) ListUsers(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_ListUsers_Call { return &OpenFGAServiceClient_ListUsers_Call{Call: _e.mock.On("ListUsers", append([]interface{}{ctx, in}, opts...)...)} @@ -617,8 +753,25 @@ func (_e *OpenFGAServiceClient_Expecter) ListUsers(ctx interface{}, in interface func (_c *OpenFGAServiceClient_ListUsers_Call) Run(run func(ctx context.Context, in *openfgav1.ListUsersRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_ListUsers_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.ListUsersRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.ListUsersRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.ListUsersRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -673,9 +826,9 @@ type OpenFGAServiceClient_Read_Call struct { } // Read is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.ReadRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) Read(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_Read_Call { return &OpenFGAServiceClient_Read_Call{Call: _e.mock.On("Read", append([]interface{}{ctx, in}, opts...)...)} @@ -683,8 +836,25 @@ func (_e *OpenFGAServiceClient_Expecter) Read(ctx interface{}, in interface{}, o func (_c *OpenFGAServiceClient_Read_Call) Run(run func(ctx context.Context, in *openfgav1.ReadRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_Read_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.ReadRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.ReadRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.ReadRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -739,9 +909,9 @@ type OpenFGAServiceClient_ReadAssertions_Call struct { } // ReadAssertions is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.ReadAssertionsRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) ReadAssertions(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_ReadAssertions_Call { return &OpenFGAServiceClient_ReadAssertions_Call{Call: _e.mock.On("ReadAssertions", append([]interface{}{ctx, in}, opts...)...)} @@ -749,8 +919,25 @@ func (_e *OpenFGAServiceClient_Expecter) ReadAssertions(ctx interface{}, in inte func (_c *OpenFGAServiceClient_ReadAssertions_Call) Run(run func(ctx context.Context, in *openfgav1.ReadAssertionsRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_ReadAssertions_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.ReadAssertionsRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.ReadAssertionsRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.ReadAssertionsRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -805,9 +992,9 @@ type OpenFGAServiceClient_ReadAuthorizationModel_Call struct { } // ReadAuthorizationModel is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.ReadAuthorizationModelRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) ReadAuthorizationModel(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_ReadAuthorizationModel_Call { return &OpenFGAServiceClient_ReadAuthorizationModel_Call{Call: _e.mock.On("ReadAuthorizationModel", append([]interface{}{ctx, in}, opts...)...)} @@ -815,8 +1002,25 @@ func (_e *OpenFGAServiceClient_Expecter) ReadAuthorizationModel(ctx interface{}, func (_c *OpenFGAServiceClient_ReadAuthorizationModel_Call) Run(run func(ctx context.Context, in *openfgav1.ReadAuthorizationModelRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_ReadAuthorizationModel_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.ReadAuthorizationModelRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.ReadAuthorizationModelRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.ReadAuthorizationModelRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -871,9 +1075,9 @@ type OpenFGAServiceClient_ReadAuthorizationModels_Call struct { } // ReadAuthorizationModels is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.ReadAuthorizationModelsRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) ReadAuthorizationModels(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_ReadAuthorizationModels_Call { return &OpenFGAServiceClient_ReadAuthorizationModels_Call{Call: _e.mock.On("ReadAuthorizationModels", append([]interface{}{ctx, in}, opts...)...)} @@ -881,8 +1085,25 @@ func (_e *OpenFGAServiceClient_Expecter) ReadAuthorizationModels(ctx interface{} func (_c *OpenFGAServiceClient_ReadAuthorizationModels_Call) Run(run func(ctx context.Context, in *openfgav1.ReadAuthorizationModelsRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_ReadAuthorizationModels_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.ReadAuthorizationModelsRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.ReadAuthorizationModelsRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.ReadAuthorizationModelsRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -937,9 +1158,9 @@ type OpenFGAServiceClient_ReadChanges_Call struct { } // ReadChanges is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.ReadChangesRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) ReadChanges(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_ReadChanges_Call { return &OpenFGAServiceClient_ReadChanges_Call{Call: _e.mock.On("ReadChanges", append([]interface{}{ctx, in}, opts...)...)} @@ -947,8 +1168,25 @@ func (_e *OpenFGAServiceClient_Expecter) ReadChanges(ctx interface{}, in interfa func (_c *OpenFGAServiceClient_ReadChanges_Call) Run(run func(ctx context.Context, in *openfgav1.ReadChangesRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_ReadChanges_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.ReadChangesRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.ReadChangesRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.ReadChangesRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -1003,9 +1241,9 @@ type OpenFGAServiceClient_StreamedListObjects_Call struct { } // StreamedListObjects is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.StreamedListObjectsRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) StreamedListObjects(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_StreamedListObjects_Call { return &OpenFGAServiceClient_StreamedListObjects_Call{Call: _e.mock.On("StreamedListObjects", append([]interface{}{ctx, in}, opts...)...)} @@ -1013,8 +1251,25 @@ func (_e *OpenFGAServiceClient_Expecter) StreamedListObjects(ctx interface{}, in func (_c *OpenFGAServiceClient_StreamedListObjects_Call) Run(run func(ctx context.Context, in *openfgav1.StreamedListObjectsRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_StreamedListObjects_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.StreamedListObjectsRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.StreamedListObjectsRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.StreamedListObjectsRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -1069,9 +1324,9 @@ type OpenFGAServiceClient_UpdateStore_Call struct { } // UpdateStore is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.UpdateStoreRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) UpdateStore(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_UpdateStore_Call { return &OpenFGAServiceClient_UpdateStore_Call{Call: _e.mock.On("UpdateStore", append([]interface{}{ctx, in}, opts...)...)} @@ -1079,8 +1334,25 @@ func (_e *OpenFGAServiceClient_Expecter) UpdateStore(ctx interface{}, in interfa func (_c *OpenFGAServiceClient_UpdateStore_Call) Run(run func(ctx context.Context, in *openfgav1.UpdateStoreRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_UpdateStore_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.UpdateStoreRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.UpdateStoreRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.UpdateStoreRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -1135,9 +1407,9 @@ type OpenFGAServiceClient_Write_Call struct { } // Write is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.WriteRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) Write(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_Write_Call { return &OpenFGAServiceClient_Write_Call{Call: _e.mock.On("Write", append([]interface{}{ctx, in}, opts...)...)} @@ -1145,8 +1417,25 @@ func (_e *OpenFGAServiceClient_Expecter) Write(ctx interface{}, in interface{}, func (_c *OpenFGAServiceClient_Write_Call) Run(run func(ctx context.Context, in *openfgav1.WriteRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_Write_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.WriteRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.WriteRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.WriteRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -1201,9 +1490,9 @@ type OpenFGAServiceClient_WriteAssertions_Call struct { } // WriteAssertions is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.WriteAssertionsRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) WriteAssertions(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_WriteAssertions_Call { return &OpenFGAServiceClient_WriteAssertions_Call{Call: _e.mock.On("WriteAssertions", append([]interface{}{ctx, in}, opts...)...)} @@ -1211,8 +1500,25 @@ func (_e *OpenFGAServiceClient_Expecter) WriteAssertions(ctx interface{}, in int func (_c *OpenFGAServiceClient_WriteAssertions_Call) Run(run func(ctx context.Context, in *openfgav1.WriteAssertionsRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_WriteAssertions_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.WriteAssertionsRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.WriteAssertionsRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.WriteAssertionsRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } @@ -1267,9 +1573,9 @@ type OpenFGAServiceClient_WriteAuthorizationModel_Call struct { } // WriteAuthorizationModel is a helper method to define mock.On call -// - ctx -// - in -// - opts +// - ctx context.Context +// - in *openfgav1.WriteAuthorizationModelRequest +// - opts ...grpc.CallOption func (_e *OpenFGAServiceClient_Expecter) WriteAuthorizationModel(ctx interface{}, in interface{}, opts ...interface{}) *OpenFGAServiceClient_WriteAuthorizationModel_Call { return &OpenFGAServiceClient_WriteAuthorizationModel_Call{Call: _e.mock.On("WriteAuthorizationModel", append([]interface{}{ctx, in}, opts...)...)} @@ -1277,8 +1583,25 @@ func (_e *OpenFGAServiceClient_Expecter) WriteAuthorizationModel(ctx interface{} func (_c *OpenFGAServiceClient_WriteAuthorizationModel_Call) Run(run func(ctx context.Context, in *openfgav1.WriteAuthorizationModelRequest, opts ...grpc.CallOption)) *OpenFGAServiceClient_WriteAuthorizationModel_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := args[2].([]grpc.CallOption) - run(args[0].(context.Context), args[1].(*openfgav1.WriteAuthorizationModelRequest), variadicArgs...) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *openfgav1.WriteAuthorizationModelRequest + if args[1] != nil { + arg1 = args[1].(*openfgav1.WriteAuthorizationModelRequest) + } + var arg2 []grpc.CallOption + var variadicArgs []grpc.CallOption + if len(args) > 2 { + variadicArgs = args[2].([]grpc.CallOption) + } + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } diff --git a/directive/tenant.go b/directive/tenant.go index 1d28a0d..b631e4a 100644 --- a/directive/tenant.go +++ b/directive/tenant.go @@ -4,15 +4,16 @@ import ( "context" "github.com/99designs/gqlgen/graphql" - openmfpcontext "github.com/openmfp/golang-commons/context" - "github.com/openmfp/golang-commons/logger" "github.com/vektah/gqlparser/v2/gqlerror" + + pmpcontext "github.com/platform-mesh/golang-commons/context" + "github.com/platform-mesh/golang-commons/logger" ) func setTenantToContextForTechnicalUsers(ctx context.Context, l *logger.Logger) (context.Context, error) { - spiffee, err := openmfpcontext.GetSpiffeFromContext(ctx) + spiffee, err := pmpcontext.GetSpiffeFromContext(ctx) hasSpiffee := err == nil && spiffee != "" - if isTechnicalIssuer := openmfpcontext.GetIsTechnicalIssuerFromContext(ctx); !isTechnicalIssuer && !hasSpiffee { + if isTechnicalIssuer := pmpcontext.GetIsTechnicalIssuerFromContext(ctx); !isTechnicalIssuer && !hasSpiffee { return ctx, nil } @@ -32,7 +33,7 @@ func setTenantToContextForTechnicalUsers(ctx context.Context, l *logger.Logger) return ctx, nil } - ctx = openmfpcontext.AddTenantToContext(ctx, tenantID) + ctx = pmpcontext.AddTenantToContext(ctx, tenantID) l.Debug().Str("tenantId", tenantID).Msg("Added a tenant id for technical user to the context") return ctx, nil } diff --git a/directive/tenant_test.go b/directive/tenant_test.go index e376738..68a0121 100644 --- a/directive/tenant_test.go +++ b/directive/tenant_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/utils/ptr" - openmfpcontext "github.com/openmfp/golang-commons/context" - "github.com/openmfp/golang-commons/logger" + pmcontext "github.com/platform-mesh/golang-commons/context" + "github.com/platform-mesh/golang-commons/logger" ) func TestSetTenantToContextForTechnicalUsers(t *testing.T) { @@ -22,7 +22,7 @@ func TestSetTenantToContextForTechnicalUsers(t *testing.T) { }{ { name: "Technical user with tenantId", - ctx: openmfpcontext.AddIsTechnicalIssuerToContext(context.Background()), + ctx: pmcontext.AddIsTechnicalIssuerToContext(context.Background()), args: map[string]interface{}{ "tenantId": "tenant123", }, @@ -31,7 +31,7 @@ func TestSetTenantToContextForTechnicalUsers(t *testing.T) { }, { name: "Technical user with nil tenantId", - ctx: openmfpcontext.AddIsTechnicalIssuerToContext(context.Background()), + ctx: pmcontext.AddIsTechnicalIssuerToContext(context.Background()), args: map[string]interface{}{ "tenantId": (*string)(nil), }, @@ -49,7 +49,7 @@ func TestSetTenantToContextForTechnicalUsers(t *testing.T) { }, { name: "Non-technical user with spiffee", - ctx: openmfpcontext.AddSpiffeToContext(context.Background(), "spiffee123"), + ctx: pmcontext.AddSpiffeToContext(context.Background(), "spiffee123"), args: map[string]interface{}{ "tenantId": "tenant123", }, @@ -58,7 +58,7 @@ func TestSetTenantToContextForTechnicalUsers(t *testing.T) { }, { name: "Non-technical user with spiffee (*string)", - ctx: openmfpcontext.AddIsTechnicalIssuerToContext(context.Background()), + ctx: pmcontext.AddIsTechnicalIssuerToContext(context.Background()), args: map[string]interface{}{ "tenantId": ptr.To("tenant123"), }, @@ -67,7 +67,7 @@ func TestSetTenantToContextForTechnicalUsers(t *testing.T) { }, { name: "Non-technical user with spiffee (*string empty)", - ctx: openmfpcontext.AddIsTechnicalIssuerToContext(context.Background()), + ctx: pmcontext.AddIsTechnicalIssuerToContext(context.Background()), args: map[string]interface{}{ "tenantId": ptr.To(""), }, @@ -95,7 +95,7 @@ func TestSetTenantToContextForTechnicalUsers(t *testing.T) { } else { assert.NoError(t, err) if tt.expectedTenant != "" { - tenantID, err := openmfpcontext.GetTenantFromContext(newCtx) + tenantID, err := pmcontext.GetTenantFromContext(newCtx) assert.Nil(t, err) assert.Equal(t, tt.expectedTenant, tenantID) } diff --git a/errors/README.md b/errors/README.md index 9955787..1b3a180 100644 --- a/errors/README.md +++ b/errors/README.md @@ -1,4 +1,4 @@ -# OpenMFP Errors +# Platform Mesh Errors The `errors` package is a drop-in replacement for the stdlib `errors` package but enhances all errors with a stacktrace. This is especially useful in combination with Sentry as it implements @@ -7,7 +7,7 @@ the `StackFrames()` function that the Sentry SDK uses to collect data to show a ### Usage This package can be used like the default stdlib `errors` package. Just switch the import from -`errors` to `github.com/openmfp/golang-commons/errors`. +`errors` to `github.com/platform-mesh/golang-commons/errors`. Instead of `fmt.Errorf()` to wrap errors you can use the `errors.Errorf()` function from this package or the helper functions `errors.Wrap()` or `errors.Wrapf()`. diff --git a/fga/client/check_test.go b/fga/client/check_test.go index a9200cc..db7f74f 100644 --- a/fga/client/check_test.go +++ b/fga/client/check_test.go @@ -6,7 +6,7 @@ import ( "github.com/jellydator/ttlcache/v3" openfgav1 "github.com/openfga/api/proto/openfga/v1" - "github.com/openmfp/golang-commons/directive/mocks" + "github.com/platform-mesh/golang-commons/directive/mocks" "github.com/stretchr/testify/assert" ) diff --git a/fga/client/client.go b/fga/client/client.go index 22497d8..eac44ce 100644 --- a/fga/client/client.go +++ b/fga/client/client.go @@ -6,7 +6,7 @@ import ( "github.com/jellydator/ttlcache/v3" openfgav1 "github.com/openfga/api/proto/openfga/v1" - "github.com/openmfp/golang-commons/fga" + "github.com/platform-mesh/golang-commons/fga" ) var _ fga.OpenFGAClientServicer = (*OpenFGAClient)(nil) diff --git a/fga/client/client_test.go b/fga/client/client_test.go index 1b3ca92..ba6988a 100644 --- a/fga/client/client_test.go +++ b/fga/client/client_test.go @@ -3,7 +3,7 @@ package client import ( "testing" - "github.com/openmfp/golang-commons/directive/mocks" + "github.com/platform-mesh/golang-commons/directive/mocks" "github.com/stretchr/testify/assert" ) diff --git a/fga/client/read_test.go b/fga/client/read_test.go index aa4fbff..b51a1cb 100644 --- a/fga/client/read_test.go +++ b/fga/client/read_test.go @@ -6,8 +6,9 @@ import ( "github.com/jellydator/ttlcache/v3" openfgav1 "github.com/openfga/api/proto/openfga/v1" - "github.com/openmfp/golang-commons/directive/mocks" "github.com/stretchr/testify/assert" + + "github.com/platform-mesh/golang-commons/directive/mocks" ) func TestOpenFGAClient_Exists(t *testing.T) { diff --git a/fga/client/store_test.go b/fga/client/store_test.go index 827d039..0696372 100644 --- a/fga/client/store_test.go +++ b/fga/client/store_test.go @@ -8,7 +8,7 @@ import ( "github.com/jellydator/ttlcache/v3" openfgav1 "github.com/openfga/api/proto/openfga/v1" - "github.com/openmfp/golang-commons/directive/mocks" + "github.com/platform-mesh/golang-commons/directive/mocks" "github.com/stretchr/testify/assert" ) diff --git a/fga/client/write_test.go b/fga/client/write_test.go index 4eadcae..86cbdbb 100644 --- a/fga/client/write_test.go +++ b/fga/client/write_test.go @@ -6,7 +6,7 @@ import ( "github.com/jellydator/ttlcache/v3" openfgav1 "github.com/openfga/api/proto/openfga/v1" - "github.com/openmfp/golang-commons/directive/mocks" + "github.com/platform-mesh/golang-commons/directive/mocks" "github.com/stretchr/testify/assert" ) diff --git a/fga/helpers/helper_test.go b/fga/helpers/helper_test.go index f0b1505..cffc64e 100644 --- a/fga/helpers/helper_test.go +++ b/fga/helpers/helper_test.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/openmfp/golang-commons/directive/mocks" + "github.com/platform-mesh/golang-commons/directive/mocks" ) func TestGetModelIDForTenant(t *testing.T) { diff --git a/fga/policy_services/mocks/mock_TenantIdReader.go b/fga/policy_services/mocks/mock_TenantIdReader.go index 4267ba1..1cca8c8 100644 --- a/fga/policy_services/mocks/mock_TenantIdReader.go +++ b/fga/policy_services/mocks/mock_TenantIdReader.go @@ -69,14 +69,20 @@ type TenantIdReader_Read_Call struct { } // Read is a helper method to define mock.On call -// - parentCtx +// - parentCtx context.Context func (_e *TenantIdReader_Expecter) Read(parentCtx interface{}) *TenantIdReader_Read_Call { return &TenantIdReader_Read_Call{Call: _e.mock.On("Read", parentCtx)} } func (_c *TenantIdReader_Read_Call) Run(run func(parentCtx context.Context)) *TenantIdReader_Read_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + run( + arg0, + ) }) return _c } diff --git a/fga/store/mocks/mock_FGAStoreHelper.go b/fga/store/mocks/mock_FGAStoreHelper.go index dbe3939..95e82a2 100644 --- a/fga/store/mocks/mock_FGAStoreHelper.go +++ b/fga/store/mocks/mock_FGAStoreHelper.go @@ -70,16 +70,32 @@ type FGAStoreHelper_GetModelIDForTenant_Call struct { } // GetModelIDForTenant is a helper method to define mock.On call -// - ctx -// - conn -// - tenantID +// - ctx context.Context +// - conn openfgav1.OpenFGAServiceClient +// - tenantID string func (_e *FGAStoreHelper_Expecter) GetModelIDForTenant(ctx interface{}, conn interface{}, tenantID interface{}) *FGAStoreHelper_GetModelIDForTenant_Call { return &FGAStoreHelper_GetModelIDForTenant_Call{Call: _e.mock.On("GetModelIDForTenant", ctx, conn, tenantID)} } func (_c *FGAStoreHelper_GetModelIDForTenant_Call) Run(run func(ctx context.Context, conn openfgav1.OpenFGAServiceClient, tenantID string)) *FGAStoreHelper_GetModelIDForTenant_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(openfgav1.OpenFGAServiceClient), args[2].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 openfgav1.OpenFGAServiceClient + if args[1] != nil { + arg1 = args[1].(openfgav1.OpenFGAServiceClient) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) }) return _c } @@ -126,16 +142,32 @@ type FGAStoreHelper_GetStoreIDForTenant_Call struct { } // GetStoreIDForTenant is a helper method to define mock.On call -// - ctx -// - conn -// - tenantID +// - ctx context.Context +// - conn openfgav1.OpenFGAServiceClient +// - tenantID string func (_e *FGAStoreHelper_Expecter) GetStoreIDForTenant(ctx interface{}, conn interface{}, tenantID interface{}) *FGAStoreHelper_GetStoreIDForTenant_Call { return &FGAStoreHelper_GetStoreIDForTenant_Call{Call: _e.mock.On("GetStoreIDForTenant", ctx, conn, tenantID)} } func (_c *FGAStoreHelper_GetStoreIDForTenant_Call) Run(run func(ctx context.Context, conn openfgav1.OpenFGAServiceClient, tenantID string)) *FGAStoreHelper_GetStoreIDForTenant_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(openfgav1.OpenFGAServiceClient), args[2].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 openfgav1.OpenFGAServiceClient + if args[1] != nil { + arg1 = args[1].(openfgav1.OpenFGAServiceClient) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) }) return _c } @@ -173,14 +205,20 @@ type FGAStoreHelper_IsDuplicateWriteError_Call struct { } // IsDuplicateWriteError is a helper method to define mock.On call -// - err +// - err error func (_e *FGAStoreHelper_Expecter) IsDuplicateWriteError(err interface{}) *FGAStoreHelper_IsDuplicateWriteError_Call { return &FGAStoreHelper_IsDuplicateWriteError_Call{Call: _e.mock.On("IsDuplicateWriteError", err)} } func (_c *FGAStoreHelper_IsDuplicateWriteError_Call) Run(run func(err error)) *FGAStoreHelper_IsDuplicateWriteError_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(error)) + var arg0 error + if args[0] != nil { + arg0 = args[0].(error) + } + run( + arg0, + ) }) return _c } diff --git a/fga/store/store_test.go b/fga/store/store_test.go index 32063d3..381f676 100644 --- a/fga/store/store_test.go +++ b/fga/store/store_test.go @@ -10,8 +10,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/openmfp/golang-commons/directive/mocks" - fgastore "github.com/openmfp/golang-commons/fga/store" + "github.com/platform-mesh/golang-commons/directive/mocks" + fgastore "github.com/platform-mesh/golang-commons/fga/store" ) func TestGetModelIDForTenant(t *testing.T) { diff --git a/go.mod b/go.mod index c7bedc8..09080e8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/openmfp/golang-commons +module github.com/platform-mesh/golang-commons go 1.24.3 diff --git a/logger/README.md b/logger/README.md index ead9f85..abd8aaf 100644 --- a/logger/README.md +++ b/logger/README.md @@ -1,6 +1,6 @@ -# OpenMFP Logger +# Platform Mesh Logger -The OpenMFP logger is a structured type safe logger that operates on top of [Zerolog](https://github.com/rs/zerolog). +The Platform Mesh logger is a structured type safe logger that operates on top of [Zerolog](https://github.com/rs/zerolog). It can create JSON formatted logs but also tagged logs for console output. ### Initialization @@ -97,10 +97,10 @@ and give this field a common name that can be used for in Kibana. ### Logr Instance -The helper method `log.Logr()` returns a log instance of an existing OpenMFP Logger that fulfills the `logr.Logger` interface from [go-logr](https://github.com/go-logr/logr). +The helper method `log.Logr()` returns a log instance of an existing Platform Mesh Logger that fulfills the `logr.Logger` interface from [go-logr](https://github.com/go-logr/logr). This is a common interface that is used in many external packages for instance in the Kubernetes controller runtime. -The returned logger inherits settings from the existing OpenMFP Logger. +The returned logger inherits settings from the existing Platform Mesh Logger. ### Default Logger @@ -109,11 +109,11 @@ The package defines a global default logger as `logger.StdLogger`. Please only u Please always create a new logger instance with `New()` and pass it to structs and functions. This makes testing easier and is in general best practice. -### OpenMFP Logger from Zerolog +### Platform Mesh Logger from Zerolog -Because the OpenMFP logger internally embeds Zerolog it is compatible with new versions of Zerolog. +Because the Platform Mesh logger internally embeds Zerolog it is compatible with new versions of Zerolog. Nevertheless, because of this embeding, some functions return Zerolog instances. -It is very easy to return a new OpenMFP logger from a Zerolog instance using this helper function: +It is very easy to return a new Platform Mesh logger from a Zerolog instance using this helper function: ```go log := NewFromZerolog(zerologger) ``` diff --git a/logger/logger.go b/logger/logger.go index e8bb67a..b2ace46 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -13,7 +13,7 @@ import ( "github.com/go-logr/zerologr" "github.com/rs/zerolog" - "github.com/openmfp/golang-commons/context/keys" + "github.com/platform-mesh/golang-commons/context/keys" ) type Level zerolog.Level @@ -98,7 +98,7 @@ func (l *Logger) MustChildLoggerWithAttributes(keyVal ...string) *Logger { return logger } -// Level wraps the underlying zerolog level func to openmfp logger level +// Level wraps the underlying zerolog level func to Platform Mesh logger level func (l *Logger) Level(lvl Level) *Logger { return NewFromZerolog(l.Logger.Level(zerolog.Level(lvl))) } diff --git a/logger/logger_test.go b/logger/logger_test.go index d7a39d8..91987a8 100644 --- a/logger/logger_test.go +++ b/logger/logger_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - "github.com/openmfp/golang-commons/context/keys" + "github.com/platform-mesh/golang-commons/context/keys" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" ) diff --git a/logger/testlogger/test_logger.go b/logger/testlogger/test_logger.go index c2f5418..c880176 100644 --- a/logger/testlogger/test_logger.go +++ b/logger/testlogger/test_logger.go @@ -9,7 +9,7 @@ import ( "github.com/rs/zerolog" - "github.com/openmfp/golang-commons/logger" + "github.com/platform-mesh/golang-commons/logger" ) type TestLogger struct { diff --git a/logger/testlogger/test_logger_test.go b/logger/testlogger/test_logger_test.go index d3236ed..5649ec7 100644 --- a/logger/testlogger/test_logger_test.go +++ b/logger/testlogger/test_logger_test.go @@ -7,7 +7,7 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/assert" - "github.com/openmfp/golang-commons/logger" + "github.com/platform-mesh/golang-commons/logger" ) func TestTestLogger(t *testing.T) { diff --git a/oauth/kubernetes_source_test.go b/oauth/kubernetes_source_test.go index 7cd10d2..25fed6b 100644 --- a/oauth/kubernetes_source_test.go +++ b/oauth/kubernetes_source_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/openmfp/golang-commons/oauth" + "github.com/platform-mesh/golang-commons/oauth" "github.com/stretchr/testify/assert" authenticationv1 "k8s.io/api/authentication/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/policy_services/common.go b/policy_services/common.go index f212391..8804f3e 100644 --- a/policy_services/common.go +++ b/policy_services/common.go @@ -10,9 +10,9 @@ import ( "github.com/machinebox/graphql" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" - openmfpcontext "github.com/openmfp/golang-commons/context" - "github.com/openmfp/golang-commons/jwt" - "github.com/openmfp/golang-commons/logger" + pmcontext "github.com/platform-mesh/golang-commons/context" + "github.com/platform-mesh/golang-commons/jwt" + "github.com/platform-mesh/golang-commons/logger" ) func createClient(ctx context.Context, iamApiUrl string) *graphql.Client { @@ -28,7 +28,7 @@ func createClient(ctx context.Context, iamApiUrl string) *graphql.Client { } func run(ctx context.Context, client GraphqlClient, request *graphql.Request, resp interface{}, timeout time.Duration) error { - auth, err := openmfpcontext.GetAuthHeaderFromContext(ctx) + auth, err := pmcontext.GetAuthHeaderFromContext(ctx) if err != nil || len(auth) == 0 { return fmt.Errorf("the request context does not contain an auth header under the key %q. You can use authz.context to set it", jwt.AuthHeaderCtxKey) } diff --git a/policy_services/graphqlTenantReader_test.go b/policy_services/graphqlTenantReader_test.go index 1cf3cc3..8d36fbb 100644 --- a/policy_services/graphqlTenantReader_test.go +++ b/policy_services/graphqlTenantReader_test.go @@ -9,7 +9,7 @@ import ( "github.com/go-jose/go-jose/v4" "github.com/golang-jwt/jwt/v5" "github.com/machinebox/graphql" - openmfpcontext "github.com/openmfp/golang-commons/context" + pmcontext "github.com/platform-mesh/golang-commons/context" "github.com/stretchr/testify/assert" ) @@ -52,8 +52,8 @@ func TestTenantReader(t *testing.T) { token, err := jwt.NewWithClaims(jwt.SigningMethodNone, claims).SignedString(jwt.UnsafeAllowNoneSignatureType) assert.NoError(t, err) - ctx := openmfpcontext.AddAuthHeaderToContext(context.Background(), fmt.Sprintf("Bearer %s", token)) - ctx = openmfpcontext.AddWebTokenToContext(ctx, token, []jose.SignatureAlgorithm{jose.SignatureAlgorithm("none")}) + ctx := pmcontext.AddAuthHeaderToContext(context.Background(), fmt.Sprintf("Bearer %s", token)) + ctx = pmcontext.AddWebTokenToContext(ctx, token, []jose.SignatureAlgorithm{jose.SignatureAlgorithm("none")}) t.Run("gets a tenant from a mocked client", func(t *testing.T) { // Arrange diff --git a/policy_services/localTenantReader_test.go b/policy_services/localTenantReader_test.go index 23ac5d8..587c6dc 100644 --- a/policy_services/localTenantReader_test.go +++ b/policy_services/localTenantReader_test.go @@ -7,8 +7,9 @@ import ( "github.com/go-jose/go-jose/v4" "github.com/golang-jwt/jwt/v5" - openmfpcontext "github.com/openmfp/golang-commons/context" "github.com/stretchr/testify/assert" + + pmcontext "github.com/platform-mesh/golang-commons/context" ) func TestLocalTenantReader(t *testing.T) { @@ -23,8 +24,8 @@ func TestLocalTenantReader(t *testing.T) { token, err := jwt.NewWithClaims(jwt.SigningMethodNone, claims).SignedString(jwt.UnsafeAllowNoneSignatureType) assert.NoError(t, err) - testContext = openmfpcontext.AddWebTokenToContext(testContext, token, []jose.SignatureAlgorithm{jose.SignatureAlgorithm("none")}) - testContext = openmfpcontext.AddAuthHeaderToContext(testContext, fmt.Sprintf("Bearer %s", token)) + testContext = pmcontext.AddWebTokenToContext(testContext, token, []jose.SignatureAlgorithm{jose.SignatureAlgorithm("none")}) + testContext = pmcontext.AddAuthHeaderToContext(testContext, fmt.Sprintf("Bearer %s", token)) // Act id, err := reader.RetrieveTenant(testContext) diff --git a/policy_services/tenantRetriever.go b/policy_services/tenantRetriever.go index a16d53f..a838cb1 100644 --- a/policy_services/tenantRetriever.go +++ b/policy_services/tenantRetriever.go @@ -7,8 +7,8 @@ import ( lru "github.com/hashicorp/golang-lru/v2" "github.com/machinebox/graphql" - openmfpcontext "github.com/openmfp/golang-commons/context" - "github.com/openmfp/golang-commons/logger" + pmcontext "github.com/platform-mesh/golang-commons/context" + "github.com/platform-mesh/golang-commons/logger" ) type GraphqlData struct { @@ -57,7 +57,7 @@ type TenantRetriever interface { } func (tenantRetriever *TenantRetrieverService) RetrieveTenant(ctx context.Context) (string, error) { - webToken, err := openmfpcontext.GetWebTokenFromContext(ctx) + webToken, err := pmcontext.GetWebTokenFromContext(ctx) if err != nil { return "", nil } diff --git a/policy_services/tenantRetriever_test.go b/policy_services/tenantRetriever_test.go index 556d0f2..1543085 100644 --- a/policy_services/tenantRetriever_test.go +++ b/policy_services/tenantRetriever_test.go @@ -10,7 +10,7 @@ import ( "github.com/go-jose/go-jose/v4" "github.com/golang-jwt/jwt/v5" - openmfpcontext "github.com/openmfp/golang-commons/context" + pmcontext "github.com/platform-mesh/golang-commons/context" "github.com/stretchr/testify/assert" ) @@ -52,7 +52,7 @@ func TestTenantRetriever(t *testing.T) { claims := &jwt.RegisteredClaims{Audience: jwt.ClaimStrings{audience}} token, _ := jwt.NewWithClaims(jwt.SigningMethodNone, claims).SignedString(jwt.UnsafeAllowNoneSignatureType) - ctx := openmfpcontext.AddAuthHeaderToContext(context.Background(), fmt.Sprintf("Bearer %s", token)) + ctx := pmcontext.AddAuthHeaderToContext(context.Background(), fmt.Sprintf("Bearer %s", token)) id, err := retriever.RetrieveTenant(ctx) @@ -65,7 +65,7 @@ func TestTenantRetriever(t *testing.T) { claims := &jwt.RegisteredClaims{Issuer: issuer} token, _ := jwt.NewWithClaims(jwt.SigningMethodNone, claims).SignedString(jwt.UnsafeAllowNoneSignatureType) - ctx := openmfpcontext.AddAuthHeaderToContext(context.Background(), fmt.Sprintf("Bearer %s", token)) + ctx := pmcontext.AddAuthHeaderToContext(context.Background(), fmt.Sprintf("Bearer %s", token)) id, err := retriever.RetrieveTenant(ctx) @@ -86,8 +86,8 @@ func TestTenantRetriever(t *testing.T) { claims := &jwt.RegisteredClaims{Issuer: issuer, Audience: jwt.ClaimStrings{audience}} token, err := jwt.NewWithClaims(jwt.SigningMethodNone, claims).SignedString(jwt.UnsafeAllowNoneSignatureType) assert.NoError(t, err) - testContext = openmfpcontext.AddWebTokenToContext(testContext, token, []jose.SignatureAlgorithm{jose.SignatureAlgorithm("none")}) - testContext = openmfpcontext.AddAuthHeaderToContext(testContext, fmt.Sprintf("Bearer %s", token)) + testContext = pmcontext.AddWebTokenToContext(testContext, token, []jose.SignatureAlgorithm{jose.SignatureAlgorithm("none")}) + testContext = pmcontext.AddAuthHeaderToContext(testContext, fmt.Sprintf("Bearer %s", token)) id, err := retriever.RetrieveTenant(testContext) // Assert @@ -103,8 +103,8 @@ func TestTenantRetriever(t *testing.T) { claims := &jwt.RegisteredClaims{Issuer: issuer, Audience: jwt.ClaimStrings{audience}} token, err := jwt.NewWithClaims(jwt.SigningMethodNone, claims).SignedString(jwt.UnsafeAllowNoneSignatureType) assert.NoError(t, err) - testContext = openmfpcontext.AddWebTokenToContext(testContext, token, []jose.SignatureAlgorithm{jose.SignatureAlgorithm("none")}) - testContext = openmfpcontext.AddAuthHeaderToContext(testContext, fmt.Sprintf("Bearer %s", token)) + testContext = pmcontext.AddWebTokenToContext(testContext, token, []jose.SignatureAlgorithm{jose.SignatureAlgorithm("none")}) + testContext = pmcontext.AddAuthHeaderToContext(testContext, fmt.Sprintf("Bearer %s", token)) id1, err1 := retriever.RetrieveTenant(testContext) id2, err2 := retriever.RetrieveTenant(testContext) @@ -125,8 +125,8 @@ func TestTenantRetriever(t *testing.T) { claims := &jwt.RegisteredClaims{Issuer: issuer, Audience: jwt.ClaimStrings{audience}} token, err := jwt.NewWithClaims(jwt.SigningMethodNone, claims).SignedString(jwt.UnsafeAllowNoneSignatureType) assert.NoError(t, err) - testContext = openmfpcontext.AddWebTokenToContext(testContext, token, []jose.SignatureAlgorithm{jose.SignatureAlgorithm("none")}) - testContext = openmfpcontext.AddAuthHeaderToContext(testContext, fmt.Sprintf("Bearer %s", token)) + testContext = pmcontext.AddWebTokenToContext(testContext, token, []jose.SignatureAlgorithm{jose.SignatureAlgorithm("none")}) + testContext = pmcontext.AddAuthHeaderToContext(testContext, fmt.Sprintf("Bearer %s", token)) retriever, mockClient := createRetrieverWithMock() errMsg := "oh nose" mockedErr := errors.New(errMsg) @@ -158,7 +158,7 @@ func TestTenantRetriever(t *testing.T) { claims := &jwt.RegisteredClaims{Issuer: issuer, Audience: jwt.ClaimStrings{audience + strconv.Itoa(in%3)}} token, err := jwt.NewWithClaims(jwt.SigningMethodNone, claims).SignedString(jwt.UnsafeAllowNoneSignatureType) assert.NoError(t, err) - ctx := openmfpcontext.AddAuthHeaderToContext(context.Background(), fmt.Sprintf("Bearer %s", token)) + ctx := pmcontext.AddAuthHeaderToContext(context.Background(), fmt.Sprintf("Bearer %s", token)) _, _ = retriever.RetrieveTenant(ctx) }(i) @@ -182,8 +182,8 @@ func TestTenantRetriever(t *testing.T) { claims := &jwt.RegisteredClaims{Issuer: issuer, Audience: jwt.ClaimStrings{audience}} token, err := jwt.NewWithClaims(jwt.SigningMethodNone, claims).SignedString(jwt.UnsafeAllowNoneSignatureType) assert.NoError(t, err) - testContext = openmfpcontext.AddWebTokenToContext(testContext, token, []jose.SignatureAlgorithm{jose.SignatureAlgorithm("none")}) - testContext = openmfpcontext.AddAuthHeaderToContext(testContext, fmt.Sprintf("Bearer %s", token)) + testContext = pmcontext.AddWebTokenToContext(testContext, token, []jose.SignatureAlgorithm{jose.SignatureAlgorithm("none")}) + testContext = pmcontext.AddAuthHeaderToContext(testContext, fmt.Sprintf("Bearer %s", token)) // Act id, err := r.RetrieveTenant(testContext) @@ -202,8 +202,8 @@ func TestTenantRetriever(t *testing.T) { claims := &jwt.RegisteredClaims{Issuer: issuer, Audience: jwt.ClaimStrings{audience}} token, err := jwt.NewWithClaims(jwt.SigningMethodNone, claims).SignedString(jwt.UnsafeAllowNoneSignatureType) assert.NoError(t, err) - testContext = openmfpcontext.AddWebTokenToContext(testContext, token, []jose.SignatureAlgorithm{jose.SignatureAlgorithm("none")}) - testContext = openmfpcontext.AddAuthHeaderToContext(testContext, fmt.Sprintf("Bearer %s", token)) + testContext = pmcontext.AddWebTokenToContext(testContext, token, []jose.SignatureAlgorithm{jose.SignatureAlgorithm("none")}) + testContext = pmcontext.AddAuthHeaderToContext(testContext, fmt.Sprintf("Bearer %s", token)) // Act id, err := r.RetrieveTenant(testContext) diff --git a/renovate.json b/renovate.json index 136acf7..f3e3225 100644 --- a/renovate.json +++ b/renovate.json @@ -1,6 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "local>openmfp/.github:renovate-config" + "local>platform-mesh/.github:renovate-config" ] } diff --git a/sentry/README.md b/sentry/README.md index a510746..583446e 100644 --- a/sentry/README.md +++ b/sentry/README.md @@ -1,4 +1,4 @@ -# OpenMFP Sentry +# Platform Mesh Sentry The `sentry` package implements some helper functions to use in applications that want to send error captures to Sentry. @@ -84,9 +84,9 @@ But it uses provided tags and extras if the error is of `sentry.Error` type. ### Better Stack Traces If you create a SentryError from an existing error the current stack trace is added. This is done by wrapping it as an -`ErrorWithStack` from `github.com/openmfp/golang-commons/errors` +`ErrorWithStack` from `github.com/platform-mesh/golang-commons/errors` -You can use the `github.com/openmfp/golang-commons/errors` package as a drop-in replacement for the stdlib `errors` package +You can use the `github.com/platform-mesh/golang-commons/errors` package as a drop-in replacement for the stdlib `errors` package everywhere in your application. This way you get additional stack traces for every wrapped error in the Sentry UI. ### GraphQL Error Presenter @@ -96,7 +96,7 @@ It can be used in a GraphQL service like so: ```go import ( - "github.com/openmfp/golang-commons/sentry" + "github.com/platform-mesh/golang-commons/sentry" ) gqHandler.SetErrorPresenter(sentry.GraphQLErrorPresenter()) @@ -122,8 +122,8 @@ import ( "os/signal" "syscall" - "github.com/openmfp/golang-commons/sentry" - "github.com/openmfp/golang-commons/logger" + "github.com/platform-mesh/golang-commons/sentry" + "github.com/platform-mesh/golang-commons/logger" ) func main() { diff --git a/sentry/context.go b/sentry/context.go index 6beae63..62afa8e 100644 --- a/sentry/context.go +++ b/sentry/context.go @@ -3,7 +3,7 @@ package sentry import ( "context" - "github.com/openmfp/golang-commons/context/keys" + "github.com/platform-mesh/golang-commons/context/keys" ) func GetSentryTagsFromContext(ctx context.Context) map[string]string { diff --git a/sentry/filter_test.go b/sentry/filter_test.go index 4ff984f..e5d4951 100644 --- a/sentry/filter_test.go +++ b/sentry/filter_test.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - openmfperrors "github.com/openmfp/golang-commons/errors" + pmerrors "github.com/platform-mesh/golang-commons/errors" ) func TestIsTerminatingNSError(t *testing.T) { @@ -49,7 +49,7 @@ func TestShouldBeProcessedPositive(t *testing.T) { } func TestShouldBeProcessedSentryPositive(t *testing.T) { - err := openmfperrors.New("test error") + err := pmerrors.New("test error") sentryError := SentryError(err) shouldBeProcessed := ShouldBeProcessed(sentryError) assert.True(t, shouldBeProcessed) diff --git a/sentry/graphql_middleware.go b/sentry/graphql_middleware.go index 2fbc6c9..cb423be 100644 --- a/sentry/graphql_middleware.go +++ b/sentry/graphql_middleware.go @@ -8,8 +8,8 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/vektah/gqlparser/v2/gqlerror" - openmfpcontext "github.com/openmfp/golang-commons/context" - "github.com/openmfp/golang-commons/logger" + pmcontext "github.com/platform-mesh/golang-commons/context" + "github.com/platform-mesh/golang-commons/logger" ) // GraphQLErrorPresenter returns a function that can be used as GraphQL error presenter @@ -23,9 +23,9 @@ func GraphQLErrorPresenter(skipTenants ...string) graphql.ErrorPresenterFunc { if !IsSentryError(e) { l := logger.LoadLoggerFromContext(ctx) - spiffe, err2 := openmfpcontext.GetSpiffeFromContext(ctx) - isTechnicalIssuer := openmfpcontext.GetIsTechnicalIssuerFromContext(ctx) - webToken, err3 := openmfpcontext.GetWebTokenFromContext(ctx) + spiffe, err2 := pmcontext.GetSpiffeFromContext(ctx) + isTechnicalIssuer := pmcontext.GetIsTechnicalIssuerFromContext(ctx) + webToken, err3 := pmcontext.GetWebTokenFromContext(ctx) event := l.Debug().Err(err) if err2 == nil { @@ -39,11 +39,11 @@ func GraphQLErrorPresenter(skipTenants ...string) graphql.ErrorPresenterFunc { return err } - if !openmfpcontext.HasTenantInContext(ctx) { + if !pmcontext.HasTenantInContext(ctx) { captureErrorForContext(ctx, err, "") } - tenantID, _ := openmfpcontext.GetTenantFromContext(ctx) + tenantID, _ := pmcontext.GetTenantFromContext(ctx) // return without sending to Sentry if tenant should be skipped for _, tenant := range skipTenants { @@ -65,7 +65,7 @@ func GraphQLRecover(log *logger.Logger) graphql.RecoverFunc { return func(ctx context.Context, err interface{}) (userMessage error) { log.Error().Interface("stack", debug.Stack()).Msgf("GraphQL panic: %v", err) - tenantID, ctxErr := openmfpcontext.GetTenantFromContext(ctx) + tenantID, ctxErr := pmcontext.GetTenantFromContext(ctx) if ctxErr != nil { captureErrorForContext(ctx, ctxErr, "") } diff --git a/sentry/graphql_middleware_test.go b/sentry/graphql_middleware_test.go index 092eac3..b149f7d 100644 --- a/sentry/graphql_middleware_test.go +++ b/sentry/graphql_middleware_test.go @@ -6,21 +6,21 @@ import ( "testing" "github.com/99designs/gqlgen/graphql" - "github.com/openmfp/golang-commons/logger" + "github.com/platform-mesh/golang-commons/logger" "github.com/stretchr/testify/assert" "github.com/vektah/gqlparser/v2/ast" "github.com/vektah/gqlparser/v2/gqlerror" - openmfpcontext "github.com/openmfp/golang-commons/context" - "github.com/openmfp/golang-commons/jwt" - testlogger "github.com/openmfp/golang-commons/logger/testlogger" + pmcontext "github.com/platform-mesh/golang-commons/context" + "github.com/platform-mesh/golang-commons/jwt" + testlogger "github.com/platform-mesh/golang-commons/logger/testlogger" ) func TestGraphQLRecover(t *testing.T) { // Given log := testlogger.New() recoverFunc := GraphQLRecover(log.Logger) - ctx := context.WithValue(context.Background(), openmfpcontext.ContextKey(jwt.TenantIdCtxKey), "test") + ctx := context.WithValue(context.Background(), pmcontext.ContextKey(jwt.TenantIdCtxKey), "test") ctx = graphql.WithOperationContext(ctx, &graphql.OperationContext{ Operation: &ast.OperationDefinition{ Name: "test", @@ -49,7 +49,7 @@ func TestGraphQLErrorPresenter(t *testing.T) { //Given presenter := GraphQLErrorPresenter() testError := errors.New("test error") - ctx := openmfpcontext.AddTenantToContext(context.Background(), "test") + ctx := pmcontext.AddTenantToContext(context.Background(), "test") //When err := presenter(ctx, testError) @@ -90,7 +90,7 @@ func TestGraphQLErrorPresenterWithSkipTenants(t *testing.T) { presenter := GraphQLErrorPresenter("test") testError := SentryError(errors.New("test error")) tl := testlogger.New() - ctx := openmfpcontext.AddTenantToContext(context.Background(), "test") + ctx := pmcontext.AddTenantToContext(context.Background(), "test") ctx = logger.SetLoggerInContext(ctx, tl.Logger) //When diff --git a/test/openfga.go b/test/openfga.go index 4598d77..7923148 100644 --- a/test/openfga.go +++ b/test/openfga.go @@ -8,7 +8,7 @@ import ( language "github.com/openfga/language/pkg/go/transformer" "github.com/openfga/openfga/pkg/server" "github.com/openfga/openfga/pkg/storage/memory" - "github.com/openmfp/golang-commons/fga/helpers" + "github.com/platform-mesh/golang-commons/fga/helpers" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/resolver"