Fixed field mappings for resources that target compute instance (#15462)

Author: melinath

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

@@ -8,10 +8,14 @@ api_version: 'v1'
 {{- end }}
 api_resource_type_kind: 'Instance'
 fields:
-  - field: 'device_name'
-  - field: 'disk'
+  - api_field: 'disks.deviceName'
+    field: 'device_name'
+  - api_field: 'disks.source'
+    field: 'disk'
   - field: 'instance'
-  - field: 'interface'
-  - field: 'mode'
+  - api_field: 'disks.interface'
+    field: 'interface'
+  - api_field: 'disks.mode'
+    field: 'mode'
   - field: 'project'
   - api_field: 'zone'

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

@@ -12,111 +12,149 @@ fields:
   - api_field: 'advancedMachineFeatures.turboMode'
   - api_field: 'advancedMachineFeatures.visibleCoreCount'
   - field: 'allow_stopping_for_update'
+    provider_only: true
   - field: 'attached_disk.device_name'
-    api_field: 'disk.device_name'
+    api_field: 'disks.deviceName'
   - field: 'attached_disk.disk_encryption_key_raw'
-    api_field: 'disk.disk_encryption_key.raw_key'
+    api_field: 'disks.diskEncryptionKey.rawKey'
   - field: 'attached_disk.disk_encryption_key_sha256'
-    api_field: 'disk.disk_encryption_key.sha256'
+    api_field: 'disks.diskEncryptionKey.sha256'
   - field: 'attached_disk.kms_key_self_link'
-    api_field: 'disk.disk_encryption_key.kms_key_self_link'
+    api_field: 'disks.diskEncryptionKey.kmsKeyName'
   - field: 'attached_disk.mode'
-    api_field: 'disk.mode'
+    api_field: 'disks.mode'
   - field: 'attached_disk.source'
-    api_field: 'disk.source'
+    api_field: 'disks.source'
   - field: 'boot_disk.auto_delete'
-    api_field: 'disk.auto_delete'
+    api_field: 'disks.autoDelete'
   - field: 'boot_disk.device_name'
-    api_field: 'disk.device_name'
+    api_field: 'disks.deviceName'
   - field: 'boot_disk.disk_encryption_key_raw'
-    api_field: 'disk.disk_encryption_key.raw_key'
+    api_field: 'disks.diskEncryptionKey.rawKey'
   - field: 'boot_disk.disk_encryption_key_sha256'
-    api_field: 'disk.disk_encryption_key.sha256'
+    api_field: 'disks.diskEncryptionKey.sha256'
   - field: 'boot_disk.initialize_params.enable_confidential_compute'
-    api_field: 'disk.initialize_params.enable_confidential_compute'
+    api_field: 'disks.initializeParams.enableConfidentialCompute'
   - field: 'boot_disk.initialize_params.image'
-    api_field: 'disk.initialize_params.source_image'
+    api_field: 'disks.initializeParams.sourceImage'
   - field: 'boot_disk.initialize_params.labels'
-    api_field: 'disk.initialize_params.labels'
+    api_field: 'disks.initializeParams.labels'
   - field: 'boot_disk.initialize_params.provisioned_iops'
-    api_field: 'disk.initialize_params.provisioned_iops'
+    api_field: 'disks.initializeParams.provisionedIops'
   - field: 'boot_disk.initialize_params.provisioned_throughput'
-    api_field: 'disk.initialize_params.provisioned_throughput'
+    api_field: 'disks.initializeParams.provisionedThroughput'
   - field: 'boot_disk.initialize_params.resource_manager_tags'
-    api_field: 'disk.initialize_params.resource_manager_tags'
+    api_field: 'disks.initializeParams.resourceManagerTags'
   - field: 'boot_disk.initialize_params.resource_policies'
-    api_field: 'disk.initialize_params.resource_policy'
+    api_field: 'disks.initializeParams.resourcePolicies'
   - field: 'boot_disk.initialize_params.size'
-    api_field: 'disk.initialize_params.disk_size_gb'
+    api_field: 'disks.initializeParams.diskSizeGb'
   - field: 'boot_disk.initialize_params.storage_pool'
-    api_field: 'disk.initialize_params.storage_pool'
+    api_field: 'disks.initializeParams.storagePool'
   - field: 'boot_disk.initialize_params.type'
-    api_field: 'disk.initialize_params.disk_type'
+    api_field: 'disks.initializeParams.diskType'
   - field: 'boot_disk.interface'
-    api_field: 'disk.interface'
+    api_field: 'disks.interface'
   - field: 'boot_disk.kms_key_self_link'
-    api_field: 'disk.disk_encryption_key.kms_key_self_link'
+    api_field: 'disks.diskEncryptionKey.kmsKeyName'
   - field: 'boot_disk.mode'
-    api_field: 'disk.mode'
+    api_field: 'disks.mode'
   - field: 'boot_disk.source'
-    api_field: 'disk.source'
+    api_field: 'disks.source'
   - api_field: 'canIpForward'
   - api_field: 'confidentialInstanceConfig.confidentialInstanceType'
   - api_field: 'confidentialInstanceConfig.enableConfidentialCompute'
   - api_field: 'cpuPlatform'
   - api_field: 'creationTimestamp'
-  - field: 'current_status'
+  - api_field: 'status'
+    field: 'current_status'
   - api_field: 'deletionProtection'
   - api_field: 'description'
-  - field: 'desired_status'
+  - api_field: 'status'
+    field: 'desired_status'
   - field: 'effective_labels'
     provider_only: true
-  - field: 'enable_display'
-  - field: 'guest_accelerator.count'
-  - field: 'guest_accelerator.type'
+  - api_field: 'displayDevice.enableDisplay'
+    field: 'enable_display'
+  - api_field: 'guestAccelerators.acceleratorCount'
+    field: 'guest_accelerator.count'
+  - api_field: 'guestAccelerators.acceleratorType'
+    field: 'guest_accelerator.type'
   - api_field: 'hostname'
-  - field: 'instance_id'
+  - api_field: 'id'
+    field: 'instance_id'
   - api_field: 'keyRevocationActionType'
   - api_field: 'labelFingerprint'
   - api_field: 'labels'
   - api_field: 'machineType'
-  - field: 'metadata'
-  - field: 'metadata_fingerprint'
+  - api_field: 'metadata.items'
+    field: 'metadata'
+  - api_field: 'metadata.fingerprint'
+    field: 'metadata_fingerprint'
   - field: 'metadata_startup_script'
+    provider_only: true
   - api_field: 'minCpuPlatform'
   - api_field: 'name'
-  - field: 'network_interface.access_config.nat_ip'
-  - field: 'network_interface.access_config.network_tier'
-  - field: 'network_interface.access_config.public_ptr_domain_name'
-  - field: 'network_interface.access_config.security_policy'
-  - field: 'network_interface.alias_ip_range.ip_cidr_range'
-  - field: 'network_interface.alias_ip_range.subnetwork_range_name'
-  - field: 'network_interface.internal_ipv6_prefix_length'
-  - field: 'network_interface.ipv6_access_config.external_ipv6'
-  - field: 'network_interface.ipv6_access_config.external_ipv6_prefix_length'
-  - field: 'network_interface.ipv6_access_config.name'
-  - field: 'network_interface.ipv6_access_config.network_tier'
-  - field: 'network_interface.ipv6_access_config.public_ptr_domain_name'
-  - field: 'network_interface.ipv6_access_config.security_policy'
-  - field: 'network_interface.ipv6_access_type'
-  - field: 'network_interface.ipv6_address'
-  - field: 'network_interface.name'
-  - field: 'network_interface.network'
-  - field: 'network_interface.network_attachment'
-  - field: 'network_interface.network_ip'
-  - field: 'network_interface.nic_type'
-  - field: 'network_interface.queue_count'
-  - field: 'network_interface.security_policy'
-  - field: 'network_interface.stack_type'
-  - field: 'network_interface.subnetwork'
-  - field: 'network_interface.subnetwork_project'
+  - api_field: 'networkInterfaces.accessConfigs.natIP'
+    field: 'network_interface.access_config.nat_ip'
+  - api_field: 'networkInterfaces.accessConfigs.networkTier'
+    field: 'network_interface.access_config.network_tier'
+  - api_field: 'networkInterfaces.accessConfigs.publicPtrDomainName'
+    field: 'network_interface.access_config.public_ptr_domain_name'
+  - api_field: 'networkInterfaces.accessConfigs.securityPolicy'
+    field: 'network_interface.access_config.security_policy'
+  - api_field: 'networkInterfaces.aliasIpRanges.ipCidrRange'
+    field: 'network_interface.alias_ip_range.ip_cidr_range'
+  - api_field: 'networkInterfaces.aliasIpRanges.subnetworkRangeName'
+    field: 'network_interface.alias_ip_range.subnetwork_range_name'
+  - api_field: 'networkInterfaces.internalIpv6PrefixLength'
+    field: 'network_interface.internal_ipv6_prefix_length'
+  - api_field: 'networkInterfaces.ipv6AccessConfigs.externalIpv6'
+    field: 'network_interface.ipv6_access_config.external_ipv6'
+  - api_field: 'networkInterfaces.ipv6AccessConfigs.externalIpv6PrefixLength'
+    field: 'network_interface.ipv6_access_config.external_ipv6_prefix_length'
+  - api_field: 'networkInterfaces.ipv6AccessConfigs.name'
+    field: 'network_interface.ipv6_access_config.name'
+  - api_field: 'networkInterfaces.ipv6AccessConfigs.networkTier'
+    field: 'network_interface.ipv6_access_config.network_tier'
+  - api_field: 'networkInterfaces.ipv6AccessConfigs.publicPtrDomainName'
+    field: 'network_interface.ipv6_access_config.public_ptr_domain_name'
+  - api_field: 'networkInterfaces.ipv6AccessConfigs.securityPolicy'
+    field: 'network_interface.ipv6_access_config.security_policy'
+  - api_field: 'networkInterfaces.ipv6AccessType'
+    field: 'network_interface.ipv6_access_type'
+  - api_field: 'networkInterfaces.ipv6Address'
+    field: 'network_interface.ipv6_address'
+  - api_field: 'networkInterfaces.name'
+    field: 'network_interface.name'
+  - api_field: 'networkInterfaces.network'
+    field: 'network_interface.network'
+  - api_field: 'networkInterfaces.networkAttachment'
+    field: 'network_interface.network_attachment'
+  - api_field: 'networkInterfaces.networkIP'
+    field: 'network_interface.network_ip'
+  - api_field: 'networkInterfaces.nicType'
+    field: 'network_interface.nic_type'
+  - api_field: 'networkInterfaces.queueCount'
+    field: 'network_interface.queue_count'
+  - api_field: 'networkInterfaces.accessConfigs.securityPolicy'
+    field: 'network_interface.security_policy'
+  - api_field: 'networkInterfaces.stackType'
+    field: 'network_interface.stack_type'
+  - api_field: 'networkInterfaces.subnetwork'
+    field: 'network_interface.subnetwork'
+  - api_field: 'networkInterfaces.subnetwork'
+    field: 'network_interface.subnetwork_project'
   - api_field: 'networkPerformanceConfig.totalEgressBandwidthTier'
   - api_field: 'params.resourceManagerTags'
   - api_field: 'partnerMetadata'
   - field: 'project'
-  - field: 'reservation_affinity.specific_reservation.key'
-  - field: 'reservation_affinity.specific_reservation.values'
-  - field: 'reservation_affinity.type'
+  - api_field: 'reservationAffinity.key'
+    field: 'reservation_affinity.specific_reservation.key'
+  - api_field: 'reservationAffinity.values'
+    field: 'reservation_affinity.specific_reservation.values'
+  - api_field: 'reservationAffinity.consumeReservationType'
+    field: 'reservation_affinity.type'
   - api_field: 'resourcePolicies'
   - api_field: 'scheduling.automaticRestart'
   - api_field: 'scheduling.availabilityDomain'
@@ -135,18 +173,24 @@ fields:
   - api_field: 'scheduling.onInstanceStopAction.discardLocalSsd'
   - api_field: 'scheduling.preemptible'
   - api_field: 'scheduling.provisioningModel'
-  - field: 'scratch_disk.device_name'
-  - field: 'scratch_disk.interface'
-  - field: 'scratch_disk.size'
+  - api_field: 'disks.deviceName'
+    field: 'scratch_disk.device_name'
+  - api_field: 'disks.interface'
+    field: 'scratch_disk.interface'
+  - api_field: 'disks.diskSizeGb'
+    field: 'scratch_disk.size'
   - api_field: 'selfLink'
-  - field: 'service_account.email'
-  - field: 'service_account.scopes'
+  - api_field: 'serviceAccounts.email'
+    field: 'service_account.email'
+  - api_field: 'serviceAccounts.scopes'
+    field: 'service_account.scopes'
   - api_field: 'shieldedInstanceConfig.enableIntegrityMonitoring'
   - api_field: 'shieldedInstanceConfig.enableSecureBoot'
   - api_field: 'shieldedInstanceConfig.enableVtpm'
-  - api_field: 'sourceMachineImage'
-  - field: 'tags'
-  - field: 'tags_fingerprint'
+  - api_field: 'tags.items'
+    field: 'tags'
+  - api_field: 'tags.fingerprint'
+    field: 'tags_fingerprint'
   - field: 'terraform_labels'
     provider_only: true
   - api_field: 'zone'