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 14:54:09 UTC

[incubator-dlab] 03/03: Merged

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 03b6694efd53c90252ca9fb20edc6fdee45ca42e
Merge: bd48194 9d3e854
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Feb 20 16:53:46 2020 +0200

    Merged

 .../src/general/lib/aws/actions_lib.py             | 10 ++++++++
 .../src/general/scripts/aws/project_prepare.py     | 28 ++++++++--------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --cc infrastructure-provisioning/src/general/lib/aws/actions_lib.py
index d094ec5,adb2661..6ec2396
--- a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
@@@ -83,8 -83,18 +83,18 @@@ def create_s3_bucket(bucket_name, bucke
                      },
                  ]
              })
+         tags = list()
+         tags.append({'Key': os.environ['conf_tag_resource_id'],
+                      'Value': os.environ['conf_service_base_name'] + ':' + bucket_name_tag})
+         for tag in bucket_tags.split(','):
+             tags.append(
+                 {
+                     'Key': tag.split(':')[0],
+                     'Value': tag.split(':')[1]
+                 }
+             )
          tagging = bucket.Tagging()
 -        tagging.put(Tagging={'TagSet': tags})
 +        tagging.put(Tagging={'TagSet': bucket_tags})
          tagging.reload()
          return bucket.name
      except Exception as err:


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org