Merge branch 'add_password_to_rclone_config_for_aws_gdrive' of github.com:neuroinformatics-unit/datashuttle into add_password_to_rclone_config_for_aws_gdrive

Author: JoeZiminski

datashuttle/configs/rclone_configs.py

@@ -21,7 +21,7 @@ class RCloneConfigs:
     the GDrive rclone config holds the access token, etc.
 
     In datashuttle, local filesystem configs uses the Rclone default configuration file,
-    that RClone manages, for backwards comatability reasons. However, SSH, AWS and GDrive
+    that RClone manages, for backwards compatibility reasons. However, SSH, AWS and GDrive
     configs are stored in separate config files (set using RClone's --config argument).
     Then being separate means these files can be separately encrypted.
 
@@ -94,7 +94,7 @@ def set_rclone_config_encryption_state(self, value: bool) -> None:
 
     def rclone_file_is_encrypted(
         self,
-    ) -> dict:
+    ) -> bool:
         """Return whether the config file associated with the current `connection_method`."""
         assert rclone_encryption.connection_method_requires_encryption(
             self.datashuttle_configs["connection_method"]

datashuttle/utils/rclone.py

@@ -145,7 +145,7 @@ def call_rclone_with_popen(
     Killing a process might be required when running rclone setup in a thread worker
     to allow the user to cancel the setup process. In such a case, cancelling the
     thread worker alone will not kill the rclone process, so we need to kill the
-    env process explicitly.
+    process explicitly.
     """
     command = "rclone " + command
     process = subprocess.Popen(

datashuttle/utils/rclone_encryption.py

@@ -234,7 +234,7 @@ def run_rclone_config_encrypt(cfg: Configs) -> None:
         raise RuntimeError(
             f"\n--- STDOUT ---\n{output.stdout}\n"
             f"\n--- STDERR ---\n{output.stderr}\n"
-            "Could not remove the password from the RClone config. See the error message above."
+            "Could not encrypt the RClone config. See the error message above."
         )
 
     remove_credentials_as_password_command()
@@ -336,7 +336,7 @@ def get_explanation_message(
 
     pass_type = {
         "ssh": "your private SSH key",
-        "aws": "your IAM access key ID and seceret access key",
+        "aws": "your IAM access key ID and secret access key",
         "gdrive": "your Google Drive access token and client secret (if set)",
     }
 

tests/tests_transfers/ssh/test_ssh_transfer.py

@@ -160,7 +160,7 @@ def test_ssh_wildcards_3(self, ssh_setup):
         )
 
     def test_rclone_config_file_encrypted(self, ssh_setup):
-        """Quick confidence check the set up rclone config is indeed ecrypted."""
+        """Quick confidence check the set up rclone config is indeed encrypted."""
         pathtable, project = ssh_setup
 
         test_utils.check_rclone_file_is_encrypted(