diff --git a/CHANGELOG.md b/CHANGELOG.md index 523305e8d..4c15a8bca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +- new `data-solutions` section +- new `cmek-via-centralized-kms` e2e example ## [1.9.0] - 2020-06-10 diff --git a/README.md b/README.md index 4940430c5..28be754dd 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Currently available examples: - **foundations** - [single level hierarchy](./foundations/environments/) (environments), [multiple level hierarchy](./foundations/business-units/) (business units + environments) - **infrastructure** - [hub and spoke via peering](./infrastructure/hub-and-spoke-peering/), [hub and spoke via VPN](./infrastructure/hub-and-spoke-vpn/), [DNS and Google Private Access for on-premises](./infrastructure/onprem-google-access-dns/), [Shared VPC with GKE support](./infrastructure/shared-vpc-gke/) -- **data solutions** - [Cloud KMS with Cloud Storage and Compute Engine](./data-solutions/cloud-kms/) +- **data solutions** - [CMEK on Cloud Storage and Compute Engine via centralized Cloud KMS](./data-solutions/cmek-via-centralized-kms/) For more information see the README files in the [foundations](./foundations/), [infrastructure](./infrastructure/) and [data solutions](./data-solutions/) folders. diff --git a/data-solutions/README.md b/data-solutions/README.md index 4a6889be4..f8f70d75f 100644 --- a/data-solutions/README.md +++ b/data-solutions/README.md @@ -8,4 +8,4 @@ They are meant to be used as minimal but complete starting points to create actu ### CMEK for Cloud Storage and Compute Engine via centralized KMS - This [example](./cloud-kms/) implements [CMEK](https://cloud.google.com/kms/docs/cmek) for GCS and GCE, via keys hosted in KMS running in a centralized project. The example shows the basic resources and permissions for the typical use case of application projects implementing encryption at rest via a centrally managed KMS service. + This [example](./cmek-via-centralized-kms/) implements [CMEK](https://cloud.google.com/kms/docs/cmek) for GCS and GCE, via keys hosted in KMS running in a centralized project. The example shows the basic resources and permissions for the typical use case of application projects implementing encryption at rest via a centrally managed KMS service. diff --git a/data-solutions/cloud-kms/README.md b/data-solutions/cmek-via-centralized-kms/README.md similarity index 97% rename from data-solutions/cloud-kms/README.md rename to data-solutions/cmek-via-centralized-kms/README.md index 058a6acaf..d1ea3bef9 100644 --- a/data-solutions/cloud-kms/README.md +++ b/data-solutions/cmek-via-centralized-kms/README.md @@ -1,4 +1,4 @@ -# Cloud KMS with Cloud Storage and Compute Engine +# CMEK on Cloud Storage and Compute Engine via centralized Cloud KMS This sample creates a sample [Cloud KMS](https://cloud.google.com/kms?hl=it) configuration to be used with [Cloud Storage](https://cloud.google.com/storage/docs/encryption/using-customer-managed-keys) and [Copute Engine](https://cloud.google.com/compute/docs/disks/customer-managed-encryption). Cloud KMS is deployed in a separate project to highlight the IAM binding needed and to mock a more real scenario where you usually have a project to manage keys across all your projects in one single place. diff --git a/data-solutions/cloud-kms/backend.tf.sample b/data-solutions/cmek-via-centralized-kms/backend.tf.sample similarity index 100% rename from data-solutions/cloud-kms/backend.tf.sample rename to data-solutions/cmek-via-centralized-kms/backend.tf.sample diff --git a/data-solutions/cloud-kms/diagram.png b/data-solutions/cmek-via-centralized-kms/diagram.png similarity index 100% rename from data-solutions/cloud-kms/diagram.png rename to data-solutions/cmek-via-centralized-kms/diagram.png diff --git a/data-solutions/cloud-kms/main.tf b/data-solutions/cmek-via-centralized-kms/main.tf similarity index 100% rename from data-solutions/cloud-kms/main.tf rename to data-solutions/cmek-via-centralized-kms/main.tf diff --git a/data-solutions/cloud-kms/outputs.tf b/data-solutions/cmek-via-centralized-kms/outputs.tf similarity index 100% rename from data-solutions/cloud-kms/outputs.tf rename to data-solutions/cmek-via-centralized-kms/outputs.tf diff --git a/data-solutions/cloud-kms/variables.tf b/data-solutions/cmek-via-centralized-kms/variables.tf similarity index 100% rename from data-solutions/cloud-kms/variables.tf rename to data-solutions/cmek-via-centralized-kms/variables.tf diff --git a/data-solutions/cloud-kms/versions.tf b/data-solutions/cmek-via-centralized-kms/versions.tf similarity index 100% rename from data-solutions/cloud-kms/versions.tf rename to data-solutions/cmek-via-centralized-kms/versions.tf