Upgrade terraform-provider-google-beta to v6.15.0 (#2826)

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

---

- Upgrading terraform-provider-google-beta from 6.14.1  to 6.15.0.
	Fixes #2818

.pulumi-java-gen.version

@@ -1 +1 @@
-0.20.0
+0.21.0

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 16a0bcf26..8f31ba934 100644
+index 02e416341..97cef6303 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 16a0bcf26..8f31ba934 100644
  			"request_reason": {
  				Type:     schema.TypeString,
  				Optional: true,
-@@ -943,6 +956,21 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
+@@ -948,6 +961,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,7 +5,7 @@ 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 b0c5b32c7..94ae4dc64 100644
+index 90ed41ee9..68417874b 100644
 --- a/google-beta/services/sql/resource_sql_database_instance.go
 +++ b/google-beta/services/sql/resource_sql_database_instance.go
 @@ -2180,6 +2180,10 @@ func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta 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 32a63f07d..a981f8d87 100644
+index 961e8f318..dbcc430c3 100644
 --- a/google-beta/services/bigquery/resource_bigquery_dataset.go
 +++ b/google-beta/services/bigquery/resource_bigquery_dataset.go
-@@ -762,8 +762,13 @@ func resourceBigQueryDatasetRead(d *schema.ResourceData, meta interface{}) error
+@@ -797,8 +797,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

@@ -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 8eeb84614..4d5284637 100644
+index 56f90a480..6777bfca7 100644
 --- a/website/docs/r/bigquery_job.html.markdown
 +++ b/website/docs/r/bigquery_job.html.markdown
-@@ -721,8 +721,8 @@ The following arguments are supported:
+@@ -711,8 +711,8 @@ The following arguments are supported:
 
  * `null_marker` -
    (Optional)
@@ -175,7 +175,7 @@ index 8eeb84614..4d5284637 100644
    an empty value.
 
 diff --git a/website/docs/r/bigquery_table.html.markdown b/website/docs/r/bigquery_table.html.markdown
-index 75c460cc7..294d64298 100644
+index 0a4893bed..6d4b314ce 100644
 --- a/website/docs/r/bigquery_table.html.markdown
 +++ b/website/docs/r/bigquery_table.html.markdown
 @@ -11,7 +11,7 @@ Creates a table resource in a dataset for Google BigQuery. For more information
@@ -200,7 +200,7 @@ index 75c460cc7..294d64298 100644
 
  * `table_constraints` - (Optional) Defines the primary key and foreign keys. 
      Structure is [documented below](#nested_table_constraints).
-@@ -275,8 +273,8 @@ The following arguments are supported:
+@@ -280,8 +278,8 @@ The following arguments are supported:
      CSV file. If your data does not contain quoted sections, set the
      property value to an empty string. If your data contains quoted newline
      characters, you must also set the `allow_quoted_newlines` property to true.
@@ -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 acd46bad2..47060bb12 100644
+index a9d0efc64..794b8b8d4 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 88a604fa4..9c8259586 100644
+index b73f4c095..7b4923115 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" {
@@ -3363,7 +3363,7 @@ index fe9f8b04a..f1ca040b9 100644
 
  ~> **Note:** Once created, this resource cannot be updated or destroyed. These
 diff --git a/website/docs/r/redis_instance.html.markdown b/website/docs/r/redis_instance.html.markdown
-index 3399b32cf..4b19f8a4e 100644
+index f4e44aed8..f9ed9e443 100644
 --- a/website/docs/r/redis_instance.html.markdown
 +++ b/website/docs/r/redis_instance.html.markdown
 @@ -66,7 +66,7 @@ resource "google_redis_instance" "cache" {
@@ -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 edcfd4544..c645159d5 100644
+index f6193b91d..3be112b5e 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

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 8f31ba934..d21aebbde 100644
+index 97cef6303..24b310860 100644
 --- a/google-beta/provider/provider.go
 +++ b/google-beta/provider/provider.go
-@@ -916,6 +916,15 @@ func Provider() *schema.Provider {
+@@ -921,6 +921,15 @@ func Provider() *schema.Provider {
 
  func DatasourceMap() map[string]*schema.Resource {
  	datasourceMap, _ := DatasourceMapWithErrors()

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

@@ -5,7 +5,7 @@ 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 94ae4dc64..b20e756d1 100644
+index 68417874b..b601cb663 100644
 --- a/google-beta/services/sql/resource_sql_database_instance.go
 +++ b/google-beta/services/sql/resource_sql_database_instance.go
 @@ -2009,10 +2009,11 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})

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 840d0cb0e..9bc2c3ab2 100644
+index 742d3fc5e..184515ff6 100644
 --- a/google-beta/transport/config.go
 +++ b/google-beta/transport/config.go
-@@ -668,7 +668,7 @@ var DefaultClientScopes = []string{
+@@ -671,7 +671,7 @@ var DefaultClientScopes = []string{
  	"https://www.googleapis.com/auth/userinfo.email",
  }