Skip to content

Commit 5d710f3

Browse files
committed
RBAC for action-alias help changelog entry.
1 parent 1a3fab0 commit 5d710f3

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

CHANGELOG.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ Fixed
1313
* Bumped `paramiko` to `2.10.5` to fix an issue with SSH Certs - https://github.com/paramiko/paramiko/issues/2017
1414
Contributed by @jk464
1515

16+
* Added RBAC support to action-alias help end point. #6022
17+
Contributed by @nzlosh
18+
1619
Added
1720
~~~~~
1821
* Move `git clone` to `user_home/.st2packs` #5845

st2api/st2api/controllers/v1/actionalias.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,21 +122,21 @@ def help(self, filter, pack, limit, offset, **kwargs):
122122
permission_type=permission_type,
123123
)
124124
aliases.append(ActionAliasAPI(**alias))
125-
except ResourceTypeAccessDeniedError as exception:
125+
except ResourceTypeAccessDeniedError:
126126
# Permission denied, don't include in output.
127127
pass
128128
except Exception as exception:
129-
LOG.exception(f"Error processing action-alias.")
129+
LOG.exception("Error processing action-alias: %s" % str(exception))
130130

131131
return generate_helpstring_result(
132132
aliases, filter, pack, int(limit), int(offset)
133133
)
134-
except (TypeError) as e:
134+
except TypeError as exception_type:
135135
LOG.exception(
136136
"Helpstring request contains an invalid data type: %s.",
137-
six.text_type(e),
137+
six.text_type(exception_type),
138138
)
139-
return abort(http_client.BAD_REQUEST, six.text_type(e))
139+
return abort(http_client.BAD_REQUEST, six.text_type(exception_type))
140140

141141
def post(self, action_alias, requester_user):
142142
"""

0 commit comments

Comments
 (0)