diff --git a/mmv1/third_party/terraform/services/bigquery/resource_bigquery_table_meta.yaml.tmpl b/mmv1/third_party/terraform/services/bigquery/resource_bigquery_table_meta.yaml similarity index 99% rename from mmv1/third_party/terraform/services/bigquery/resource_bigquery_table_meta.yaml.tmpl rename to mmv1/third_party/terraform/services/bigquery/resource_bigquery_table_meta.yaml index e328fe66fc4a..68f97545b7b5 100644 --- a/mmv1/third_party/terraform/services/bigquery/resource_bigquery_table_meta.yaml.tmpl +++ b/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' diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_router_peer_meta.yaml.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_router_peer_meta.yaml.tmpl index 482706c52a8d..3ef534b50ba3 100644 --- a/mmv1/third_party/terraform/services/compute/resource_compute_router_peer_meta.yaml.tmpl +++ b/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' diff --git a/mmv1/third_party/terraform/services/container/resource_container_cluster_meta.yaml.tmpl b/mmv1/third_party/terraform/services/container/resource_container_cluster_meta.yaml.tmpl index e934645679e4..f4be0c6247e3 100644 --- a/mmv1/third_party/terraform/services/container/resource_container_cluster_meta.yaml.tmpl +++ b/mmv1/third_party/terraform/services/container/resource_container_cluster_meta.yaml.tmpl @@ -11,9 +11,9 @@ api_variant_patterns: - 'projects/{project}/locations/{location}/clusters/{cluster}' fields: - field: 'addons_config.cloudrun_config.disabled' - api_field: 'addons_config.cloud_run_config.disabled' + api_field: 'addonsConfig.cloudRunConfig.disabled' - field: 'addons_config.cloudrun_config.load_balancer_type' - api_field: 'addons_config.cloud_run_config.load_balancer_type' + api_field: 'addonsConfig.cloudRunConfig.loadBalancerType' - api_field: 'addonsConfig.configConnectorConfig.enabled' - api_field: 'addonsConfig.dnsCacheConfig.enabled' - api_field: 'addonsConfig.gcePersistentDiskCsiDriverConfig.enabled' @@ -31,69 +31,74 @@ fields: {{- if ne $.TargetVersionName "ga" }} - api_field: 'addonsConfig.kalmConfig.enabled' {{- end }} + - api_field: 'addonsConfig.lustreCsiDriverConfig.enableLegacyLustrePort' + - api_field: 'addonsConfig.lustreCsiDriverConfig.enabled' - api_field: 'addonsConfig.networkPolicyConfig.disabled' - api_field: 'addonsConfig.parallelstoreCsiDriverConfig.enabled' - api_field: 'addonsConfig.rayOperatorConfig.enabled' - api_field: 'addonsConfig.rayOperatorConfig.rayClusterLoggingConfig.enabled' - api_field: 'addonsConfig.rayOperatorConfig.rayClusterMonitoringConfig.enabled' - api_field: 'addonsConfig.statefulHaConfig.enabled' + - api_field: 'anonymousAuthenticationConfig.mode' - field: 'allow_net_admin' - api_field: 'autopilot.workload_policy_config.allow_net_admin' + api_field: 'autopilot.workloadPolicyConfig.allowNetAdmin' - api_field: 'authenticatorGroupsConfig.securityGroup' - api_field: 'binaryAuthorization.enabled' - api_field: 'binaryAuthorization.evaluationMode' - field: 'cluster_autoscaling.auto_provisioning_defaults.boot_disk_kms_key' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.boot_disk_kms_key' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.bootDiskKmsKey' - field: 'cluster_autoscaling.auto_provisioning_defaults.disk_size' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.disk_size_gb' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.diskSizeGb' - field: 'cluster_autoscaling.auto_provisioning_defaults.disk_type' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.disk_type' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.diskType' - field: 'cluster_autoscaling.auto_provisioning_defaults.image_type' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.image_type' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.imageType' - field: 'cluster_autoscaling.auto_provisioning_defaults.management.auto_repair' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.management.auto_repair' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.management.autoRepair' - field: 'cluster_autoscaling.auto_provisioning_defaults.management.auto_upgrade' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.management.auto_upgrade' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.management.autoUpgrade' - field: 'cluster_autoscaling.auto_provisioning_defaults.management.upgrade_options.auto_upgrade_start_time' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.management.upgrade_options.auto_upgrade_start_time' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.management.upgradeOptions.autoUpgradeStartTime' - field: 'cluster_autoscaling.auto_provisioning_defaults.management.upgrade_options.description' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.management.upgrade_options.description' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.management.upgradeOptions.description' - field: 'cluster_autoscaling.auto_provisioning_defaults.min_cpu_platform' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.min_cpu_platform' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.minCpuPlatform' - field: 'cluster_autoscaling.auto_provisioning_defaults.oauth_scopes' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.oauth_scopes' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.oauthScopes' - field: 'cluster_autoscaling.auto_provisioning_defaults.service_account' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.service_account' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.serviceAccount' - field: 'cluster_autoscaling.auto_provisioning_defaults.shielded_instance_config.enable_integrity_monitoring' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.shielded_instance_config.enable_integrity_monitoring' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.shieldedInstanceConfig.enableIntegrityMonitoring' - field: 'cluster_autoscaling.auto_provisioning_defaults.shielded_instance_config.enable_secure_boot' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.shielded_instance_config.enable_secure_boot' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.shieldedInstanceConfig.enableSecureBoot' - field: 'cluster_autoscaling.auto_provisioning_defaults.upgrade_settings.blue_green_settings.node_pool_soak_duration' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.upgrade_settings.blue_green_settings.node_pool_soak_duration' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.upgradeSettings.blueGreenSettings.nodePoolSoakDuration' - field: 'cluster_autoscaling.auto_provisioning_defaults.upgrade_settings.blue_green_settings.standard_rollout_policy.batch_node_count' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.upgrade_settings.blue_green_settings.standard_rollout_policy.batch_node_count' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.upgradeSettings.blueGreenSettings.standardRolloutPolicy.batchNodeCount' - field: 'cluster_autoscaling.auto_provisioning_defaults.upgrade_settings.blue_green_settings.standard_rollout_policy.batch_percentage' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.upgrade_settings.blue_green_settings.standard_rollout_policy.batch_percentage' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.upgradeSettings.blueGreenSettings.standardRolloutPolicy.batchPercentage' - field: 'cluster_autoscaling.auto_provisioning_defaults.upgrade_settings.blue_green_settings.standard_rollout_policy.batch_soak_duration' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.upgrade_settings.blue_green_settings.standard_rollout_policy.batch_soak_duration' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.upgradeSettings.blueGreenSettings.standardRolloutPolicy.batchSoakDuration' - field: 'cluster_autoscaling.auto_provisioning_defaults.upgrade_settings.max_surge' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.upgrade_settings.max_surge' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.upgradeSettings.maxSurge' - field: 'cluster_autoscaling.auto_provisioning_defaults.upgrade_settings.max_unavailable' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.upgrade_settings.max_unavailable' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.upgradeSettings.maxUnavailable' - field: 'cluster_autoscaling.auto_provisioning_defaults.upgrade_settings.strategy' - api_field: 'autoscaling.autoprovisioning_node_pool_defaults.upgrade_settings.strategy' + api_field: 'autoscaling.autoprovisioningNodePoolDefaults.upgradeSettings.strategy' - field: 'cluster_autoscaling.auto_provisioning_locations' - api_field: 'autoscaling.autoprovisioning_locations' + api_field: 'autoscaling.autoprovisioningLocations' - field: 'cluster_autoscaling.autoscaling_profile' - api_field: 'autoscaling.autoscaling_profile' + api_field: 'autoscaling.autoscalingProfile' + - field: 'cluster_autoscaling.default_compute_class_enabled' + api_field: 'autoscaling.defaultComputeClassConfig.enabled' - field: 'cluster_autoscaling.enabled' - api_field: 'autoscaling.enable_node_autoprovisioning' + api_field: 'autoscaling.enableNodeAutoprovisioning' - field: 'cluster_autoscaling.resource_limits.maximum' - api_field: 'autoscaling.resource_limits.maximum' + api_field: 'autoscaling.resourceLimits.maximum' - field: 'cluster_autoscaling.resource_limits.minimum' - api_field: 'autoscaling.resource_limits.minimum' + api_field: 'autoscaling.resourceLimits.minimum' - field: 'cluster_autoscaling.resource_limits.resource_type' - api_field: 'autoscaling.resource_limits.resource_type' + api_field: 'autoscaling.resourceLimits.resourceType' - api_field: 'clusterIpv4Cidr' {{- if ne $.TargetVersionName "ga" }} - api_field: 'clusterTelemetry.type' @@ -101,49 +106,52 @@ fields: - api_field: 'confidentialNodes.enabled' - api_field: 'confidentialNodes.confidentialInstanceType' - api_field: 'controlPlaneEndpointsConfig.dnsEndpointConfig.allowExternalTraffic' + - api_field: 'controlPlaneEndpointsConfig.dnsEndpointConfig.enableK8sCertsViaDns' + - api_field: 'controlPlaneEndpointsConfig.dnsEndpointConfig.enableK8sTokensViaDns' - api_field: 'controlPlaneEndpointsConfig.dnsEndpointConfig.endpoint' + - api_field: 'controlPlaneEndpointsConfig.ipEndpointsConfig.enabled' - api_field: 'costManagementConfig.enabled' - api_field: 'databaseEncryption.keyName' - api_field: 'databaseEncryption.state' - field: 'datapath_provider' - api_field: 'network_config.datapath_provider' + api_field: 'networkConfig.datapathProvider' - field: 'default_max_pods_per_node' - api_field: 'default_max_pods_constraint.max_pods_per_node' + api_field: 'defaultMaxPodsConstraint.maxPodsPerNode' - field: 'default_snat_status.disabled' - api_field: 'network_config.default_snat_status.disabled' + api_field: 'networkConfig.defaultSnatStatus.disabled' - field: 'deletion_protection' provider_only: true - api_field: 'description' - field: 'dns_config.additive_vpc_scope_dns_domain' - api_field: 'network_config.dns_config.additive_vpc_scope_dns_domain' + api_field: 'networkConfig.dnsConfig.additiveVpcScopeDnsDomain' - field: 'dns_config.cluster_dns' - api_field: 'network_config.dns_config.cluster_dns' + api_field: 'networkConfig.dnsConfig.clusterDns' - field: 'dns_config.cluster_dns_domain' - api_field: 'network_config.dns_config.cluster_dns_domain' + api_field: 'networkConfig.dnsConfig.clusterDnsDomain' - field: 'dns_config.cluster_dns_scope' - api_field: 'network_config.dns_config.cluster_dns_scope' + api_field: 'networkConfig.dnsConfig.clusterDnsScope' - field: 'effective_labels' provider_only: true - field: 'enable_autopilot' api_field: 'autopilot.enabled' - field: 'enable_cilium_clusterwide_network_policy' - api_field: 'network_config.enable_cilium_clusterwide_network_policy' + api_field: 'networkConfig.enableCiliumClusterwideNetworkPolicy' - field: 'enable_fqdn_network_policy' - api_field: 'network_config.enable_fqdn_network_policy' + api_field: 'networkConfig.enableFqdnNetworkPolicy' - field: 'enable_intranode_visibility' - api_field: 'network_config.enable_intra_node_visibility' + api_field: 'networkConfig.enableIntraNodeVisibility' - api_field: 'enableK8sBetaApis.enabledApis' - api_field: 'enableKubernetesAlpha' - field: 'enable_l4_ilb_subsetting' - api_field: 'network_config.enable_l4ilb_subsetting' + api_field: 'networkConfig.enableL4ilbSubsetting' - field: 'disable_l4_lb_firewall_reconciliation' - api_field: 'network_config.disable_l4_lb_firewall_reconciliation' + api_field: 'networkConfig.disableL4LbFirewallReconciliation' - field: 'enable_legacy_abac' - api_field: 'legacy_abac.enabled' + api_field: 'legacyAbac.enabled' - field: 'enable_multi_networking' - api_field: 'network_config.enable_multi_networking' + api_field: 'networkConfig.enableMultiNetworking' - field: 'enable_shielded_nodes' - api_field: 'shielded_nodes.enabled' + api_field: 'shieldedNodes.enabled' - api_field: 'enableTpu' - api_field: 'endpoint' - api_field: 'enterpriseConfig.clusterTier' @@ -153,11 +161,15 @@ fields: provider_only: true - field: 'fleet.membership_location' provider_only: true + - api_field: 'fleet.membershipType' - api_field: 'fleet.preRegistered' - api_field: 'fleet.project' - field: 'gateway_api_config.channel' - api_field: 'network_config.gateway_api_config.channel' + api_field: 'networkConfig.gatewayApiConfig.channel' + - api_field: 'gkeAutoUpgradeConfig.patchMode' - api_field: 'identityServiceConfig.enabled' + - field: 'in_transit_encryption_config' + api_field: 'networkConfig.inTransitEncryptionConfig' - api_field: 'initialNodeCount' - api_field: 'ipAllocationPolicy.additionalPodRangesConfig.podRangeNames' - field: 'ip_allocation_policy.additional_ip_ranges_config.subnetwork' @@ -167,19 +179,19 @@ fields: - api_field: 'ipAllocationPolicy.clusterSecondaryRangeName' - api_field: 'ipAllocationPolicy.networkTierConfig.networkTier' - field: 'ip_allocation_policy.pod_cidr_overprovision_config.disabled' - api_field: 'ip_allocation_policy.pod_cidr_overprovision_config.disable' + api_field: 'ipAllocationPolicy.podCidrOverprovisionConfig.disable' - api_field: 'ipAllocationPolicy.servicesIpv4CidrBlock' - api_field: 'ipAllocationPolicy.servicesSecondaryRangeName' - api_field: 'ipAllocationPolicy.stackType' - api_field: 'labelFingerprint' - api_field: 'location' - field: 'logging_config.enable_components' - api_field: 'logging_config.component_config.enable_components' + api_field: 'loggingConfig.componentConfig.enableComponents' - api_field: 'loggingService' - field: 'maintenance_policy.daily_maintenance_window.duration' - api_field: 'maintenance_policy.window.daily_maintenance_window.duration' + api_field: 'maintenancePolicy.window.dailyMaintenanceWindow.duration' - field: 'maintenance_policy.daily_maintenance_window.start_time' - api_field: 'maintenance_policy.window.daily_maintenance_window.start_time' + api_field: 'maintenancePolicy.window.dailyMaintenanceWindow.startTime' - field: 'maintenance_policy.maintenance_exclusion.end_time' api_field: 'maintenance_policy.window.maintenance_exclusion.end_time' - field: 'maintenance_policy.maintenance_exclusion.exclusion_name' @@ -189,11 +201,11 @@ fields: - field: 'maintenance_policy.maintenance_exclusion.start_time' api_field: 'maintenance_policy.window.maintenance_exclusion.start_time' - field: 'maintenance_policy.recurring_window.end_time' - api_field: 'maintenance_policy.window.recurring_window.window.end_time' + api_field: 'maintenancePolicy.window.recurringWindow.window.endTime' - field: 'maintenance_policy.recurring_window.recurrence' - api_field: 'maintenance_policy.window.recurring_window.recurrence' + api_field: 'maintenancePolicy.window.recurringWindow.recurrence' - field: 'maintenance_policy.recurring_window.start_time' - api_field: 'maintenance_policy.window.recurring_window.window.start_time' + api_field: 'maintenancePolicy.window.recurringWindow.window.startTime' - api_field: 'masterAuth.clientCertificate' - api_field: 'masterAuth.clientCertificateConfig.issueClientCertificate' - api_field: 'masterAuth.clientKey' @@ -203,26 +215,35 @@ fields: - api_field: 'masterAuthorizedNetworksConfig.gcpPublicCidrsAccessEnabled' - api_field: 'masterAuthorizedNetworksConfig.privateEndpointEnforcementEnabled' - field: 'master_version' - api_field: 'current_master_version' + api_field: 'currentMasterVersion' - api_field: 'meshCertificates.enableCertificates' - field: 'min_master_version' - api_field: 'initial_cluster_version' + api_field: 'initialClusterVersion' - api_field: 'monitoringConfig.advancedDatapathObservabilityConfig.enableMetrics' - api_field: 'monitoringConfig.advancedDatapathObservabilityConfig.enableRelay' - field: 'monitoring_config.enable_components' - api_field: 'monitoring_config.component_config.enable_components' + api_field: 'monitoringConfig.componentConfig.enableComponents' + - field: 'monitoring_config.managed_prometheus.auto_monitoring_config.scope' + api_field: 'monitoringConfig.managedPrometheusConfig.autoMonitoringConfig.scope' - field: 'monitoring_config.managed_prometheus.enabled' - api_field: 'monitoring_config.managed_prometheus_config.enabled' + api_field: 'monitoringConfig.managedPrometheusConfig.enabled' - api_field: 'monitoringService' - api_field: 'name' - api_field: 'network' + - field: 'network_performance_config.total_egress_bandwidth_tier' + api_field: 'networkConfig.networkPerformanceConfig.totalEgressBandwidthTier' - api_field: 'networkPolicy.enabled' - api_field: 'networkPolicy.provider' - field: 'networking_mode' - api_field: 'ip_allocation_policy.use_ip_aliases' + api_field: 'ipAllocationPolicy.useIpAliases' - api_field: 'nodeConfig.advancedMachineFeatures.enableNestedVirtualization' + - api_field: 'nodeConfig.advancedMachineFeatures.performanceMonitoringUnit' - api_field: 'nodeConfig.advancedMachineFeatures.threadsPerCore' - api_field: 'nodeConfig.bootDiskKmsKey' + - api_field: 'nodeConfig.bootDisk.diskType' + - api_field: 'nodeConfig.bootDisk.provisionedIops' + - api_field: 'nodeConfig.bootDisk.provisionedThroughput' + - api_field: 'nodeConfig.bootDisk.sizeGb' - api_field: 'nodeConfig.confidentialNodes.enabled' - api_field: 'nodeConfig.confidentialNodes.confidentialInstanceType' - api_field: 'nodeConfig.containerdConfig.privateRegistryAccessConfig.certificateAuthorityDomainConfig.fqdns' @@ -240,41 +261,76 @@ fields: {{- if ne $.TargetVersionName "ga" }} - api_field: 'nodeConfig.ephemeralStorageConfig.localSsdCount' {{- end }} + - api_field: 'nodeConfig.ephemeralStorageLocalSsdConfig.dataCacheCount' - api_field: 'nodeConfig.ephemeralStorageLocalSsdConfig.localSsdCount' - api_field: 'nodeConfig.fastSocket.enabled' + - api_field: 'nodeConfig.flexStart' - api_field: 'nodeConfig.gcfsConfig.enabled' - field: 'node_config.guest_accelerator.count' - api_field: 'node_config.accelerators.accelerator_count' + api_field: 'nodeConfig.accelerators.acceleratorCount' - field: 'node_config.guest_accelerator.gpu_driver_installation_config.gpu_driver_version' - api_field: 'node_config.accelerators.gpu_driver_installation_config.gpu_driver_version' + api_field: 'nodeConfig.accelerators.gpuDriverInstallationConfig.gpuDriverVersion' - field: 'node_config.guest_accelerator.gpu_partition_size' - api_field: 'node_config.accelerators.gpu_partition_size' + api_field: 'nodeConfig.accelerators.gpuPartitionSize' - field: 'node_config.guest_accelerator.gpu_sharing_config.gpu_sharing_strategy' - api_field: 'node_config.accelerators.gpu_sharing_config.gpu_sharing_strategy' + api_field: 'nodeConfig.accelerators.gpuSharingConfig.gpuSharingStrategy' - field: 'node_config.guest_accelerator.gpu_sharing_config.max_shared_clients_per_gpu' - api_field: 'node_config.accelerators.gpu_sharing_config.max_shared_clients_per_gpu' + api_field: 'nodeConfig.accelerators.gpuSharingConfig.maxSharedClientsPerGpu' - field: 'node_config.guest_accelerator.type' - api_field: 'node_config.accelerators.accelerator_type' + api_field: 'nodeConfig.accelerators.acceleratorType' - api_field: 'nodeConfig.gvnic.enabled' - api_field: 'nodeConfig.hostMaintenancePolicy.maintenanceInterval' - api_field: 'nodeConfig.imageType' + - api_field: 'nodeConfig.kubeletConfig.allowedUnsafeSysctls' + - api_field: 'nodeConfig.kubeletConfig.containerLogMaxFiles' + - api_field: 'nodeConfig.kubeletConfig.containerLogMaxSize' - api_field: 'nodeConfig.kubeletConfig.cpuCfsQuota' - api_field: 'nodeConfig.kubeletConfig.cpuCfsQuotaPeriod' - api_field: 'nodeConfig.kubeletConfig.cpuManagerPolicy' + - api_field: 'nodeConfig.kubeletConfig.evictionMaxPodGracePeriodSeconds' + - api_field: 'nodeConfig.kubeletConfig.evictionMinimumReclaim.imagefsAvailable' + - api_field: 'nodeConfig.kubeletConfig.evictionMinimumReclaim.imagefsInodesFree' + - api_field: 'nodeConfig.kubeletConfig.evictionMinimumReclaim.memoryAvailable' + - api_field: 'nodeConfig.kubeletConfig.evictionMinimumReclaim.nodefsAvailable' + - api_field: 'nodeConfig.kubeletConfig.evictionMinimumReclaim.nodefsInodesFree' + - api_field: 'nodeConfig.kubeletConfig.evictionMinimumReclaim.pidAvailable' + - api_field: 'nodeConfig.kubeletConfig.evictionSoft.imagefsAvailable' + - api_field: 'nodeConfig.kubeletConfig.evictionSoft.imagefsInodesFree' + - api_field: 'nodeConfig.kubeletConfig.evictionSoft.memoryAvailable' + - api_field: 'nodeConfig.kubeletConfig.evictionSoft.nodefsAvailable' + - api_field: 'nodeConfig.kubeletConfig.evictionSoft.nodefsInodesFree' + - api_field: 'nodeConfig.kubeletConfig.evictionSoft.pidAvailable' + - api_field: 'nodeConfig.kubeletConfig.evictionSoftGracePeriod.imagefsAvailable' + - api_field: 'nodeConfig.kubeletConfig.evictionSoftGracePeriod.imagefsInodesFree' + - api_field: 'nodeConfig.kubeletConfig.evictionSoftGracePeriod.memoryAvailable' + - api_field: 'nodeConfig.kubeletConfig.evictionSoftGracePeriod.nodefsAvailable' + - api_field: 'nodeConfig.kubeletConfig.evictionSoftGracePeriod.nodefsInodesFree' + - api_field: 'nodeConfig.kubeletConfig.evictionSoftGracePeriod.pidAvailable' + - api_field: 'nodeConfig.kubeletConfig.imageGcHighThresholdPercent' + - api_field: 'nodeConfig.kubeletConfig.imageGcLowThresholdPercent' + - api_field: 'nodeConfig.kubeletConfig.imageMaximumGcAge' + - api_field: 'nodeConfig.kubeletConfig.imageMinimumGcAge' - api_field: 'nodeConfig.kubeletConfig.insecureKubeletReadonlyPortEnabled' + - api_field: 'nodeConfig.kubeletConfig.maxParallelImagePulls' + - api_field: 'nodeConfig.kubeletConfig.memoryManager.policy' - api_field: 'nodeConfig.kubeletConfig.podPidsLimit' + - api_field: 'nodeConfig.kubeletConfig.singleProcessOomKill' + - api_field: 'nodeConfig.kubeletConfig.topologyManager.policy' + - api_field: 'nodeConfig.kubeletConfig.topologyManager.scope' - api_field: 'nodeConfig.labels' - api_field: 'nodeConfig.linuxNodeConfig.cgroupMode' - field: 'node_config.linux_node_config.hugepages_config.hugepage_size_1g' - api_field: 'node_config.linux_node_config.hugepages.hugepage_size1g' + api_field: 'nodeConfig.linuxNodeConfig.hugepages.hugepageSize1g' - field: 'node_config.linux_node_config.hugepages_config.hugepage_size_2m' - api_field: 'node_config.linux_node_config.hugepages.hugepage_size2m' + api_field: 'nodeConfig.linuxNodeConfig.hugepages.hugepageSize2m' - api_field: 'nodeConfig.linuxNodeConfig.sysctls' + - api_field: 'nodeConfig.linuxNodeConfig.transparentHugepageDefrag' + - api_field: 'nodeConfig.linuxNodeConfig.transparentHugepageEnabled' - api_field: 'nodeConfig.localNvmeSsdBlockConfig.localSsdCount' - api_field: 'nodeConfig.localSsdCount' - api_field: 'nodeConfig.localSsdEncryptionMode' - field: 'node_config.logging_variant' - api_field: 'node_config.logging_config.variant_config.variant' + api_field: 'nodeConfig.loggingConfig.variantConfig.variant' - api_field: 'nodeConfig.machineType' - api_field: 'nodeConfig.maxRunDuration' - api_field: 'nodeConfig.metadata' @@ -287,7 +343,7 @@ fields: - api_field: 'nodeConfig.reservationAffinity.values' - api_field: 'nodeConfig.resourceLabels' - field: 'node_config.resource_manager_tags' - api_field: 'node_config.resource_manager_tags.tags' + api_field: 'nodeConfig.resourceManagerTags.tags' {{- if ne $.TargetVersionName "ga" }} - api_field: 'nodeConfig.sandboxConfig.sandboxType' {{- end }} @@ -296,92 +352,107 @@ fields: - api_field: 'nodeConfig.serviceAccount' - api_field: 'nodeConfig.shieldedInstanceConfig.enableIntegrityMonitoring' - api_field: 'nodeConfig.shieldedInstanceConfig.enableSecureBoot' + - api_field: 'nodeConfig.soleTenantConfig.minNodeCpus' - field: 'node_config.sole_tenant_config.node_affinity.key' - api_field: 'node_config.sole_tenant_config.node_affinities.key' + api_field: 'nodeConfig.soleTenantConfig.nodeAffinities.key' - field: 'node_config.sole_tenant_config.node_affinity.operator' - api_field: 'node_config.sole_tenant_config.node_affinities.operator' + api_field: 'nodeConfig.soleTenantConfig.nodeAffinities.operator' - field: 'node_config.sole_tenant_config.node_affinity.values' - api_field: 'node_config.sole_tenant_config.node_affinities.values' + api_field: 'nodeConfig.soleTenantConfig.nodeAffinities.values' - api_field: 'nodeConfig.spot' - api_field: 'nodeConfig.storagePools' - api_field: 'nodeConfig.tags' - field: 'node_config.taint.effect' - api_field: 'node_config.taints.effect' + api_field: 'nodeConfig.taints.effect' - field: 'node_config.taint.key' - api_field: 'node_config.taints.key' + api_field: 'nodeConfig.taints.key' - field: 'node_config.taint.value' - api_field: 'node_config.taints.value' + api_field: 'nodeConfig.taints.value' + - api_field: 'nodeConfig.windowsNodeConfig.osVersion' + field: 'node_config.windows_node_config.osversion' - api_field: 'nodeConfig.workloadMetadataConfig.mode' - field: 'node_locations' api_field: 'locations' - field: 'node_pool.autoscaling.location_policy' - api_field: 'node_pools.autoscaling.location_policy' + api_field: 'nodePools.autoscaling.locationPolicy' - field: 'node_pool.autoscaling.max_node_count' - api_field: 'node_pools.autoscaling.max_node_count' + api_field: 'nodePools.autoscaling.maxNodeCount' - field: 'node_pool.autoscaling.min_node_count' - api_field: 'node_pools.autoscaling.min_node_count' + api_field: 'nodePools.autoscaling.minNodeCount' - field: 'node_pool.autoscaling.total_max_node_count' - api_field: 'node_pools.autoscaling.total_max_node_count' + api_field: 'nodePools.autoscaling.totalMaxNodeCount' - field: 'node_pool.autoscaling.total_min_node_count' - api_field: 'node_pools.autoscaling.total_min_node_count' + api_field: 'nodePools.autoscaling.totalMinNodeCount' - field: 'node_pool.initial_node_count' - api_field: 'node_pools.initial_node_count' + api_field: 'nodePools.initialNodeCount' - field: 'node_pool.instance_group_urls' - api_field: 'node_pools.instance_group_urls' + api_field: 'nodePools.instanceGroupUrls' - field: 'node_pool.managed_instance_group_urls' provider_only: true - field: 'node_pool.management.auto_repair' - api_field: 'node_pools.management.auto_repair' + api_field: 'nodePools.management.autoRepair' - field: 'node_pool.management.auto_upgrade' - api_field: 'node_pools.management.auto_upgrade' + api_field: 'nodePools.management.autoUpgrade' - field: 'node_pool.max_pods_per_node' - api_field: 'node_pools.max_pods_constraint.max_pods_per_node' + api_field: 'nodePools.maxPodsConstraint.maxPodsPerNode' - field: 'node_pool.name' - api_field: 'node_pools.name' + api_field: 'nodePools.name' - field: 'node_pool.name_prefix' provider_only: true - field: 'node_pool.network_config.additional_node_network_configs.network' - api_field: 'node_pools.network_config.additional_node_network_configs.network' + api_field: 'nodePools.networkConfig.additionalNodeNetworkConfigs.network' - field: 'node_pool.network_config.additional_node_network_configs.subnetwork' - api_field: 'node_pools.network_config.additional_node_network_configs.subnetwork' + api_field: 'nodePools.networkConfig.additionalNodeNetworkConfigs.subnetwork' - field: 'node_pool.network_config.additional_pod_network_configs.max_pods_per_node' - api_field: 'node_pools.network_config.additional_pod_network_configs.max_pods_per_node.max_pods_per_node' + api_field: 'nodePools.networkConfig.additionalPodNetworkConfigs.maxPodsPerNode.maxPodsPerNode' - field: 'node_pool.network_config.additional_pod_network_configs.secondary_pod_range' - api_field: 'node_pools.network_config.additional_pod_network_configs.secondary_pod_range' + api_field: 'nodePools.networkConfig.additionalPodNetworkConfigs.secondaryPodRange' - field: 'node_pool.network_config.additional_pod_network_configs.subnetwork' - api_field: 'node_pools.network_config.additional_pod_network_configs.subnetwork' + api_field: 'nodePools.networkConfig.additionalPodNetworkConfigs.subnetwork' - field: 'node_pool.network_config.create_pod_range' - api_field: 'node_pools.network_config.create_pod_range' + api_field: 'nodePools.networkConfig.createPodRange' - field: 'node_pool.network_config.enable_private_nodes' - api_field: 'node_pools.network_config.enable_private_nodes' + api_field: 'nodePools.networkConfig.enablePrivateNodes' - field: 'node_pool.network_config.network_performance_config.total_egress_bandwidth_tier' - api_field: 'node_pools.network_config.network_performance_config.total_egress_bandwidth_tier' + api_field: 'nodePools.networkConfig.networkPerformanceConfig.totalEgressBandwidthTier' - field: 'node_pool.network_config.pod_cidr_overprovision_config.disabled' - api_field: 'node_pools.network_config.pod_cidr_overprovision_config.disable' + api_field: 'nodePools.networkConfig.podCidrOverprovisionConfig.disable' - field: 'node_pool.network_config.pod_ipv4_cidr_block' - api_field: 'node_pools.network_config.pod_ipv4_cidr_block' + api_field: 'nodePools.networkConfig.podIpv4CidrBlock' - field: 'node_pool.network_config.pod_range' - api_field: 'node_pools.network_config.pod_range' + api_field: 'nodePools.networkConfig.podRange' + - field: 'node_pool.network_config.subnetwork' + api_field: 'nodePools.networkConfig.subnetwork' - field: 'node_pool.node_config.advanced_machine_features.enable_nested_virtualization' - api_field: 'node_pools.config.advanced_machine_features.enable_nested_virtualization' + api_field: 'nodePools.config.advancedMachineFeatures.enableNestedVirtualization' + - field: 'node_pool.node_config.advanced_machine_features.performance_monitoring_unit' + api_field: 'nodePools.config.advancedMachineFeatures.performanceMonitoringUnit' - field: 'node_pool.node_config.advanced_machine_features.threads_per_core' - api_field: 'node_pools.config.advanced_machine_features.threads_per_core' + api_field: 'nodePools.config.advancedMachineFeatures.threadsPerCore' - field: 'node_pool.node_config.boot_disk_kms_key' - api_field: 'node_pools.config.boot_disk_kms_key' + api_field: 'nodePools.config.bootDiskKmsKey' + - field: 'node_pool.node_config.boot_disk.disk_type' + api_field: 'nodePools.config.bootDisk.diskType' + - field: 'node_pool.node_config.boot_disk.provisioned_iops' + api_field: 'nodePools.config.bootDisk.provisionedIops' + - field: 'node_pool.node_config.boot_disk.provisioned_throughput' + api_field: 'nodePools.config.bootDisk.provisionedThroughput' + - field: 'node_pool.node_config.boot_disk.size_gb' + api_field: 'nodePools.config.bootDisk.sizeGb' - field: 'node_pool.node_config.confidential_nodes.enabled' - api_field: 'node_pools.config.confidential_nodes.enabled' + api_field: 'nodePools.config.confidentialNodes.enabled' - field: 'node_pool.node_config.confidential_nodes.confidential_instance_type' - api_field: 'node_pools.config.confidential_nodes.confidential_instance_type' + api_field: 'nodePools.config.confidentialNodes.confidentialInstanceType' - field: 'node_pool.node_config.containerd_config.private_registry_access_config.certificate_authority_domain_config.fqdns' - api_field: 'node_pools.config.containerd_config.private_registry_access_config.certificate_authority_domain_config.fqdns' + api_field: 'nodePools.config.containerdConfig.privateRegistryAccessConfig.certificateAuthorityDomainConfig.fqdns' - field: 'node_pool.node_config.containerd_config.private_registry_access_config.certificate_authority_domain_config.gcp_secret_manager_certificate_config.secret_uri' - api_field: 'node_pools.config.containerd_config.private_registry_access_config.certificate_authority_domain_config.gcp_secret_manager_certificate_config.secret_uri' + api_field: 'nodePools.config.containerdConfig.privateRegistryAccessConfig.certificateAuthorityDomainConfig.gcpSecretManagerCertificateConfig.secretUri' - field: 'node_pool.node_config.containerd_config.private_registry_access_config.enabled' - api_field: 'node_pools.config.containerd_config.private_registry_access_config.enabled' + api_field: 'nodePools.config.containerdConfig.privateRegistryAccessConfig.enabled' - field: 'node_pool.node_config.disk_size_gb' - api_field: 'node_pools.config.disk_size_gb' + api_field: 'nodePools.config.diskSizeGb' - field: 'node_pool.node_config.disk_type' - api_field: 'node_pools.config.disk_type' + api_field: 'nodePools.config.diskType' - field: 'node_pool.node_config.effective_taints.effect' provider_only: true - field: 'node_pool.node_config.effective_taints.key' @@ -389,169 +460,244 @@ fields: - field: 'node_pool.node_config.effective_taints.value' provider_only: true - field: 'node_pool.node_config.enable_confidential_storage' - api_field: 'node_pools.config.enable_confidential_storage' + api_field: 'nodePools.config.enableConfidentialStorage' {{- if ne $.TargetVersionName "ga" }} - field: 'node_pool.node_config.ephemeral_storage_config.local_ssd_count' - api_field: 'node_pools.config.ephemeral_storage_config.local_ssd_count' + api_field: 'nodePools.config.ephemeralStorageConfig.localSsdCount' {{- end }} + - field: 'node_pool.node_config.ephemeral_storage_local_ssd_config.data_cache_count' + api_field: 'nodePools.config.ephemeralStorageLocalSsdConfig.dataCacheCount' - field: 'node_pool.node_config.ephemeral_storage_local_ssd_config.local_ssd_count' - api_field: 'node_pools.config.ephemeral_storage_local_ssd_config.local_ssd_count' + api_field: 'nodePools.config.ephemeralStorageLocalSsdConfig.localSsdCount' - field: 'node_pool.node_config.fast_socket.enabled' - api_field: 'node_pools.config.fast_socket.enabled' + api_field: 'nodePools.config.fastSocket.enabled' + - field: 'node_pool.node_config.flex_start' + api_field: 'nodePools.config.flexStart' - field: 'node_pool.node_config.gcfs_config.enabled' - api_field: 'node_pools.config.gcfs_config.enabled' + api_field: 'nodePools.config.gcfsConfig.enabled' - field: 'node_pool.node_config.guest_accelerator.count' - api_field: 'node_pools.config.accelerators.accelerator_count' + api_field: 'nodePools.config.accelerators.acceleratorCount' - field: 'node_pool.node_config.guest_accelerator.gpu_driver_installation_config.gpu_driver_version' - api_field: 'node_pools.config.accelerators.gpu_driver_installation_config.gpu_driver_version' + api_field: 'nodePools.config.accelerators.gpuDriverInstallationConfig.gpuDriverVersion' - field: 'node_pool.node_config.guest_accelerator.gpu_partition_size' - api_field: 'node_pools.config.accelerators.gpu_partition_size' + api_field: 'nodePools.config.accelerators.gpuPartitionSize' - field: 'node_pool.node_config.guest_accelerator.gpu_sharing_config.gpu_sharing_strategy' - api_field: 'node_pools.config.accelerators.gpu_sharing_config.gpu_sharing_strategy' + api_field: 'nodePools.config.accelerators.gpuSharingConfig.gpuSharingStrategy' - field: 'node_pool.node_config.guest_accelerator.gpu_sharing_config.max_shared_clients_per_gpu' - api_field: 'node_pools.config.accelerators.gpu_sharing_config.max_shared_clients_per_gpu' + api_field: 'nodePools.config.accelerators.gpuSharingConfig.maxSharedClientsPerGpu' - field: 'node_pool.node_config.guest_accelerator.type' - api_field: 'node_pools.config.accelerators.accelerator_type' + api_field: 'nodePools.config.accelerators.acceleratorType' - field: 'node_pool.node_config.gvnic.enabled' - api_field: 'node_pools.config.gvnic.enabled' + api_field: 'nodePools.config.gvnic.enabled' - field: 'node_pool.node_config.host_maintenance_policy.maintenance_interval' - api_field: 'node_pools.config.host_maintenance_policy.maintenance_interval' + api_field: 'nodePools.config.hostMaintenancePolicy.maintenanceInterval' - field: 'node_pool.node_config.image_type' - api_field: 'node_pools.config.image_type' + api_field: 'nodePools.config.imageType' + - field: 'node_pool.node_config.kubelet_config.allowed_unsafe_sysctls' + api_field: 'nodePools.config.kubeletConfig.allowedUnsafeSysctls' + - field: 'node_pool.node_config.kubelet_config.container_log_max_files' + api_field: 'nodePools.config.kubeletConfig.containerLogMaxFiles' + - field: 'node_pool.node_config.kubelet_config.container_log_max_size' + api_field: 'nodePools.config.kubeletConfig.containerLogMaxSize' - field: 'node_pool.node_config.kubelet_config.cpu_cfs_quota' - api_field: 'node_pools.config.kubelet_config.cpu_cfs_quota' + api_field: 'nodePools.config.kubeletConfig.cpuCfsQuota' - field: 'node_pool.node_config.kubelet_config.cpu_cfs_quota_period' - api_field: 'node_pools.config.kubelet_config.cpu_cfs_quota_period' + api_field: 'nodePools.config.kubeletConfig.cpuCfsQuotaPeriod' - field: 'node_pool.node_config.kubelet_config.cpu_manager_policy' - api_field: 'node_pools.config.kubelet_config.cpu_manager_policy' + api_field: 'nodePools.config.kubeletConfig.cpuManagerPolicy' + - field: 'node_pool.node_config.kubelet_config.eviction_max_pod_grace_period_seconds' + api_field: 'nodePools.config.kubeletConfig.evictionMaxPodGracePeriodSeconds' + - field: 'node_pool.node_config.kubelet_config.eviction_minimum_reclaim.imagefs_available' + api_field: 'nodePools.config.kubeletConfig.evictionMinimumReclaim.imagefsAvailable' + - field: 'node_pool.node_config.kubelet_config.eviction_minimum_reclaim.imagefs_inodes_free' + api_field: 'nodePools.config.kubeletConfig.evictionMinimumReclaim.imagefsInodesFree' + - field: 'node_pool.node_config.kubelet_config.eviction_minimum_reclaim.memory_available' + api_field: 'nodePools.config.kubeletConfig.evictionMinimumReclaim.memoryAvailable' + - field: 'node_pool.node_config.kubelet_config.eviction_minimum_reclaim.nodefs_available' + api_field: 'nodePools.config.kubeletConfig.evictionMinimumReclaim.nodefsAvailable' + - field: 'node_pool.node_config.kubelet_config.eviction_minimum_reclaim.nodefs_inodes_free' + api_field: 'nodePools.config.kubeletConfig.evictionMinimumReclaim.nodefsInodesFree' + - field: 'node_pool.node_config.kubelet_config.eviction_minimum_reclaim.pid_available' + api_field: 'nodePools.config.kubeletConfig.evictionMinimumReclaim.pidAvailable' + - field: 'node_pool.node_config.kubelet_config.eviction_soft.imagefs_available' + api_field: 'nodePools.config.kubeletConfig.evictionSoft.imagefsAvailable' + - field: 'node_pool.node_config.kubelet_config.eviction_soft.imagefs_inodes_free' + api_field: 'nodePools.config.kubeletConfig.evictionSoft.imagefsInodesFree' + - field: 'node_pool.node_config.kubelet_config.eviction_soft.memory_available' + api_field: 'nodePools.config.kubeletConfig.evictionSoft.memoryAvailable' + - field: 'node_pool.node_config.kubelet_config.eviction_soft.nodefs_available' + api_field: 'nodePools.config.kubeletConfig.evictionSoft.nodefsAvailable' + - field: 'node_pool.node_config.kubelet_config.eviction_soft.nodefs_inodes_free' + api_field: 'nodePools.config.kubeletConfig.evictionSoft.nodefsInodesFree' + - field: 'node_pool.node_config.kubelet_config.eviction_soft.pid_available' + api_field: 'nodePools.config.kubeletConfig.evictionSoft.pidAvailable' + - field: 'node_pool.node_config.kubelet_config.eviction_soft_grace_period.imagefs_available' + api_field: 'nodePools.config.kubeletConfig.evictionSoftGracePeriod.imagefsAvailable' + - field: 'node_pool.node_config.kubelet_config.eviction_soft_grace_period.imagefs_inodes_free' + api_field: 'nodePools.config.kubeletConfig.evictionSoftGracePeriod.imagefsInodesFree' + - field: 'node_pool.node_config.kubelet_config.eviction_soft_grace_period.memory_available' + api_field: 'nodePools.config.kubeletConfig.evictionSoftGracePeriod.memoryAvailable' + - field: 'node_pool.node_config.kubelet_config.eviction_soft_grace_period.nodefs_available' + api_field: 'nodePools.config.kubeletConfig.evictionSoftGracePeriod.nodefsAvailable' + - field: 'node_pool.node_config.kubelet_config.eviction_soft_grace_period.nodefs_inodes_free' + api_field: 'nodePools.config.kubeletConfig.evictionSoftGracePeriod.nodefsInodesFree' + - field: 'node_pool.node_config.kubelet_config.eviction_soft_grace_period.pid_available' + api_field: 'nodePools.config.kubeletConfig.evictionSoftGracePeriod.pidAvailable' + - field: 'node_pool.node_config.kubelet_config.image_gc_high_threshold_percent' + api_field: 'nodePools.config.kubeletConfig.imageGcHighThresholdPercent' + - field: 'node_pool.node_config.kubelet_config.image_gc_low_threshold_percent' + api_field: 'nodePools.config.kubeletConfig.imageGcLowThresholdPercent' + - field: 'node_pool.node_config.kubelet_config.image_maximum_gc_age' + api_field: 'nodePools.config.kubeletConfig.imageMaximumGcAge' + - field: 'node_pool.node_config.kubelet_config.image_minimum_gc_age' + api_field: 'nodePools.config.kubeletConfig.imageMinimumGcAge' - field: 'node_pool.node_config.kubelet_config.insecure_kubelet_readonly_port_enabled' - api_field: 'node_pools.config.kubelet_config.insecure_kubelet_readonly_port_enabled' + api_field: 'nodePools.config.kubeletConfig.insecureKubeletReadonlyPortEnabled' + - field: 'node_pool.node_config.kubelet_config.max_parallel_image_pulls' + api_field: 'nodePools.config.kubeletConfig.maxParallelImagePulls' + - field: 'node_pool.node_config.kubelet_config.memory_manager.policy' + api_field: 'nodePools.config.kubeletConfig.memoryManager.policy' - field: 'node_pool.node_config.kubelet_config.pod_pids_limit' - api_field: 'node_pools.config.kubelet_config.pod_pids_limit' + api_field: 'nodePools.config.kubeletConfig.podPidsLimit' + - field: 'node_pool.node_config.kubelet_config.single_process_oom_kill' + api_field: 'nodePools.config.kubeletConfig.singleProcessOomKill' + - field: 'node_pool.node_config.kubelet_config.topology_manager.policy' + api_field: 'nodePools.config.kubeletConfig.topologyManager.policy' + - field: 'node_pool.node_config.kubelet_config.topology_manager.scope' + api_field: 'nodePools.config.kubeletConfig.topologyManager.scope' - field: 'node_pool.node_config.labels' - api_field: 'node_pools.config.labels' + api_field: 'nodePools.config.labels' - field: 'node_pool.node_config.linux_node_config.cgroup_mode' - api_field: 'node_pools.config.linux_node_config.cgroup_mode' + api_field: 'nodePools.config.linuxNodeConfig.cgroupMode' - field: 'node_pool.node_config.linux_node_config.hugepages_config.hugepage_size_1g' - api_field: 'node_pools.config.linux_node_config.hugepages.hugepage_size1g' + api_field: 'nodePools.config.linuxNodeConfig.hugepages.hugepageSize1g' - field: 'node_pool.node_config.linux_node_config.hugepages_config.hugepage_size_2m' - api_field: 'node_pools.config.linux_node_config.hugepages.hugepage_size2m' + api_field: 'nodePools.config.linuxNodeConfig.hugepages.hugepageSize2m' - field: 'node_pool.node_config.linux_node_config.sysctls' - api_field: 'node_pools.config.linux_node_config.sysctls' + api_field: 'nodePools.config.linuxNodeConfig.sysctls' + - field: 'node_pool.node_config.linux_node_config.transparent_hugepage_defrag' + api_field: 'nodePools.config.linuxNodeConfig.transparentHugepageDefrag' + - field: 'node_pool.node_config.linux_node_config.transparent_hugepage_enabled' + api_field: 'nodePools.config.linuxNodeConfig.transparentHugepageEnabled' - field: 'node_pool.node_config.local_nvme_ssd_block_config.local_ssd_count' - api_field: 'node_pools.config.local_nvme_ssd_block_config.local_ssd_count' + api_field: 'nodePools.config.localNvmeSsdBlockConfig.localSsdCount' - field: 'node_pool.node_config.local_ssd_count' - api_field: 'node_pools.config.local_ssd_count' + api_field: 'nodePools.config.localSsdCount' - field: 'node_pool.node_config.local_ssd_encryption_mode' - api_field: 'node_pools.config.local_ssd_encryption_mode' + api_field: 'nodePools.config.localSsdEncryptionMode' - field: 'node_pool.node_config.logging_variant' - api_field: 'node_pools.config.logging_config.variant_config.variant' + api_field: 'nodePools.config.loggingConfig.variantConfig.variant' - field: 'node_pool.node_config.machine_type' - api_field: 'node_pools.config.machine_type' + api_field: 'nodePools.config.machineType' - field: 'node_pool.node_config.max_run_duration' - api_field: 'node_pools.config.max_run_duration' + api_field: 'nodePools.config.maxRunDuration' - field: 'node_pool.node_config.metadata' - api_field: 'node_pools.config.metadata' + api_field: 'nodePools.config.metadata' - field: 'node_pool.node_config.min_cpu_platform' - api_field: 'node_pools.config.min_cpu_platform' + api_field: 'nodePools.config.minCpuPlatform' - field: 'node_pool.node_config.node_group' - api_field: 'node_pools.config.node_group' + api_field: 'nodePools.config.nodeGroup' - field: 'node_pool.node_config.oauth_scopes' - api_field: 'node_pools.config.oauth_scopes' + api_field: 'nodePools.config.oauthScopes' - field: 'node_pool.node_config.preemptible' - api_field: 'node_pools.config.preemptible' + api_field: 'nodePools.config.preemptible' - field: 'node_pool.node_config.reservation_affinity.consume_reservation_type' - api_field: 'node_pools.config.reservation_affinity.consume_reservation_type' + api_field: 'nodePools.config.reservationAffinity.consumeReservationType' - field: 'node_pool.node_config.reservation_affinity.key' - api_field: 'node_pools.config.reservation_affinity.key' + api_field: 'nodePools.config.reservationAffinity.key' - field: 'node_pool.node_config.reservation_affinity.values' - api_field: 'node_pools.config.reservation_affinity.values' + api_field: 'nodePools.config.reservationAffinity.values' - field: 'node_pool.node_config.resource_labels' - api_field: 'node_pools.config.resource_labels' + api_field: 'nodePools.config.resourceLabels' - field: 'node_pool.node_config.resource_manager_tags' - api_field: 'node_pools.config.resource_manager_tags.tags' + api_field: 'nodePools.config.resourceManagerTags.tags' {{- if ne $.TargetVersionName "ga" }} - field: 'node_pool.node_config.sandbox_config.sandbox_type' - api_field: 'node_pools.config.sandbox_config.sandbox_type' + api_field: 'nodePools.config.sandboxConfig.sandboxType' {{- end }} - field: 'node_pool.node_config.secondary_boot_disks.disk_image' - api_field: 'node_pools.config.secondary_boot_disks.disk_image' + api_field: 'nodePools.config.secondaryBootDisks.diskImage' - field: 'node_pool.node_config.secondary_boot_disks.mode' - api_field: 'node_pools.config.secondary_boot_disks.mode' + api_field: 'nodePools.config.secondaryBootDisks.mode' - field: 'node_pool.node_config.service_account' - api_field: 'node_pools.config.service_account' + api_field: 'nodePools.config.serviceAccount' - field: 'node_pool.node_config.shielded_instance_config.enable_integrity_monitoring' - api_field: 'node_pools.config.shielded_instance_config.enable_integrity_monitoring' + api_field: 'nodePools.config.shieldedInstanceConfig.enableIntegrityMonitoring' - field: 'node_pool.node_config.shielded_instance_config.enable_secure_boot' - api_field: 'node_pools.config.shielded_instance_config.enable_secure_boot' + api_field: 'nodePools.config.shieldedInstanceConfig.enableSecureBoot' + - field: 'node_pool.node_config.sole_tenant_config.min_node_cpus' + api_field: 'nodePools.config.soleTenantConfig.minNodeCpus' - field: 'node_pool.node_config.sole_tenant_config.node_affinity.key' - api_field: 'node_pools.config.sole_tenant_config.node_affinities.key' + api_field: 'nodePools.config.soleTenantConfig.nodeAffinities.key' - field: 'node_pool.node_config.sole_tenant_config.node_affinity.operator' - api_field: 'node_pools.config.sole_tenant_config.node_affinities.operator' + api_field: 'nodePools.config.soleTenantConfig.nodeAffinities.operator' - field: 'node_pool.node_config.sole_tenant_config.node_affinity.values' - api_field: 'node_pools.config.sole_tenant_config.node_affinities.values' + api_field: 'nodePools.config.soleTenantConfig.nodeAffinities.values' - field: 'node_pool.node_config.spot' - api_field: 'node_pools.config.spot' + api_field: 'nodePools.config.spot' - field: 'node_pool.node_config.storage_pools' - api_field: 'node_pools.config.storage_pools' + api_field: 'nodePools.config.storagePools' - field: 'node_pool.node_config.tags' - api_field: 'node_pools.config.tags' + api_field: 'nodePools.config.tags' - field: 'node_pool.node_config.taint.effect' - api_field: 'node_pools.config.taints.effect' + api_field: 'nodePools.config.taints.effect' - field: 'node_pool.node_config.taint.key' - api_field: 'node_pools.config.taints.key' + api_field: 'nodePools.config.taints.key' - field: 'node_pool.node_config.taint.value' - api_field: 'node_pools.config.taints.value' + api_field: 'nodePools.config.taints.value' + - field: 'node_pool.node_config.windows_node_config.osversion' + api_field: 'nodePools.config.windowsNodeConfig.osVersion' - field: 'node_pool.node_config.workload_metadata_config.mode' - api_field: 'node_pools.config.workload_metadata_config.mode' + api_field: 'nodePools.config.workloadMetadataConfig.mode' - field: 'node_pool.node_count' provider_only: true - field: 'node_pool.node_locations' - api_field: 'node_pools.locations' + api_field: 'nodePools.locations' - field: 'node_pool.placement_policy.policy_name' - api_field: 'node_pools.placement_policy.policy_name' + api_field: 'nodePools.placementPolicy.policyName' - field: 'node_pool.placement_policy.tpu_topology' - api_field: 'node_pools.placement_policy.tpu_topology' + api_field: 'nodePools.placementPolicy.tpuTopology' - field: 'node_pool.placement_policy.type' - api_field: 'node_pools.placement_policy.type' + api_field: 'nodePools.placementPolicy.type' - field: 'node_pool.queued_provisioning.enabled' - api_field: 'node_pools.queued_provisioning.enabled' + api_field: 'nodePools.queuedProvisioning.enabled' - field: 'node_pool.upgrade_settings.blue_green_settings.node_pool_soak_duration' - api_field: 'node_pools.upgrade_settings.blue_green_settings.node_pool_soak_duration' + api_field: 'nodePools.upgradeSettings.blueGreenSettings.nodePoolSoakDuration' - field: 'node_pool.upgrade_settings.blue_green_settings.standard_rollout_policy.batch_node_count' - api_field: 'node_pools.upgrade_settings.blue_green_settings.standard_rollout_policy.batch_node_count' + api_field: 'nodePools.upgradeSettings.blueGreenSettings.standardRolloutPolicy.batchNodeCount' - field: 'node_pool.upgrade_settings.blue_green_settings.standard_rollout_policy.batch_percentage' - api_field: 'node_pools.upgrade_settings.blue_green_settings.standard_rollout_policy.batch_percentage' + api_field: 'nodePools.upgradeSettings.blueGreenSettings.standardRolloutPolicy.batchPercentage' - field: 'node_pool.upgrade_settings.blue_green_settings.standard_rollout_policy.batch_soak_duration' - api_field: 'node_pools.upgrade_settings.blue_green_settings.standard_rollout_policy.batch_soak_duration' + api_field: 'nodePools.upgradeSettings.blueGreenSettings.standardRolloutPolicy.batchSoakDuration' - field: 'node_pool.upgrade_settings.max_surge' - api_field: 'node_pools.upgrade_settings.max_surge' + api_field: 'nodePools.upgradeSettings.maxSurge' - field: 'node_pool.upgrade_settings.max_unavailable' - api_field: 'node_pools.upgrade_settings.max_unavailable' + api_field: 'nodePools.upgradeSettings.maxUnavailable' - field: 'node_pool.upgrade_settings.strategy' - api_field: 'node_pools.upgrade_settings.strategy' + api_field: 'nodePools.upgradeSettings.strategy' - field: 'node_pool.version' - api_field: 'node_pools.version' + api_field: 'nodePools.version' - api_field: 'nodePoolAutoConfig.linuxNodeConfig.cgroupMode' - api_field: 'nodePoolAutoConfig.networkTags.tags' - api_field: 'nodePoolAutoConfig.nodeKubeletConfig.insecureKubeletReadonlyPortEnabled' - field: 'node_pool_auto_config.resource_manager_tags' - api_field: 'node_pool_auto_config.resource_manager_tags.tags' + api_field: 'nodePoolAutoConfig.resourceManagerTags.tags' - api_field: 'nodePoolDefaults.nodeConfigDefaults.containerdConfig.privateRegistryAccessConfig.certificateAuthorityDomainConfig.fqdns' - api_field: 'nodePoolDefaults.nodeConfigDefaults.containerdConfig.privateRegistryAccessConfig.certificateAuthorityDomainConfig.gcpSecretManagerCertificateConfig.secretUri' - api_field: 'nodePoolDefaults.nodeConfigDefaults.containerdConfig.privateRegistryAccessConfig.enabled' - api_field: 'nodePoolDefaults.nodeConfigDefaults.gcfsConfig.enabled' - field: 'node_pool_defaults.node_config_defaults.insecure_kubelet_readonly_port_enabled' - api_field: 'node_pool_defaults.node_config_defaults.node_kubelet_config.insecure_kubelet_readonly_port_enabled' + api_field: 'nodePoolDefaults.nodeConfigDefaults.nodeKubeletConfig.insecureKubeletReadonlyPortEnabled' - field: 'node_pool_defaults.node_config_defaults.logging_variant' - api_field: 'node_pool_defaults.node_config_defaults.logging_config.variant_config.variant' + api_field: 'nodePoolDefaults.nodeConfigDefaults.loggingConfig.variantConfig.variant' - field: 'node_version' - api_field: 'current_node_version' + api_field: 'currentNodeVersion' - api_field: 'notificationConfig.pubsub.enabled' - api_field: 'notificationConfig.pubsub.filter.eventType' - api_field: 'notificationConfig.pubsub.topic' - field: 'operation' provider_only: true + - api_field: 'podAutoscaling.hpaProfile' {{- if ne $.TargetVersionName "ga" }} - api_field: 'podSecurityPolicyConfig.enabled' {{- end }} @@ -564,7 +710,7 @@ fields: - api_field: 'privateClusterConfig.privateEndpointSubnetwork' - api_field: 'privateClusterConfig.publicEndpoint' - field: 'private_ipv6_google_access' - api_field: 'network_config.private_ipv6_google_access' + api_field: 'networkConfig.privateIpv6GoogleAccess' - field: 'project' {{- if ne $.TargetVersionName "ga" }} - api_field: 'protectConfig.workloadConfig.auditMode' @@ -572,6 +718,8 @@ fields: {{- if ne $.TargetVersionName "ga" }} - api_field: 'protectConfig.workloadVulnerabilityMode' {{- end }} + - api_field: 'rbacBindingConfig.enableInsecureBindingSystemAuthenticated' + - api_field: 'rbacBindingConfig.enableInsecureBindingSystemUnauthenticated' - api_field: 'releaseChannel.channel' - field: 'remove_default_node_pool' provider_only: true @@ -579,13 +727,15 @@ fields: - api_field: 'resourceUsageExportConfig.bigqueryDestination.datasetId' - api_field: 'resourceUsageExportConfig.enableNetworkEgressMetering' - field: 'resource_usage_export_config.enable_resource_consumption_metering' - api_field: 'resource_usage_export_config.consumption_metering_config.enabled' + api_field: 'resourceUsageExportConfig.consumptionMeteringConfig.enabled' - api_field: 'secretManagerConfig.enabled' + - api_field: 'secretManagerConfig.rotationConfig.enabled' + - api_field: 'secretManagerConfig.rotationConfig.rotationInterval' - api_field: 'securityPostureConfig.mode' - api_field: 'securityPostureConfig.vulnerabilityMode' - api_field: 'selfLink' - field: 'service_external_ips_config.enabled' - api_field: 'network_config.service_external_ips_config.enabled' + api_field: 'networkConfig.serviceExternalIpsConfig.enabled' - api_field: 'servicesIpv4Cidr' - api_field: 'subnetwork' - field: 'terraform_labels' diff --git a/mmv1/third_party/terraform/services/container/resource_container_node_pool_meta.yaml.tmpl b/mmv1/third_party/terraform/services/container/resource_container_node_pool_meta.yaml.tmpl index 74dcd13fdff3..63b5a134f126 100644 --- a/mmv1/third_party/terraform/services/container/resource_container_node_pool_meta.yaml.tmpl +++ b/mmv1/third_party/terraform/services/container/resource_container_node_pool_meta.yaml.tmpl @@ -22,44 +22,54 @@ fields: - api_field: 'management.autoRepair' - api_field: 'management.autoUpgrade' - field: 'max_pods_per_node' - api_field: 'max_pods_constraint.max_pods_per_node' + api_field: 'maxPodsConstraint.maxPodsPerNode' - api_field: 'name' - field: 'name_prefix' provider_only: true - api_field: 'networkConfig.additionalNodeNetworkConfigs.network' - api_field: 'networkConfig.additionalNodeNetworkConfigs.subnetwork' - field: 'network_config.additional_pod_network_configs.max_pods_per_node' - api_field: 'network_config.additional_pod_network_configs.max_pods_per_node.max_pods_per_node' + api_field: 'networkConfig.additionalPodNetworkConfigs.maxPodsPerNode.maxPodsPerNode' - api_field: 'networkConfig.additionalPodNetworkConfigs.secondaryPodRange' - api_field: 'networkConfig.additionalPodNetworkConfigs.subnetwork' - api_field: 'networkConfig.createPodRange' - api_field: 'networkConfig.enablePrivateNodes' - api_field: 'networkConfig.networkPerformanceConfig.totalEgressBandwidthTier' - field: 'network_config.pod_cidr_overprovision_config.disabled' - api_field: 'network_config.pod_cidr_overprovision_config.disable' + api_field: 'networkConfig.podCidrOverprovisionConfig.disable' - api_field: 'networkConfig.podIpv4CidrBlock' - api_field: 'networkConfig.podRange' - api_field: 'networkConfig.subnetwork' - field: 'node_config.advanced_machine_features.enable_nested_virtualization' - api_field: 'config.advanced_machine_features.enable_nested_virtualization' + api_field: 'config.advancedMachineFeatures.enableNestedVirtualization' + - field: 'node_config.advanced_machine_features.performance_monitoring_unit' + api_field: 'config.advancedMachineFeatures.performanceMonitoringUnit' - field: 'node_config.advanced_machine_features.threads_per_core' - api_field: 'config.advanced_machine_features.threads_per_core' + api_field: 'config.advancedMachineFeatures.threadsPerCore' - field: 'node_config.boot_disk_kms_key' - api_field: 'config.boot_disk_kms_key' + api_field: 'config.bootDiskKmsKey' + - field: 'node_config.boot_disk.disk_type' + api_field: 'config.bootDisk.diskType' + - field: 'node_config.boot_disk.provisioned_iops' + api_field: 'config.bootDisk.provisionedIops' + - field: 'node_config.boot_disk.provisioned_throughput' + api_field: 'config.bootDisk.provisionedThroughput' + - field: 'node_config.boot_disk.size_gb' + api_field: 'config.bootDisk.sizeGb' - field: 'node_config.confidential_nodes.enabled' - api_field: 'config.confidential_nodes.enabled' + api_field: 'config.confidentialNodes.enabled' - field: 'node_config.confidential_nodes.confidential_instance_type' - api_field: 'config.confidential_nodes.confidential_instance_type' + api_field: 'config.confidentialNodes.confidentialInstanceType' - field: 'node_config.containerd_config.private_registry_access_config.certificate_authority_domain_config.fqdns' - api_field: 'config.containerd_config.private_registry_access_config.certificate_authority_domain_config.fqdns' + api_field: 'config.containerdConfig.privateRegistryAccessConfig.certificateAuthorityDomainConfig.fqdns' - field: 'node_config.containerd_config.private_registry_access_config.certificate_authority_domain_config.gcp_secret_manager_certificate_config.secret_uri' - api_field: 'config.containerd_config.private_registry_access_config.certificate_authority_domain_config.gcp_secret_manager_certificate_config.secret_uri' + api_field: 'config.containerdConfig.privateRegistryAccessConfig.certificateAuthorityDomainConfig.gcpSecretManagerCertificateConfig.secretUri' - field: 'node_config.containerd_config.private_registry_access_config.enabled' - api_field: 'config.containerd_config.private_registry_access_config.enabled' + api_field: 'config.containerdConfig.privateRegistryAccessConfig.enabled' - field: 'node_config.disk_size_gb' - api_field: 'config.disk_size_gb' + api_field: 'config.diskSizeGb' - field: 'node_config.disk_type' - api_field: 'config.disk_type' + api_field: 'config.diskType' - field: 'node_config.effective_taints.effect' provider_only: true - field: 'node_config.effective_taints.key' @@ -67,111 +77,183 @@ fields: - field: 'node_config.effective_taints.value' provider_only: true - field: 'node_config.enable_confidential_storage' - api_field: 'config.enable_confidential_storage' + api_field: 'config.enableConfidentialStorage' {{- if ne $.TargetVersionName "ga" }} - field: 'node_config.ephemeral_storage_config.local_ssd_count' - api_field: 'config.ephemeral_storage_config.local_ssd_count' + api_field: 'config.ephemeralStorageConfig.localSsdCount' {{- end }} + - field: 'node_config.ephemeral_storage_local_ssd_config.data_cache_count' + api_field: 'config.ephemeralStorageLocalSsdConfig.dataCacheCount' - field: 'node_config.ephemeral_storage_local_ssd_config.local_ssd_count' - api_field: 'config.ephemeral_storage_local_ssd_config.local_ssd_count' + api_field: 'config.ephemeralStorageLocalSsdConfig.localSsdCount' - field: 'node_config.fast_socket.enabled' - api_field: 'config.fast_socket.enabled' + api_field: 'config.fastSocket.enabled' + - field: node_config.flex_start + api_field: 'config.flexStart' - field: 'node_config.gcfs_config.enabled' - api_field: 'config.gcfs_config.enabled' + api_field: 'config.gcfsConfig.enabled' - field: 'node_config.guest_accelerator.count' - api_field: 'config.accelerators.accelerator_count' + api_field: 'config.accelerators.acceleratorCount' - field: 'node_config.guest_accelerator.gpu_driver_installation_config.gpu_driver_version' - api_field: 'config.accelerators.gpu_driver_installation_config.gpu_driver_version' + api_field: 'config.accelerators.gpuDriverInstallationConfig.gpuDriverVersion' - field: 'node_config.guest_accelerator.gpu_partition_size' - api_field: 'config.accelerators.gpu_partition_size' + api_field: 'config.accelerators.gpuPartitionSize' - field: 'node_config.guest_accelerator.gpu_sharing_config.gpu_sharing_strategy' - api_field: 'config.accelerators.gpu_sharing_config.gpu_sharing_strategy' + api_field: 'config.accelerators.gpuSharingConfig.gpuSharingStrategy' - field: 'node_config.guest_accelerator.gpu_sharing_config.max_shared_clients_per_gpu' - api_field: 'config.accelerators.gpu_sharing_config.max_shared_clients_per_gpu' + api_field: 'config.accelerators.gpuSharingConfig.maxSharedClientsPerGpu' - field: 'node_config.guest_accelerator.type' - api_field: 'config.accelerators.accelerator_type' + api_field: 'config.accelerators.acceleratorType' - field: 'node_config.gvnic.enabled' api_field: 'config.gvnic.enabled' - field: 'node_config.host_maintenance_policy.maintenance_interval' - api_field: 'config.host_maintenance_policy.maintenance_interval' + api_field: 'config.hostMaintenancePolicy.maintenanceInterval' - field: 'node_config.image_type' - api_field: 'config.image_type' + api_field: 'config.imageType' + - field: 'node_config.kubelet_config.allowed_unsafe_sysctls' + api_field: 'config.kubeletConfig.allowedUnsafeSysctls' + - field: 'node_config.kubelet_config.container_log_max_files' + api_field: 'config.kubeletConfig.containerLogMaxFiles' + - field: 'node_config.kubelet_config.container_log_max_size' + api_field: 'config.kubeletConfig.containerLogMaxSize' - field: 'node_config.kubelet_config.cpu_cfs_quota' - api_field: 'config.kubelet_config.cpu_cfs_quota' + api_field: 'config.kubeletConfig.cpuCfsQuota' - field: 'node_config.kubelet_config.cpu_cfs_quota_period' - api_field: 'config.kubelet_config.cpu_cfs_quota_period' + api_field: 'config.kubeletConfig.cpuCfsQuotaPeriod' - field: 'node_config.kubelet_config.cpu_manager_policy' - api_field: 'config.kubelet_config.cpu_manager_policy' + api_field: 'config.kubeletConfig.cpuManagerPolicy' + - field: 'node_config.kubelet_config.eviction_max_pod_grace_period_seconds' + api_field: 'config.kubeletConfig.evictionMaxPodGracePeriodSeconds' + - field: 'node_config.kubelet_config.eviction_minimum_reclaim.imagefs_available' + api_field: 'config.kubeletConfig.evictionMinimumReclaim.imagefsAvailable' + - field: 'node_config.kubelet_config.eviction_minimum_reclaim.imagefs_inodes_free' + api_field: 'config.kubeletConfig.evictionMinimumReclaim.imagefsInodesFree' + - field: 'node_config.kubelet_config.eviction_minimum_reclaim.memory_available' + api_field: 'config.kubeletConfig.evictionMinimumReclaim.memoryAvailable' + - field: 'node_config.kubelet_config.eviction_minimum_reclaim.nodefs_available' + api_field: 'config.kubeletConfig.evictionMinimumReclaim.nodefsAvailable' + - field: 'node_config.kubelet_config.eviction_minimum_reclaim.nodefs_inodes_free' + api_field: 'config.kubeletConfig.evictionMinimumReclaim.nodefsInodesFree' + - field: 'node_config.kubelet_config.eviction_minimum_reclaim.pid_available' + api_field: 'config.kubeletConfig.evictionMinimumReclaim.pidAvailable' + - field: 'node_config.kubelet_config.eviction_soft.imagefs_available' + api_field: 'config.kubeletConfig.evictionSoft.imagefsAvailable' + - field: 'node_config.kubelet_config.eviction_soft.imagefs_inodes_free' + api_field: 'config.kubeletConfig.evictionSoft.imagefsInodesFree' + - field: 'node_config.kubelet_config.eviction_soft.memory_available' + api_field: 'config.kubeletConfig.evictionSoft.memoryAvailable' + - field: 'node_config.kubelet_config.eviction_soft.nodefs_available' + api_field: 'config.kubeletConfig.evictionSoft.nodefsAvailable' + - field: 'node_config.kubelet_config.eviction_soft.nodefs_inodes_free' + api_field: 'config.kubeletConfig.evictionSoft.nodefsInodesFree' + - field: 'node_config.kubelet_config.eviction_soft.pid_available' + api_field: 'config.kubeletConfig.evictionSoft.pidAvailable' + - field: 'node_config.kubelet_config.eviction_soft_grace_period.imagefs_available' + api_field: 'config.kubeletConfig.evictionSoftGracePeriod.imagefsAvailable' + - field: 'node_config.kubelet_config.eviction_soft_grace_period.imagefs_inodes_free' + api_field: 'config.kubeletConfig.evictionSoftGracePeriod.imagefsInodesFree' + - field: 'node_config.kubelet_config.eviction_soft_grace_period.memory_available' + api_field: 'config.kubeletConfig.evictionSoftGracePeriod.memoryAvailable' + - field: 'node_config.kubelet_config.eviction_soft_grace_period.nodefs_available' + api_field: 'config.kubeletConfig.evictionSoftGracePeriod.nodefsAvailable' + - field: 'node_config.kubelet_config.eviction_soft_grace_period.nodefs_inodes_free' + api_field: 'config.kubeletConfig.evictionSoftGracePeriod.nodefsInodesFree' + - field: 'node_config.kubelet_config.eviction_soft_grace_period.pid_available' + api_field: 'config.kubeletConfig.evictionSoftGracePeriod.pidAvailable' + - field: 'node_config.kubelet_config.image_gc_high_threshold_percent' + api_field: 'config.kubeletConfig.imageGcHighThresholdPercent' + - field: 'node_config.kubelet_config.image_gc_low_threshold_percent' + api_field: 'config.kubeletConfig.imageGcLowThresholdPercent' + - field: 'node_config.kubelet_config.image_maximum_gc_age' + api_field: 'config.kubeletConfig.imageMaximumGcAge' + - field: 'node_config.kubelet_config.image_minimum_gc_age' + api_field: 'config.kubeletConfig.imageMinimumGcAge' - field: 'node_config.kubelet_config.insecure_kubelet_readonly_port_enabled' - api_field: 'config.kubelet_config.insecure_kubelet_readonly_port_enabled' + api_field: 'config.kubeletConfig.insecureKubeletReadonlyPortEnabled' + - field: 'node_config.kubelet_config.max_parallel_image_pulls' + api_field: 'config.kubeletConfig.maxParallelImagePulls' + - field: 'node_config.kubelet_config.memory_manager.policy' + api_field: 'config.kubeletConfig.memoryManager.policy' - field: 'node_config.kubelet_config.pod_pids_limit' - api_field: 'config.kubelet_config.pod_pids_limit' + api_field: 'config.kubeletConfig.podPidsLimit' + - field: 'node_config.kubelet_config.single_process_oom_kill' + api_field: 'config.kubeletConfig.singleProcessOomKill' + - field: 'node_config.kubelet_config.topology_manager.policy' + api_field: 'config.kubeletConfig.topologyManager.policy' + - field: 'node_config.kubelet_config.topology_manager.scope' + api_field: 'config.kubeletConfig.topologyManager.scope' - field: 'node_config.labels' api_field: 'config.labels' - field: 'node_config.linux_node_config.cgroup_mode' - api_field: 'config.linux_node_config.cgroup_mode' + api_field: 'config.linuxNodeConfig.cgroupMode' - field: 'node_config.linux_node_config.hugepages_config.hugepage_size_1g' - api_field: 'config.linux_node_config.hugepages.hugepage_size1g' + api_field: 'config.linuxNodeConfig.hugepages.hugepageSize1g' - field: 'node_config.linux_node_config.hugepages_config.hugepage_size_2m' - api_field: 'config.linux_node_config.hugepages.hugepage_size2m' + api_field: 'config.linuxNodeConfig.hugepages.hugepageSize2m' - field: 'node_config.linux_node_config.sysctls' - api_field: 'config.linux_node_config.sysctls' + api_field: 'config.linuxNodeConfig.sysctls' + - field: 'node_config.linux_node_config.transparent_hugepage_defrag' + api_field: 'config.linuxNodeConfig.transparentHugepageDefrag' + - field: 'node_config.linux_node_config.transparent_hugepage_enabled' + api_field: 'config.linuxNodeConfig.transparentHugepageEnabled' - field: 'node_config.local_nvme_ssd_block_config.local_ssd_count' - api_field: 'config.local_nvme_ssd_block_config.local_ssd_count' + api_field: 'config.localNvmeSsdBlockConfig.localSsdCount' - field: 'node_config.local_ssd_count' - api_field: 'config.local_ssd_count' + api_field: 'config.localSsdCount' - field: 'node_config.local_ssd_encryption_mode' - api_field: 'config.local_ssd_encryption_mode' + api_field: 'config.localSsdEncryptionMode' - field: 'node_config.logging_variant' - api_field: 'config.logging_config.variant_config.variant' + api_field: 'config.loggingConfig.variantConfig.variant' - field: 'node_config.machine_type' - api_field: 'config.machine_type' + api_field: 'config.machineType' - field: 'node_config.max_run_duration' - api_field: 'config.max_run_duration' + api_field: 'config.maxRunDuration' - field: 'node_config.metadata' api_field: 'config.metadata' - field: 'node_config.min_cpu_platform' - api_field: 'config.min_cpu_platform' + api_field: 'config.minCpuPlatform' - field: 'node_config.node_group' - api_field: 'config.node_group' + api_field: 'config.nodeGroup' - field: 'node_config.oauth_scopes' - api_field: 'config.oauth_scopes' + api_field: 'config.oauthScopes' - field: 'node_config.preemptible' api_field: 'config.preemptible' - field: 'node_config.reservation_affinity.consume_reservation_type' - api_field: 'config.reservation_affinity.consume_reservation_type' + api_field: 'config.reservationAffinity.consumeReservationType' - field: 'node_config.reservation_affinity.key' - api_field: 'config.reservation_affinity.key' + api_field: 'config.reservationAffinity.key' - field: 'node_config.reservation_affinity.values' - api_field: 'config.reservation_affinity.values' + api_field: 'config.reservationAffinity.values' - field: 'node_config.resource_labels' - api_field: 'config.resource_labels' + api_field: 'config.resourceLabels' - field: 'node_config.resource_manager_tags' - api_field: 'config.resource_manager_tags.tags' + api_field: 'config.resourceManagerTags.tags' {{- if ne $.TargetVersionName "ga" }} - field: 'node_config.sandbox_config.sandbox_type' - api_field: 'config.sandbox_config.sandbox_type' + api_field: 'config.sandboxConfig.sandboxType' {{- end }} - field: 'node_config.secondary_boot_disks.disk_image' - api_field: 'config.secondary_boot_disks.disk_image' + api_field: 'config.secondaryBootDisks.diskImage' - field: 'node_config.secondary_boot_disks.mode' - api_field: 'config.secondary_boot_disks.mode' + api_field: 'config.secondaryBootDisks.mode' - field: 'node_config.service_account' - api_field: 'config.service_account' + api_field: 'config.serviceAccount' - field: 'node_config.shielded_instance_config.enable_integrity_monitoring' - api_field: 'config.shielded_instance_config.enable_integrity_monitoring' + api_field: 'config.shieldedInstanceConfig.enableIntegrityMonitoring' - field: 'node_config.shielded_instance_config.enable_secure_boot' - api_field: 'config.shielded_instance_config.enable_secure_boot' + api_field: 'config.shieldedInstanceConfig.enableSecureBoot' + - field: 'node_config.sole_tenant_config.min_node_cpus' + api_field: 'config.soleTenantConfig.minNodeCpus' - field: 'node_config.sole_tenant_config.node_affinity.key' - api_field: 'config.sole_tenant_config.node_affinities.key' + api_field: 'config.soleTenantConfig.nodeAffinities.key' - field: 'node_config.sole_tenant_config.node_affinity.operator' - api_field: 'config.sole_tenant_config.node_affinities.operator' + api_field: 'config.soleTenantConfig.nodeAffinities.operator' - field: 'node_config.sole_tenant_config.node_affinity.values' - api_field: 'config.sole_tenant_config.node_affinities.values' + api_field: 'config.soleTenantConfig.nodeAffinities.values' - field: 'node_config.spot' api_field: 'config.spot' - field: 'node_config.storage_pools' - api_field: 'config.storage_pools' + api_field: 'config.storagePools' - field: 'node_config.tags' api_field: 'config.tags' - field: 'node_config.taint.effect' @@ -180,8 +262,10 @@ fields: api_field: 'config.taints.key' - field: 'node_config.taint.value' api_field: 'config.taints.value' + - field: 'node_config.windows_node_config.osversion' + api_field: 'config.windowsNodeConfig.osVersion' - field: 'node_config.workload_metadata_config.mode' - api_field: 'config.workload_metadata_config.mode' + api_field: 'config.workloadMetadataConfig.mode' - field: 'node_count' provider_only: true - field: 'node_locations' diff --git a/mmv1/third_party/terraform/services/gkehub/resource_gke_hub_feature_membership_meta.yaml.tmpl b/mmv1/third_party/terraform/services/gkehub/resource_gke_hub_feature_membership_meta.yaml.tmpl index bb160974eefd..4cb604caa2c6 100644 --- a/mmv1/third_party/terraform/services/gkehub/resource_gke_hub_feature_membership_meta.yaml.tmpl +++ b/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' diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_meta.yaml b/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_meta.yaml index de27213f7a2f..467d4c9b6159 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_folder_meta.yaml +++ b/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' diff --git a/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_meta.yaml b/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_meta.yaml.tmpl similarity index 53% rename from mmv1/third_party/terraform/services/sql/resource_sql_database_instance_meta.yaml rename to mmv1/third_party/terraform/services/sql/resource_sql_database_instance_meta.yaml.tmpl index 7286fc63df0f..e354b447ed50 100644 --- a/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_meta.yaml +++ b/mmv1/third_party/terraform/services/sql/resource_sql_database_instance_meta.yaml.tmpl @@ -3,7 +3,7 @@ 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' @@ -11,46 +11,70 @@ fields: - 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' diff --git a/mmv1/third_party/terraform/services/sql/resource_sql_user_meta.yaml b/mmv1/third_party/terraform/services/sql/resource_sql_user_meta.yaml index 946c446b8512..d60b7a6a7078 100644 --- a/mmv1/third_party/terraform/services/sql/resource_sql_user_meta.yaml +++ b/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' diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_meta.yaml b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_meta.yaml index 5fb8a4781a45..d121a97f2e84 100644 --- a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_meta.yaml +++ b/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' diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_object_meta.yaml b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_object_meta.yaml index 974285729107..cd88b6c818fa 100644 --- a/mmv1/third_party/terraform/services/storage/resource_storage_bucket_object_meta.yaml +++ b/mmv1/third_party/terraform/services/storage/resource_storage_bucket_object_meta.yaml @@ -11,21 +11,33 @@ fields: - api_field: 'contentEncoding' - api_field: 'contentLanguage' - api_field: 'contentType' - - field: 'crc32c' + - api_field: 'checksums.crc32c' + field: 'crc32c' - api_field: 'customerEncryption.encryptionAlgorithm' - field: 'customer_encryption.encryption_key' + - field: 'deletion_policy' + provider_only: true - field: 'detect_md5hash' + provider_only: true - api_field: 'eventBasedHold' + - field: 'force_empty_content_type' + provider_only: true - api_field: 'generation' - - field: 'kms_key_name' - - field: 'md5hash' + - api_field: 'kmsKey' + field: 'kms_key_name' + - api_field: 'checksums.md5Hash' + field: 'md5hash' + - api_field: 'checksums.md5Hash' + field: 'md5hexhash' - field: 'media_link' - api_field: 'metadata' - api_field: 'name' - - field: 'output_name' + - api_field: 'name' + field: 'output_name' - api_field: 'retention.mode' - api_field: 'retention.retainUntilTime' - field: 'self_link' - field: 'source' + - field: 'source_md5hash' - api_field: 'storageClass' - api_field: 'temporaryHold' diff --git a/mmv1/third_party/terraform/services/storage/resource_storage_notification_meta.yaml b/mmv1/third_party/terraform/services/storage/resource_storage_notification_meta.yaml index 975b0e639c37..2404947be6e4 100644 --- a/mmv1/third_party/terraform/services/storage/resource_storage_notification_meta.yaml +++ b/mmv1/third_party/terraform/services/storage/resource_storage_notification_meta.yaml @@ -7,6 +7,7 @@ fields: - field: 'bucket' - api_field: 'customAttributes' - api_field: 'eventTypes' + - field: 'id' - field: 'notification_id' - api_field: 'objectNamePrefix' - api_field: 'payloadFormat' diff --git a/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job_meta.yaml b/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job_meta.yaml index d47e58db1483..5950abca6af8 100644 --- a/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job_meta.yaml +++ b/mmv1/third_party/terraform/services/storagetransfer/resource_storage_transfer_job_meta.yaml @@ -12,6 +12,10 @@ fields: - api_field: 'eventStream.name' - api_field: 'lastModificationTime' - api_field: 'name' + - api_field: 'loggingConfig.enableOnpremGcsTransferLogs' + field: 'logging_config.enable_on_prem_gcs_transfer_logs' + - api_field: 'loggingConfig.logActionStates' + - api_field: 'loggingConfig.logActions' - api_field: 'notificationConfig.eventTypes' - api_field: 'notificationConfig.payloadFormat' - api_field: 'notificationConfig.pubsubTopic' @@ -28,6 +32,15 @@ fields: - api_field: 'replicationSpec.objectConditions.minTimeElapsedSinceLastModification' - api_field: 'replicationSpec.transferOptions.deleteObjectsFromSourceAfterTransfer' - api_field: 'replicationSpec.transferOptions.deleteObjectsUniqueInSink' + - api_field: 'replicationSpec.transferOptions.metadataOptions.acl' + - api_field: 'replicationSpec.transferOptions.metadataOptions.gid' + - api_field: 'replicationSpec.transferOptions.metadataOptions.kmsKey' + - api_field: 'replicationSpec.transferOptions.metadataOptions.mode' + - api_field: 'replicationSpec.transferOptions.metadataOptions.storageClass' + - api_field: 'replicationSpec.transferOptions.metadataOptions.symlink' + - api_field: 'replicationSpec.transferOptions.metadataOptions.temporaryHold' + - api_field: 'replicationSpec.transferOptions.metadataOptions.timeCreated' + - api_field: 'replicationSpec.transferOptions.metadataOptions.uid' - api_field: 'replicationSpec.transferOptions.overwriteObjectsAlreadyExistingInSink' - api_field: 'replicationSpec.transferOptions.overwriteWhen' - api_field: 'schedule.repeatInterval' @@ -41,6 +54,7 @@ fields: - api_field: 'schedule.startTimeOfDay.minutes' - api_field: 'schedule.startTimeOfDay.nanos' - api_field: 'schedule.startTimeOfDay.seconds' + - api_field: 'serviceAccount' - api_field: 'status' - api_field: 'transferSpec.awsS3DataSource.awsAccessKey.accessKeyId' - api_field: 'transferSpec.awsS3DataSource.awsAccessKey.secretAccessKey' @@ -84,5 +98,14 @@ fields: - api_field: 'transferSpec.transferManifest.location' - api_field: 'transferSpec.transferOptions.deleteObjectsFromSourceAfterTransfer' - api_field: 'transferSpec.transferOptions.deleteObjectsUniqueInSink' + - api_field: 'transferSpec.transferOptions.metadataOptions.acl' + - api_field: 'transferSpec.transferOptions.metadataOptions.gid' + - api_field: 'transferSpec.transferOptions.metadataOptions.kmsKey' + - api_field: 'transferSpec.transferOptions.metadataOptions.mode' + - api_field: 'transferSpec.transferOptions.metadataOptions.storageClass' + - api_field: 'transferSpec.transferOptions.metadataOptions.symlink' + - api_field: 'transferSpec.transferOptions.metadataOptions.temporaryHold' + - api_field: 'transferSpec.transferOptions.metadataOptions.timeCreated' + - api_field: 'transferSpec.transferOptions.metadataOptions.uid' - api_field: 'transferSpec.transferOptions.overwriteObjectsAlreadyExistingInSink' - api_field: 'transferSpec.transferOptions.overwriteWhen' diff --git a/mmv1/third_party/tgc/resource_converters.go.tmpl b/mmv1/third_party/tgc/resource_converters.go.tmpl index dcf712adb631..34da07386e72 100644 --- a/mmv1/third_party/tgc/resource_converters.go.tmpl +++ b/mmv1/third_party/tgc/resource_converters.go.tmpl @@ -94,6 +94,7 @@ import ( "github.com/GoogleCloudPlatform/terraform-google-conversion/v7/tfplan2cai/converters/google/resources/services/vertexai" "github.com/GoogleCloudPlatform/terraform-google-conversion/v7/tfplan2cai/converters/google/resources/services/vpcaccess" "github.com/GoogleCloudPlatform/terraform-google-conversion/v7/tfplan2cai/converters/google/resources/services/workbench" + "github.com/GoogleCloudPlatform/terraform-google-conversion/v7/tfplan2cai/converters/google/resources/services/vmwareengine" ) @@ -210,7 +211,9 @@ func ResourceConverters() map[string][]cai.ResourceConverter { "google_cloudfunctions_function": {cloudfunctions.ResourceConverterCloudFunctionsCloudFunction()}, "google_monitoring_notification_channel": {monitoring.ResourceConverterMonitoringNotificationChannel()}, "google_monitoring_alert_policy": {monitoring.ResourceConverterMonitoringAlertPolicy()}, - "google_vertex_ai_dataset": {vertexai.ResourceConverterVertexAIDataset()}, + "google_vertex_ai_dataset": {vertexai.ResourceConverterVertexAIDataset()}, + "google_vmwareengine_network_peering": {vmwareengine.ResourceConverterVmwareengineNetworkPeering()}, + "google_workbench_instance": {workbench.ResourceConverterWorkbenchInstance()}, {{- range $object := $.IamResources }} {{- if $object.IamClassName }} "{{ $object.TerraformName }}_iam_policy": { {{- $object.IamClassName }}IamPolicy()}, diff --git a/mmv1/third_party/tgc/tests/data/google_vmwareengine_network_peering.json b/mmv1/third_party/tgc/tests/data/google_vmwareengine_network_peering.json new file mode 100644 index 000000000000..9e7d82dc05c3 --- /dev/null +++ b/mmv1/third_party/tgc/tests/data/google_vmwareengine_network_peering.json @@ -0,0 +1,20 @@ +[{ + "asset_type": "vmwareengine.googleapis.com/NetworkPeering", + "name": "//vmwareengine.googleapis.com/projects/{{.Provider.project}}/locations/global/networkPeerings/network-peering-test", + "ancestry_path": "{{.Ancestry}}/project/{{.Provider.project}}", + "resource": { + "version": "v1", + "discovery_document_uri": "https://vmwareengine.googleapis.com/$discovery/rest", + "discovery_name": "NetworkPeering", + "parent": "//cloudresourcemanager.googleapis.com/projects/{{.Provider.project}}", + "data": { + "peerNetworkType": "STANDARD", + "peerNetwork" : "projects/{{.Provider.Project}}/locations/global/vmwareEngineNetworks/network-peering-test-nw", + "vmwareEngineNetwork" : "projects/{{.Provider.Project}}/locations/global/vmwareEngineNetworks/network-peering-test-ven", + "exportCustomRoutes": true, + "exportCustomRoutesWithPublicIp": true, + "importCustomRoutes": true, + "importCustomRoutesWithPublicIp": true + } + } +}] diff --git a/mmv1/third_party/tgc/tests/data/google_vmwareengine_network_peering.tf b/mmv1/third_party/tgc/tests/data/google_vmwareengine_network_peering.tf new file mode 100644 index 000000000000..b28dd845414b --- /dev/null +++ b/mmv1/third_party/tgc/tests/data/google_vmwareengine_network_peering.tf @@ -0,0 +1,6 @@ +resource "google_vmwareengine_network_peering" "peering" { + name = "network-peering-test" + peer_network = "projects/{{.Provider.Project}}/locations/global/vmwareEngineNetworks/network-peering-test-nw" + peer_network_type = "STANDARD" + vmware_engine_network = "projects/{{.Provider.Project}}/locations/global/vmwareEngineNetworks/network-peering-test-ven" +} diff --git a/mmv1/third_party/tgc/tests/data/workbench_instance.json b/mmv1/third_party/tgc/tests/data/workbench_instance.json new file mode 100644 index 000000000000..876febb0f7d0 --- /dev/null +++ b/mmv1/third_party/tgc/tests/data/workbench_instance.json @@ -0,0 +1,26 @@ +[ + { + "name": "//notebooks.googleapis.com/projects/{{.Provider.project}}/locations/us-central1-a/instances/workbench-instance-cai", + "asset_type": "notebooks.googleapis.com/Instance", + "ancestry_path": "{{.Ancestry}}/project/{{.Provider.project}}", + "resource": { + "version": "v2", + "discovery_document_uri": "https://notebooks.googleapis.com/$discovery/rest", + "discovery_name": "Instance", + "parent": "//cloudresourcemanager.googleapis.com/projects/{{.Provider.project}}", + "data": { + "gceSetup": { + "machineType": "e2-standard-2", + "shieldedInstanceConfig": { + "enableSecureBoot": true, + "enableVtpm": true, + "enableIntegrityMonitoring": true + } + }, + "labels": { + "goog-terraform-provisioned": "true" + } + } + } + } +] diff --git a/mmv1/third_party/tgc/tests/data/workbench_instance.tf b/mmv1/third_party/tgc/tests/data/workbench_instance.tf new file mode 100644 index 000000000000..be10eaf63a34 --- /dev/null +++ b/mmv1/third_party/tgc/tests/data/workbench_instance.tf @@ -0,0 +1,13 @@ + +resource "google_workbench_instance" "basic" { + name = "workbench-instance-cai" + location = "us-central1-a" + gce_setup { + machine_type = "e2-standard-2" + shielded_instance_config { + enable_secure_boot = true + enable_vtpm = true + enable_integrity_monitoring = true + } + } +}