Merge pull request #83 from HPCNow/main

froster v0.14.1

Author: victormachadoperez

Diff for: froster/froster.py

@@ -543,11 +543,9 @@ def set_credentials(self, aws: 'AWSBoto'):
             # Get the default credentials directory from the config file
             default_credentials_dir = self.__get_configuration_entry(
                 'CREDENTIALS', 'credentials_dir')
-            if default_credentials_dir is None:
-                default_credentials_dir = os.path.join('~', '.aws')
-                if not os.path.exists(os.path.expanduser(default_credentials_dir)):
-                    os.makedirs(os.path.expanduser(default_credentials_dir),
-                                exist_ok=True, mode=0o775)
+            
+            if not os.path.exists(default_credentials_dir):
+                default_credentials_dir = None
 
             # Ask user to enter the path to a aws credentials directory
             credentials_dir_question = [
@@ -912,10 +910,17 @@ def set_email(self):
         try:
             log(f'\n*** SET EMAIL ***\n')
 
+            default_email = self.__get_configuration_entry('USER', 'email')
+
+            # Email pattern
+            pattern = r'^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$'
+            if re.match(pattern, default_email) is None:
+                default_email = None
+
             # Ask the user for their email
             email = inquirer.text(
                 message="Enter your email",
-                default=self.__get_configuration_entry('USER', 'email'),
+                default=default_email,
                 validate=self.__inquirer_check_email_format)
 
             # Print for a new line when prompting
@@ -946,10 +951,16 @@ def set_endpoint(self):
             elif self.provider == 'GCS':
                 endpoint = 'https://storage.googleapis.com'
             else:
+                default_endpoint = self.__get_configuration_entry(
+                    'S3', 'endpoint', fallback=None)
+                
+                if default_endpoint == '':
+                    default_endpoint = None
+
                 # Get the user answer
                 endpoint = inquirer.text(
                     message=f'Enter the {self.provider} endpoint',
-                    default=self.__get_configuration_entry('S3', 'endpoint'),
+                    default=default_endpoint,
                     validate=self.__inquirer_check_required)
 
             # Ensure the endpoint starts with "https://" for IDrive
@@ -997,11 +1008,16 @@ def set_provider(self):
             list_of_providers = PROVIDERS_LIST
             list_of_providers.append('+ Create new provider')
 
+            default_provider = self.__get_configuration_entry(
+                    'S3', 'provider', fallback='AWS')
+
+            if default_provider == '':
+                default_provider = None
+
             # Get the user answer
             provider = inquirer.list_input(
                 "Choose your s3 provider",
-                default=self.__get_configuration_entry(
-                    'S3', 'provider', fallback='AWS'),
+                default=default_provider,
                 choices=list_of_providers)
 
             if provider == '+ Create new provider':
@@ -1061,10 +1077,15 @@ def set_s3(self, aws: "AWSBoto"):
                 # Store aws s3 bucket in the config object
                 self.__set_configuration_entry('S3', 'bucket_name', s3_bucket)
 
+            default_archive_dir = self.__get_configuration_entry('S3', 'archive_dir', fallback='froster')
+
+            if default_archive_dir == '':
+                default_archive_dir = 'froster'
+
             # Get user answer
             archive_dir = inquirer.text(
                 message='Enter the directory name inside S3 bucket',
-                default=self.__get_configuration_entry('S3', 'archive_dir', fallback='froster'),
+                default=default_archive_dir,
                 validate=self.__inquirer_check_required)
 
             # Print newline after this prompt
@@ -1076,6 +1097,9 @@ def set_s3(self, aws: "AWSBoto"):
             default_storage_class = self.__get_configuration_entry(
                 'S3', 'storage_class', fallback='DEEP_ARCHIVE')
 
+            if default_storage_class == '':
+                default_storage_class = None
+
             if self.provider == 'AWS':
                 storage_class = inquirer.list_input(
                     "Choose the AWS S3 storage class",
@@ -1146,13 +1170,18 @@ def set_shared(self):
             # and check if we need to move cfg.archive_json_file_name and configuration to the shared directory
             if is_shared:
 
+                default_shared_dir = self.__get_configuration_entry(
+                            'SHARED', 'shared_dir', fallback=None)
+                
+                if default_shared_dir == '':
+                    default_shared_dir = None
+
                 # Ask user to enter the path to a shared config directory
                 # TODO: make this inquiring in shortchut mode once this PR is merged: https://github.com/magmax/python-inquirer/pull/543
                 shared_config_dir_question = [
                     inquirer.Path(
                         'shared_dir', message='Enter the path to a shared config directory',
-                        default=self.__get_configuration_entry(
-                            'SHARED', 'shared_dir', fallback=None),
+                        default=default_shared_dir,
                         validate=self.__inquirer_check_path_exists)
                 ]
 

Diff for: pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "froster"
-version = "0.14.0"
+version = "0.14.1"
 description = "Froster is a tool for easy data transfer between local file systems and AWS S3 storage."
 authors = ["Victor Machado <[email protected]>"]
 readme = "README.md"