This is an automated email from the ASF dual-hosted git repository.

omartushevskyi pushed a commit to branch DLAB-1546
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1546 by this push:
     new a946003  [DLAB-1546]: added name convention changes
a946003 is described below

commit a946003cdfbfb41317246463608cb6fe0d4192b7
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Thu Mar 5 13:30:36 2020 +0200

    [DLAB-1546]: added name convention changes
---
 .../src/general/scripts/aws/common_create_policy.py        | 14 ++++++++------
 .../src/general/scripts/aws/project_prepare.py             |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/common_create_policy.py 
b/infrastructure-provisioning/src/general/scripts/aws/common_create_policy.py
index d7f5ee0..8b7f038 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/common_create_policy.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/common_create_policy.py
@@ -35,6 +35,7 @@ parser.add_argument('--username', type=str, default='')
 parser.add_argument('--edge_role_name', type=str, default='')
 parser.add_argument('--notebook_role_name', type=str, default='')
 parser.add_argument('--region', type=str, default='')
+parser.add_argument('--endpoint_name', type=str, default='')
 parser.add_argument('--user_predefined_s3_policies', type=str, default='')
 args = parser.parse_args()
 
@@ -64,18 +65,19 @@ if __name__ == "__main__":
                     for i in list:
                         if i.get('PolicyName') in list_predefined_policies:
                             list_policies_arn.append(i.get('Arn'))
-                response = 
iam.create_policy(PolicyName='{}-{}-strict_to_S3-Policy'.
-                                             format(args.service_base_name, 
args.username), PolicyDocument=policy)
+                response = 
iam.create_policy(PolicyName='{}-{}-{}-strict_to_S3-Policy'.
+                                             format(args.service_base_name, 
args.username, args.endpoint_name),
+                                             PolicyDocument=policy)
                 time.sleep(10)
                 list_policies_arn.append(response.get('Policy').get('Arn'))
             except botocore.exceptions.ClientError as cle:
                 if cle.response['Error']['Code'] == 'EntityAlreadyExists':
-                    print("Policy {}-{}-strict_to_S3-Policy already exists. 
Reusing it.".
-                          format(args.service_base_name, args.username))
+                    print("Policy {}-{}-{}-strict_to_S3-Policy already exists. 
Reusing it.".
+                          format(args.service_base_name, args.username, 
args.endpoint_name))
                     list = iam.list_policies().get('Policies')
                     for i in list:
-                        if '{}-{}-strict_to_S3-Policy'.format(
-                                args.service_base_name, args.username) == 
i.get('PolicyName') or (
+                        if '{}-{}-{}-strict_to_S3-Policy'.format(
+                                args.service_base_name, args.username, 
args.endpoint_name) == i.get('PolicyName') or (
                                 args.user_predefined_s3_policies != 'None' and 
i.get('PolicyName') in
                                 list_predefined_policies):
                             list_policies_arn.append(i.get('Arn'))
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py 
b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
index 0da3a57..9d44ba5 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
@@ -589,11 +589,11 @@ if __name__ == "__main__":
         print('[CREATING BUCKET POLICY FOR USER INSTANCES]')
         params = '--bucket_name {} --shared_bucket_name {} --username {} 
--edge_role_name {} ' \
                  '--notebook_role_name {} --service_base_name {} --region {} ' 
\
-                 '--user_predefined_s3_policies "{}"'.format(
+                 '--user_predefined_s3_policies "{}" --endpoint_name 
{}'.format(
                   project_conf['bucket_name'], 
project_conf['shared_bucket_name'], project_conf['project_name'],
                   project_conf['edge_role_name'], 
project_conf['notebook_dataengine_role_name'],
                   project_conf['service_base_name'], project_conf['region'],
-                  os.environ['aws_user_predefined_s3_policies'])
+                  os.environ['aws_user_predefined_s3_policies'], 
project_conf['endpoint_name'])
         try:
             local("~/scripts/{}.py {}".format('common_create_policy', params))
         except:


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to