Merge pull request #13 from HPCNow:OHSU-126-froster-config-s3

OHSU-126-froster-config-s3

Author: macheitor

froster/froster.py

@@ -6,6 +6,18 @@
 """
 
 # internal modules
+from textual.widgets import DataTable, Footer, Button
+from textual.widgets import Label, Input, LoadingIndicator
+from textual.screen import ModalScreen
+from textual.containers import Horizontal, Vertical
+from textual.app import App, ComposeResult
+from textual import on, work
+import psutil
+import botocore
+import boto3
+import duckdb
+import requests
+import inquirer
 import sys
 import os
 import argparse
@@ -50,19 +62,6 @@
 warnings.filterwarnings("ignore", category=ResourceWarning)
 
 # stuff from pypi
-import inquirer
-import requests
-import duckdb
-import boto3
-import botocore
-import psutil
-
-from textual import on, work
-from textual.app import App, ComposeResult
-from textual.containers import Horizontal, Vertical
-from textual.screen import ModalScreen
-from textual.widgets import Label, Input, LoadingIndicator
-from textual.widgets import DataTable, Footer, Button
 
 
 class ConfigManager:
@@ -586,7 +585,8 @@ def set_aws(self, aws: 'AWSBoto'):
                     print('    ...region is valid\n')
                 else:
                     print('    ...region is NOT valid\n')
-                    print('\nYou can configure aws credentials and region using the command:')
+                    print(
+                        '\nYou can configure aws credentials and region using the command:')
                     print('    froster config --aws\n')
                     return False
 
@@ -634,7 +634,7 @@ def set_aws(self, aws: 'AWSBoto'):
                     print(
                         '\nYou can configure aws credentials and region using the command:')
                     print('    froster config --aws\n')
-       
+
                     return False
 
                 if region != aws_profile_region:
@@ -857,7 +857,7 @@ def set_s3(self, aws: "AWSBoto"):
 
             print(
                 f'Checking AWS credentials for profile "{self.aws_profile}"...')
-            if aws.check_credentials():
+            if aws.check_credentials(aws_profile=self.aws_profile):
                 print('    ...AWS credentials are valid\n')
             else:
                 print('    ...AWS credentials are NOT valid\n')
@@ -893,7 +893,8 @@ def set_s3(self, aws: "AWSBoto"):
                     return False
 
                 # Create new bucket
-                aws.create_bucket(bucket_name=new_bucket_name)
+                aws.create_bucket(bucket_name=new_bucket_name,
+                                  region=self.aws_region)
 
                 # Store new aws s3 bucket in the config object
                 self.__set_configuration_entry(
@@ -904,7 +905,7 @@ def set_s3(self, aws: "AWSBoto"):
 
             # Get the archive directory in the selected bucket
             archive_dir = inquirer.text(
-                message='Enter the archive directory name inside your S3 bucket',
+                message='Enter the directory name inside S3 bucket (default= "froster")',
                 default='froster',
                 validate=self.__inquirer_check_required)
 
@@ -1160,7 +1161,7 @@ def set_slurm(self, args):
                 print(f'\n*** SLURM NOT FOUND: Nothing to configure ***\n')
 
             return True
-        
+
         except:
             print_error()
             return False
@@ -1275,7 +1276,8 @@ def check_credentials(self,
 
             elif aws_profile:
                 # Build a new STS client with the provided profile
-                sts = boto3.Session(profile_name=aws_profile, region_name=aws_region_name).client('sts')
+                sts = boto3.Session(profile_name=aws_profile,
+                                    region_name=aws_region_name).client('sts')
 
             elif hasattr(self, 's3_client'):
                 # Get the current sts_client
@@ -6107,7 +6109,6 @@ def subcmd_config(args, cfg: ConfigManager, aws: AWSBoto):
                     '''))
                 return
 
-
         if not cfg.set_nih():
             return
 

setup.py

@@ -9,7 +9,7 @@
 
 setup(
     name='froster',
-    version='0.10.5',
+    version='0.10.6',
     license='MIT',
     packages=find_packages(),
     install_requires=requirements,