Merge branch 'feature-rebac' into main-to-rebac

canonical · Aug 28, 2023 · a2e5247 · a2e5247
2 parents 95eb981 + b9bb883
commit a2e5247
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/internal/jujuapi/access_control.go b/internal/jujuapi/access_control.go
@@ -576,9 +576,6 @@ func (r *controllerRoot) ListRelationshipTuples(ctx context.Context, req apipara
 	if req.Tuple.TargetObject != "" {
 		key, err = r.parseTuple(ctx, req.Tuple)
 		if err != nil {
-			if errors.ErrorCode(err) == errors.CodeFailedToParseTupleKey {
-				return returnValue, errors.E(op, errors.CodeBadRequest, "failed to parse the tuple key")
-			}
 			return returnValue, errors.E(op, err)
 		}
 	}

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)