Fixed remaining missing fields in meta.yaml (#15597)

Author: melinath

…y/resource_bigquery_table_meta.yaml.tmpl …gquery/resource_bigquery_table_meta.yamlmmv1/third_party/terraform/services/bigquery/resource_bigquery_table_meta.yaml.tmpl renamed to mmv1/third_party/terraform/services/bigquery/resource_bigquery_table_meta.yaml mmv1/third_party/terraform/services/bigquery/resource_bigquery_table_meta.yaml.tmpl renamed to mmv1/third_party/terraform/services/bigquery/resource_bigquery_table_meta.yaml

@@ -96,9 +96,7 @@ fields:
     provider_only: true
   - field: 'ignore_schema_changes'
     provider_only: true
-{{- if ne $.TargetVersionName "ga" }}
   - field: 'schema_foreign_type_info.type_system'
-{{- end }}
   - api_field: 'selfLink'
   - api_field: 'tableConstraints.foreignKeys.columnReferences.referencedColumn'
   - api_field: 'tableConstraints.foreignKeys.columnReferences.referencingColumn'

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

@@ -36,14 +36,10 @@ fields:
     field: 'enable_ipv4'
   - api_field: 'bgpPeers.enableIpv6'
     field: 'enable_ipv6'
-{{- if ne $.TargetVersionName "ga" }}
   - api_field: 'bgpPeers.exportPolicies'
     field: 'export_policies'
-{{- end }}
-{{- if ne $.TargetVersionName "ga" }}
   - api_field: 'bgpPeers.importPolicies'
     field: 'import_policies'
-{{- end }}
   - api_field: 'bgpPeers.interfaceName'
     field: 'interface'
   - api_field: 'bgpPeers.ipAddress'

mmv1/third_party/terraform/services/gkehub/resource_gke_hub_feature_membership_meta.yaml.tmpl

@@ -8,6 +8,13 @@ api_version: 'v1'
 {{- end }}
 api_resource_type_kind: 'Feature'
 fields:
+  - field: 'configmanagement.config_sync.deployment_overrides.containers.container_name'
+  - field: 'configmanagement.config_sync.deployment_overrides.containers.cpu_limit'
+  - field: 'configmanagement.config_sync.deployment_overrides.containers.cpu_request'
+  - field: 'configmanagement.config_sync.deployment_overrides.containers.memory_limit'
+  - field: 'configmanagement.config_sync.deployment_overrides.containers.memory_request'
+  - field: 'configmanagement.config_sync.deployment_overrides.deployment_name'
+  - field: 'configmanagement.config_sync.deployment_overrides.deployment_namespace'
   - field: 'configmanagement.config_sync.enabled'
   - field: 'configmanagement.config_sync.git.gcp_service_account_email'
   - field: 'configmanagement.config_sync.git.https_proxy'

mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_meta.yaml

@@ -4,11 +4,13 @@ api_service_name: 'cloudresourcemanager.googleapis.com'
 api_version: 'v3'
 api_resource_type_kind: 'Folder'
 fields:
+  - api_field: 'configuredCapabilities'
   - api_field: 'createTime'
   - field: 'deletion_protection'
   - api_field: 'displayName'
   - field: 'folder_id'
   - api_field: 'lifecycleState'
+  - api_field: 'managementProject'
   - api_field: 'name'
   - api_field: 'parent'
   - api_field: 'tags'

…resource_sql_database_instance_meta.yaml …rce_sql_database_instance_meta.yaml.tmplmmv1/third_party/terraform/services/sql/resource_sql_database_instance_meta.yaml renamed to mmv1/third_party/terraform/services/sql/resource_sql_database_instance_meta.yaml.tmpl mmv1/third_party/terraform/services/sql/resource_sql_database_instance_meta.yaml renamed to mmv1/third_party/terraform/services/sql/resource_sql_database_instance_meta.yaml.tmpl

@@ -3,54 +3,78 @@ generation_type: 'handwritten'
 api_service_name: 'sqladmin.googleapis.com'
 api_version: 'v1beta4'
 api_resource_type_kind: 'DatabaseInstance'
-cai_asset_name_format: '//cloudsql.googleapis.com/projects/{{project}}/instances/{{name}}'
+cai_asset_name_format: '//cloudsql.googleapis.com/projects/{{"{{"}}project{{"}}"}}/instances/{{"{{"}}name{{"}}"}}'
 fields:
   - api_field: 'availableMaintenanceVersions'
   - field: 'backupdr_backup'
   - field: 'clone.allocated_ip_range'
   - field: 'clone.database_names'
   - field: 'clone.point_in_time'
   - field: 'clone.preferred_zone'
+  - field: 'clone.source_instance_deletion_time'
   - field: 'clone.source_instance_name'
   - api_field: 'connectionName'
   - api_field: 'databaseVersion'
   - field: 'deletion_protection'
+    provider_only: true
   - api_field: 'dnsName'
-  - field: 'dns_names'
-  - field: 'encryption_key_name'
-  - field: 'first_ip_address'
+  - api_field: 'dnsNames.connectionType'
+  - api_field: 'dnsNames.dnsScope'
+  - api_field: 'dnsNames.name'
+  - api_field: 'diskEncryptionConfiguration.kmsKeyName'
+    field: 'encryption_key_name'
+  - field: 'final_backup_description'
+  - api_field: 'ipAddresses.ipAddress'
+    field: 'first_ip_address'
   - api_field: 'instanceType'
-  - field: 'ip_address.ip_address'
-  - field: 'ip_address.time_to_retire'
-  - field: 'ip_address.type'
+  - api_field: 'ipAddresses.ipAddress'
+    field: 'ip_address.ip_address'
+  - api_field: 'ipAddresses.timeToRetire'
+    field: 'ip_address.time_to_retire'
+  - api_field: 'ipAddresses.type'
+    field: 'ip_address.type'
   - api_field: 'maintenanceVersion'
   - api_field: 'masterInstanceName'
   - api_field: 'name'
-  - field: 'point_in_time_restore.allocated_ip_range'
-  - field: 'point_in_time_restore.datasource'
-  - field: 'point_in_time_restore.target_instance'
-  - field: 'point_in_time_restore.point_in_time'
-  - field: 'point_in_time_restore.preferred_zone'
-  - field: 'private_ip_address'
+  - api_field: 'nodeCount'
+  - field: 'point_in_time_restore_context.allocated_ip_range'
+  - field: 'point_in_time_restore_context.datasource'
+  - field: 'point_in_time_restore_context.target_instance'
+  - field: 'point_in_time_restore_context.point_in_time'
+  - field: 'point_in_time_restore_context.preferred_zone'
+  - api_field: 'ipAddresses.ipAddress'
+    field: 'private_ip_address'
   - api_field: 'project'
   - api_field: 'pscServiceAttachmentLink'
-  - field: 'public_ip_address'
+  - api_field: 'ipAddresses.ipAddress'
+    field: 'public_ip_address'
   - api_field: 'region'
-  - field: 'replica_configuration.ca_certificate'
+  - api_field: 'replicaConfiguration.mysqlReplicaConfiguration.caCertificate'
+    field: 'replica_configuration.ca_certificate'
   - api_field: 'replicaConfiguration.cascadableReplica'
-  - field: 'replica_configuration.client_certificate'
-  - field: 'replica_configuration.client_key'
-  - field: 'replica_configuration.connect_retry_interval'
-  - field: 'replica_configuration.dump_file_path'
+  - api_field: 'replicaConfiguration.mysqlReplicaConfiguration.clientCertificate'
+    field: 'replica_configuration.client_certificate'
+  - api_field: 'replicaConfiguration.mysqlReplicaConfiguration.clientKey'
+    field: 'replica_configuration.client_key'
+  - api_field: 'replicaConfiguration.mysqlReplicaConfiguration.connectRetryInterval'
+    field: 'replica_configuration.connect_retry_interval'
+  - api_field: 'replicaConfiguration.mysqlReplicaConfiguration.dumpFilePath'
+    field: 'replica_configuration.dump_file_path'
   - api_field: 'replicaConfiguration.failoverTarget'
-  - field: 'replica_configuration.master_heartbeat_period'
-  - field: 'replica_configuration.password'
-  - field: 'replica_configuration.ssl_cipher'
-  - field: 'replica_configuration.username'
-  - field: 'replica_configuration.verify_server_certificate'
+  - api_field: 'replicaConfiguration.mysqlReplicaConfiguration.masterHeartbeatPeriod'
+    field: 'replica_configuration.master_heartbeat_period'
+  - api_field: 'replicaConfiguration.mysqlReplicaConfiguration.password'
+    field: 'replica_configuration.password'
+  - api_field: 'replicaConfiguration.mysqlReplicaConfiguration.sslCipher'
+    field: 'replica_configuration.ssl_cipher'
+  - api_field: 'replicaConfiguration.mysqlReplicaConfiguration.username'
+    field: 'replica_configuration.username'
+  - api_field: 'replicaConfiguration.mysqlReplicaConfiguration.verifyServerCertificate'
+    field: 'replica_configuration.verify_server_certificate'
   - api_field: 'replicaNames'
   - api_field: 'replicationCluster.drReplica'
   - api_field: 'replicationCluster.failoverDrReplicaName'
+  - api_field: 'replicationCluster.psaWriteEndpoint'
   - field: 'restore_backup_context.backup_run_id'
   - field: 'restore_backup_context.instance_id'
   - field: 'restore_backup_context.project'
@@ -66,6 +90,8 @@ fields:
   - api_field: 'settings.activeDirectoryConfig.domain'
   - api_field: 'settings.advancedMachineFeatures.threadsPerCore'
   - api_field: 'settings.availabilityType'
+  - api_field: 'settings.availabilityType'
+    field: 'settings.effective_availability_type'
   - api_field: 'settings.backupConfiguration.backupRetentionSettings.retainedBackups'
   - api_field: 'settings.backupConfiguration.backupRetentionSettings.retentionUnit'
   - api_field: 'settings.backupConfiguration.binaryLogEnabled'
@@ -75,23 +101,39 @@ fields:
   - api_field: 'settings.backupConfiguration.startTime'
   - api_field: 'settings.backupConfiguration.transactionLogRetentionDays'
   - api_field: 'settings.collation'
+  - api_field: 'settings.connectionPoolConfig.connectionPoolingEnabled'
+  - api_field: 'settings.connectionPoolConfig.flags.name'
+  - api_field: 'settings.connectionPoolConfig.flags.value'
   - api_field: 'settings.connectorEnforcement'
   - api_field: 'settings.dataCacheConfig.dataCacheEnabled'
   - api_field: 'settings.databaseFlags.name'
   - api_field: 'settings.databaseFlags.value'
   - api_field: 'settings.deletionProtectionEnabled'
-  - field: 'settings.deny_maintenance_period.end_date'
-  - field: 'settings.deny_maintenance_period.start_date'
-  - field: 'settings.deny_maintenance_period.time'
-  - field: 'settings.disk_autoresize'
-  - field: 'settings.disk_autoresize_limit'
-  - field: 'settings.disk_size'
+  - api_field: 'settings.denyMaintenancePeriods.endDate'
+    field: 'settings.deny_maintenance_period.end_date'
+  - api_field: 'settings.denyMaintenancePeriods.startDate'
+    field: 'settings.deny_maintenance_period.start_date'
+  - api_field: 'settings.denyMaintenancePeriods.time'
+    field: 'settings.deny_maintenance_period.time'
+  - api_field: 'settings.storageAutoResize'
+    field: 'settings.disk_autoresize'
+  - api_field: 'settings.storageAutoResizeLimit'
+    field: 'settings.disk_autoresize_limit'
+  - api_field: 'settings.dataDiskSizeGb'
+    field: 'settings.disk_size'
+{{- if ne $.TargetVersionName "ga" }}
   - api_field: 'settings.dataDiskProvisionedIops'
+{{- end }}
+{{- if ne $.TargetVersionName "ga" }}
   - api_field: 'settings.dataDiskProvisionedThroughput'
-  - field: 'settings.disk_type'
+{{- end }}
+  - api_field: 'settings.dataDiskType'
+    field: 'settings.disk_type'
   - api_field: 'settings.edition'
   - api_field: 'settings.enableDataplexIntegration'
   - api_field: 'settings.enableGoogleMlIntegration'
+  - api_field: 'settings.finalBackupConfig.enabled'
+  - api_field: 'settings.finalBackupConfig.retentionDays'
   - api_field: 'settings.insightsConfig.queryInsightsEnabled'
   - api_field: 'settings.insightsConfig.queryPlansPerMinute'
   - api_field: 'settings.insightsConfig.queryStringLength'
@@ -101,13 +143,16 @@ fields:
   - field: 'settings.ip_configuration.authorized_networks.expiration_time'
   - field: 'settings.ip_configuration.authorized_networks.name'
   - field: 'settings.ip_configuration.authorized_networks.value'
+  - api_field: 'settings.ipConfiguration.customSubjectAlternativeNames'
   - api_field: 'settings.ipConfiguration.enablePrivatePathForGoogleCloudServices'
   - api_field: 'settings.ipConfiguration.ipv4Enabled'
   - api_field: 'settings.ipConfiguration.privateNetwork'
   - api_field: 'settings.ipConfiguration.pscConfig.allowedConsumerProjects'
+  - api_field: 'settings.ipConfiguration.pscConfig.networkAttachmentUri'
   - api_field: 'settings.ipConfiguration.pscConfig.pscAutoConnections.consumerNetwork'
   - api_field: 'settings.ipConfiguration.pscConfig.pscAutoConnections.consumerNetworkStatus'
-  - field: 'settings.ip_configuration.psc_config.psc_auto_connections.consumer_service_project_id'
+  - api_field: 'settings.ipConfiguration.pscConfig.pscAutoConnections.consumerProject'
+    field: 'settings.ip_configuration.psc_config.psc_auto_connections.consumer_service_project_id'
   - api_field: 'settings.ipConfiguration.pscConfig.pscAutoConnections.ipAddress'
   - api_field: 'settings.ipConfiguration.pscConfig.pscAutoConnections.status'
   - api_field: 'settings.ipConfiguration.pscConfig.pscEnabled'
@@ -127,10 +172,20 @@ fields:
   - api_field: 'settings.passwordValidationPolicy.passwordChangeInterval'
   - api_field: 'settings.passwordValidationPolicy.reuseInterval'
   - api_field: 'settings.pricingPlan'
+  - api_field: 'settings.readPoolAutoScaleConfig.disableScaleIn'
+  - api_field: 'settings.readPoolAutoScaleConfig.enabled'
+  - api_field: 'settings.readPoolAutoScaleConfig.maxNodeCount'
+  - api_field: 'settings.readPoolAutoScaleConfig.minNodeCount'
+  - api_field: 'settings.readPoolAutoScaleConfig.scaleInCooldownSeconds'
+  - api_field: 'settings.readPoolAutoScaleConfig.scaleOutCooldownSeconds'
+  - api_field: 'settings.readPoolAutoScaleConfig.targetMetrics.metric'
+  - api_field: 'settings.readPoolAutoScaleConfig.targetMetrics.targetValue'
+  - api_field: 'settings.retainBackupsOnDelete'
   - api_field: 'settings.sqlServerAuditConfig.bucket'
   - api_field: 'settings.sqlServerAuditConfig.retentionInterval'
   - api_field: 'settings.sqlServerAuditConfig.uploadInterval'
   - api_field: 'settings.tier'
   - api_field: 'settings.timeZone'
   - api_field: 'settings.userLabels'
-  - field: 'settings.version'
+  - api_field: 'settings.settingsVersion'
+    field: 'settings.version'

mmv1/third_party/terraform/services/sql/resource_sql_user_meta.yaml

@@ -9,6 +9,10 @@ fields:
   - api_field: 'instance'
   - api_field: 'name'
   - api_field: 'password'
+  - api_field: 'password'
+    field: 'password_wo'
+  - field: 'password_wo_version'
+    provider_only: true
   - api_field: 'passwordPolicy.allowedFailedAttempts'
   - api_field: 'passwordPolicy.enableFailedAttemptsCheck'
   - api_field: 'passwordPolicy.enablePasswordVerification'

mmv1/third_party/terraform/services/storage/resource_storage_bucket_meta.yaml

@@ -14,47 +14,81 @@ fields:
   - api_field: 'defaultEventBasedHold'
   - field: 'effective_labels'
     provider_only: true
-  - field: 'enable_object_retention'
-  - field: 'encryption.default_kms_key_name'
+  - api_field: 'objectRetention.enabled'
+    field: 'enable_object_retention'
+  - api_field: 'encryption.defaultKmsKey'
+    field: 'encryption.default_kms_key_name'
   - field: 'force_destroy'
+    provider_only: true
   - api_field: 'hierarchicalNamespace.enabled'
+  - api_field: 'ipFilter.allowAllServiceAgentAccess'
+  - api_field: 'ipFilter.allowCrossOrgVpcs'
+  - api_field: 'ipFilter.mode'
+  - api_field: 'ipFilter.publicNetworkSource.allowedIpCidrRanges'
+  - api_field: 'ipFilter.vpcNetworkSources.allowedIpCidrRanges'
+  - api_field: 'ipFilter.vpcNetworkSources.network'
   - api_field: 'labels'
-  - field: 'lifecycle_rule.action.storage_class'
-  - field: 'lifecycle_rule.action.type'
-  - field: 'lifecycle_rule.condition.age'
-  - field: 'lifecycle_rule.condition.created_before'
-  - field: 'lifecycle_rule.condition.custom_time_before'
-  - field: 'lifecycle_rule.condition.days_since_custom_time'
-  - field: 'lifecycle_rule.condition.days_since_noncurrent_time'
-  - field: 'lifecycle_rule.condition.matches_prefix'
-  - field: 'lifecycle_rule.condition.matches_storage_class'
-  - field: 'lifecycle_rule.condition.matches_suffix'
-  - field: 'lifecycle_rule.condition.noncurrent_time_before'
-  - field: 'lifecycle_rule.condition.num_newer_versions'
+  - api_field: 'lifecycle.rule.action.storageClass'
+    field: 'lifecycle_rule.action.storage_class'
+  - api_field: 'lifecycle.rule.action.type'
+    field: 'lifecycle_rule.action.type'
+  - api_field: 'lifecycle.rule.condition.ageDays'
+    field: 'lifecycle_rule.condition.age'
+  - api_field: 'lifecycle.rule.condition.createdBefore'
+    field: 'lifecycle_rule.condition.created_before'
+  - api_field: 'lifecycle.rule.condition.customTimeBefore'
+    field: 'lifecycle_rule.condition.custom_time_before'
+  - api_field: 'lifecycle.rule.condition.daysSinceCustomTime'
+    field: 'lifecycle_rule.condition.days_since_custom_time'
+  - api_field: 'lifecycle.rule.condition.daysSinceNoncurrentTime'
+    field: 'lifecycle_rule.condition.days_since_noncurrent_time'
+  - api_field: 'lifecycle.rule.condition.matchesPrefix'
+    field: 'lifecycle_rule.condition.matches_prefix'
+  - api_field: 'lifecycle.rule.condition.matchesStorageClass'
+    field: 'lifecycle_rule.condition.matches_storage_class'
+  - api_field: 'lifecycle.rule.condition.matchesSuffix'
+    field: 'lifecycle_rule.condition.matches_suffix'
+  - api_field: 'lifecycle.rule.condition.noncurrentTimeBefore'
+    field: 'lifecycle_rule.condition.noncurrent_time_before'
+  - api_field: 'lifecycle.rule.condition.numNewerVersions'
+    field: 'lifecycle_rule.condition.num_newer_versions'
   - field: 'lifecycle_rule.condition.send_age_if_zero'
+    provider_only: true
   - field: 'lifecycle_rule.condition.send_days_since_custom_time_if_zero'
+    provider_only: true
   - field: 'lifecycle_rule.condition.send_days_since_noncurrent_time_if_zero'
+    provider_only: true
   - field: 'lifecycle_rule.condition.send_num_newer_versions_if_zero'
-  - field: 'lifecycle_rule.condition.with_state'
+    provider_only: true
+  - api_field: 'lifecycle.rule.condition.isLive'
+    field: 'lifecycle_rule.condition.with_state'
   - api_field: 'location'
   - api_field: 'logging.logBucket'
   - api_field: 'logging.logObjectPrefix'
   - api_field: 'name'
   - api_field: 'project'
   - field: 'project_number'
-  - field: 'public_access_prevention'
-  - field: 'requester_pays'
+  - api_field: 'iamConfig.publicAccessPrevention'
+    field: 'public_access_prevention'
+  - api_field: 'billing.requesterPays'
+    field: 'requester_pays'
   - api_field: 'retentionPolicy.isLocked'
-  - field: 'retention_policy.retention_period'
+  - api_field: 'retentionPolicy.retentionDuration'
+    field: 'retention_policy.retention_period'
   - api_field: 'rpo'
   - field: 'self_link'
   - api_field: 'softDeletePolicy.effectiveTime'
-  - field: 'soft_delete_policy.retention_duration_seconds'
+  - api_field: 'softDeletePolicy.retentionDuration'
+    field: 'soft_delete_policy.retention_duration_seconds'
   - api_field: 'storageClass'
   - field: 'terraform_labels'
     provider_only: true
-  - field: 'uniform_bucket_level_access'
-  - field: 'url'
+  - api_field: 'iamConfig.uniformBucketLevelAccess.enabled'
+    field: 'uniform_bucket_level_access'
+  - api_field: 'name'
+    field: 'url'
+  - field: 'time_created'
+  - field: 'updated'
   - api_field: 'versioning.enabled'
   - api_field: 'website.mainPageSuffix'
   - api_field: 'website.notFoundPage'