Upgrade terraform-provider-google-beta to v6.9.0 (#2549)

This PR was generated via `$ upgrade-provider pulumi/pulumi-gcp`.

---

- Upgrading terraform-provider-google-beta from 6.7.0  to 6.9.0.
	Fixes #2547
	Fixes #2540

patches/0001-Allow-disabling-the-partner-name.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Allow disabling the partner name
 Add options to set or disable partner name.
 
 diff --git a/google-beta/provider/provider.go b/google-beta/provider/provider.go
-index 26c04953d..db8f8792e 100644
+index 58c19e19b..e280102fd 100644
 --- a/google-beta/provider/provider.go
 +++ b/google-beta/provider/provider.go
 @@ -122,6 +122,19 @@ func Provider() *schema.Provider {
@@ -29,7 +29,7 @@ index 26c04953d..db8f8792e 100644
  			"request_reason": {
  				Type:     schema.TypeString,
  				Optional: true,
-@@ -915,6 +928,21 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
+@@ -925,6 +938,21 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
  		UserAgent:           p.UserAgent("terraform-provider-google-beta", version.ProviderVersion),
  	}
 

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

@@ -5,10 +5,10 @@ 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 3c4a2074e..b683e06f0 100644
+index 44400c32b..3f9e9a5df 100644
 --- a/google-beta/services/sql/resource_sql_database_instance.go
 +++ b/google-beta/services/sql/resource_sql_database_instance.go
-@@ -2089,6 +2089,10 @@ func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta interface{})
+@@ -2090,6 +2090,10 @@ func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta interface{})
  }
 
  func flattenSettings(settings *sqladmin.Settings, d *schema.ResourceData) []map[string]interface{} {
@@ -19,7 +19,7 @@ index 3c4a2074e..b683e06f0 100644
  	data := map[string]interface{}{
  		"version":                     settings.SettingsVersion,
  		"tier":                        settings.Tier,
-@@ -2179,6 +2183,10 @@ func flattenDataCacheConfig(d *sqladmin.DataCacheConfig) []map[string]interface{
+@@ -2180,6 +2184,10 @@ func flattenDataCacheConfig(d *sqladmin.DataCacheConfig) []map[string]interface{
  }
 
  func flattenBackupConfiguration(backupConfiguration *sqladmin.BackupConfiguration) []map[string]interface{} {
@@ -30,7 +30,7 @@ index 3c4a2074e..b683e06f0 100644
  	data := map[string]interface{}{
  		"binary_log_enabled":             backupConfiguration.BinaryLogEnabled,
  		"enabled":                        backupConfiguration.Enabled,
-@@ -2271,6 +2279,10 @@ func flattenDatabaseFlags(databaseFlags []*sqladmin.DatabaseFlags) []map[string]
+@@ -2272,6 +2280,10 @@ func flattenDatabaseFlags(databaseFlags []*sqladmin.DatabaseFlags) []map[string]
  }
 
  func flattenIpConfiguration(ipConfiguration *sqladmin.IpConfiguration, d *schema.ResourceData) interface{} {
@@ -41,7 +41,7 @@ index 3c4a2074e..b683e06f0 100644
  	data := map[string]interface{}{
  		"ipv4_enabled":       ipConfiguration.Ipv4Enabled,
  		"private_network":    ipConfiguration.PrivateNetwork,
-@@ -2317,6 +2329,10 @@ func flattenAuthorizedNetworks(entries []*sqladmin.AclEntry) interface{} {
+@@ -2318,6 +2330,10 @@ func flattenAuthorizedNetworks(entries []*sqladmin.AclEntry) interface{} {
  }
 
  func flattenLocationPreference(locationPreference *sqladmin.LocationPreference) interface{} {
@@ -52,7 +52,7 @@ index 3c4a2074e..b683e06f0 100644
  	data := map[string]interface{}{
  		"follow_gae_application": locationPreference.FollowGaeApplication,
  		"zone":                   locationPreference.Zone,
-@@ -2327,6 +2343,10 @@ func flattenLocationPreference(locationPreference *sqladmin.LocationPreference)
+@@ -2328,6 +2344,10 @@ func flattenLocationPreference(locationPreference *sqladmin.LocationPreference)
  }
 
  func flattenMaintenanceWindow(maintenanceWindow *sqladmin.MaintenanceWindow) interface{} {
@@ -63,7 +63,7 @@ index 3c4a2074e..b683e06f0 100644
  	data := map[string]interface{}{
  		"day":          maintenanceWindow.Day,
  		"hour":         maintenanceWindow.Hour,
-@@ -2401,6 +2421,10 @@ func flattenServerCaCerts(caCerts []*sqladmin.SslCert) []map[string]interface{}
+@@ -2402,6 +2422,10 @@ func flattenServerCaCerts(caCerts []*sqladmin.SslCert) []map[string]interface{}
  }
 
  func flattenInsightsConfig(insightsConfig *sqladmin.InsightsConfig) interface{} {

patches/0004-website-docs-d-tweaks.patch

@@ -37,7 +37,7 @@ index d2ae162e1..c435027aa 100644
 -See [google_compute_forwarding_rule](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_forwarding_rule) resource for details of the available attributes.
 +See google_compute_forwarding_rule resource for details of the available attributes.
 diff --git a/website/docs/d/compute_global_forwarding_rule.html.markdown b/website/docs/d/compute_global_forwarding_rule.html.markdown
-index 50f04270d..87cb31d7c 100644
+index e8abc6b59..bef58b1da 100644
 --- a/website/docs/d/compute_global_forwarding_rule.html.markdown
 +++ b/website/docs/d/compute_global_forwarding_rule.html.markdown
 @@ -28,4 +28,4 @@ The following arguments are supported:
@@ -47,7 +47,7 @@ index 50f04270d..87cb31d7c 100644
 -See [google_compute_global_forwarding_rule](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_global_forwarding_rule) resource for details of the available attributes.
 +See google_compute_global_forwarding_rule resource for details of the available attributes.
 diff --git a/website/docs/d/compute_instance.html.markdown b/website/docs/d/compute_instance.html.markdown
-index 743fc9f1a..4b1ae7d5f 100644
+index b2a64d881..7b7fdf30f 100644
 --- a/website/docs/d/compute_instance.html.markdown
 +++ b/website/docs/d/compute_instance.html.markdown
 @@ -11,7 +11,6 @@ Get information about a VM instance resource within GCE. For more information se
@@ -58,7 +58,7 @@ index 743fc9f1a..4b1ae7d5f 100644
  ## Example Usage
 
  ```hcl
-@@ -97,15 +96,15 @@ The following arguments are supported:
+@@ -99,15 +98,15 @@ The following arguments are supported:
 
  * `attached_disk.0.disk_encryption_key_sha256` - The [RFC 4648 base64](https://tools.ietf.org/html/rfc4648#section-4)
      encoded SHA-256 hash of the [customer-supplied encryption key]
@@ -75,9 +75,9 @@ index 743fc9f1a..4b1ae7d5f 100644
 -    (https://cloud.google.com/compute/docs/disks/customer-supplied-encryption) that protects this resource.
 +    (<https://cloud.google.com/compute/docs/disks/customer-supplied-encryption>) that protects this resource.
 
- ---
+ * `key_revocation_action_type` - Action to be taken when a customer's encryption key is revoked.
 
-@@ -150,9 +149,9 @@ The following arguments are supported:
+@@ -154,9 +153,9 @@ The following arguments are supported:
 
  * `network` - The name or self_link of the network attached to this interface.
 
@@ -89,7 +89,7 @@ index 743fc9f1a..4b1ae7d5f 100644
 
  * `network_ip` - The private IP address assigned to the instance.
 
-@@ -201,7 +200,7 @@ The following arguments are supported:
+@@ -205,7 +204,7 @@ The following arguments are supported:
 
  * `provisioning_model` - Describe the type of preemptible VM.
 
@@ -99,7 +99,7 @@ index 743fc9f1a..4b1ae7d5f 100644
  <a name="nested_guest_accelerator"></a>The `guest_accelerator` block supports:
 
 diff --git a/website/docs/d/compute_instance_template.html.markdown b/website/docs/d/compute_instance_template.html.markdown
-index 08be6b15f..829134670 100644
+index 7d6ced023..54ca22935 100644
 --- a/website/docs/d/compute_instance_template.html.markdown
 +++ b/website/docs/d/compute_instance_template.html.markdown
 @@ -65,7 +65,7 @@ The following arguments are supported:
@@ -111,7 +111,7 @@ index 08be6b15f..829134670 100644
 
  * `name_prefix` - Creates a unique name beginning with the specified
    prefix. Conflicts with `name`.
-@@ -215,7 +215,7 @@ The `disk_encryption_key` block supports:
+@@ -217,7 +217,7 @@ The `disk_encryption_key` block supports:
  * `access_config` - Access configurations, i.e. IPs via which this
      instance can be accessed via the Internet. Omit to ensure that the instance
      is not accessible from the Internet (this means that ssh provisioners will

patches/0005-docs-patching.patch

@@ -160,10 +160,10 @@ index ab54b615d..2ed6376e4 100644
  * `default_expiration` -
    (Optional)
 diff --git a/website/docs/r/bigquery_job.html.markdown b/website/docs/r/bigquery_job.html.markdown
-index 171bd1a29..7f53f8286 100644
+index 8eeb84614..4d5284637 100644
 --- a/website/docs/r/bigquery_job.html.markdown
 +++ b/website/docs/r/bigquery_job.html.markdown
-@@ -720,8 +720,8 @@ The following arguments are supported:
+@@ -721,8 +721,8 @@ The following arguments are supported:
 
  * `null_marker` -
    (Optional)
@@ -494,7 +494,7 @@ index c3e738686..4ab0fb25d 100644
  * `project` - (Optional) The ID of the project in which the resource belongs.
      If it is not provided, the provider project is used.
 diff --git a/website/docs/r/composer_environment.html.markdown b/website/docs/r/composer_environment.html.markdown
-index 0e7437591..4766f2d48 100644
+index e82b80921..24473920a 100644
 --- a/website/docs/r/composer_environment.html.markdown
 +++ b/website/docs/r/composer_environment.html.markdown
 @@ -31,24 +31,21 @@ To get more information about Environments, see:
@@ -577,7 +577,7 @@ index 0a305240d..845f44993 100644
  ## Example Usage - Backend Bucket Signed Url Key
 
 diff --git a/website/docs/r/compute_backend_service.html.markdown b/website/docs/r/compute_backend_service.html.markdown
-index 6a4c84a9b..540444f37 100644
+index 7edeae294..f411c61a5 100644
 --- a/website/docs/r/compute_backend_service.html.markdown
 +++ b/website/docs/r/compute_backend_service.html.markdown
 @@ -36,7 +36,6 @@ To get more information about BackendService, see:
@@ -669,10 +669,10 @@ index f9cad9040..243ba6fd0 100644
  ## Attributes Reference
 
 diff --git a/website/docs/r/compute_instance.html.markdown b/website/docs/r/compute_instance.html.markdown
-index 9f51d2dfa..2e130da94 100644
+index 369f11e5b..011c0de51 100644
 --- a/website/docs/r/compute_instance.html.markdown
 +++ b/website/docs/r/compute_instance.html.markdown
-@@ -138,7 +138,7 @@ The following arguments are supported:
+@@ -140,7 +140,7 @@ The following arguments are supported:
 
  - - -
 
@@ -681,7 +681,7 @@ index 9f51d2dfa..2e130da94 100644
    If you try to update a property that requires stopping the instance without setting this field, the update will fail.
 
  * `attached_disk` - (Optional) Additional disks to attach to the instance. Can be repeated multiple times for multiple disks. Structure is [documented below](#nested_attached_disk).
-@@ -153,7 +153,7 @@ The following arguments are supported:
+@@ -155,7 +155,7 @@ The following arguments are supported:
  `"RUNNING"`, `"SUSPENDED"` or `"TERMINATED"`.
 
  * `deletion_protection` - (Optional) Enable deletion protection on this instance. Defaults to false.
@@ -690,7 +690,7 @@ index 9f51d2dfa..2e130da94 100644
 
  * `hostname` - (Optional) A custom hostname for the instance. Must be a fully qualified DNS name and RFC-1035-valid.
    Valid format is a series of labels 1-63 characters long matching the regular expression `[a-z]([-a-z0-9]*[a-z0-9])`, concatenated with periods.
-@@ -161,11 +161,6 @@ The following arguments are supported:
+@@ -163,11 +163,6 @@ The following arguments are supported:
 
  * `guest_accelerator` - (Optional) List of the type and count of accelerator cards attached to the instance. Structure [documented below](#nested_guest_accelerator).
      **Note:** GPU accelerators can only be used with [`on_host_maintenance`](#on_host_maintenance) option set to TERMINATE.
@@ -702,7 +702,7 @@ index 9f51d2dfa..2e130da94 100644
 
  * `labels` - (Optional) A map of key/value label pairs to assign to the instance.
      **Note**: This field is non-authoritative, and will only manage the labels present in your configuration.
-@@ -200,8 +195,7 @@ only distinction is that this separate attribute will cause a recreate on
+@@ -202,8 +197,7 @@ only distinction is that this separate attribute will cause a recreate on
  modification.  On import, `metadata_startup_script` will not be set - if you
  choose to specify it you will see a diff immediately after import causing a
  destroy/recreate operation. If importing an instance and specifying this value
@@ -826,7 +826,7 @@ index fe6888f17..64fce6636 100644
  ## Attributes Reference
 
 diff --git a/website/docs/r/compute_instance_template.html.markdown b/website/docs/r/compute_instance_template.html.markdown
-index afe75854b..6097d6cb3 100644
+index 1d65214ae..83d9a6cf7 100644
 --- a/website/docs/r/compute_instance_template.html.markdown
 +++ b/website/docs/r/compute_instance_template.html.markdown
 @@ -183,12 +183,11 @@ resource "google_compute_instance_template" "foobar" {
@@ -890,7 +890,7 @@ index afe75854b..6097d6cb3 100644
 
  * `name_prefix` - (Optional) Creates a unique name beginning with the specified
    prefix. Conflicts with `name`. Max length is 54 characters.
-@@ -551,7 +551,7 @@ The following arguments are supported:
+@@ -553,7 +553,7 @@ The following arguments are supported:
  * `access_config` - (Optional) Access configurations, i.e. IPs via which this
      instance can be accessed via the Internet. Omit to ensure that the instance
      is not accessible from the Internet (this means that ssh provisioners will
@@ -1145,7 +1145,7 @@ index cdc4e9963..0f0c5cb65 100644
 
  * `wait_for_instances_status` - (Optional) When used with `wait_for_instances` it specifies the status to wait for.
 diff --git a/website/docs/r/compute_region_network_endpoint_group.html.markdown b/website/docs/r/compute_region_network_endpoint_group.html.markdown
-index 4041ee9b5..db7ec64f1 100644
+index d3bc3d4d0..c3ac4fa42 100644
 --- a/website/docs/r/compute_region_network_endpoint_group.html.markdown
 +++ b/website/docs/r/compute_region_network_endpoint_group.html.markdown
 @@ -23,11 +23,6 @@ description: |-
@@ -2302,7 +2302,7 @@ index 3ee7bcb3d..752a8ebbb 100644
 
  ## Attributes Reference
 diff --git a/website/docs/r/google_folder.html.markdown b/website/docs/r/google_folder.html.markdown
-index 8d977035e..b92f93979 100644
+index 404437cbe..b2a41d19e 100644
 --- a/website/docs/r/google_folder.html.markdown
 +++ b/website/docs/r/google_folder.html.markdown
 @@ -15,7 +15,7 @@ A folder can contain projects, other folders, or a combination of both. You can
@@ -2678,7 +2678,7 @@ index 1e419d9e4..16c9465d2 100644
  ## Example Usage
 
 diff --git a/website/docs/r/google_project.html.markdown b/website/docs/r/google_project.html.markdown
-index fea020389..e8792e772 100644
+index cfddb1839..b05298e7b 100644
 --- a/website/docs/r/google_project.html.markdown
 +++ b/website/docs/r/google_project.html.markdown
 @@ -11,7 +11,7 @@ Allows creation and management of a Google Cloud Platform project.
@@ -3523,7 +3523,7 @@ index bde87ca55..099c538b8 100644
  * How-to Guides
      * [Managing Service Quota](https://cloud.google.com/service-usage/docs/manage-quota )
 diff --git a/website/docs/r/spanner_database.html.markdown b/website/docs/r/spanner_database.html.markdown
-index 2ac02739f..da87bdaae 100644
+index da83c6829..cd1223aa8 100644
 --- a/website/docs/r/spanner_database.html.markdown
 +++ b/website/docs/r/spanner_database.html.markdown
 @@ -29,12 +29,10 @@ To get more information about Database, see:
@@ -3557,7 +3557,7 @@ index 2ac02739f..da87bdaae 100644
 
  <a name="nested_encryption_config"></a>The `encryption_config` block supports:
 diff --git a/website/docs/r/sql_database_instance.html.markdown b/website/docs/r/sql_database_instance.html.markdown
-index dfc63b30e..0a86fd348 100644
+index 70435988d..a1a0a47f0 100644
 --- a/website/docs/r/sql_database_instance.html.markdown
 +++ b/website/docs/r/sql_database_instance.html.markdown
 @@ -10,12 +10,12 @@ Creates a new Google SQL Database Instance. For more information, see the [offic
@@ -3668,7 +3668,7 @@ index 21e3d32cd..5fc2cc98d 100644
  ## Example Usage
 
 diff --git a/website/docs/r/sql_user.html.markdown b/website/docs/r/sql_user.html.markdown
-index 9f2c3cde4..d350e3336 100644
+index e6847a79f..3e2ad5aa7 100644
 --- a/website/docs/r/sql_user.html.markdown
 +++ b/website/docs/r/sql_user.html.markdown
 @@ -9,8 +9,6 @@ description: |-
@@ -3681,10 +3681,10 @@ index 9f2c3cde4..d350e3336 100644
  ## Example Usage
 
 diff --git a/website/docs/r/storage_bucket.html.markdown b/website/docs/r/storage_bucket.html.markdown
-index db1b5e7e8..ed954e41f 100644
+index a509e780d..0a44f8676 100644
 --- a/website/docs/r/storage_bucket.html.markdown
 +++ b/website/docs/r/storage_bucket.html.markdown
-@@ -115,7 +115,7 @@ The following arguments are supported:
+@@ -129,7 +129,7 @@ The following arguments are supported:
 
  * `force_destroy` - (Optional, Default: false) When deleting a bucket, this
      boolean option will delete all contained objects. If you try to delete a
@@ -3693,7 +3693,7 @@ index db1b5e7e8..ed954e41f 100644
 
  * `project` - (Optional) The ID of the project in which the resource belongs. If it
      is not provided, the provider project is used.
-@@ -255,9 +255,9 @@ The following arguments are supported:
+@@ -271,9 +271,9 @@ The following arguments are supported:
    until a relevant action has occurred which triggers its creation.
    You should use the [`google_storage_project_service_account`](/docs/providers/google/d/storage_project_service_account.html) data source to obtain the email
    address for the service account when configuring IAM policy on the Cloud KMS key.

patches/0007-Remove-duplicative-resource-token.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Remove duplicative resource token
 
 
 diff --git a/google-beta/provider/provider.go b/google-beta/provider/provider.go
-index db8f8792e..3cbb8b62e 100644
+index e280102fd..d1ffe22ae 100644
 --- a/google-beta/provider/provider.go
 +++ b/google-beta/provider/provider.go
-@@ -888,6 +888,15 @@ func Provider() *schema.Provider {
+@@ -898,6 +898,15 @@ func Provider() *schema.Provider {
 
  func DatasourceMap() map[string]*schema.Resource {
  	datasourceMap, _ := DatasourceMapWithErrors()

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 b683e06f0..d3153f10e 100644
+index 3f9e9a5df..aeaa7e92e 100644
 --- a/google-beta/services/sql/resource_sql_database_instance.go
 +++ b/google-beta/services/sql/resource_sql_database_instance.go
-@@ -1919,10 +1919,11 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
+@@ -1920,10 +1920,11 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
  		if err != nil {
  			return err
  		}

patches/0009-Bucket-Skip-default-labels-for-Import-and-Create.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Bucket: Skip default labels for Import and Create
 
 
 diff --git a/google-beta/services/storage/resource_storage_bucket.go b/google-beta/services/storage/resource_storage_bucket.go
-index 2cbd3ab79..22c461cf6 100644
+index 607d608d0..694867515 100644
 --- a/google-beta/services/storage/resource_storage_bucket.go
 +++ b/google-beta/services/storage/resource_storage_bucket.go
-@@ -1859,10 +1859,10 @@ func setStorageBucket(d *schema.ResourceData, config *transport_tpg.Config, res
+@@ -1904,10 +1904,10 @@ func setStorageBucket(d *schema.ResourceData, config *transport_tpg.Config, res
  	if err := d.Set("lifecycle_rule", flattenBucketLifecycle(d, res.Lifecycle)); err != nil {
  		return fmt.Errorf("Error setting lifecycle_rule: %s", err)
  	}

patches/0010-Rename-default-provisioning-label-to-goog-pulumi-pro.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Rename default provisioning label to goog-pulumi-provisioned
 
 
 diff --git a/google-beta/transport/config.go b/google-beta/transport/config.go
-index 2ba15a566..4c93ff573 100644
+index 215f380d2..02487bb0a 100644
 --- a/google-beta/transport/config.go
 +++ b/google-beta/transport/config.go
-@@ -652,7 +652,7 @@ var DefaultClientScopes = []string{
+@@ -658,7 +658,7 @@ var DefaultClientScopes = []string{
  	"https://www.googleapis.com/auth/userinfo.email",
  }