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

Irods ssl connection #19014

Merged
merged 11 commits into from
Nov 12, 2024
Merged

Irods ssl connection #19014

merged 11 commits into from
Nov 12, 2024

Conversation

pauldg
Copy link
Contributor

@pauldg pauldg commented Oct 16, 2024

This PR allows optional ssl settings and an optional logical path on the remote storage.
This is necessary since our irods provider requires ssl parameters to establish connection.
Additionally, the default logical path was hard coded as self.home = f"/{self.zone}/home/{self.username}" which is not flexibel and may not always exist on the remote storage.

How to test the changes?

(Select all options that apply)

  • I've included appropriate automated tests.
  • This is a refactoring of components with existing test coverage.
  • Instructions for manual testing are as follows:
    1. [add testing steps and prerequisites here if you didn't write automated tests covering all your changes]

License

  • I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.

@pauldg pauldg marked this pull request as ready for review October 17, 2024 11:59
@github-actions github-actions bot added this to the 24.2 milestone Oct 17, 2024
@@ -172,6 +223,11 @@ def __init__(self, config, config_dict):
if self.connection_pool_monitor_interval is None:
_config_dict_error("connection->connection_pool_monitor_interval")

logical_dict = config_dict.get("logical") or {}
self.logical_path = logical_dict.get("path") or f"/{self.zone}/home/{self.username}"
Copy link
Contributor Author

@pauldg pauldg Nov 12, 2024

Choose a reason for hiding this comment

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

@mvdbeek I think I did cover backward-compatibility by setting the default for self.logical_path to f"/{self.zone}/home/{self.username}" (previously self.home)

@mvdbeek mvdbeek merged commit df69357 into galaxyproject:dev Nov 12, 2024
54 checks passed
@mvdbeek
Copy link
Member

mvdbeek commented Nov 12, 2024

Thank you @pauldg !

Copy link

This PR was merged without a "kind/" label, please correct.

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

Successfully merging this pull request may close these issues.

3 participants