Upgrade terraform-provider-google-beta to v5.33.0 (#2084)

This PR was generated via `$ upgrade-provider pulumi/pulumi-gcp`. --- - Upgrading terraform-provider-google-beta from 5.32.0 to 5.33.0. Fixes #2069
pulumi · Jun 13, 2024 · 63d645c · 63d645c
1 parent 7151fa1
commit 63d645c
Show file tree

Hide file tree

Showing 547 changed files with 48,191 additions and 1,015 deletions.
diff --git a/patches/0001-Allow-disabling-the-partner-name.patch b/patches/0001-Allow-disabling-the-partner-name.patch
@@ -6,10 +6,10 @@ 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 c26d864a9..64491e969 100644
+index e592732aa..31215950d 100644
 --- a/google-beta/provider/provider.go
 +++ b/google-beta/provider/provider.go
-@@ -123,6 +123,19 @@ func Provider() *schema.Provider {
+@@ -122,6 +122,19 @@ func Provider() *schema.Provider {
  				Optional: true,
  			},
 
@@ -29,7 +29,7 @@ index c26d864a9..64491e969 100644
  			"request_reason": {
  				Type:     schema.TypeString,
  				Optional: true,
-@@ -875,6 +888,21 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
+@@ -879,6 +892,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 1a9487b54..52ea39529 100644
+index a2ad8ea46..990596c42 100644
 --- a/google-beta/services/sql/resource_sql_database_instance.go
 +++ b/google-beta/services/sql/resource_sql_database_instance.go
-@@ -2054,6 +2054,10 @@ func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta interface{})
+@@ -2055,6 +2055,10 @@ func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta interface{})
  }
 
  func flattenSettings(settings *sqladmin.Settings, d *schema.ResourceData) []map[string]interface{} {
@@ -19,7 +19,7 @@ index 1a9487b54..52ea39529 100644
  	data := map[string]interface{}{
  		"version":                     settings.SettingsVersion,
  		"tier":                        settings.Tier,
-@@ -2143,6 +2147,10 @@ func flattenDataCacheConfig(d *sqladmin.DataCacheConfig) []map[string]interface{
+@@ -2144,6 +2148,10 @@ func flattenDataCacheConfig(d *sqladmin.DataCacheConfig) []map[string]interface{
  }
 
  func flattenBackupConfiguration(backupConfiguration *sqladmin.BackupConfiguration) []map[string]interface{} {
@@ -30,7 +30,7 @@ index 1a9487b54..52ea39529 100644
  	data := map[string]interface{}{
  		"binary_log_enabled":             backupConfiguration.BinaryLogEnabled,
  		"enabled":                        backupConfiguration.Enabled,
-@@ -2235,6 +2243,10 @@ func flattenDatabaseFlags(databaseFlags []*sqladmin.DatabaseFlags) []map[string]
+@@ -2236,6 +2244,10 @@ func flattenDatabaseFlags(databaseFlags []*sqladmin.DatabaseFlags) []map[string]
  }
 
  func flattenIpConfiguration(ipConfiguration *sqladmin.IpConfiguration, d *schema.ResourceData) interface{} {
@@ -41,7 +41,7 @@ index 1a9487b54..52ea39529 100644
  	data := map[string]interface{}{
  		"ipv4_enabled":       ipConfiguration.Ipv4Enabled,
  		"private_network":    ipConfiguration.PrivateNetwork,
-@@ -2285,6 +2297,10 @@ func flattenAuthorizedNetworks(entries []*sqladmin.AclEntry) interface{} {
+@@ -2286,6 +2298,10 @@ func flattenAuthorizedNetworks(entries []*sqladmin.AclEntry) interface{} {
  }
 
  func flattenLocationPreference(locationPreference *sqladmin.LocationPreference) interface{} {
@@ -52,7 +52,7 @@ index 1a9487b54..52ea39529 100644
  	data := map[string]interface{}{
  		"follow_gae_application": locationPreference.FollowGaeApplication,
  		"zone":                   locationPreference.Zone,
-@@ -2295,6 +2311,10 @@ func flattenLocationPreference(locationPreference *sqladmin.LocationPreference)
+@@ -2296,6 +2312,10 @@ func flattenLocationPreference(locationPreference *sqladmin.LocationPreference)
  }
 
  func flattenMaintenanceWindow(maintenanceWindow *sqladmin.MaintenanceWindow) interface{} {
@@ -63,7 +63,7 @@ index 1a9487b54..52ea39529 100644
  	data := map[string]interface{}{
  		"day":          maintenanceWindow.Day,
  		"hour":         maintenanceWindow.Hour,
-@@ -2369,6 +2389,10 @@ func flattenServerCaCerts(caCerts []*sqladmin.SslCert) []map[string]interface{}
+@@ -2370,6 +2390,10 @@ func flattenServerCaCerts(caCerts []*sqladmin.SslCert) []map[string]interface{}
  }
 
  func flattenInsightsConfig(insightsConfig *sqladmin.InsightsConfig) interface{} {

diff --git a/patches/0006-docs-patching.patch b/patches/0006-docs-patching.patch
diff --git a/patches/0008-Remove-duplicative-resource-token.patch b/patches/0008-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 64491e969..70c0826c1 100644
+index 31215950d..6b748384f 100644
 --- a/google-beta/provider/provider.go
 +++ b/google-beta/provider/provider.go
-@@ -848,6 +848,15 @@ func Provider() *schema.Provider {
+@@ -852,6 +852,15 @@ func Provider() *schema.Provider {
 
  func DatasourceMap() map[string]*schema.Resource {
  	datasourceMap, _ := DatasourceMapWithErrors()

diff --git a/patches/0009-Fix-794-with-an-unconditional-read.patch b/patches/0009-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 52ea39529..ac718482a 100644
+index 990596c42..8bd4c63f3 100644
 --- a/google-beta/services/sql/resource_sql_database_instance.go
 +++ b/google-beta/services/sql/resource_sql_database_instance.go
-@@ -1909,10 +1909,11 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
+@@ -1910,10 +1910,11 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
  		if err != nil {
  			return err
  		}

diff --git a/patches/0011-fix-label-imports.patch b/patches/0011-fix-label-imports.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] fix label imports
 
 
 diff --git a/google-beta/services/storage/resource_storage_bucket.go b/google-beta/services/storage/resource_storage_bucket.go
-index ecb3e6ee9..b2890f736 100644
+index 772e911ac..932dfb4a3 100644
 --- a/google-beta/services/storage/resource_storage_bucket.go
 +++ b/google-beta/services/storage/resource_storage_bucket.go
-@@ -1785,10 +1785,10 @@ func setStorageBucket(d *schema.ResourceData, config *transport_tpg.Config, res
+@@ -1837,10 +1837,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)
  	}