Merge pull request #128 from basepair/feature/added-retry-option-to-s…

…3-ec2-iam Feature/added retry option to s3 ec2 iam
basepair · Sep 3, 2024 · 18f0157 · 18f0157
2 parents c6e78e9 + 05ab1b5
commit 18f0157
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/basepair/__init__.py b/basepair/__init__.py
@@ -12,7 +12,7 @@
 # Exposing the storage wrapper
 
 __title__ = 'basepair'
-__version__ = '2.1.9'
+__version__ = '2.1.10'
 __copyright__ = 'Copyright [2017] - [2024] Basepair INC'
 
 

diff --git a/basepair/modules/aws/ec2.py b/basepair/modules/aws/ec2.py
@@ -20,7 +20,7 @@ class EC2(Service):
   def __init__(self, cfg):
     super().__init__(cfg, 'EC2')
     self.client = self.session.client(**{
-      'config': Config(retries={'max_attempts': 0, 'mode': 'standard'}),
+      'config': Config(retries={'max_attempts': 10, 'mode': 'standard'}),
       'service_name': 'ec2',
     })
     self.default = {

diff --git a/basepair/modules/aws/iam.py b/basepair/modules/aws/iam.py
@@ -24,7 +24,7 @@ class IAM(Service):
   def __init__(self, cfg):
     super().__init__(cfg, 'IAM')
     self.client = self.session.client(**{
-      'config': Config(retries={'max_attempts': 0, 'mode': 'standard'}),
+      'config': Config(retries={'max_attempts': 10, 'mode': 'standard'}),
       'service_name': 'iam',
     })
     # Reminder: Update __bp_tmp_user__ will require to update boundary policy for the role

diff --git a/basepair/modules/aws/policy.py b/basepair/modules/aws/policy.py
@@ -44,6 +44,24 @@ def ecr_bio_modules(repository_settings):
             'aws:ResourceTag/Type': 'Bio'
           }
         }
+      }, {
+        'Effect': 'Allow',
+        'Action': [
+          'ecr:BatchCheckLayerAvailability',
+          'ecr:GetDownloadUrlForLayer',
+          'ecr:GetRepositoryPolicy',
+          'ecr:DescribeRepositories',
+          'ecr:ListImages',
+          'ecr:DescribeImages',
+          'ecr:BatchGetImage',
+          'ecr:GetLifecyclePolicy',
+          'ecr:GetLifecyclePolicyPreview',
+          'ecr:ListTagsForResource',
+          'ecr:DescribeImageScanFindings'
+        ],
+        'Resource': [
+          f"arn:aws:ecr:*:{repository_settings.get('account')}:repository/worker*",
+        ]
       }, {
         'Effect': 'Allow',
         'Action': 'ecr:GetAuthorizationToken',

diff --git a/basepair/modules/aws/s3.py b/basepair/modules/aws/s3.py
@@ -26,7 +26,7 @@ def __init__(self, cfg):
     self.bucket = cfg.get('bucket')
     client_vars = {
       'config': Config(
-        retries={'max_attempts': 0, 'mode': 'standard'},
+        retries={'max_attempts': 10, 'mode': 'standard'},
         signature_version='s3v4',
       ),
       'service_name': 's3',