Merge pull request #38 from 4dn-dcic/cgapwolf_env_name

Cgapwolf env name
4dn-dcic · Sep 16, 2021 · e9c55a2 · e9c55a2
2 parents f087a62 + 2277b07
commit e9c55a2
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,2 +1,2 @@
 tibanna>=1.5.0
-dcicutils>=2.2.1
+dcicutils>=2.3.1
diff --git a/tests/tibanna/zebra/test_iam_utils.py b/tests/tibanna/zebra/test_iam_utils.py
@@ -33,7 +33,8 @@ def expected_policy_arn_list_for_cgap():
             'start_run': [prefix + 'tibanna_zebra_cgap_vpc_access',
                           prefix + 'tibanna_zebra_cgap_bucket_access',
                           prefix + 'tibanna_zebra_cgap_cloudwatchlogs',
-                          prefix + 'tibanna_zebra_cgap_dynamodb'],
+                          prefix + 'tibanna_zebra_cgap_dynamodb',
+                          prefix + 'ElasticBeanstalkFullAccess'],
             'status_wfr': [prefix + 'tibanna_zebra_cgap_vpc_access',
                            prefix + 'tibanna_zebra_cgap_bucket_access',
                            prefix + 'tibanna_zebra_cgap_cloudwatchlogs',
@@ -48,7 +49,8 @@ def expected_policy_arn_list_for_cgap():
             'update_ffmeta': [prefix + 'tibanna_zebra_cgap_vpc_access',
                               prefix + 'tibanna_zebra_cgap_bucket_access',
                               prefix + 'tibanna_zebra_cgap_cloudwatchlogs',
-                              prefix + 'tibanna_zebra_cgap_dynamodb']}
+                              prefix + 'tibanna_zebra_cgap_dynamodb',
+                              prefix + 'ElasticBeanstalkFullAccess']}
 
 
 def test_policy_prefix(expected_policy_arn_list_for_cgap):

diff --git a/tibanna_4dn/lambdas/requirements.txt b/tibanna_4dn/lambdas/requirements.txt
@@ -2,5 +2,5 @@ urllib3>=1.24
 Benchmark-4dn>=0.5.13
 boto3>=1.9.0
 botocore>=1.12.1
-dcicutils>=2.2.1
+dcicutils>=2.3.1
 tibanna>=1.5.0
diff --git a/tibanna_cgap/lambdas/requirements.txt b/tibanna_cgap/lambdas/requirements.txt
@@ -2,5 +2,5 @@ urllib3>=1.24
 Benchmark-4dn>=0.5.13
 boto3>=1.9.0
 botocore>=1.12.1
-dcicutils>=2.2.1
+dcicutils>=2.3.1
 tibanna>=1.5.0
diff --git a/tibanna_ffcommon/_version.py b/tibanna_ffcommon/_version.py
@@ -1,4 +1,4 @@
 """Version information."""
 
 # The following line *must* be the last in the module, exactly as formatted:
-__version__ = "0.22.0"
+__version__ = "0.22.1"
diff --git a/tibanna_ffcommon/iam_utils.py b/tibanna_ffcommon/iam_utils.py
@@ -35,8 +35,12 @@ def policy_arn_list_for_role(self):
         general_lambda_policy_types = ['vpc', 'bucket', 'cloudwatch', 'dynamodb']
         execution_lambda_policy_types = general_lambda_policy_types + ['executions']
 
-        arnlist[self.start_run_lambda_name] = [self.policy_arn(_) for _ in general_lambda_policy_types]
-        arnlist[self.update_ffmeta_lambda_name] = [self.policy_arn(_) for _ in general_lambda_policy_types]
+        policy_prefix = 'arn:aws:iam::' + self.account_id + ':policy/'
+
+        arnlist[self.start_run_lambda_name] = [self.policy_arn(_) for _ in general_lambda_policy_types] + \
+                                              [policy_prefix + 'ElasticBeanstalkFullAccess']
+        arnlist[self.update_ffmeta_lambda_name] = [self.policy_arn(_) for _ in general_lambda_policy_types] + \
+                                                  [policy_prefix + 'ElasticBeanstalkFullAccess']
         arnlist[self.run_workflow_lambda_name] = [self.policy_arn(_) for _ in execution_lambda_policy_types]
         arnlist[self.status_wfr_lambda_name] = [self.policy_arn(_) for _ in execution_lambda_policy_types]