Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Dataproc Metastore CMEK config #5881

Merged
merged 1 commit into from
Apr 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions mmv1/products/metastore/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,21 @@ objects:
- :FRIDAY
- :SATURDAY
- :SUNDAY
- !ruby/object:Api::Type::NestedObject
name: 'encryptionConfig'
min_version: beta
description: |
Information used to configure the Dataproc Metastore service to encrypt
customer data at rest.
properties:
- !ruby/object:Api::Type::String
name: 'kmsKey'
min_version: beta
description: |
The fully qualified customer provided Cloud KMS key name to use for customer data encryption.
Use the following format: `projects/([^/]+)/locations/([^/]+)/keyRings/([^/]+)/cryptoKeys/([^/]+)`
required: true
input: true
- !ruby/object:Api::Type::NestedObject
name: 'hiveMetastoreConfig'
description: |
Expand Down
18 changes: 18 additions & 0 deletions mmv1/products/metastore/terraform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,24 @@ overrides: !ruby/object:Overrides::ResourceOverrides
primary_resource_id: "default"
vars:
metastore_service_name: "metastore-srv"
- !ruby/object:Provider::Terraform::Examples
name: "dataproc_metastore_service_cmek_test"
min_version: beta
skip_docs: true
primary_resource_id: "default"
vars:
metastore_service_name: "example-service"
key_name: "example-key"
keyring_name: "example-keyring"
- !ruby/object:Provider::Terraform::Examples
name: "dataproc_metastore_service_cmek_example"
min_version: beta
skip_test: true
primary_resource_id: "default"
Noremac201 marked this conversation as resolved.
Show resolved Hide resolved
vars:
metastore_service_name: "example-service"
key_name: "example-key"
keyring_name: "example-keyring"
properties:
network: !ruby/object:Overrides::Terraform::PropertyOverride
default_from_api: true
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
resource "google_dataproc_metastore_service" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
service_id = "<%= ctx[:vars]['metastore_service_name'] %>"
location = "us-central1"

encryption_config {
kms_key = google_kms_crypto_key.crypto_key.id
}

hive_metastore_config {
version = "3.1.2"
}
}

resource "google_kms_crypto_key" "crypto_key" {
provider = google-beta
name = "<%= ctx[:vars]['key_name'] %>"
key_ring = google_kms_key_ring.key_ring.id

purpose = "ENCRYPT_DECRYPT"
}

resource "google_kms_key_ring" "key_ring" {
provider = google-beta
name = "<%= ctx[:vars]['keyring_name'] %>"
location = "us-central1"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
data "google_project" "project" {
provider = google-beta
}

data "google_storage_project_service_account" "gcs_account" {
provider = google-beta
}


resource "google_dataproc_metastore_service" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
service_id = "<%= ctx[:vars]['metastore_service_name'] %>"
location = "us-central1"

encryption_config {
kms_key = google_kms_crypto_key.crypto_key.id
}

hive_metastore_config {
version = "3.1.2"
}

depends_on = [google_kms_crypto_key_iam_binding.crypto_key_binding]
}

resource "google_kms_crypto_key" "crypto_key" {
provider = google-beta
name = "<%= ctx[:vars]['key_name'] %>"
key_ring = google_kms_key_ring.key_ring.id

purpose = "ENCRYPT_DECRYPT"
}

resource "google_kms_key_ring" "key_ring" {
provider = google-beta
name = "<%= ctx[:vars]['keyring_name'] %>"
location = "us-central1"
}

resource "google_kms_crypto_key_iam_binding" "crypto_key_binding" {
provider = google-beta
crypto_key_id = google_kms_crypto_key.crypto_key.id
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"

members = [
"serviceAccount:service-${data.google_project.project.number}@gcp-sa-metastore.iam.gserviceaccount.com",
"serviceAccount:${data.google_storage_project_service_account.gcs_account.email_address}"
]
}