You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/03/16 16:10:23 UTC
[incubator-dlab] branch DLAB-1628 updated: [DLAB-1628]: made bucket
name variable lower-case everywhere for aws
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1628
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1628 by this push:
new 34d156c [DLAB-1628]: made bucket name variable lower-case everywhere for aws
34d156c is described below
commit 34d156c8f2c5c2be818e24c4b8af8d453b8c39aa
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Mar 16 18:09:50 2020 +0200
[DLAB-1628]: made bucket name variable lower-case everywhere for aws
---
.../src/general/scripts/aws/common_stop_notebook.py | 2 +-
.../src/general/scripts/aws/common_terminate_notebook.py | 2 +-
.../src/general/scripts/aws/dataengine-service_configure.py | 2 +-
.../src/general/scripts/aws/edge_configure.py | 5 +++--
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py b/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py
index 3e14dff..a3ce304 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py
@@ -105,7 +105,7 @@ if __name__ == "__main__":
notebook_config['endpoint_name'] = os.environ['endpoint_name']
notebook_config['bucket_name'] = ('{0}-{1}-{2}-bucket'.format(notebook_config['service_base_name'],
notebook_config['project_name'],
- notebook_config['endpoint_name']))
+ notebook_config['endpoint_name'])).lower()
notebook_config['tag_name'] = notebook_config['service_base_name'] + '-tag'
notebook_config['key_path'] = os.environ['conf_key_dir'] + '/' + os.environ['conf_key_name'] + '.pem'
diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_terminate_notebook.py b/infrastructure-provisioning/src/general/scripts/aws/common_terminate_notebook.py
index d330683..e9b9950 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_terminate_notebook.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_terminate_notebook.py
@@ -84,7 +84,7 @@ if __name__ == "__main__":
notebook_config['endpoint_name'] = os.environ['endpoint_name']
notebook_config['bucket_name'] = ('{0}-{1}-{2}-bucket'.format(notebook_config['service_base_name'],
notebook_config['project_name'],
- notebook_config['endpoint_name']))
+ notebook_config['endpoint_name'])).lower()
notebook_config['tag_name'] = notebook_config['service_base_name'] + '-tag'
try:
diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
index 026b4b0..cc1c85a 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
@@ -204,7 +204,7 @@ if __name__ == "__main__":
emr_conf['computational_name'],
args.uuid)
emr_conf['bucket_name'] = ('{0}-{1}-{2}-bucket'.format(emr_conf['service_base_name'], emr_conf['project_name'],
- emr_conf['endpoint_name']))
+ emr_conf['endpoint_name'])).lower()
tag = {"Key": "{}-tag".format(emr_conf['service_base_name']), "Value": "{}-{}-{}-subnet".format(
emr_conf['service_base_name'], emr_conf['project_name'], emr_conf['endpoint_name'])}
emr_conf['subnet_cidr'] = dlab.meta_lib.get_subnet_by_tag(tag)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
index 244cd63..d96ef49 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@ -65,9 +65,10 @@ if __name__ == "__main__":
edge_conf['tag_name'] = edge_conf['service_base_name'] + '-tag'
edge_conf['bucket_name'] = '{0}-{1}-{2}-bucket'.format(edge_conf['service_base_name'],
edge_conf['project_name'],
- edge_conf['endpoint_name']).replace('_', '-')
+ edge_conf['endpoint_name']).replace('_', '-').lower()
edge_conf['shared_bucket_name'] = '{0}-{1}-shared-bucket'.format(edge_conf['service_base_name'],
- edge_conf['endpoint_name']).replace('_', '-')
+ edge_conf['endpoint_name']
+ ).replace('_', '-').lower()
edge_conf['edge_security_group_name'] = '{}-{}-{}-edge-sg'.format(edge_conf['service_base_name'],
edge_conf['project_name'],
edge_conf['endpoint_name'])
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org