Upgrade terraform-provider-google-beta to v6.17.0 (#2894)

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

---

- Upgrading terraform-provider-google-beta from 6.16.0  to 6.17.0.
	Fixes #2888

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 02e416341..97cef6303 100644
+index aca7ba22c..79e0bbcff 100644
 --- a/google-beta/provider/provider.go
 +++ b/google-beta/provider/provider.go
 @@ -125,6 +125,19 @@ func Provider() *schema.Provider {
@@ -29,7 +29,7 @@ index 02e416341..97cef6303 100644
  			"request_reason": {
  				Type:     schema.TypeString,
  				Optional: true,
-@@ -948,6 +961,21 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
+@@ -963,6 +976,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 d6fb25a5d..68f0c2fff 100644
+index 3f823c609..ea9082cb2 100644
 --- a/google-beta/services/sql/resource_sql_database_instance.go
 +++ b/google-beta/services/sql/resource_sql_database_instance.go
-@@ -2188,6 +2188,10 @@ func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta interface{})
+@@ -2221,6 +2221,10 @@ func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta interface{})
  }
 
  func flattenSettings(settings *sqladmin.Settings, d *schema.ResourceData) []map[string]interface{} {
@@ -19,7 +19,7 @@ index d6fb25a5d..68f0c2fff 100644
  	data := map[string]interface{}{
  		"version":                     settings.SettingsVersion,
  		"tier":                        settings.Tier,
-@@ -2288,6 +2292,10 @@ func flattenDataCacheConfig(d *sqladmin.DataCacheConfig) []map[string]interface{
+@@ -2321,6 +2325,10 @@ func flattenDataCacheConfig(d *sqladmin.DataCacheConfig) []map[string]interface{
  }
 
  func flattenBackupConfiguration(backupConfiguration *sqladmin.BackupConfiguration) []map[string]interface{} {
@@ -30,7 +30,7 @@ index d6fb25a5d..68f0c2fff 100644
  	data := map[string]interface{}{
  		"binary_log_enabled":             backupConfiguration.BinaryLogEnabled,
  		"enabled":                        backupConfiguration.Enabled,
-@@ -2380,6 +2388,10 @@ func flattenDatabaseFlags(databaseFlags []*sqladmin.DatabaseFlags) []map[string]
+@@ -2429,6 +2437,10 @@ func flattenReplicationCluster(replicationCluster *sqladmin.ReplicationCluster,
  }
 
  func flattenIpConfiguration(ipConfiguration *sqladmin.IpConfiguration, d *schema.ResourceData) interface{} {
@@ -41,7 +41,7 @@ index d6fb25a5d..68f0c2fff 100644
  	data := map[string]interface{}{
  		"ipv4_enabled":       ipConfiguration.Ipv4Enabled,
  		"private_network":    ipConfiguration.PrivateNetwork,
-@@ -2443,6 +2455,10 @@ func flattenAuthorizedNetworks(entries []*sqladmin.AclEntry) interface{} {
+@@ -2492,6 +2504,10 @@ func flattenAuthorizedNetworks(entries []*sqladmin.AclEntry) interface{} {
  }
 
  func flattenLocationPreference(locationPreference *sqladmin.LocationPreference) interface{} {
@@ -52,7 +52,7 @@ index d6fb25a5d..68f0c2fff 100644
  	data := map[string]interface{}{
  		"follow_gae_application": locationPreference.FollowGaeApplication,
  		"zone":                   locationPreference.Zone,
-@@ -2453,6 +2469,10 @@ func flattenLocationPreference(locationPreference *sqladmin.LocationPreference)
+@@ -2502,6 +2518,10 @@ func flattenLocationPreference(locationPreference *sqladmin.LocationPreference)
  }
 
  func flattenMaintenanceWindow(maintenanceWindow *sqladmin.MaintenanceWindow) interface{} {
@@ -63,7 +63,7 @@ index d6fb25a5d..68f0c2fff 100644
  	data := map[string]interface{}{
  		"day":          maintenanceWindow.Day,
  		"hour":         maintenanceWindow.Hour,
-@@ -2528,6 +2548,10 @@ func flattenServerCaCerts(caCerts []*sqladmin.SslCert) []map[string]interface{}
+@@ -2577,6 +2597,10 @@ func flattenServerCaCerts(caCerts []*sqladmin.SslCert) []map[string]interface{}
  }
 
  func flattenInsightsConfig(insightsConfig *sqladmin.InsightsConfig) interface{} {

patches/0005-docs-patching.patch

@@ -669,7 +669,7 @@ index df91843c5..40b452e03 100644
  ## Attributes Reference
 
 diff --git a/website/docs/r/compute_instance.html.markdown b/website/docs/r/compute_instance.html.markdown
-index a9d0efc64..794b8b8d4 100644
+index 1fddef270..417939d56 100644
 --- a/website/docs/r/compute_instance.html.markdown
 +++ b/website/docs/r/compute_instance.html.markdown
 @@ -140,7 +140,7 @@ The following arguments are supported:
@@ -825,7 +825,7 @@ index c7a253e6d..fd7c0580c 100644
  ## Attributes Reference
 
 diff --git a/website/docs/r/compute_instance_template.html.markdown b/website/docs/r/compute_instance_template.html.markdown
-index b73f4c095..7b4923115 100644
+index efe4969eb..69d9d53d6 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" {
@@ -1523,7 +1523,7 @@ index e96d17f09..bbd005a6a 100644
  resource "google_compute_ssl_certificate" "default" {
    name_prefix = "my-certificate-"
 diff --git a/website/docs/r/compute_subnetwork.html.markdown b/website/docs/r/compute_subnetwork.html.markdown
-index 2818f72b0..93b55e24e 100644
+index 1ba64e0db..a047ac09f 100644
 --- a/website/docs/r/compute_subnetwork.html.markdown
 +++ b/website/docs/r/compute_subnetwork.html.markdown
 @@ -391,9 +391,6 @@ The following arguments are supported:
@@ -3558,7 +3558,7 @@ index b6e4a06bd..a775c628e 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 6f6e2e668..585819a79 100644
+index 8992cfead..79ca28100 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
@@ -3629,7 +3629,7 @@ index 6f6e2e668..585819a79 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.
-@@ -585,21 +581,13 @@ instance.
+@@ -591,21 +587,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/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 97cef6303..24b310860 100644
+index 79e0bbcff..578b8360b 100644
 --- a/google-beta/provider/provider.go
 +++ b/google-beta/provider/provider.go
-@@ -921,6 +921,15 @@ func Provider() *schema.Provider {
+@@ -936,6 +936,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 68f0c2fff..686242ff7 100644
+index ea9082cb2..f283d41f0 100644
 --- a/google-beta/services/sql/resource_sql_database_instance.go
 +++ b/google-beta/services/sql/resource_sql_database_instance.go
-@@ -2017,10 +2017,11 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
+@@ -2043,10 +2043,11 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
  		if err != nil {
  			return 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 b88e939d5..a98602771 100644
+index 87d27968d..2ae7e8f5f 100644
 --- a/google-beta/transport/config.go
 +++ b/google-beta/transport/config.go
-@@ -671,7 +671,7 @@ var DefaultClientScopes = []string{
+@@ -680,7 +680,7 @@ var DefaultClientScopes = []string{
  	"https://www.googleapis.com/auth/userinfo.email",
  }