better surfacing of errors

canonical · Aug 24, 2023 · 0690c98 · 0690c98
1 parent 3c1dfeb
commit 0690c98
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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)