Skip to content

Commit b6d6d04

Browse files
melinathmelinath
authored
Added new fields to compute instance meta.yaml (#15498)
1 parent 3289256 commit b6d6d04

File tree

3 files changed

+155
-4
lines changed

3 files changed

+155
-4
lines changed

‎mmv1/third_party/terraform/services/compute/resource_compute_instance_from_machine_image_meta.yaml.tmpl‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,16 @@ fields:
1717
api_field: 'disks.deviceName'
1818
- field: 'attached_disk.disk_encryption_key_raw'
1919
api_field: 'disks.diskEncryptionKey.rawKey'
20+
- field: 'attached_disk.disk_encryption_key_rsa'
21+
api_field: 'disks.diskEncryptionKey.rsaEncryptedKey'
22+
- field: 'attached_disk.disk_encryption_service_account'
23+
api_field: 'disks.diskEncryptionKey.kmsKeyServiceAccount'
2024
- field: 'attached_disk.disk_encryption_key_sha256'
2125
api_field: 'disks.diskEncryptionKey.sha256'
2226
- field: 'attached_disk.kms_key_self_link'
2327
api_field: 'disks.diskEncryptionKey.kmsKeyName'
28+
- field: 'attached_disk.force_attach'
29+
api_field: 'disks.forceAttach'
2430
- field: 'attached_disk.mode'
2531
api_field: 'disks.mode'
2632
- field: 'attached_disk.source'
@@ -31,12 +37,28 @@ fields:
3137
api_field: 'disks.deviceName'
3238
- field: 'boot_disk.disk_encryption_key_raw'
3339
api_field: 'disks.diskEncryptionKey.rawKey'
40+
- field: 'boot_disk.disk_encryption_key_rsa'
41+
api_field: 'disks.diskEncryptionKey.rsaEncryptedKey'
42+
- field: 'boot_disk.disk_encryption_service_account'
43+
api_field: 'disks.diskEncryptionKey.kmsKeyServiceAccount'
3444
- field: 'boot_disk.disk_encryption_key_sha256'
3545
api_field: 'disks.diskEncryptionKey.sha256'
46+
- field: 'boot_disk.initialize_params.architecture'
47+
api_field: 'disks.initializeParams.architecture'
3648
- field: 'boot_disk.initialize_params.enable_confidential_compute'
3749
api_field: 'disks.initializeParams.enableConfidentialCompute'
3850
- field: 'boot_disk.initialize_params.image'
3951
api_field: 'disks.initializeParams.sourceImage'
52+
- field: 'boot_disk.initialize_params.source_image_encryption_key.kms_key_self_link'
53+
api_field: 'disks.initializeParams.sourceImageEncryptionKey.kmsKeyName'
54+
- field: 'boot_disk.initialize_params.source_image_encryption_key.kms_key_service_account'
55+
api_field: 'disks.initializeParams.sourceImageEncryptionKey.kmsKeyServiceAccount'
56+
- field: 'boot_disk.initialize_params.source_image_encryption_key.raw_key'
57+
api_field: 'disks.initializeParams.sourceImageEncryptionKey.rawKey'
58+
- field: 'boot_disk.initialize_params.source_image_encryption_key.rsa_encrypted_key'
59+
api_field: 'disks.initializeParams.sourceImageEncryptionKey.rsaEncryptedKey'
60+
- field: 'boot_disk.initialize_params.source_image_encryption_key.sha256'
61+
api_field: 'disks.initializeParams.sourceImageEncryptionKey.sha256'
4062
- field: 'boot_disk.initialize_params.labels'
4163
api_field: 'disks.initializeParams.labels'
4264
- field: 'boot_disk.initialize_params.provisioned_iops'
@@ -47,6 +69,18 @@ fields:
4769
api_field: 'disks.initializeParams.resourceManagerTags'
4870
- field: 'boot_disk.initialize_params.resource_policies'
4971
api_field: 'disks.initializeParams.resourcePolicies'
72+
- field: 'boot_disk.initialize_params.snapshot'
73+
api_field: 'disks.initializeParams.sourceSnapshot'
74+
- field: 'boot_disk.initialize_params.source_snapshot_encryption_key.kms_key_self_link'
75+
api_field: 'disks.initializeParams.sourceSnapshotEncryptionKey.kmsKeyName'
76+
- field: 'boot_disk.initialize_params.source_snapshot_encryption_key.kms_key_service_account'
77+
api_field: 'disks.initializeParams.sourceSnapshotEncryptionKey.kmsKeyServiceAccount'
78+
- field: 'boot_disk.initialize_params.source_snapshot_encryption_key.raw_key'
79+
api_field: 'disks.initializeParams.sourceSnapshotEncryptionKey.rawKey'
80+
- field: 'boot_disk.initialize_params.source_snapshot_encryption_key.rsa_encrypted_key'
81+
api_field: 'disks.initializeParams.sourceSnapshotEncryptionKey.rsaEncryptedKey'
82+
- field: 'boot_disk.initialize_params.source_snapshot_encryption_key.sha256'
83+
api_field: 'disks.initializeParams.sourceSnapshotEncryptionKey.sha256'
5084
- field: 'boot_disk.initialize_params.size'
5185
api_field: 'disks.initializeParams.diskSizeGb'
5286
- field: 'boot_disk.initialize_params.storage_pool'
@@ -57,6 +91,10 @@ fields:
5791
api_field: 'disks.interface'
5892
- field: 'boot_disk.kms_key_self_link'
5993
api_field: 'disks.diskEncryptionKey.kmsKeyName'
94+
- field: 'boot_disk.force_attach'
95+
api_field: 'disks.forceAttach'
96+
- api_field: 'disks.guestOsFeatures.type'
97+
field: 'boot_disk.guest_os_features'
6098
- field: 'boot_disk.mode'
6199
api_field: 'disks.mode'
62100
- field: 'boot_disk.source'
@@ -83,6 +121,10 @@ fields:
83121
- api_field: 'hostname'
84122
- api_field: 'id'
85123
field: 'instance_id'
124+
- api_field: 'instanceEncryptionKey.kmsKeyName'
125+
field: 'instance_encryption_key.kms_key_self_link'
126+
- api_field: 'instanceEncryptionKey.kmsKeyServiceAccount'
127+
- api_field: 'instanceEncryptionKey.sha256'
86128
- api_field: 'keyRevocationActionType'
87129
- api_field: 'labelFingerprint'
88130
- api_field: 'labels'
@@ -158,6 +200,9 @@ fields:
158200
- api_field: 'resourcePolicies'
159201
- api_field: 'scheduling.automaticRestart'
160202
- api_field: 'scheduling.availabilityDomain'
203+
- api_field: 'scheduling.gracefulShutdown.enabled'
204+
- api_field: 'scheduling.gracefulShutdown.maxDuration.nanos'
205+
- api_field: 'scheduling.gracefulShutdown.maxDuration.seconds'
161206
- api_field: 'scheduling.hostErrorTimeoutSeconds'
162207
- api_field: 'scheduling.instanceTerminationAction'
163208
- api_field: 'scheduling.localSsdRecoveryTimeout.nanos'
@@ -173,6 +218,8 @@ fields:
173218
- api_field: 'scheduling.onInstanceStopAction.discardLocalSsd'
174219
- api_field: 'scheduling.preemptible'
175220
- api_field: 'scheduling.provisioningModel'
221+
- api_field: 'scheduling.skipGuestOsShutdown'
222+
- api_field: 'scheduling.terminationTime'
176223
- api_field: 'disks.deviceName'
177224
field: 'scratch_disk.device_name'
178225
- api_field: 'disks.interface'
@@ -187,6 +234,12 @@ fields:
187234
- api_field: 'shieldedInstanceConfig.enableIntegrityMonitoring'
188235
- api_field: 'shieldedInstanceConfig.enableSecureBoot'
189236
- api_field: 'shieldedInstanceConfig.enableVtpm'
237+
- api_field: 'sourceMachineImage'
238+
- api_field: 'sourceMachineImageEncryptionKey.kmsKeyName'
239+
- api_field: 'sourceMachineImageEncryptionKey.kmsKeyServiceAccount'
240+
- api_field: 'sourceMachineImageEncryptionKey.rawKey'
241+
- api_field: 'sourceMachineImageEncryptionKey.rsaEncryptedKey'
242+
- api_field: 'sourceMachineImageEncryptionKey.sha256'
190243
- api_field: 'tags.items'
191244
field: 'tags'
192245
- api_field: 'tags.fingerprint'

‎mmv1/third_party/terraform/services/compute/resource_compute_instance_from_template_meta.yaml.tmpl‎

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,16 @@ fields:
2020
api_field: 'disks.deviceName'
2121
- field: 'attached_disk.disk_encryption_key_raw'
2222
api_field: 'disks.diskEncryptionKey.rawKey'
23+
- field: 'attached_disk.disk_encryption_key_rsa'
24+
api_field: 'disks.diskEncryptionKey.rsaEncryptedKey'
25+
- field: 'attached_disk.disk_encryption_service_account'
26+
api_field: 'disks.diskEncryptionKey.kmsKeyServiceAccount'
2327
- field: 'attached_disk.disk_encryption_key_sha256'
2428
api_field: 'disks.diskEncryptionKey.sha256'
2529
- field: 'attached_disk.kms_key_self_link'
2630
api_field: 'disks.diskEncryptionKey.kmsKeyName'
31+
- field: 'attached_disk.force_attach'
32+
api_field: 'disks.forceAttach'
2733
- field: 'attached_disk.mode'
2834
api_field: 'disks.mode'
2935
- field: 'attached_disk.source'
@@ -34,12 +40,28 @@ fields:
3440
api_field: 'disks.deviceName'
3541
- field: 'boot_disk.disk_encryption_key_raw'
3642
api_field: 'disks.diskEncryptionKey.rawKey'
43+
- field: 'boot_disk.disk_encryption_key_rsa'
44+
api_field: 'disks.diskEncryptionKey.rsaEncryptedKey'
45+
- field: 'boot_disk.disk_encryption_service_account'
46+
api_field: 'disks.diskEncryptionKey.kmsKeyServiceAccount'
3747
- field: 'boot_disk.disk_encryption_key_sha256'
3848
api_field: 'disks.diskEncryptionKey.sha256'
49+
- field: 'boot_disk.initialize_params.architecture'
50+
api_field: 'disks.initializeParams.architecture'
3951
- field: 'boot_disk.initialize_params.enable_confidential_compute'
4052
api_field: 'disks.initializeParams.enableConfidentialCompute'
4153
- field: 'boot_disk.initialize_params.image'
4254
api_field: 'disks.initializeParams.sourceImage'
55+
- field: 'boot_disk.initialize_params.source_image_encryption_key.kms_key_self_link'
56+
api_field: 'disks.initializeParams.sourceImageEncryptionKey.kmsKeyName'
57+
- field: 'boot_disk.initialize_params.source_image_encryption_key.kms_key_service_account'
58+
api_field: 'disks.initializeParams.sourceImageEncryptionKey.kmsKeyServiceAccount'
59+
- field: 'boot_disk.initialize_params.source_image_encryption_key.raw_key'
60+
api_field: 'disks.initializeParams.sourceImageEncryptionKey.rawKey'
61+
- field: 'boot_disk.initialize_params.source_image_encryption_key.rsa_encrypted_key'
62+
api_field: 'disks.initializeParams.sourceImageEncryptionKey.rsaEncryptedKey'
63+
- field: 'boot_disk.initialize_params.source_image_encryption_key.sha256'
64+
api_field: 'disks.initializeParams.sourceImageEncryptionKey.sha256'
4365
- field: 'boot_disk.initialize_params.labels'
4466
api_field: 'disks.initializeParams.labels'
4567
- field: 'boot_disk.initialize_params.provisioned_iops'
@@ -50,6 +72,18 @@ fields:
5072
api_field: 'disks.initializeParams.resourceManagerTags'
5173
- field: 'boot_disk.initialize_params.resource_policies'
5274
api_field: 'disks.initializeParams.resourcePolicies'
75+
- field: 'boot_disk.initialize_params.snapshot'
76+
api_field: 'disks.initializeParams.sourceSnapshot'
77+
- field: 'boot_disk.initialize_params.source_snapshot_encryption_key.kms_key_self_link'
78+
api_field: 'disks.initializeParams.sourceSnapshotEncryptionKey.kmsKeyName'
79+
- field: 'boot_disk.initialize_params.source_snapshot_encryption_key.kms_key_service_account'
80+
api_field: 'disks.initializeParams.sourceSnapshotEncryptionKey.kmsKeyServiceAccount'
81+
- field: 'boot_disk.initialize_params.source_snapshot_encryption_key.raw_key'
82+
api_field: 'disks.initializeParams.sourceSnapshotEncryptionKey.rawKey'
83+
- field: 'boot_disk.initialize_params.source_snapshot_encryption_key.rsa_encrypted_key'
84+
api_field: 'disks.initializeParams.sourceSnapshotEncryptionKey.rsaEncryptedKey'
85+
- field: 'boot_disk.initialize_params.source_snapshot_encryption_key.sha256'
86+
api_field: 'disks.initializeParams.sourceSnapshotEncryptionKey.sha256'
5387
- field: 'boot_disk.initialize_params.size'
5488
api_field: 'disks.initializeParams.diskSizeGb'
5589
- field: 'boot_disk.initialize_params.storage_pool'
@@ -60,6 +94,10 @@ fields:
6094
api_field: 'disks.interface'
6195
- field: 'boot_disk.kms_key_self_link'
6296
api_field: 'disks.diskEncryptionKey.kmsKeyName'
97+
- field: 'boot_disk.force_attach'
98+
api_field: 'disks.forceAttach'
99+
- api_field: 'disks.guestOsFeatures.type'
100+
field: 'boot_disk.guest_os_features'
63101
- field: 'boot_disk.mode'
64102
api_field: 'disks.mode'
65103
- field: 'boot_disk.source'
@@ -86,6 +124,10 @@ fields:
86124
- api_field: 'hostname'
87125
- api_field: 'id'
88126
field: 'instance_id'
127+
- api_field: 'instanceEncryptionKey.kmsKeyName'
128+
field: 'instance_encryption_key.kms_key_self_link'
129+
- api_field: 'instanceEncryptionKey.kmsKeyServiceAccount'
130+
- api_field: 'instanceEncryptionKey.sha256'
89131
- api_field: 'keyRevocationActionType'
90132
- api_field: 'labelFingerprint'
91133
- api_field: 'labels'
@@ -136,10 +178,8 @@ fields:
136178
field: 'network_interface.name'
137179
- api_field: 'networkInterfaces.network'
138180
field: 'network_interface.network'
139-
{{- if ne $.TargetVersionName "ga" }}
140181
- api_field: 'networkInterfaces.networkAttachment'
141182
field: 'network_interface.network_attachment'
142-
{{- end }}
143183
- api_field: 'networkInterfaces.networkIP'
144184
field: 'network_interface.network_ip'
145185
- api_field: 'networkInterfaces.nicType'
@@ -171,6 +211,11 @@ fields:
171211
- api_field: 'resourcePolicies'
172212
- api_field: 'scheduling.automaticRestart'
173213
- api_field: 'scheduling.availabilityDomain'
214+
{{- if ne $.TargetVersionName "ga" }}
215+
- api_field: 'scheduling.gracefulShutdown.enabled'
216+
- api_field: 'scheduling.gracefulShutdown.maxDuration.nanos'
217+
- api_field: 'scheduling.gracefulShutdown.maxDuration.seconds'
218+
{{- end }}
174219
{{- if ne $.TargetVersionName "ga" }}
175220
- api_field: 'scheduling.hostErrorTimeoutSeconds'
176221
{{- end }}
@@ -190,6 +235,10 @@ fields:
190235
- api_field: 'scheduling.onInstanceStopAction.discardLocalSsd'
191236
- api_field: 'scheduling.preemptible'
192237
- api_field: 'scheduling.provisioningModel'
238+
{{- if ne $.TargetVersionName "ga" }}
239+
- api_field: 'scheduling.skipGuestOsShutdown'
240+
{{- end }}
241+
- api_field: 'scheduling.terminationTime'
193242
- api_field: 'disks.deviceName'
194243
field: 'scratch_disk.device_name'
195244
- api_field: 'disks.interface'

‎mmv1/third_party/terraform/services/compute/resource_compute_instance_meta.yaml.tmpl‎

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,16 @@ fields:
2020
api_field: 'disks.deviceName'
2121
- field: 'attached_disk.disk_encryption_key_raw'
2222
api_field: 'disks.diskEncryptionKey.rawKey'
23+
- field: 'attached_disk.disk_encryption_key_rsa'
24+
api_field: 'disks.diskEncryptionKey.rsaEncryptedKey'
25+
- field: 'attached_disk.disk_encryption_service_account'
26+
api_field: 'disks.diskEncryptionKey.kmsKeyServiceAccount'
2327
- field: 'attached_disk.disk_encryption_key_sha256'
2428
api_field: 'disks.diskEncryptionKey.sha256'
2529
- field: 'attached_disk.kms_key_self_link'
2630
api_field: 'disks.diskEncryptionKey.kmsKeyName'
31+
- field: 'attached_disk.force_attach'
32+
api_field: 'disks.forceAttach'
2733
- field: 'attached_disk.mode'
2834
api_field: 'disks.mode'
2935
- field: 'attached_disk.source'
@@ -34,12 +40,28 @@ fields:
3440
api_field: 'disks.deviceName'
3541
- field: 'boot_disk.disk_encryption_key_raw'
3642
api_field: 'disks.diskEncryptionKey.rawKey'
43+
- field: 'boot_disk.disk_encryption_key_rsa'
44+
api_field: 'disks.diskEncryptionKey.rsaEncryptedKey'
45+
- field: 'boot_disk.disk_encryption_service_account'
46+
api_field: 'disks.diskEncryptionKey.kmsKeyServiceAccount'
3747
- field: 'boot_disk.disk_encryption_key_sha256'
3848
api_field: 'disks.diskEncryptionKey.sha256'
49+
- field: 'boot_disk.initialize_params.architecture'
50+
api_field: 'disks.initializeParams.architecture'
3951
- field: 'boot_disk.initialize_params.enable_confidential_compute'
4052
api_field: 'disks.initializeParams.enableConfidentialCompute'
4153
- field: 'boot_disk.initialize_params.image'
4254
api_field: 'disks.initializeParams.sourceImage'
55+
- field: 'boot_disk.initialize_params.source_image_encryption_key.kms_key_self_link'
56+
api_field: 'disks.initializeParams.sourceImageEncryptionKey.kmsKeyName'
57+
- field: 'boot_disk.initialize_params.source_image_encryption_key.kms_key_service_account'
58+
api_field: 'disks.initializeParams.sourceImageEncryptionKey.kmsKeyServiceAccount'
59+
- field: 'boot_disk.initialize_params.source_image_encryption_key.raw_key'
60+
api_field: 'disks.initializeParams.sourceImageEncryptionKey.rawKey'
61+
- field: 'boot_disk.initialize_params.source_image_encryption_key.rsa_encrypted_key'
62+
api_field: 'disks.initializeParams.sourceImageEncryptionKey.rsaEncryptedKey'
63+
- field: 'boot_disk.initialize_params.source_image_encryption_key.sha256'
64+
api_field: 'disks.initializeParams.sourceImageEncryptionKey.sha256'
4365
- field: 'boot_disk.initialize_params.labels'
4466
api_field: 'disks.initializeParams.labels'
4567
- field: 'boot_disk.initialize_params.provisioned_iops'
@@ -50,6 +72,18 @@ fields:
5072
api_field: 'disks.initializeParams.resourceManagerTags'
5173
- field: 'boot_disk.initialize_params.resource_policies'
5274
api_field: 'disks.initializeParams.resourcePolicies'
75+
- field: 'boot_disk.initialize_params.snapshot'
76+
api_field: 'disks.initializeParams.sourceSnapshot'
77+
- field: 'boot_disk.initialize_params.source_snapshot_encryption_key.kms_key_self_link'
78+
api_field: 'disks.initializeParams.sourceSnapshotEncryptionKey.kmsKeyName'
79+
- field: 'boot_disk.initialize_params.source_snapshot_encryption_key.kms_key_service_account'
80+
api_field: 'disks.initializeParams.sourceSnapshotEncryptionKey.kmsKeyServiceAccount'
81+
- field: 'boot_disk.initialize_params.source_snapshot_encryption_key.raw_key'
82+
api_field: 'disks.initializeParams.sourceSnapshotEncryptionKey.rawKey'
83+
- field: 'boot_disk.initialize_params.source_snapshot_encryption_key.rsa_encrypted_key'
84+
api_field: 'disks.initializeParams.sourceSnapshotEncryptionKey.rsaEncryptedKey'
85+
- field: 'boot_disk.initialize_params.source_snapshot_encryption_key.sha256'
86+
api_field: 'disks.initializeParams.sourceSnapshotEncryptionKey.sha256'
5387
- field: 'boot_disk.initialize_params.size'
5488
api_field: 'disks.initializeParams.diskSizeGb'
5589
- field: 'boot_disk.initialize_params.storage_pool'
@@ -60,6 +94,10 @@ fields:
6094
api_field: 'disks.interface'
6195
- field: 'boot_disk.kms_key_self_link'
6296
api_field: 'disks.diskEncryptionKey.kmsKeyName'
97+
- field: 'boot_disk.force_attach'
98+
api_field: 'disks.forceAttach'
99+
- api_field: 'disks.guestOsFeatures.type'
100+
field: 'boot_disk.guest_os_features'
63101
- field: 'boot_disk.mode'
64102
api_field: 'disks.mode'
65103
- field: 'boot_disk.source'
@@ -86,6 +124,10 @@ fields:
86124
- api_field: 'hostname'
87125
- api_field: 'id'
88126
field: 'instance_id'
127+
- api_field: 'instanceEncryptionKey.kmsKeyName'
128+
field: 'instance_encryption_key.kms_key_self_link'
129+
- api_field: 'instanceEncryptionKey.kmsKeyServiceAccount'
130+
- api_field: 'instanceEncryptionKey.sha256'
89131
- api_field: 'keyRevocationActionType'
90132
- api_field: 'labelFingerprint'
91133
- api_field: 'labels'
@@ -136,10 +178,8 @@ fields:
136178
field: 'network_interface.name'
137179
- api_field: 'networkInterfaces.network'
138180
field: 'network_interface.network'
139-
{{- if ne $.TargetVersionName "ga" }}
140181
- api_field: 'networkInterfaces.networkAttachment'
141182
field: 'network_interface.network_attachment'
142-
{{- end }}
143183
- api_field: 'networkInterfaces.networkIP'
144184
field: 'network_interface.network_ip'
145185
- api_field: 'networkInterfaces.nicType'
@@ -171,6 +211,11 @@ fields:
171211
- api_field: 'resourcePolicies'
172212
- api_field: 'scheduling.automaticRestart'
173213
- api_field: 'scheduling.availabilityDomain'
214+
{{- if ne $.TargetVersionName "ga" }}
215+
- api_field: 'scheduling.gracefulShutdown.enabled'
216+
- api_field: 'scheduling.gracefulShutdown.maxDuration.nanos'
217+
- api_field: 'scheduling.gracefulShutdown.maxDuration.seconds'
218+
{{- end }}
174219
{{- if ne $.TargetVersionName "ga" }}
175220
- api_field: 'scheduling.hostErrorTimeoutSeconds'
176221
{{- end }}
@@ -190,6 +235,10 @@ fields:
190235
- api_field: 'scheduling.onInstanceStopAction.discardLocalSsd'
191236
- api_field: 'scheduling.preemptible'
192237
- api_field: 'scheduling.provisioningModel'
238+
{{- if ne $.TargetVersionName "ga" }}
239+
- api_field: 'scheduling.skipGuestOsShutdown'
240+
{{- end }}
241+
- api_field: 'scheduling.terminationTime'
193242
- api_field: 'disks.deviceName'
194243
field: 'scratch_disk.device_name'
195244
- api_field: 'disks.interface'

0 commit comments

Comments
 (0)