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 setting kms_key_name on machine image #4771

Merged
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
1 change: 0 additions & 1 deletion mmv1/products/compute/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7553,7 +7553,6 @@ objects:
output: true
- !ruby/object:Api::Type::String
name: 'kmsKeyName'
output: true
description: |
The name of the encryption key that is stored in Google Cloud KMS.
- !ruby/object:Api::Type::String
Expand Down
11 changes: 11 additions & 0 deletions mmv1/products/compute/terraform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1105,6 +1105,9 @@ overrides: !ruby/object:Overrides::ResourceOverrides
License: !ruby/object:Overrides::Terraform::ResourceOverride
exclude: true
MachineImage: !ruby/object:Overrides::Terraform::ResourceOverride
properties:
machineImageEncryptionKey.kmsKeyName: !ruby/object:Overrides::Terraform::PropertyOverride
diff_suppress_func: compareCryptoKeyVersions
iam_policy: !ruby/object:Api::Resource::IamPolicy
allowed_iam_role: 'roles/compute.admin'
parent_resource_attribute: 'machine_image'
Expand All @@ -1116,6 +1119,14 @@ overrides: !ruby/object:Overrides::ResourceOverrides
vars:
vm_name: "vm"
image_name: "image"
- !ruby/object:Provider::Terraform::Examples
name: "compute_machine_image_kms"
primary_resource_id: "image"
vars:
vm_name: "vm"
image_name: "image"
key_name: "key"
keyring_name: "keyring"

MachineType: !ruby/object:Overrides::Terraform::ResourceOverride
exclude: true
Expand Down
48 changes: 48 additions & 0 deletions mmv1/templates/terraform/examples/compute_machine_image_kms.tf.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
resource "google_compute_instance" "vm" {
provider = google-beta
name = "<%= ctx[:vars]['vm_name'] %>"
machine_type = "e2-medium"

boot_disk {
initialize_params {
image = "debian-cloud/debian-9"
}
}

network_interface {
network = "default"
}
}

resource "google_compute_machine_image" "<%= ctx[:primary_resource_id] %>" {
provider = google-beta
name = "<%= ctx[:vars]['image_name'] %>"
source_instance = google_compute_instance.vm.self_link
machine_image_encryption_key {
kms_key_name = google_kms_crypto_key.crypto_key.id
}
depends_on = [google_project_iam_member.kms-project-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
}

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

data "google_project" "project" {
provider = google-beta
}

resource "google_project_iam_member" "kms-project-binding" {
provider = google-beta
project = data.google_project.project.project_id
role = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
member = "serviceAccount:service-${data.google_project.project.number}@compute-system.iam.gserviceaccount.com"
}