From 77f1b431c400794c44a3bcb18e393bf8b95ebbe3 Mon Sep 17 00:00:00 2001 From: Kristen O'Leary Date: Mon, 19 Apr 2021 12:26:28 -0400 Subject: [PATCH 1/2] fix(docs): correct docs for CUSTOMER_MANAGED_ENCRYPTION --- .../cloud/bigtable/admin/v2/models/EncryptionInfo.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/EncryptionInfo.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/EncryptionInfo.java index 9eb3b13e1..8104dc7c0 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/EncryptionInfo.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/EncryptionInfo.java @@ -37,8 +37,11 @@ public enum Type { GOOGLE_DEFAULT_ENCRYPTION( com.google.bigtable.admin.v2.EncryptionInfo.EncryptionType.GOOGLE_DEFAULT_ENCRYPTION), /** - * The data backing this resource is encrypted at rest with a key that is fully managed by - * Google. No key version or status will be populated. This is the default state. + * The data backing this resource is encrypted at rest with a key that is managed by the + * customer. The in-use version of the key and its status are populated for CMEK-protected + * tables. CMEK-protected backups are pinned to the key version that was in use at the time the + * backup was taken. This key version is populated but its status is not tracked and is reported + * as `UNKNOWN`. */ CUSTOMER_MANAGED_ENCRYPTION( com.google.bigtable.admin.v2.EncryptionInfo.EncryptionType.CUSTOMER_MANAGED_ENCRYPTION), From 450cf5fbe0844dbb3ec5795cf6150936bed5ae75 Mon Sep 17 00:00:00 2001 From: Kristen O'Leary Date: Mon, 19 Apr 2021 12:31:49 -0400 Subject: [PATCH 2/2] fix(docs): correct docs for CUSTOMER_MANAGED_ENCRYPTION --- .../google/cloud/bigtable/admin/v2/models/EncryptionInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/EncryptionInfo.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/EncryptionInfo.java index 8104dc7c0..b96e0ade1 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/EncryptionInfo.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/models/EncryptionInfo.java @@ -32,7 +32,7 @@ public enum Type { com.google.bigtable.admin.v2.EncryptionInfo.EncryptionType.ENCRYPTION_TYPE_UNSPECIFIED), /** * The data backing this resource is encrypted at rest with a key that is fully managed by - * Google. No key version or status will be populated. + * Google. No key version or status will be populated. This is the default state. */ GOOGLE_DEFAULT_ENCRYPTION( com.google.bigtable.admin.v2.EncryptionInfo.EncryptionType.GOOGLE_DEFAULT_ENCRYPTION),