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

Bug/ssh fix #109

Merged
merged 6 commits into from
Feb 11, 2025
Merged

Bug/ssh fix #109

merged 6 commits into from
Feb 11, 2025

Conversation

grallewellyn
Copy link
Contributor

@grallewellyn grallewellyn commented Feb 6, 2025

Github Issue: MAAP-Project/Community#872

Description

Need account_info to receive proxy-ticket as an optional parameter, because MAAP_PGT isn't being set as an environment variable until the call to injectPublicKey in jupyter-server-extension which doesn't happen until we already have the public ssh key which we need this account_info function to get. These calls are originating from user workspace management jupyter extension

Overview of work done

Added proxy_ticket as an optional parameter for account_info which adds this variable to the header if not already present in self._api_header

Overview of verification done

Tested locally and in the ADE with image: mas.dit.maap-project.org/root/maap-workspaces/jupyterlab/python:ssh-fix
Deleted the authorized_keys file in DIT then relaunched the workspace, authorized_keys was automatically added again. This was because I had uploaded my public key to my MAAP profile here:
Screenshot 2025-02-06 at 2 07 47 PM

Overview of integration done

Tested in this image: mas.dit.maap-project.org/root/maap-workspaces/jupyterlab/python:ssh-fix. Made sure PGT token was still present in the workspace and still could view/ submit jobs

PR checklist:

  • Linted -> how do we do this?
  • Updated unit tests
  • Updated changelog
  • Integration testing
  • Updated documentation

See Pull Request Review Checklist for pointers on reviewing this pull request

Should be merged in combination with these PRs: MAAP-Project/jupyter-server-extension#18, MAAP-Project/user-workspace-management-jupyter-extension#12

@@ -1,6 +1,6 @@
[tool.poetry]
name = "maap-py"
version = "4.2.1a0"
version = "4.2.2"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is correct following our versioning standards? I can't remember the current way for this repo

@grallewellyn grallewellyn merged commit 133e5d3 into develop Feb 11, 2025
@grallewellyn grallewellyn deleted the bug/ssh-fix branch February 11, 2025 23:10
frankinspace pushed a commit that referenced this pull request Feb 26, 2025
* proxy_ticket is now an optional argument

* upgraded version
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants