From 5e57d3bebbdabfcfa7a3f837ec0db368d4430afc Mon Sep 17 00:00:00 2001 From: Stefan Benz <46600784+stebenz@users.noreply.github.com> Date: Thu, 3 Oct 2024 17:53:03 +0200 Subject: [PATCH] fix: correct error messages for policy queries (#8722) # Which Problems Are Solved Errors messages are mixed up for some policies # How the Problems Are Solved Define new error IDs and correct the messages. # Additional Changes None # Additional Context None --- internal/query/lockout_policy.go | 4 ++-- internal/query/password_age_policy.go | 4 ++-- internal/query/password_complexity_policy.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/query/lockout_policy.go b/internal/query/lockout_policy.go index 64be9b0b7..be4b16278 100644 --- a/internal/query/lockout_policy.go +++ b/internal/query/lockout_policy.go @@ -173,9 +173,9 @@ func prepareLockoutPolicyQuery(ctx context.Context, db prepareDatabase) (sq.Sele ) if err != nil { if errors.Is(err, sql.ErrNoRows) { - return nil, zerrors.ThrowNotFound(err, "QUERY-63mtI", "Errors.PasswordComplexityPolicy.NotFound") + return nil, zerrors.ThrowNotFound(err, "QUERY-38pZnUemLP", "Errors.IAM.PasswordLockoutPolicy.NotFound") } - return nil, zerrors.ThrowInternal(err, "QUERY-uulCZ", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-PJURxRUoYG", "Errors.Internal") } return policy, nil } diff --git a/internal/query/password_age_policy.go b/internal/query/password_age_policy.go index 199b75795..15b1b248c 100644 --- a/internal/query/password_age_policy.go +++ b/internal/query/password_age_policy.go @@ -176,9 +176,9 @@ func preparePasswordAgePolicyQuery(ctx context.Context, db prepareDatabase) (sq. ) if err != nil { if errors.Is(err, sql.ErrNoRows) { - return nil, zerrors.ThrowNotFound(err, "QUERY-63mtI", "Errors.Org.PasswordComplexity.NotFound") + return nil, zerrors.ThrowNotFound(err, "QUERY-ShCWRnWJfH", "Errors.IAM.PasswordAgePolicy.NotFound") } - return nil, zerrors.ThrowInternal(err, "QUERY-uulCZ", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-6nj7Bm4fxT", "Errors.Internal") } return policy, nil } diff --git a/internal/query/password_complexity_policy.go b/internal/query/password_complexity_policy.go index 76015af44..a895c98b7 100644 --- a/internal/query/password_complexity_policy.go +++ b/internal/query/password_complexity_policy.go @@ -198,9 +198,9 @@ func preparePasswordComplexityPolicyQuery(ctx context.Context, db prepareDatabas ) if err != nil { if errors.Is(err, sql.ErrNoRows) { - return nil, zerrors.ThrowNotFound(err, "QUERY-63mtI", "Errors.PasswordComplexity.NotFound") + return nil, zerrors.ThrowNotFound(err, "QUERY-hgA9vuM0qg", "Errors.IAM.PasswordComplexityPolicy.NotFound") } - return nil, zerrors.ThrowInternal(err, "QUERY-uulCZ", "Errors.Internal") + return nil, zerrors.ThrowInternal(err, "QUERY-TvvW9Uij7M", "Errors.Internal") } return policy, nil }