You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2022/02/07 14:32:14 UTC
[incubator-datalab] branch DATALAB-2674 updated (5122dde -> 55e3457)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DATALAB-2674
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
from 5122dde [DATALAB-2674]: cmek argument for gcp buckets
new e22aaab [DATALAB-2674]: changed how cmek and versioning is enabled for gcp buckets
new 55e3457 [DATALAB-2674]: changed cmek value in datalab.ini
The 2 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.
Summary of changes:
.../src/general/conf/datalab.ini | 2 +-
.../src/general/lib/gcp/actions_lib.py | 17 ++++++-----------
.../src/general/scripts/gcp/common_create_bucket.py | 4 ++--
3 files changed, 9 insertions(+), 14 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/02: [DATALAB-2674]: changed how cmek and versioning is enabled for gcp buckets
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2674
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit e22aaab758b279c4f4ad437b972533bcd39b7883
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Feb 7 16:26:10 2022 +0200
[DATALAB-2674]: changed how cmek and versioning is enabled for gcp buckets
---
.../src/general/lib/gcp/actions_lib.py | 17 ++++++-----------
.../src/general/scripts/gcp/common_create_bucket.py | 4 ++--
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
index 531d6fc..9bec18a 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
@@ -210,17 +210,9 @@ class GCPActions:
traceback.print_exc(file=sys.stdout)
- def create_bucket(self, bucket_name, versioning_enabled='false', cmek_resource_name=''):
+ def create_bucket(self, bucket_name):
try:
- bucket_params = {
- "name": bucket_name,
- "versioning": {
- "enabled": "{}".format(versioning_enabled)
- }
- }
- if cmek_resource_name != '':
- bucket_params["encryption"] = {"defaultKmsKeyName": cmek_resource_name}
- bucket = self.storage_client.create_bucket(project=self.project, body=bucket_params)
+ bucket = self.storage_client.create_bucket(bucket_name)
print('Bucket {} created.'.format(bucket.name))
except Exception as err:
logging.info(
@@ -230,12 +222,15 @@ class GCPActions:
file=sys.stdout)}))
traceback.print_exc(file=sys.stdout)
- def add_bucket_labels(self, bucket_name, tags):
+ def add_bucket_labels_vers_cmek(self, bucket_name, tags, versioning_enabled='false', cmek_resource_name=''):
try:
bucket = self.storage_client.get_bucket(bucket_name)
labels = bucket.labels
labels.update(tags)
bucket.labels = labels
+ bucket.versioning = {"enabled": versioning_enabled}
+ if cmek_resource_name != '':
+ bucket.encryption = {"defaultKmsKeyName": cmek_resource_name}
bucket.patch()
print('Updated labels on {}.'.format(bucket_name))
except Exception as err:
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 0291dbb..5a49201 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_create_bucket.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_create_bucket.py
@@ -41,8 +41,8 @@ if __name__ == "__main__":
logging.info("REQUESTED BUCKET {} ALREADY EXISTS".format(args.bucket_name))
else:
logging.info("Creating Bucket {}".format(args.bucket_name))
- GCPActions().create_bucket(args.bucket_name, args.versioning_enabled, args.cmek_resource_name)
- GCPActions().add_bucket_labels(args.bucket_name, json.loads(args.tags))
+ GCPActions().create_bucket(args.bucket_name)
+ GCPActions().add_bucket_labels_vers_cmek(args.bucket_name, json.loads(args.tags), args.versioning_enabled, args.cmek_resource_name)
else:
parser.print_help()
sys.exit(2)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 02/02: [DATALAB-2674]: changed cmek value in datalab.ini
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2674
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 55e34571caaf1b8830d7f5950c7c5afb4fb671a2
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Feb 7 16:32:00 2022 +0200
[DATALAB-2674]: changed cmek value in datalab.ini
---
infrastructure-provisioning/src/general/conf/datalab.ini | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/conf/datalab.ini b/infrastructure-provisioning/src/general/conf/datalab.ini
index b495302..681384b 100644
--- a/infrastructure-provisioning/src/general/conf/datalab.ini
+++ b/infrastructure-provisioning/src/general/conf/datalab.ini
@@ -235,7 +235,7 @@ block_project_ssh_keys = FALSE
### True if versioning is enabled for buckets
bucket_enable_versioning = false
### gcp customer managed encryption key to use
-# cmek_resource_name =
+cmek_resource_name = ''
### GCP region name for whole DataLab provisioning
region = us-west1
### GCP zone name for whole DataLab provisioning
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org