Skip to content

Commit

Permalink
Upgrade terraform-provider-google-beta to v6.12.0 (#2658)
Browse files Browse the repository at this point in the history 
This PR was generated via `$ upgrade-provider pulumi/pulumi-gcp`.

---

- Upgrading terraform-provider-google-beta from 6.11.2  to 6.12.0.
	Fixes #2654
  • Loading branch information
@iwahbe
iwahbe authored Nov 19, 2024
1 parent 678ddd9 commit 01ba4e4
Show file tree
Hide file tree
Showing 366 changed files with 40,306 additions and 1,153 deletions.
14 changes: 7 additions & 7 deletions patches/0002-Add-nil-checks-for-sql-database-instance-flattening.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 e19c9de09..e109b30d2 100644
index 34aa20f72..af14d90a7 100644
--- a/google-beta/services/sql/resource_sql_database_instance.go
+++ b/google-beta/services/sql/resource_sql_database_instance.go
@@ -2142,6 +2142,10 @@ func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta interface{})
@@ -2179,6 +2179,10 @@ func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta interface{})
}

func flattenSettings(settings *sqladmin.Settings, d *schema.ResourceData) []map[string]interface{} {
Expand All @@ -19,7 +19,7 @@ index e19c9de09..e109b30d2 100644
data := map[string]interface{}{
"version": settings.SettingsVersion,
"tier": settings.Tier,
@@ -2232,6 +2236,10 @@ func flattenDataCacheConfig(d *sqladmin.DataCacheConfig) []map[string]interface{
@@ -2269,6 +2273,10 @@ func flattenDataCacheConfig(d *sqladmin.DataCacheConfig) []map[string]interface{
}

func flattenBackupConfiguration(backupConfiguration *sqladmin.BackupConfiguration) []map[string]interface{} {
Expand All @@ -30,7 +30,7 @@ index e19c9de09..e109b30d2 100644
data := map[string]interface{}{
"binary_log_enabled": backupConfiguration.BinaryLogEnabled,
"enabled": backupConfiguration.Enabled,
@@ -2324,6 +2332,10 @@ func flattenDatabaseFlags(databaseFlags []*sqladmin.DatabaseFlags) []map[string]
@@ -2361,6 +2369,10 @@ func flattenDatabaseFlags(databaseFlags []*sqladmin.DatabaseFlags) []map[string]
}

func flattenIpConfiguration(ipConfiguration *sqladmin.IpConfiguration, d *schema.ResourceData) interface{} {
Expand All @@ -41,7 +41,7 @@ index e19c9de09..e109b30d2 100644
data := map[string]interface{}{
"ipv4_enabled": ipConfiguration.Ipv4Enabled,
"private_network": ipConfiguration.PrivateNetwork,
@@ -2370,6 +2382,10 @@ func flattenAuthorizedNetworks(entries []*sqladmin.AclEntry) interface{} {
@@ -2423,6 +2435,10 @@ func flattenAuthorizedNetworks(entries []*sqladmin.AclEntry) interface{} {
}

func flattenLocationPreference(locationPreference *sqladmin.LocationPreference) interface{} {
Expand All @@ -52,7 +52,7 @@ index e19c9de09..e109b30d2 100644
data := map[string]interface{}{
"follow_gae_application": locationPreference.FollowGaeApplication,
"zone": locationPreference.Zone,
@@ -2380,6 +2396,10 @@ func flattenLocationPreference(locationPreference *sqladmin.LocationPreference)
@@ -2433,6 +2449,10 @@ func flattenLocationPreference(locationPreference *sqladmin.LocationPreference)
}

func flattenMaintenanceWindow(maintenanceWindow *sqladmin.MaintenanceWindow) interface{} {
Expand All @@ -63,7 +63,7 @@ index e19c9de09..e109b30d2 100644
data := map[string]interface{}{
"day": maintenanceWindow.Day,
"hour": maintenanceWindow.Hour,
@@ -2455,6 +2475,10 @@ func flattenServerCaCerts(caCerts []*sqladmin.SslCert) []map[string]interface{}
@@ -2508,6 +2528,10 @@ func flattenServerCaCerts(caCerts []*sqladmin.SslCert) []map[string]interface{}
}

func flattenInsightsConfig(insightsConfig *sqladmin.InsightsConfig) interface{} {
Expand Down
28 changes: 14 additions & 14 deletions patches/0005-docs-patching.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ index a68f58813..650247567 100644
**Note**: This field is non-authoritative, and will only manage the annotations present in your configuration.
Please refer to the field `effective_annotations` for all of the annotations present on the resource.
diff --git a/website/docs/r/cloud_run_service.html.markdown b/website/docs/r/cloud_run_service.html.markdown
index 318d7fa21..bef470c6b 100644
index 91c38fdd4..32b13d59c 100644
--- a/website/docs/r/cloud_run_service.html.markdown
+++ b/website/docs/r/cloud_run_service.html.markdown
@@ -31,8 +31,63 @@ To get more information about Service, see:
Expand Down Expand Up @@ -452,7 +452,7 @@ index 318d7fa21..bef470c6b 100644
}
}
}
@@ -382,7 +437,7 @@ The following arguments are supported:
@@ -376,7 +431,7 @@ The following arguments are supported:
may be set by external tools to store and retrieve arbitrary metadata.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations
**Note**: The Cloud Run API may add additional annotations that were not provided in your config.
Expand All @@ -461,7 +461,7 @@ index 318d7fa21..bef470c6b 100644
or apply the lifecycle.ignore_changes rule to the metadata.0.annotations field.
Annotations with `run.googleapis.com/` and `autoscaling.knative.dev` are restricted. Use the following annotation
keys to configure features on a Revision template:
@@ -538,7 +593,8 @@ The following arguments are supported:
@@ -532,7 +587,8 @@ The following arguments are supported:

* `liveness_probe` -
(Optional)
Expand All @@ -471,7 +471,7 @@ index 318d7fa21..bef470c6b 100644
Structure is [documented below](#nested_liveness_probe).


@@ -1041,7 +1097,7 @@ this field is set to false, the revision name will still autogenerate.)
@@ -1035,7 +1091,7 @@ this field is set to false, the revision name will still autogenerate.)
may be set by external tools to store and retrieve arbitrary metadata.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations
**Note**: The Cloud Run API may add additional annotations that were not provided in your config.
Expand All @@ -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 e82b80921..24473920a 100644
index 35740d97b..dc6a608d7 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:
Expand Down Expand Up @@ -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 ccd6d6b7b..95e4223f4 100644
index 1521b7ee2..d4d63ec45 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:
Expand Down Expand Up @@ -3524,7 +3524,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 da83c6829..cd1223aa8 100644
index b6e4a06bd..a775c628e 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:
Expand Down Expand Up @@ -3558,7 +3558,7 @@ index da83c6829..cd1223aa8 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 0346b9a2e..566e36212 100644
index 5c70a7a4c..97dd2c486 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
Expand All @@ -3576,7 +3576,7 @@ index 0346b9a2e..566e36212 100644
It is recommended to not set this field (or set it to true) until you're ready to destroy the instance and its databases.

## Example Usage
@@ -220,7 +220,7 @@ SQL Server version to use. Supported values include `MYSQL_5_6`,
@@ -248,7 +248,7 @@ SQL Server version to use. Supported values include `MYSQL_5_6`,
includes an up-to-date reference of supported versions.

* `name` - (Optional, Computed) The name of the instance. If the name is left
Expand All @@ -3585,7 +3585,7 @@ index 0346b9a2e..566e36212 100644
created. This is done because after a name is used, it cannot be reused for
up to [one week](https://cloud.google.com/sql/docs/delete-instance).

@@ -242,7 +242,7 @@ includes an up-to-date reference of supported versions.
@@ -270,7 +270,7 @@ includes an up-to-date reference of supported versions.

* `encryption_key_name` - (Optional)
The full path to the encryption key used for the CMEK disk encryption. Setting
Expand All @@ -3594,7 +3594,7 @@ index 0346b9a2e..566e36212 100644
The provided key must be in the same region as the SQL instance. In order
to use this feature, a special kind of service account must be created and
granted permission on this key. This step can currently only be done
@@ -250,20 +250,16 @@ includes an up-to-date reference of supported versions.
@@ -278,20 +278,16 @@ includes an up-to-date reference of supported versions.
That service account needs the `Cloud KMS > Cloud KMS CryptoKey Encrypter/Decrypter` role on your
key - please see [this step](https://cloud.google.com/sql/docs/mysql/configure-cmek#grantkey).

Expand All @@ -3620,7 +3620,7 @@ index 0346b9a2e..566e36212 100644
configuration is detailed below.

The `settings` block supports:
@@ -511,7 +507,7 @@ The optional `clone` block supports:
@@ -545,7 +541,7 @@ The optional `clone` block supports:
* `allocated_ip_range` - (Optional) The name of the allocated ip range for the private ip CloudSQL instance. For example: "google-managed-services-default". If set, the cloned instance ip will be created in the allocated range. The range name must comply with [RFC 1035](https://tools.ietf.org/html/rfc1035). Specifically, the name must be 1-63 characters long and match the regular expression [a-z]([-a-z0-9]*[a-z0-9])?.

The optional `restore_backup_context` block supports:
Expand All @@ -3629,7 +3629,7 @@ index 0346b9a2e..566e36212 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.
@@ -549,21 +545,13 @@ instance.
@@ -583,21 +579,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).

Expand Down Expand Up @@ -3669,7 +3669,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 e6847a79f..3e2ad5aa7 100644
index cefb6d1a4..38e6d1608 100644
--- a/website/docs/r/sql_user.html.markdown
+++ b/website/docs/r/sql_user.html.markdown
@@ -9,8 +9,6 @@ description: |-
Expand Down
4 changes: 2 additions & 2 deletions patches/0008-Fix-794-with-an-unconditional-read.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 e109b30d2..e2980c532 100644
index af14d90a7..406447fe3 100644
--- a/google-beta/services/sql/resource_sql_database_instance.go
+++ b/google-beta/services/sql/resource_sql_database_instance.go
@@ -1972,10 +1972,11 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
@@ -2009,10 +2009,11 @@ func resourceSqlDatabaseInstanceUpdate(d *schema.ResourceData, meta interface{})
if err != nil {
return err
}
Expand Down
Loading

0 comments on commit 01ba4e4

Please sign in to comment.