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

♻️ Replace r clone ⚠️🚨 #6119

Merged

Conversation

matusdrobuliak66
Copy link
Contributor

@matusdrobuliak66 matusdrobuliak66 commented Jul 29, 2024

What do these changes do?

  • ♻️ Replace RClone with AWS CLI.
  • RClone functionality is still supported and can be turned on or off with AWS_S3_CLI_S3 env variable. If provided then AWS S3 CLI is prefered before RClone.
  • I tried to be as consistent with the RClone interface as possible.
    • I needed to handle symlinks manually, as AWS CLI doesn't have that option like RClone does.

Related issue/s

How to test

Dev-ops checklist

Copy link

codecov bot commented Jul 29, 2024

Codecov Report

Attention: Patch coverage is 87.21461% with 28 lines in your changes missing coverage. Please review.

Project coverage is 87.5%. Comparing base (cafbf96) to head (9fbc179).
Report is 397 commits behind head on master.

Files Patch % Lines
...dk/src/simcore_sdk/node_ports_common/aws_s3_cli.py 90.0% 9 Missing and 5 partials ⚠️
...k/src/simcore_sdk/node_ports_common/filemanager.py 44.0% 8 Missing and 6 partials ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #6119      +/-   ##
=========================================
+ Coverage    84.5%   87.5%    +2.9%     
=========================================
  Files          10    1460    +1450     
  Lines         214   60337   +60123     
  Branches       25    1475    +1450     
=========================================
+ Hits          181   52796   +52615     
- Misses         23    7230    +7207     
- Partials       10     311     +301     
Flag Coverage Δ
integrationtests 60.7% <85.3%> (?)
unittests 86.0% <41.0%> (+1.4%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
...ettings-library/src/settings_library/aws_s3_cli.py 100.0% <100.0%> (ø)
...core-sdk/src/simcore_sdk/node_data/data_manager.py 73.3% <100.0%> (ø)
...re-sdk/src/simcore_sdk/node_ports_common/_utils.py 100.0% <100.0%> (ø)
.../simcore_sdk/node_ports_common/aws_s3_cli_utils.py 100.0% <100.0%> (ø)
...e-sdk/src/simcore_sdk/node_ports_common/r_clone.py 98.1% <100.0%> (ø)
...src/simcore_sdk/node_ports_common/r_clone_utils.py 100.0% <100.0%> (ø)
...core-sdk/src/simcore_sdk/node_ports_v2/__init__.py 100.0% <100.0%> (ø)
...-sdk/src/simcore_sdk/node_ports_v2/nodeports_v2.py 93.2% <100.0%> (ø)
.../simcore-sdk/src/simcore_sdk/node_ports_v2/port.py 79.8% <ø> (ø)
...re-sdk/src/simcore_sdk/node_ports_v2/port_utils.py 69.0% <100.0%> (ø)
... and 9 more

... and 1397 files with indirect coverage changes

@matusdrobuliak66 matusdrobuliak66 self-assigned this Jul 29, 2024
@matusdrobuliak66 matusdrobuliak66 marked this pull request as ready for review July 30, 2024 15:28
Copy link
Contributor

@GitHK GitHK left a comment

Choose a reason for hiding this comment

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

Looks good, please see my last comments, especially the "if else assert" part. I'd prefer an error to be raised, which is more explicit than an assert which is stripped in production. This will make releases more simpler, fi the configuration is wrong.

@GitHK
Copy link
Contributor

GitHK commented Aug 1, 2024

@matusdrobuliak66 please don't forget to add an MR with the env changes to this PR

@matusdrobuliak66 matusdrobuliak66 changed the title ♻️ Replace r clone 🚨 ♻️ Replace r clone ⚠️🚨 Aug 1, 2024
Copy link
Member

@sanderegg sanderegg left a comment

Choose a reason for hiding this comment

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

very cool! thanks for the changes!

@matusdrobuliak66 matusdrobuliak66 enabled auto-merge (squash) August 5, 2024 14:22
Copy link

sonarqubecloud bot commented Aug 5, 2024

@matusdrobuliak66 matusdrobuliak66 merged commit a66a1ed into ITISFoundation:master Aug 5, 2024
57 checks passed
@matusdrobuliak66 matusdrobuliak66 deleted the replace-r-clone branch August 5, 2024 18:39
@matusdrobuliak66 matusdrobuliak66 mentioned this pull request Aug 15, 2024
67 tasks
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.

4 participants