Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable support for SSH command restrictions due to 2FA at NEMO #323

Merged
merged 1 commit into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ ubdsv <[email protected]>
Rene Caspart <[email protected]>
Leon Schuhmacher <[email protected]>
R. Florian von Cube <[email protected]>
mschnepf <[email protected]>
Benjamin Rottler <[email protected]>
mschnepf <[email protected]>
Alexander Haas <[email protected]>
mschnepf <[email protected]>
Dirk Sammel <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions docs/source/changelog.rst
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
.. Created by changelog.py at 2023-11-25, command
.. Created by changelog.py at 2023-11-28, command
'/Users/giffler/.cache/pre-commit/repor6pnmwlm/py_env-python3.10/bin/changelog docs/source/changes compile --categories Added Changed Fixed Security Deprecated --output=docs/source/changelog.rst'
based on the format of 'https://keepachangelog.com/'

#########
CHANGELOG
#########

[Unreleased] - 2023-11-25
[Unreleased] - 2023-11-28
=========================

Changed
Expand Down
4 changes: 2 additions & 2 deletions tardis/adapters/sites/moab.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
async def showq(
*resource_attributes: Tuple[AttributeDict, ...], executor: Executor
) -> Iterable[Mapping]:
showq_active_cmd = "showq --xml -w user=$(USER)"
showq_completed_cmd = "showq -c --xml -w user=$(USER)"
showq_active_cmd = "showq --xml -w user=${USER}"
showq_completed_cmd = "showq -c --xml -w user=${USER}"
logger.debug("Moab status update is running.")
combined_response_stdout = ""
for cmd in (showq_active_cmd, showq_completed_cmd):
Expand Down
4 changes: 2 additions & 2 deletions tests/adapters_t/sites_t/test_moab.py
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,8 @@ def test_resource_state_translation(self):

self.mock_executor.return_value.run_command.assert_has_calls(
[
call("showq --xml -w user=$(USER)"),
call("showq -c --xml -w user=$(USER)"),
call("showq --xml -w user=${USER}"),
call("showq -c --xml -w user=${USER}"),
]
)
self.mock_executor.reset_mock()
Expand Down
Loading