Skip to content

Commit 2842996

Browse files
authored
Merge pull request #71 from modular-magician/codegen-pr-1259
Make Disk KMS features GA
2 parents 6132c34 + 60ea73f commit 2842996

File tree

4 files changed

+15
-0
lines changed

4 files changed

+15
-0
lines changed

docs/resources/google_compute_disk.md

+6
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ Properties that can be accessed from the `google_compute_disk` resource:
6969

7070
* `sha256`: The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption key that protects this resource.
7171

72+
* `kmsKeyName`: The name of the encryption key that is stored in Google Cloud KMS.
73+
7274
* `source_image_id`: The ID value of the image used to create this disk. This value identifies the exact image that was used to create this persistent disk. For example, if you created the persistent disk from an image that was later deleted and recreated under the same name, the source image ID would identify the exact version of the image that was used.
7375

7476
* `disk_encryption_key`: Encrypts the disk using a customer-supplied encryption key. After you encrypt a disk with a customer-supplied key, you must provide the same key if you use the disk later (e.g. to create a disk snapshot or an image, or to attach the disk to a virtual machine). Customer-supplied encryption keys do not protect access to metadata of the disk. If you do not provide an encryption key when creating the disk, then the disk will be encrypted using an automatically generated key and you do not need to provide a key to use the disk later.
@@ -77,12 +79,16 @@ Properties that can be accessed from the `google_compute_disk` resource:
7779

7880
* `sha256`: The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption key that protects this resource.
7981

82+
* `kmsKeyName`: The name of the encryption key that is stored in Google Cloud KMS.
83+
8084
* `source_snapshot`: The source snapshot used to create this disk. You can provide this as a partial or full URL to the resource. For example, the following are valid values: * `https://www.googleapis.com/compute/v1/projects/project/global/snapshots/snapshot` * `projects/project/global/snapshots/snapshot` * `global/snapshots/snapshot`
8185

8286
* `source_snapshot_encryption_key`: The customer-supplied encryption key of the source snapshot. Required if the source snapshot is protected by a customer-supplied encryption key.
8387

8488
* `rawKey`: Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648 base64 to either encrypt or decrypt this resource.
8589

90+
* `kmsKeyName`: The name of the encryption key that is stored in Google Cloud KMS.
91+
8692
* `sha256`: The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption key that protects this resource.
8793

8894
* `source_snapshot_id`: The unique ID of the snapshot used to create this disk. This value identifies the exact snapshot that was used to create this persistent disk. For example, if you created the persistent disk from a snapshot that was later deleted and recreated under the same name, the source snapshot ID would identify the exact version of the snapshot that was used.

libraries/google/compute/property/disk_disk_encryption_key.rb

+3
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,13 @@ class DiskDiskencryptionkey
2121

2222
attr_reader :sha256
2323

24+
attr_reader :kms_key_name
25+
2426
def initialize(args = nil)
2527
return if args.nil?
2628
@raw_key = args['rawKey']
2729
@sha256 = args['sha256']
30+
@kms_key_name = args['kmsKeyName']
2831
end
2932
end
3033
end

libraries/google/compute/property/disk_source_image_encryption_key.rb

+3
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,13 @@ class DiskSourceimageencryptionkey
2121

2222
attr_reader :sha256
2323

24+
attr_reader :kms_key_name
25+
2426
def initialize(args = nil)
2527
return if args.nil?
2628
@raw_key = args['rawKey']
2729
@sha256 = args['sha256']
30+
@kms_key_name = args['kmsKeyName']
2831
end
2932
end
3033
end

libraries/google/compute/property/disk_source_snapshot_encryption_key.rb

+3
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@ module Property
1919
class DiskSourcesnapshotencryptionkey
2020
attr_reader :raw_key
2121

22+
attr_reader :kms_key_name
23+
2224
attr_reader :sha256
2325

2426
def initialize(args = nil)
2527
return if args.nil?
2628
@raw_key = args['rawKey']
29+
@kms_key_name = args['kmsKeyName']
2730
@sha256 = args['sha256']
2831
end
2932
end

0 commit comments

Comments
 (0)