Upgrade terraform provider google beta to v6.48.0 (#3330)

Generated via `upgrade-provider pulumi/pulumi-gcp`

Merge conflict fixed in
upstream/google-beta/services/sql/resource_sql_database_instance.go

Closes #3321

Author: ruifung

patches/0002-Add-nil-checks-for-sql-database-instance-flattening.patch

@@ -5,21 +5,21 @@ Subject: [PATCH] Add nil checks for sql database instance flattening
 
 
 diff --git a/google-beta/services/sql/resource_sql_database_instance.go b/google-beta/services/sql/resource_sql_database_instance.go
-index 608fb4afa..6bb91c84b 100644
+index 2aaecce83..22eca909c 100644
 --- a/google-beta/services/sql/resource_sql_database_instance.go
 +++ b/google-beta/services/sql/resource_sql_database_instance.go
-@@ -2362,6 +2362,10 @@ func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta interface{})
+@@ -2399,6 +2399,10 @@ func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta interface{})
  }
 
- func flattenSettings(settings *sqladmin.Settings, d *schema.ResourceData) []map[string]interface{} {
+ func flattenSettings(settings *sqladmin.Settings, iType string, d *schema.ResourceData) []map[string]interface{} {
 +	if settings == nil {
 +		return nil
 +	}
 +
  	data := map[string]interface{}{
  		"version":                          settings.SettingsVersion,
  		"tier":                             settings.Tier,
-@@ -2469,6 +2473,10 @@ func flattenDataCacheConfig(d *sqladmin.DataCacheConfig) []map[string]interface{
+@@ -2519,6 +2523,10 @@ func flattenDataCacheConfig(d *sqladmin.DataCacheConfig) []map[string]interface{
  }
 
  func flattenBackupConfiguration(backupConfiguration *sqladmin.BackupConfiguration) []map[string]interface{} {
@@ -30,7 +30,7 @@ index 608fb4afa..6bb91c84b 100644
  	data := map[string]interface{}{
  		"binary_log_enabled":             backupConfiguration.BinaryLogEnabled,
  		"enabled":                        backupConfiguration.Enabled,
-@@ -2609,6 +2617,10 @@ func flattenConnectionPoolConfig(connectionPoolConfig *sqladmin.ConnectionPoolCo
+@@ -2663,6 +2671,10 @@ func flattenConnectionPoolConfig(connectionPoolConfig *sqladmin.ConnectionPoolCo
  }
 
  func flattenIpConfiguration(ipConfiguration *sqladmin.IpConfiguration, d *schema.ResourceData) interface{} {
@@ -41,7 +41,7 @@ index 608fb4afa..6bb91c84b 100644
  	data := map[string]interface{}{
  		"ipv4_enabled":       ipConfiguration.Ipv4Enabled,
  		"private_network":    ipConfiguration.PrivateNetwork,
-@@ -2673,6 +2685,10 @@ func flattenAuthorizedNetworks(entries []*sqladmin.AclEntry) interface{} {
+@@ -2728,6 +2740,10 @@ func flattenAuthorizedNetworks(entries []*sqladmin.AclEntry) interface{} {
  }
 
  func flattenLocationPreference(locationPreference *sqladmin.LocationPreference) interface{} {
@@ -52,7 +52,7 @@ index 608fb4afa..6bb91c84b 100644
  	data := map[string]interface{}{
  		"follow_gae_application": locationPreference.FollowGaeApplication,
  		"zone":                   locationPreference.Zone,
-@@ -2683,6 +2699,10 @@ func flattenLocationPreference(locationPreference *sqladmin.LocationPreference)
+@@ -2738,6 +2754,10 @@ func flattenLocationPreference(locationPreference *sqladmin.LocationPreference)
  }
 
  func flattenMaintenanceWindow(maintenanceWindow *sqladmin.MaintenanceWindow) interface{} {
@@ -63,7 +63,7 @@ index 608fb4afa..6bb91c84b 100644
  	data := map[string]interface{}{
  		"day":          maintenanceWindow.Day,
  		"hour":         maintenanceWindow.Hour,
-@@ -2774,6 +2794,10 @@ func flattenServerCaCerts(caCerts []*sqladmin.SslCert) []map[string]interface{}
+@@ -2829,6 +2849,10 @@ func flattenServerCaCerts(caCerts []*sqladmin.SslCert) []map[string]interface{}
  }
 
  func flattenInsightsConfig(insightsConfig *sqladmin.InsightsConfig) interface{} {

patches/0003-rebase-bigquery_dataset.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] rebase bigquery_dataset
 
 
 diff --git a/google-beta/services/bigquery/resource_bigquery_dataset.go b/google-beta/services/bigquery/resource_bigquery_dataset.go
-index 884c11e6d..f0807e321 100644
+index 06e82b28b..ebaf156dd 100644
 --- a/google-beta/services/bigquery/resource_bigquery_dataset.go
 +++ b/google-beta/services/bigquery/resource_bigquery_dataset.go
-@@ -799,8 +799,13 @@ func resourceBigQueryDatasetRead(d *schema.ResourceData, meta interface{}) error
+@@ -830,8 +830,13 @@ func resourceBigQueryDatasetRead(d *schema.ResourceData, meta interface{}) error
  	if err := d.Set("effective_labels", flattenBigQueryDatasetEffectiveLabels(res["labels"], d, config)); err != nil {
  		return fmt.Errorf("Error reading Dataset: %s", err)
  	}

patches/0005-docs-patching.patch

@@ -400,14 +400,14 @@ diff --git a/website/docs/r/cloud_run_service.html.markdown b/website/docs/r/clo
 index c78432abc..f88c6585b 100644
 --- a/website/docs/r/cloud_run_service.html.markdown
 +++ b/website/docs/r/cloud_run_service.html.markdown
-@@ -33,9 +33,64 @@ To get more information about Service, see:
+@@ -33,8 +33,63 @@ To get more information about Service, see:
  ~> **Warning:** We recommend using the `google_cloud_run_v2_service` resource which offers a better
  developer experience and broader support of Cloud Run features.
 
 -## Example Usage - Cloud Run Service Basic
 +## Example Usage - Cloud Run Service Pubsub
- 
- 
++
++
 +```hcl
 +resource "google_cloud_run_service" "default" {
 +    name     = "cloud_run_service_name"
@@ -460,12 +460,11 @@ index c78432abc..f88c6585b 100644
 +  }
 +}
 +```
-+
+ 
 +## Example Usage - Cloud Run Service Basic
-+
+ 
  ```hcl
  resource "google_cloud_run_service" "default" {
-   name     = "cloudrun-srv"
 @@ -118,7 +173,7 @@ resource "google_cloud_run_service" "default" {
        annotations = {
          "autoscaling.knative.dev/maxScale"      = "1000"
@@ -1609,7 +1608,7 @@ index d88864517..9095d5782 100644
  <div class = "oics-button" style="float: right; margin: 0 0 -15px">
    <a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md&cloudshell_working_dir=vpn_tunnel_basic&open_in_editor=main.tf" target="_blank">
 diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown
-index c713ee542..f9b8d84d7 100644
+index a0719c567..3e2928fdc 100644
 --- a/website/docs/r/container_cluster.html.markdown
 +++ b/website/docs/r/container_cluster.html.markdown
 @@ -27,15 +27,12 @@ To get more information about GKE clusters, see:
@@ -1700,7 +1699,7 @@ index c713ee542..f9b8d84d7 100644
  release channel, but will not unenroll it. Instead, use the `"UNSPECIFIED"`
  channel. Structure is [documented below](#nested_release_channel).
 
-@@ -962,10 +980,6 @@ gvnic {
+@@ -965,10 +983,6 @@ gvnic {
 
  * `guest_accelerator` - (Optional) List of the type and count of accelerator cards attached to the instance.
      Structure [documented below](#nested_guest_accelerator).
@@ -1711,7 +1710,7 @@ index c713ee542..f9b8d84d7 100644
 
  * `image_type` - (Optional) The image type to use for this node. Note that changing the image type
      will delete and recreate all nodes in the node pool.
-@@ -992,7 +1006,7 @@ gvnic {
+@@ -995,7 +1009,7 @@ gvnic {
  * `metadata` - (Optional) The metadata key/value pairs assigned to instances in
      the cluster. From GKE `1.12` onwards, `disable-legacy-endpoints` is set to
      `true` by the API; if `metadata` is set but that default value is not
@@ -1720,7 +1719,7 @@ index c713ee542..f9b8d84d7 100644
      value in your config.
 
  * `min_cpu_platform` - (Optional) Minimum CPU platform to be used by this instance.
-@@ -1017,10 +1031,7 @@ gvnic {
+@@ -1020,10 +1034,7 @@ gvnic {
      See the [official documentation](https://cloud.google.com/kubernetes-engine/docs/concepts/spot-vms)
      for more information. Defaults to false.
 
@@ -1732,7 +1731,7 @@ index c713ee542..f9b8d84d7 100644
 
  * `service_account` - (Optional) The service account to be used by the Node VMs.
      If not specified, the "default" service account is used.
-@@ -1034,13 +1045,14 @@ gvnic {
+@@ -1037,13 +1048,14 @@ gvnic {
 
  * `resource_manager_tags` - (Optional) A map of resource manager tag keys and values to be attached to the nodes for managing Compute Engine firewalls using Network Firewall Policies. Tags must be according to specifications found [here](https://cloud.google.com/vpc/docs/tags-firewalls-overview#specifications). A maximum of 5 tag key-value pairs can be specified. Existing tags will be replaced with new values. Tags must be in one of the following formats ([KEY]=[VALUE]) 1. `tagKeys/{tag_key_id}=tagValues/{tag_value_id}` 2. `{org_id}/{tag_key_name}={tag_value_name}` 3. `{project_id}/{tag_key_name}={tag_value_name}`.
 
@@ -1754,7 +1753,7 @@ index c713ee542..f9b8d84d7 100644
 
  * `workload_metadata_config` - (Optional) Metadata configuration to expose to workloads on the node pool.
      Structure is [documented below](#nested_workload_metadata_config).
-@@ -1333,7 +1345,7 @@ for more details. This field only applies to private clusters, when
+@@ -1347,7 +1359,7 @@ for more details. This field only applies to private clusters, when
  * `private_endpoint_subnetwork` - (Optional) Subnetwork in cluster's network where master's endpoint will be provisioned.
 
  * `master_global_access_config` (Optional) - Controls cluster master global
@@ -1763,7 +1762,7 @@ index c713ee542..f9b8d84d7 100644
  not modify the previously-set value. Structure is [documented below](#nested_master_global_access_config).
 
  In addition, the `private_cluster_config` allows access to the following read-only fields:
-@@ -1441,9 +1453,9 @@ Enables monitoring and attestation of the boot integrity of the instance. The at
+@@ -1455,9 +1467,9 @@ Enables monitoring and attestation of the boot integrity of the instance. The at
 
  * `mode` (Required) How to expose the node metadata to the workload running on the node.
      Accepted values are:
@@ -3571,7 +3570,7 @@ index 94c3db9d4..091d0e9ac 100644
  * `default_time_zone` - (Optional) The default time zone for the database. The default time zone must be a valid name
  from the tz database. Default value is "America/Los_angeles".
 diff --git a/website/docs/r/sql_database_instance.html.markdown b/website/docs/r/sql_database_instance.html.markdown
-index 7fbfef1b7..6e576b004 100644
+index 8a3712588..117dcd9ee 100644
 --- a/website/docs/r/sql_database_instance.html.markdown
 +++ b/website/docs/r/sql_database_instance.html.markdown
 @@ -24,12 +24,12 @@ Creates a new Google SQL Database Instance. For more information, see the [offic
@@ -3589,7 +3588,7 @@ index 7fbfef1b7..6e576b004 100644
  It is recommended to not set this field (or set it to true) until you're ready to destroy the instance and its databases.
 
  ## Example Usage
-@@ -281,7 +281,7 @@ SQL Server version to use. Supported values include `MYSQL_5_6`,
+@@ -306,7 +306,7 @@ SQL Server version to use. Supported values include `MYSQL_5_6`,
  includes an up-to-date reference of supported versions.
 
  * `name` - (Optional, Computed) The name of the instance. If the name is left
@@ -3598,7 +3597,7 @@ index 7fbfef1b7..6e576b004 100644
      created. This is done because after a name is used, it cannot be reused for
      up to [one week](https://cloud.google.com/sql/docs/delete-instance).
 
-@@ -303,7 +303,7 @@ includes an up-to-date reference of supported versions.
+@@ -328,7 +328,7 @@ includes an up-to-date reference of supported versions.
 
  * `encryption_key_name` - (Optional)
      The full path to the encryption key used for the CMEK disk encryption.  Setting
@@ -3607,7 +3606,7 @@ index 7fbfef1b7..6e576b004 100644
      The provided key must be in the same region as the SQL instance.  In order
      to use this feature, a special kind of service account must be created and
      granted permission on this key.  This step can currently only be done
-@@ -311,20 +311,16 @@ includes an up-to-date reference of supported versions.
+@@ -336,20 +336,16 @@ includes an up-to-date reference of supported versions.
      That service account needs the `Cloud KMS > Cloud KMS CryptoKey Encrypter/Decrypter` role on your
      key - please see [this step](https://cloud.google.com/sql/docs/mysql/configure-cmek#grantkey).
 
@@ -3633,7 +3632,7 @@ index 7fbfef1b7..6e576b004 100644
      configuration is detailed below.
 
  The `settings` block supports:
-@@ -588,7 +584,7 @@ The optional `clone` block supports:
+@@ -619,7 +615,7 @@ The optional `clone` block supports:
  * `allocated_ip_range` -  (Optional) The name of the allocated ip range for the private ip CloudSQL instance. For example: "google-managed-services-default". If set, the cloned instance ip will be created in the allocated range. The range name must comply with [RFC 1035](https://tools.ietf.org/html/rfc1035). Specifically, the name must be 1-63 characters long and match the regular expression [a-z]([-a-z0-9]*[a-z0-9])?.
 
  The optional `restore_backup_context` block supports:
@@ -3642,7 +3641,7 @@ index 7fbfef1b7..6e576b004 100644
  block during resource creation/update will trigger the restore action after the resource is created/updated.
 
  * `backup_run_id` - (Required) The ID of the backup run to restore from.
-@@ -652,21 +648,13 @@ instance.
+@@ -685,21 +681,13 @@ instance.
 
    * A `PRIVATE` address is an address for an instance which has been configured to use private networking see: [Private IP](https://cloud.google.com/sql/docs/mysql/private-ip).
 

patches/0008-Fix-794-with-an-unconditional-read.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix #794 with an unconditional read.
 
 
 diff --git a/google-beta/services/sql/resource_sql_database_instance.go b/google-beta/services/sql/resource_sql_database_instance.go
-index 6bb91c84b..c6d77f2d1 100644
+index 22eca909c..f3a557250 100644
 --- a/google-beta/services/sql/resource_sql_database_instance.go
 +++ b/google-beta/services/sql/resource_sql_database_instance.go
-@@ -2172,10 +2172,11 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
+@@ -2205,10 +2205,11 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
  		if err != nil {
  			return err
  		}