From eb279bf0564057bbf2bb08c897f5d8351d21e58f Mon Sep 17 00:00:00 2001 From: Sylwester Piskozub Date: Thu, 12 Jun 2025 14:52:27 +0200 Subject: [PATCH 1/2] fix: change error message if no organization exists (#2088) Signed-off-by: Sylwester Piskozub --- app/cli/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/cli/main.go b/app/cli/main.go index ff807fce3..6f90b9d19 100644 --- a/app/cli/main.go +++ b/app/cli/main.go @@ -90,7 +90,7 @@ func errorInfo(err error, logger zerolog.Logger) (string, int) { case isWrappedErr(st, jwtMiddleware.ErrMissingJwtToken): msg = "authentication required, please run \"chainloop auth login\"" case v1.IsUserNotMemberOfOrgErrorNotInOrg(err), v1.IsUserWithNoMembershipErrorNotInOrg(err): - msg = "the organization you are trying to access does not exist, please run \"chainloop auth login\"" + msg = "you are not part of any organization, please run \"chainloop organization create --name ORG_NAME\" to create one" case errors.As(err, &cmd.GracefulError{}): // Graceful recovery if the flag is set and the received error is marked as recoverable if cmd.GracefulExit { From 55ad57b217a03c82d16ef9add6e763ae24a39b2e Mon Sep 17 00:00:00 2001 From: Sylwester Piskozub Date: Mon, 16 Jun 2025 09:56:24 +0200 Subject: [PATCH 2/2] fix: split user missing org membership error cases Signed-off-by: Sylwester Piskozub --- app/cli/main.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/cli/main.go b/app/cli/main.go index 6f90b9d19..ca1b95407 100644 --- a/app/cli/main.go +++ b/app/cli/main.go @@ -89,7 +89,9 @@ func errorInfo(err error, logger zerolog.Logger) (string, int) { msg = "your authentication token has expired, please run chainloop auth login again" case isWrappedErr(st, jwtMiddleware.ErrMissingJwtToken): msg = "authentication required, please run \"chainloop auth login\"" - case v1.IsUserNotMemberOfOrgErrorNotInOrg(err), v1.IsUserWithNoMembershipErrorNotInOrg(err): + case v1.IsUserNotMemberOfOrgErrorNotInOrg(err): + msg = "the organization you are trying to access does not exist or you are not part of it, please run \"chainloop auth login\"" + case v1.IsUserWithNoMembershipErrorNotInOrg(err): msg = "you are not part of any organization, please run \"chainloop organization create --name ORG_NAME\" to create one" case errors.As(err, &cmd.GracefulError{}): // Graceful recovery if the flag is set and the received error is marked as recoverable