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/06 09:39:55 UTC
[incubator-dlab] 03/03: [DLAB-1612]: changed formatting and removed
unnecessary if statement
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1612
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 30887f72f4dddc3faa3e6e91c65702162db84e8d
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Mar 6 11:16:36 2020 +0200
[DLAB-1612]: changed formatting and removed unnecessary if statement
---
.../scripts/gcp/common_notebook_configure_dataengine-service.py | 9 ++++-----
.../src/general/scripts/gcp/common_prepare_notebook.py | 9 ++++-----
.../src/general/scripts/gcp/dataengine-service_prepare.py | 9 ++++-----
.../src/general/scripts/gcp/dataengine_prepare.py | 9 ++++-----
4 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py
index 44d4287..9ebca9c 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py
@@ -65,7 +65,7 @@ if __name__ == "__main__":
application = os.environ['application']
additional_tags = os.environ['tags'].replace("': u'", ":").replace("', u'", ",").replace("{u'", "" ).replace(
- "'}", "").lower().replace('_', '-')
+ "'}", "").lower()
notebook_config['cluster_labels'] = {
os.environ['notebook_instance_name']: "configured",
@@ -78,10 +78,9 @@ if __name__ == "__main__":
for tag in additional_tags.split(','):
label_key = tag.split(':')[0]
- label_value = tag.split(':')[1]
- if label_key == 'user_tag':
- if '@' in label_value:
- label_value = label_value[:label_value.find('@')]
+ label_value = tag.split(':')[1].replace('_', '-')
+ if '@' in label_value:
+ label_value = label_value[:label_value.find('@')]
if label_value != '':
notebook_config['cluster_labels'].update({label_key: label_value})
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py b/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
index d749df5..14953fe 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
@@ -133,7 +133,7 @@ if __name__ == "__main__":
json.dump(data, f)
additional_tags = os.environ['tags'].replace("': u'", ":").replace("', u'", ",").replace("{u'", "" ).replace(
- "'}", "").lower().replace('_', '-')
+ "'}", "").lower()
print('Additional tags will be added: {}'.format(additional_tags))
notebook_config['labels'] = {"name": notebook_config['instance_name'],
@@ -143,10 +143,9 @@ if __name__ == "__main__":
for tag in additional_tags.split(','):
label_key = tag.split(':')[0]
- label_value = tag.split(':')[1]
- if label_key == 'user_tag':
- if '@' in label_value:
- label_value = label_value[:label_value.find('@')]
+ label_value = tag.split(':')[1].replace('_', '-')
+ if '@' in label_value:
+ label_value = label_value[:label_value.find('@')]
if label_value != '':
notebook_config['labels'].update({label_key: label_value})
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
index cb39d20..dca9a33 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
@@ -78,7 +78,7 @@ if __name__ == "__main__":
dataproc_conf['release_label'] = os.environ['dataproc_version']
additional_tags = os.environ['tags'].replace("': u'", ":").replace("', u'", ",").replace("{u'", "" ).replace(
- "'}", "").lower().replace('_', '-')
+ "'}", "").lower()
dataproc_conf['cluster_labels'] = {
os.environ['notebook_instance_name']: "not-configured",
@@ -91,10 +91,9 @@ if __name__ == "__main__":
for tag in additional_tags.split(','):
label_key = tag.split(':')[0]
- label_value = tag.split(':')[1]
- if label_key == 'user_tag':
- if '@' in label_value:
- label_value = label_value[:label_value.find('@')]
+ label_value = tag.split(':')[1].replace('_', '-')
+ if '@' in label_value:
+ label_value = label_value[:label_value.find('@')]
if label_value != '':
dataproc_conf['cluster_labels'].update({label_key: label_value})
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
index 25c4c25..dcbb333 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
@@ -145,7 +145,7 @@ if __name__ == "__main__":
data_engine['project_name'])
additional_tags = os.environ['tags'].replace("': u'", ":").replace("', u'", ",").replace("{u'", "" ).replace(
- "'}", "").lower().replace('_', '-')
+ "'}", "").lower()
data_engine['slave_labels'] = {"name": data_engine['cluster_name'],
"sbn": data_engine['service_base_name'],
@@ -160,10 +160,9 @@ if __name__ == "__main__":
for tag in additional_tags.split(','):
label_key = tag.split(':')[0]
- label_value = tag.split(':')[1]
- if label_key == 'user_tag':
- if '@' in label_value:
- label_value = label_value[:label_value.find('@')]
+ label_value = tag.split(':')[1].replace('_', '-')
+ if '@' in label_value:
+ label_value = label_value[:label_value.find('@')]
if label_value != '':
data_engine['slave_labels'].update({label_key: label_value})
data_engine['master_labels'].update({label_key: label_value})
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org