Upgrade terraform-provider-google-beta to v6.11.0 (#2619)

This PR was generated via `$ upgrade-provider pulumi/pulumi-gcp --kind=provider`. --- - Upgrading terraform-provider-google-beta from 6.10.0 to 6.11.0. Fixes #2614
pulumi · Nov 12, 2024 · a30bcc5 · a30bcc5
1 parent 131ba52
commit a30bcc5
Show file tree

Hide file tree

Showing 881 changed files with 99,962 additions and 22,678 deletions.
diff --git a/patches/0001-Allow-disabling-the-partner-name.patch b/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 58c19e19b..e280102fd 100644
+index b23f8b0d0..4861208ef 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 58c19e19b..e280102fd 100644
  			"request_reason": {
  				Type:     schema.TypeString,
  				Optional: true,
-@@ -925,6 +938,21 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
+@@ -935,6 +948,21 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
  		UserAgent:           p.UserAgent("terraform-provider-google-beta", version.ProviderVersion),
  	}
 

diff --git a/patches/0002-Add-nil-checks-for-sql-database-instance-flattening.patch b/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 44400c32b..3f9e9a5df 100644
+index e19c9de09..e109b30d2 100644
 --- a/google-beta/services/sql/resource_sql_database_instance.go
 +++ b/google-beta/services/sql/resource_sql_database_instance.go
-@@ -2090,6 +2090,10 @@ func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta interface{})
+@@ -2142,6 +2142,10 @@ func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta interface{})
  }
 
  func flattenSettings(settings *sqladmin.Settings, d *schema.ResourceData) []map[string]interface{} {
@@ -19,7 +19,7 @@ index 44400c32b..3f9e9a5df 100644
  	data := map[string]interface{}{
  		"version":                     settings.SettingsVersion,
  		"tier":                        settings.Tier,
-@@ -2180,6 +2184,10 @@ func flattenDataCacheConfig(d *sqladmin.DataCacheConfig) []map[string]interface{
+@@ -2232,6 +2236,10 @@ func flattenDataCacheConfig(d *sqladmin.DataCacheConfig) []map[string]interface{
  }
 
  func flattenBackupConfiguration(backupConfiguration *sqladmin.BackupConfiguration) []map[string]interface{} {
@@ -30,7 +30,7 @@ index 44400c32b..3f9e9a5df 100644
  	data := map[string]interface{}{
  		"binary_log_enabled":             backupConfiguration.BinaryLogEnabled,
  		"enabled":                        backupConfiguration.Enabled,
-@@ -2272,6 +2280,10 @@ func flattenDatabaseFlags(databaseFlags []*sqladmin.DatabaseFlags) []map[string]
+@@ -2324,6 +2332,10 @@ func flattenDatabaseFlags(databaseFlags []*sqladmin.DatabaseFlags) []map[string]
  }
 
  func flattenIpConfiguration(ipConfiguration *sqladmin.IpConfiguration, d *schema.ResourceData) interface{} {
@@ -41,7 +41,7 @@ index 44400c32b..3f9e9a5df 100644
  	data := map[string]interface{}{
  		"ipv4_enabled":       ipConfiguration.Ipv4Enabled,
  		"private_network":    ipConfiguration.PrivateNetwork,
-@@ -2318,6 +2330,10 @@ func flattenAuthorizedNetworks(entries []*sqladmin.AclEntry) interface{} {
+@@ -2370,6 +2382,10 @@ func flattenAuthorizedNetworks(entries []*sqladmin.AclEntry) interface{} {
  }
 
  func flattenLocationPreference(locationPreference *sqladmin.LocationPreference) interface{} {
@@ -52,7 +52,7 @@ index 44400c32b..3f9e9a5df 100644
  	data := map[string]interface{}{
  		"follow_gae_application": locationPreference.FollowGaeApplication,
  		"zone":                   locationPreference.Zone,
-@@ -2328,6 +2344,10 @@ func flattenLocationPreference(locationPreference *sqladmin.LocationPreference)
+@@ -2380,6 +2396,10 @@ func flattenLocationPreference(locationPreference *sqladmin.LocationPreference)
  }
 
  func flattenMaintenanceWindow(maintenanceWindow *sqladmin.MaintenanceWindow) interface{} {
@@ -63,7 +63,7 @@ index 44400c32b..3f9e9a5df 100644
  	data := map[string]interface{}{
  		"day":          maintenanceWindow.Day,
  		"hour":         maintenanceWindow.Hour,
-@@ -2402,6 +2422,10 @@ func flattenServerCaCerts(caCerts []*sqladmin.SslCert) []map[string]interface{}
+@@ -2455,6 +2475,10 @@ func flattenServerCaCerts(caCerts []*sqladmin.SslCert) []map[string]interface{}
  }
 
  func flattenInsightsConfig(insightsConfig *sqladmin.InsightsConfig) interface{} {

diff --git a/patches/0005-docs-patching.patch b/patches/0005-docs-patching.patch
diff --git a/patches/0006-Exclude-scripts-dir-from-provider-go-module.patch b/patches/0006-Exclude-scripts-dir-from-provider-go-module.patch
@@ -6,11 +6,11 @@ Subject: [PATCH] Exclude scripts dir from provider go module
 This directory references a private Go module, which we cannot "go vet" or check.
 
 diff --git a/scripts/go.mod b/scripts/go.mod
-index f993058a2..373c1814c 100755
+index 80546d338..45912d6d6 100755
 --- a/scripts/go.mod
 +++ b/scripts/go.mod
 @@ -1,3 +1,3 @@
 -module github.com/hashicorp/terraform-provider-google-beta/scripts
 +module exclude
 
- go 1.21
+ go 1.23
diff --git a/patches/0007-Remove-duplicative-resource-token.patch b/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 e280102fd..d1ffe22ae 100644
+index 4861208ef..6ebfba930 100644
 --- a/google-beta/provider/provider.go
 +++ b/google-beta/provider/provider.go
-@@ -898,6 +898,15 @@ func Provider() *schema.Provider {
+@@ -908,6 +908,15 @@ func Provider() *schema.Provider {
 
  func DatasourceMap() map[string]*schema.Resource {
  	datasourceMap, _ := DatasourceMapWithErrors()

diff --git a/patches/0008-Fix-794-with-an-unconditional-read.patch b/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 3f9e9a5df..aeaa7e92e 100644
+index e109b30d2..e2980c532 100644
 --- a/google-beta/services/sql/resource_sql_database_instance.go
 +++ b/google-beta/services/sql/resource_sql_database_instance.go
-@@ -1920,10 +1920,11 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
+@@ -1972,10 +1972,11 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
  		if err != nil {
  			return err
  		}

diff --git a/patches/0010-Rename-default-provisioning-label-to-goog-pulumi-pro.patch b/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 215f380d2..02487bb0a 100644
+index 514bcad6b..a76eae477 100644
 --- a/google-beta/transport/config.go
 +++ b/google-beta/transport/config.go
-@@ -658,7 +658,7 @@ var DefaultClientScopes = []string{
+@@ -664,7 +664,7 @@ var DefaultClientScopes = []string{
  	"https://www.googleapis.com/auth/userinfo.email",
  }