From 0690c98b20b3c5d3834b324ff65962199722833e Mon Sep 17 00:00:00 2001 From: Mina Ashraf Date: Thu, 24 Aug 2023 10:53:15 +0000 Subject: [PATCH] better surfacing of errors --- internal/jujuapi/controllerroot.go | 2 +- internal/jujuapi/jimm.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/jujuapi/controllerroot.go b/internal/jujuapi/controllerroot.go index af58fed2c..dc0bef848 100644 --- a/internal/jujuapi/controllerroot.go +++ b/internal/jujuapi/controllerroot.go @@ -82,7 +82,7 @@ func (r *controllerRoot) masquerade(ctx context.Context, userTag string) (*openf func parseUserTag(tag string) (names.UserTag, error) { ut, err := names.ParseUserTag(tag) if err != nil { - return names.UserTag{}, errors.E(errors.CodeBadRequest, err) + return names.UserTag{}, errors.E(errors.CodeBadRequest, err, "invalid user tag") } if ut.IsLocal() { return names.UserTag{}, errors.E(errors.CodeBadRequest, "unsupported local user") diff --git a/internal/jujuapi/jimm.go b/internal/jujuapi/jimm.go index e8969b034..38bd74512 100644 --- a/internal/jujuapi/jimm.go +++ b/internal/jujuapi/jimm.go @@ -396,7 +396,7 @@ func (r *controllerRoot) GrantAuditLogAccess(ctx context.Context, req apiparams. ut, err := parseUserTag(req.UserTag) if err != nil { - return errors.E(op, err, errors.CodeBadRequest, "invalid user tag") + return errors.E(op, err, errors.CodeBadRequest) } err = r.jimm.GrantAuditLogAccess(ctx, r.user, ut) @@ -414,7 +414,7 @@ func (r *controllerRoot) RevokeAuditLogAccess(ctx context.Context, req apiparams ut, err := parseUserTag(req.UserTag) if err != nil { - return errors.E(op, err, errors.CodeBadRequest, "invalid user tag") + return errors.E(op, err, errors.CodeBadRequest) } err = r.jimm.RevokeAuditLogAccess(ctx, r.user, ut)