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/02/20 08:30:17 UTC
[incubator-dlab] branch DLAB-1531 created (now 2f3dbdf)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-1531
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 2f3dbdf DLAB-1531 added some prints for testing
This branch includes the following new commits:
new 7581c97 DLAB-1531 added endpoint tag to azure shared storage account
new 376ed8e DLAB-1531 corrected additional tags for shared bucket
new fee98e6 DLAB-1531 remade add_bucket_label function for gcp a bit and added some labels to gcp buckets after creation
new 2f3dbdf DLAB-1531 added some prints for testing
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/04: DLAB-1531 corrected additional tags for
shared bucket
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1531
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 376ed8e40f465c4150c1d684928888b24d6d33fc
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Feb 19 17:24:13 2020 +0200
DLAB-1531 corrected additional tags for shared bucket
---
.../src/general/scripts/aws/project_prepare.py | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
index 1f3504e..f775e31 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
@@ -134,10 +134,18 @@ if __name__ == "__main__":
logging.info(json.dumps(project_conf))
if 'conf_additional_tags' in os.environ:
+ project_conf['shared_bucket_additional_tags'] = os.environ['conf_additional_tags'] + \
+ ';endpoint_tag:{};'.format(project_conf['endpoint_tag'])
+ project_conf['all_bucket_additional_tags'] = os.environ['conf_additional_tags'] + \
+ ';project_tag:{0};endpoint_tag:{1};'.format(
+ project_conf['project_tag'], project_conf['endpoint_tag'])
os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + \
';project_tag:{0};endpoint_tag:{1};'.format(
project_conf['project_tag'], project_conf['endpoint_tag'])
else:
+ project_conf['shared_bucket_additional_tags'] = 'endpoint_tag:{};'.format(project_conf['endpoint_tag'])
+ project_conf['all_additional_tags'] = 'project_tag:{0};endpoint_tag:{1}'.format(project_conf['project_tag'],
+ project_conf['endpoint_tag'])
os.environ['conf_additional_tags'] = 'project_tag:{0};endpoint_tag:{1}'.format(project_conf['project_tag'],
project_conf['endpoint_tag'])
print('Additional tags will be added: {}'.format(os.environ['conf_additional_tags']))
@@ -531,6 +539,7 @@ if __name__ == "__main__":
try:
logging.info('[CREATE BUCKETS]')
print('[CREATE BUCKETS]')
+ os.environ['conf_additional_tags'] = project_conf['shared_bucket_additional_tags']
params = "--bucket_name {} --infra_tag_name {} --infra_tag_value {} --region {} --bucket_name_tag {}". \
format(project_conf['shared_bucket_name'], project_conf['tag_name'], project_conf['shared_bucket_name'], project_conf['region'], project_conf['shared_bucket_name_tag'])
try:
@@ -538,7 +547,7 @@ if __name__ == "__main__":
except:
traceback.print_exc()
raise Exception
-
+ os.environ['conf_additional_tags'] = project_conf['all_bucket_additional_tags']
params = "--bucket_name {} --infra_tag_name {} --infra_tag_value {} --region {} --bucket_name_tag {}" \
.format(project_conf['bucket_name'], project_conf['tag_name'], project_conf['bucket_name'],
project_conf['region'], project_conf['bucket_name_tag'])
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 04/04: DLAB-1531 added some prints for testing
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1531
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 2f3dbdffe244449888662763b7f39a557bdd58c8
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Feb 20 10:29:52 2020 +0200
DLAB-1531 added some prints for testing
---
infrastructure-provisioning/src/general/lib/gcp/actions_lib.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
index aefc902..8657b78 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
@@ -190,9 +190,11 @@ class GCPActions:
def add_bucket_label(self, bucket_name, key , value):
try:
+ print('----------adding tags to bucket: ' + bucket_name)
bucket = self.storage_client.get_bucket(bucket_name)
-
labels = bucket.labels
+ print('labels:')
+ print(labels)
labels[key] = '{}'.format(value)
bucket.labels = labels
bucket.patch()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/04: DLAB-1531 added endpoint tag to azure
shared storage account
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1531
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 7581c97d8b17696f80b96956dd95baa08333551e
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Feb 19 15:41:15 2020 +0200
DLAB-1531 added endpoint tag to azure shared storage account
---
.../src/general/scripts/azure/project_prepare.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
index 4643647..7976d5a 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
@@ -103,7 +103,7 @@ if __name__ == "__main__":
project_conf['shared_storage_account_tags'] = {"Name": project_conf['shared_storage_account_name'],
"SBN": project_conf['service_base_name'],
os.environ['conf_billing_tag_key']: os.environ[
- 'conf_billing_tag_value']}
+ 'conf_billing_tag_value'], "endpoint_tag": project_conf['endpoint_tag'],}
# FUSE in case of absence of user's key
try:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/04: DLAB-1531 remade add_bucket_label function
for gcp a bit and added some labels to gcp buckets after creation
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1531
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit fee98e6c0d86783d71129acbf14862b0a02188a5
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Feb 19 17:48:35 2020 +0200
DLAB-1531 remade add_bucket_label function for gcp a bit and added some labels to gcp buckets after creation
---
infrastructure-provisioning/src/general/lib/gcp/actions_lib.py | 4 ++--
.../src/general/scripts/gcp/common_create_bucket.py | 1 -
.../src/general/scripts/gcp/project_prepare.py | 9 +++++++++
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
index 0487e0b..aefc902 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
@@ -188,12 +188,12 @@ class GCPActions:
file=sys.stdout)}))
traceback.print_exc(file=sys.stdout)
- def add_bucket_label(self, bucket_name):
+ def add_bucket_label(self, bucket_name, key , value):
try:
bucket = self.storage_client.get_bucket(bucket_name)
labels = bucket.labels
- labels['name'] = '{}'.format(bucket_name)
+ labels[key] = '{}'.format(value)
bucket.labels = labels
bucket.patch()
print('Updated labels on {}.'.format(bucket_name))
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_create_bucket.py b/infrastructure-provisioning/src/general/scripts/gcp/common_create_bucket.py
index c75e718..643f6ca 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_bucket.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_bucket.py
@@ -40,7 +40,6 @@ if __name__ == "__main__":
else:
print("Creating Bucket {}".format(args.bucket_name))
GCPActions().create_bucket(args.bucket_name)
- GCPActions().add_bucket_label(args.bucket_name)
else:
parser.print_help()
sys.exit(2)
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
index 099f7a6..f23cf07 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
@@ -369,6 +369,10 @@ if __name__ == "__main__":
params = "--bucket_name {}".format(project_conf['shared_bucket_name'])
try:
local("~/scripts/{}.py {}".format('common_create_bucket', params))
+ GCPActions().add_bucket_label(project_conf['shared_bucket_name'], "name", project_conf['shared_bucket_name'])
+ GCPActions().add_bucket_label(project_conf['shared_bucket_name'], "endpoint_tag", project_conf['endpoint_tag'])
+ GCPActions().add_bucket_label(project_conf['shared_bucket_name'], "product", "dlab")
+ GCPActions().add_bucket_label(project_conf['shared_bucket_name'], "sbn", project_conf['service_base_name'])
except:
traceback.print_exc()
raise Exception
@@ -377,6 +381,11 @@ if __name__ == "__main__":
try:
local("~/scripts/{}.py {}".format('common_create_bucket', params))
+ GCPActions().add_bucket_label(project_conf['bucket_name'], "name", project_conf['shared_bucket_name'])
+ GCPActions().add_bucket_label(project_conf['bucket_name'], "endpoint_tag", project_conf['endpoint_tag'])
+ GCPActions().add_bucket_label(project_conf['bucket_name'], "product", "dlab")
+ GCPActions().add_bucket_label(project_conf['bucket_name'], "project_tag", project_conf['project_tag'])
+ GCPActions().add_bucket_label(project_conf['bucket_name'], "sbn", project_conf['service_base_name'])
except:
traceback.print_exc()
raise Exception
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org