Skip to content

Commit 7bc38e4

Browse files
authored
Converted instance template fields to JSON name and fixed incorrect mappings (#15481)
1 parent a0cc958 commit 7bc38e4

File tree

2 files changed

+205
-182
lines changed

2 files changed

+205
-182
lines changed

mmv1/third_party/terraform/services/compute/resource_compute_instance_template_meta.yaml.tmpl

Lines changed: 104 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -9,207 +9,219 @@ api_version: 'v1'
99
api_resource_type_kind: 'InstanceTemplate'
1010
fields:
1111
- field: 'advanced_machine_features.enable_nested_virtualization'
12-
api_field: 'properties.advanced_machine_features.enable_nested_virtualization'
12+
api_field: 'properties.advancedMachineFeatures.enableNestedVirtualization'
1313
- field: 'advanced_machine_features.enable_uefi_networking'
14-
api_field: 'properties.advanced_machine_features.enable_uefi_networking'
14+
api_field: 'properties.advancedMachineFeatures.enableUefiNetworking'
1515
- field: 'advanced_machine_features.performance_monitoring_unit'
16-
api_field: 'properties.advanced_machine_features.performance_monitoring_unit'
16+
api_field: 'properties.advancedMachineFeatures.performanceMonitoringUnit'
1717
- field: 'advanced_machine_features.threads_per_core'
18-
api_field: 'properties.advanced_machine_features.threads_per_core'
18+
api_field: 'properties.advancedMachineFeatures.threadsPerCore'
1919
- field: 'advanced_machine_features.turbo_mode'
20-
api_field: 'properties.advanced_machine_features.turbo_mode'
20+
api_field: 'properties.advancedMachineFeatures.turboMode'
2121
- field: 'advanced_machine_features.visible_core_count'
22-
api_field: 'properties.advanced_machine_features.visible_core_count'
22+
api_field: 'properties.advancedMachineFeatures.visibleCoreCount'
2323
- field: 'can_ip_forward'
24-
api_field: 'properties.can_ip_forward'
24+
api_field: 'properties.canIpForward'
2525
- field: 'confidential_instance_config.confidential_instance_type'
26-
api_field: 'properties.confidential_instance_config.confidential_instance_type'
26+
api_field: 'properties.confidentialInstanceConfig.confidentialInstanceType'
2727
- field: 'confidential_instance_config.enable_confidential_compute'
28-
api_field: 'properties.confidential_instance_config.enable_confidential_compute'
28+
api_field: 'properties.confidentialInstanceConfig.enableConfidentialCompute'
2929
- api_field: 'creationTimestamp'
3030
- api_field: 'description'
3131
api_field: 'properties.description'
3232
- field: 'disk.auto_delete'
33-
api_field: 'properties.disk.auto_delete'
33+
api_field: 'properties.disks.autoDelete'
3434
- field: 'disk.boot'
35-
api_field: 'properties.disk.boot'
35+
api_field: 'properties.disks.boot'
3636
- field: 'disk.device_name'
37-
api_field: 'properties.disk.device_name'
37+
api_field: 'properties.disks.deviceName'
3838
- field: 'disk.disk_encryption_key.kms_key_self_link'
39-
api_field: 'properties.disk.disk_encryption_key.kms_key_self_link'
39+
api_field: 'properties.disks.diskEncryptionKey.kmsKeyName'
4040
- field: 'disk.disk_name'
41-
api_field: 'properties.disk.disk_name'
41+
api_field: 'properties.disks.initializeParams.diskName'
4242
- field: 'disk.disk_size_gb'
43-
api_field: 'properties.disk.disk_size_gb'
43+
api_field: 'properties.disks.diskSizeGb'
44+
- field: 'disk.disk_size_gb'
45+
api_field: 'properties.disks.initializeParams.diskSizeGb'
4446
- field: 'disk.disk_type'
45-
api_field: 'properties.disk.disk_type'
47+
api_field: 'properties.disks.initializeParams.diskType'
4648
- field: 'disk.interface'
47-
api_field: 'properties.disk.interface'
49+
api_field: 'properties.disks.interface'
4850
- field: 'disk.labels'
49-
api_field: 'properties.disk.labels'
51+
api_field: 'properties.disks.initializeParams.labels'
5052
- field: 'disk.mode'
51-
api_field: 'properties.disk.mode'
53+
api_field: 'properties.disks.mode'
5254
- field: 'disk.provisioned_iops'
53-
api_field: 'properties.disk.provisioned_iops'
55+
api_field: 'properties.disks.initializeParams.provisionedIops'
5456
- field: 'disk.provisioned_throughput'
55-
api_field: 'properties.disk.provisioned_throughput'
57+
api_field: 'properties.disks.initializeParams.provisionedThroughput'
5658
- field: 'disk.resource_manager_tags'
57-
api_field: 'properties.disk.resource_manager_tags'
59+
api_field: 'properties.disks.initializeParams.resourceManagerTags'
5860
- field: 'disk.resource_policies'
59-
api_field: 'properties.disk.resource_policies'
61+
api_field: 'properties.disks.initializeParams.resourcePolicies'
6062
- field: 'disk.source'
61-
api_field: 'properties.disk.source'
63+
api_field: 'properties.disks.source'
6264
- field: 'disk.source_image'
63-
api_field: 'properties.disk.source_image'
65+
api_field: 'properties.disks.initializeParams.sourceImage'
6466
- field: 'disk.source_image_encryption_key.kms_key_self_link'
65-
api_field: 'properties.disk.source_image_encryption_key.kms_key_self_link'
67+
api_field: 'properties.disks.initializeParams.sourceImageEncryptionKey.kmsKeyName'
6668
- field: 'disk.source_image_encryption_key.kms_key_service_account'
67-
api_field: 'properties.disk.source_image_encryption_key.kms_key_service_account'
69+
api_field: 'properties.disks.initializeParams.sourceImageEncryptionKey.kmsKeyServiceAccount'
6870
- field: 'disk.source_snapshot'
69-
api_field: 'properties.disk.source_snapshot'
71+
api_field: 'properties.disks.initializeParams.sourceSnapshot'
7072
- field: 'disk.source_snapshot_encryption_key.kms_key_self_link'
71-
api_field: 'properties.disk.source_snapshot_encryption_key.kms_key_self_link'
73+
api_field: 'properties.disks.initializeParams.sourceSnapshotEncryptionKey.kmsKeyName'
7274
- field: 'disk.source_snapshot_encryption_key.kms_key_service_account'
73-
api_field: 'properties.disk.source_snapshot_encryption_key.kms_key_service_account'
75+
api_field: 'properties.disks.initializeParams.sourceSnapshotEncryptionKey.kmsKeyServiceAccount'
7476
- field: 'disk.type'
75-
api_field: 'properties.disk.type'
77+
api_field: 'properties.disks.type'
7678
- field: 'effective_labels'
7779
provider_only: true
7880
{{- if ne $.TargetVersionName "ga" }}
79-
- field: 'enable_display'
81+
- api_field: 'properties.displayDevice.enableDisplay'
82+
field: 'enable_display'
8083
{{- end }}
8184
- field: 'guest_accelerator.count'
82-
api_field: 'properties.guest_accelerator.count'
85+
api_field: 'properties.guestAccelerators.acceleratorCount'
8386
- field: 'guest_accelerator.type'
84-
api_field: 'properties.guest_accelerator.type'
85-
- field: 'instance_description'
87+
api_field: 'properties.guestAccelerators.acceleratorType'
88+
- api_field: 'properties.description'
89+
field: 'instance_description'
8690
- field: 'key_revocation_action_type'
87-
api_field: 'properties.key_revocation_action_type'
91+
api_field: 'properties.keyRevocationActionType'
8892
- field: 'labels'
8993
api_field: 'properties.labels'
9094
- field: 'machine_type'
91-
api_field: 'properties.machine_type'
95+
api_field: 'properties.machineType'
9296
- field: 'metadata'
93-
api_field: 'properties.metadata'
97+
api_field: 'properties.metadata.items'
9498
- field: 'metadata_fingerprint'
99+
api_field: 'properties.metadata.fingerprint'
95100
- field: 'metadata_startup_script'
101+
provider_only: true
96102
- field: 'min_cpu_platform'
97-
api_field: 'properties.min_cpu_platform'
103+
api_field: 'properties.minCpuPlatform'
104+
- api_field: 'name'
98105
- api_field: 'name'
99-
- field: 'name_prefix'
106+
field: 'name_prefix'
100107
- field: 'network_interface.access_config.nat_ip'
101-
api_field: 'properties.network_interface.access_config.nat_ip'
108+
api_field: 'properties.networkInterfaces.accessConfigs.natIP'
102109
- field: 'network_interface.access_config.network_tier'
103-
api_field: 'properties.network_interface.access_config.network_tier'
110+
api_field: 'properties.networkInterfaces.accessConfigs.networkTier'
104111
- field: 'network_interface.access_config.public_ptr_domain_name'
105-
api_field: 'properties.network_interface.access_config.public_ptr_domain_name'
112+
api_field: 'properties.networkInterfaces.accessConfigs.publicPtrDomainName'
106113
- field: 'network_interface.alias_ip_range.ip_cidr_range'
107-
api_field: 'properties.network_interface.alias_ip_range.ip_cidr_range'
114+
api_field: 'properties.networkInterfaces.aliasIpRanges.ipCidrRange'
108115
- field: 'network_interface.alias_ip_range.subnetwork_range_name'
109-
api_field: 'properties.network_interface.alias_ip_range.subnetwork_range_name'
116+
api_field: 'properties.networkInterfaces.aliasIpRanges.subnetworkRangeName'
110117
- field: 'network_interface.internal_ipv6_prefix_length'
111-
api_field: 'properties.network_interface.internal_ipv6_prefix_length'
118+
api_field: 'properties.networkInterfaces.internalIpv6PrefixLength'
112119
- field: 'network_interface.ipv6_access_config.external_ipv6'
113-
api_field: 'properties.network_interface.ipv6_access_config.external_ipv6'
120+
api_field: 'properties.networkInterfaces.ipv6AccessConfigs.externalIpv6'
114121
- field: 'network_interface.ipv6_access_config.external_ipv6_prefix_length'
115-
api_field: 'properties.network_interface.ipv6_access_config.external_ipv6_prefix_length'
122+
api_field: 'properties.networkInterfaces.ipv6AccessConfigs.externalIpv6PrefixLength'
116123
- field: 'network_interface.ipv6_access_config.name'
117-
api_field: 'properties.network_interface.ipv6_access_config.name'
124+
api_field: 'properties.networkInterfaces.ipv6AccessConfigs.name'
118125
- field: 'network_interface.ipv6_access_config.network_tier'
119-
api_field: 'properties.network_interface.ipv6_access_config.network_tier'
126+
api_field: 'properties.networkInterfaces.ipv6AccessConfigs.networkTier'
120127
- field: 'network_interface.ipv6_access_config.public_ptr_domain_name'
121-
api_field: 'properties.network_interface.ipv6_access_config.public_ptr_domain_name'
128+
api_field: 'properties.networkInterfaces.ipv6AccessConfigs.publicPtrDomainName'
122129
- field: 'network_interface.ipv6_access_type'
123-
api_field: 'properties.network_interface.ipv6_access_type'
130+
api_field: 'properties.networkInterfaces.ipv6AccessType'
124131
- field: 'network_interface.ipv6_address'
125-
api_field: 'properties.network_interface.ipv6_address'
132+
api_field: 'properties.networkInterfaces.ipv6Address'
126133
- field: 'network_interface.name'
127-
api_field: 'properties.network_interface.name'
134+
api_field: 'properties.networkInterfaces.name'
128135
- field: 'network_interface.network'
129-
api_field: 'properties.network_interface.network'
136+
api_field: 'properties.networkInterfaces.network'
130137
{{- if ne $.TargetVersionName "ga" }}
131138
- field: 'network_interface.network_attachment'
132-
api_field: 'properties.network_interface.network_attachment'
139+
api_field: 'properties.networkInterfaces.networkAttachment'
133140
{{- end }}
134141
- field: 'network_interface.network_ip'
135-
api_field: 'properties.network_interface.network_ip'
142+
api_field: 'properties.networkInterfaces.networkIP'
136143
- field: 'network_interface.nic_type'
137-
api_field: 'properties.network_interface.nic_type'
144+
api_field: 'properties.networkInterfaces.nicType'
138145
- field: 'network_interface.queue_count'
139-
api_field: 'properties.network_interface.queue_count'
146+
api_field: 'properties.networkInterfaces.queueCount'
140147
- field: 'network_interface.stack_type'
141-
api_field: 'properties.network_interface.stack_type'
148+
api_field: 'properties.networkInterfaces.stackType'
142149
- field: 'network_interface.subnetwork'
143-
api_field: 'properties.network_interface.subnetwork'
150+
api_field: 'properties.networkInterfaces.subnetwork'
144151
- field: 'network_interface.subnetwork_project'
145-
api_field: 'properties.network_interface.subnetwork_project'
152+
api_field: 'properties.networkInterfaces.subnetwork'
146153
- field: 'network_performance_config.total_egress_bandwidth_tier'
147-
api_field: 'properties.network_performance_config.total_egress_bandwidth_tier'
154+
api_field: 'properties.networkPerformanceConfig.totalEgressBandwidthTier'
148155
{{- if ne $.TargetVersionName "ga" }}
149156
- field: 'partner_metadata'
150-
api_field: 'properties.partner_metadata'
157+
api_field: 'properties.partnerMetadata'
151158
{{- end }}
152159
- field: 'project'
153160
- api_field: 'region'
154-
- field: 'reservation_affinity.specific_reservation.key'
155-
- field: 'reservation_affinity.specific_reservation.values'
156-
- field: 'reservation_affinity.type'
161+
- api_field: 'properties.reservationAffinity.key'
162+
field: 'reservation_affinity.specific_reservation.key'
163+
- api_field: 'properties.reservationAffinity.values'
164+
field: 'reservation_affinity.specific_reservation.values'
165+
- api_field: 'properties.reservationAffinity.consumeReservationType'
166+
field: 'reservation_affinity.type'
157167
- field: 'resource_manager_tags'
158-
api_field: 'properties.resource_manager_tags'
168+
api_field: 'properties.resourceManagerTags'
159169
- field: 'resource_policies'
160-
api_field: 'properties.resource_policies'
170+
api_field: 'properties.resourcePolicies'
161171
- field: 'scheduling.automatic_restart'
162-
api_field: 'properties.scheduling.automatic_restart'
172+
api_field: 'properties.scheduling.automaticRestart'
163173
- field: 'scheduling.availability_domain'
164-
api_field: 'properties.scheduling.availability_domain'
174+
api_field: 'properties.scheduling.availabilityDomain'
165175
{{- if ne $.TargetVersionName "ga" }}
166176
- field: 'scheduling.host_error_timeout_seconds'
167-
api_field: 'properties.scheduling.host_error_timeout_seconds'
177+
api_field: 'properties.scheduling.hostErrorTimeoutSeconds'
168178
{{- end }}
169179
- field: 'scheduling.instance_termination_action'
170-
api_field: 'properties.scheduling.instance_termination_action'
180+
api_field: 'properties.scheduling.instanceTerminationAction'
171181
- field: 'scheduling.local_ssd_recovery_timeout.nanos'
172-
api_field: 'properties.scheduling.local_ssd_recovery_timeout.nanos'
182+
api_field: 'properties.scheduling.localSsdRecoveryTimeout.nanos'
173183
- field: 'scheduling.local_ssd_recovery_timeout.seconds'
174-
api_field: 'properties.scheduling.local_ssd_recovery_timeout.seconds'
184+
api_field: 'properties.scheduling.localSsdRecoveryTimeout.seconds'
175185
{{- if ne $.TargetVersionName "ga" }}
176186
- field: 'scheduling.maintenance_interval'
177-
api_field: 'properties.scheduling.maintenance_interval'
187+
api_field: 'properties.scheduling.maintenanceInterval'
178188
{{- end }}
179189
- field: 'scheduling.max_run_duration.nanos'
180-
api_field: 'properties.scheduling.max_run_duration.nanos'
190+
api_field: 'properties.scheduling.maxRunDuration.nanos'
181191
- field: 'scheduling.max_run_duration.seconds'
182-
api_field: 'properties.scheduling.max_run_duration.seconds'
192+
api_field: 'properties.scheduling.maxRunDuration.seconds'
183193
- field: 'scheduling.min_node_cpus'
184-
api_field: 'properties.scheduling.min_node_cpus'
194+
api_field: 'properties.scheduling.minNodeCpus'
185195
- field: 'scheduling.node_affinities.key'
186-
api_field: 'properties.scheduling.node_affinities.key'
196+
api_field: 'properties.scheduling.nodeAffinities.key'
187197
- field: 'scheduling.node_affinities.operator'
188-
api_field: 'properties.scheduling.node_affinities.operator'
198+
api_field: 'properties.scheduling.nodeAffinities.operator'
189199
- field: 'scheduling.node_affinities.values'
190-
api_field: 'properties.scheduling.node_affinities.values'
200+
api_field: 'properties.scheduling.nodeAffinities.values'
191201
- field: 'scheduling.on_host_maintenance'
192-
api_field: 'properties.scheduling.on_host_maintenance'
202+
api_field: 'properties.scheduling.onHostMaintenance'
193203
- field: 'scheduling.on_instance_stop_action.discard_local_ssd'
194-
api_field: 'properties.scheduling.on_instance_stop_action.discard_local_ssd'
204+
api_field: 'properties.scheduling.onInstanceStopAction.discardLocalSsd'
195205
- field: 'scheduling.preemptible'
196206
api_field: 'properties.scheduling.preemptible'
197207
- field: 'scheduling.provisioning_model'
198-
api_field: 'properties.scheduling.provisioning_model'
208+
api_field: 'properties.scheduling.provisioningModel'
199209
- api_field: 'selfLink'
200-
- field: 'self_link_unique'
210+
- api_field: 'id'
211+
field: 'self_link_unique'
201212
- field: 'service_account.email'
202-
api_field: 'properties.service_account.email'
213+
api_field: 'properties.serviceAccounts.email'
203214
- field: 'service_account.scopes'
204-
api_field: 'properties.service_account.scopes'
215+
api_field: 'properties.serviceAccounts.scopes'
205216
- field: 'shielded_instance_config.enable_integrity_monitoring'
206-
api_field: 'properties.shielded_instance_config.enable_integrity_monitoring'
217+
api_field: 'properties.shieldedInstanceConfig.enableIntegrityMonitoring'
207218
- field: 'shielded_instance_config.enable_secure_boot'
208-
api_field: 'properties.shielded_instance_config.enable_secure_boot'
219+
api_field: 'properties.shieldedInstanceConfig.enableSecureBoot'
209220
- field: 'shielded_instance_config.enable_vtpm'
210-
api_field: 'properties.shielded_instance_config.enable_vtpm'
221+
api_field: 'properties.shieldedInstanceConfig.enableVtpm'
211222
- field: 'tags'
212-
api_field: 'properties.tags'
223+
api_field: 'properties.tags.items'
213224
- field: 'tags_fingerprint'
225+
api_field: 'properties.tags.fingerprint'
214226
- field: 'terraform_labels'
215227
provider_only: true

0 commit comments

Comments
 (0)