Skip to content

Commit

Permalink
Upgrade terraform-provider-google-beta to v6.2.0 (#2383)
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.0.1  to 6.2.0.
	Fixes #2375
	Fixes #2363
  • Loading branch information
iwahbe authored Sep 16, 2024
1 parent a2e788c commit a1f7fa3
Show file tree
Hide file tree
Showing 828 changed files with 60,711 additions and 3,095 deletions.
2 changes: 1 addition & 1 deletion .pulumi-java-gen.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.15.0
0.16.1
2 changes: 1 addition & 1 deletion patches/0003-rebase-bigquery_dataset.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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 762492879..620b42fff 100644
index 4d7ec2e26..dd8497c44 100644
--- a/google-beta/services/bigquery/resource_bigquery_dataset.go
+++ b/google-beta/services/bigquery/resource_bigquery_dataset.go
@@ -729,8 +729,13 @@ func resourceBigQueryDatasetRead(d *schema.ResourceData, meta interface{}) error
Expand Down
2 changes: 1 addition & 1 deletion patches/0004-website-docs-d-tweaks.patch
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ index 50f04270d..87cb31d7c 100644
-See [google_compute_global_forwarding_rule](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/compute_global_forwarding_rule) resource for details of the available attributes.
+See google_compute_global_forwarding_rule resource for details of the available attributes.
diff --git a/website/docs/d/compute_instance.html.markdown b/website/docs/d/compute_instance.html.markdown
index 2739af406..dd2ff2598 100644
index c52917b0f..62383a602 100644
--- a/website/docs/d/compute_instance.html.markdown
+++ b/website/docs/d/compute_instance.html.markdown
@@ -11,7 +11,6 @@ Get information about a VM instance resource within GCE. For more information se
Expand Down
58 changes: 25 additions & 33 deletions patches/0005-docs-patching.patch
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ index 17a16b9f2..34943f39b 100644
## Attributes Reference

diff --git a/website/docs/r/bigtable_table.html.markdown b/website/docs/r/bigtable_table.html.markdown
index 5d6c24289..2f0aaa5b0 100644
index 33185542a..1d8219fe6 100644
--- a/website/docs/r/bigtable_table.html.markdown
+++ b/website/docs/r/bigtable_table.html.markdown
@@ -10,12 +10,6 @@ Creates a Google Cloud Bigtable table inside an instance. For more information s
Expand All @@ -296,7 +296,7 @@ index 5d6c24289..2f0aaa5b0 100644
## Example Usage

```hcl
@@ -69,7 +63,7 @@ The following arguments are supported:
@@ -88,7 +82,7 @@ The following arguments are supported:
* `instance_name` - (Required) The name of the Bigtable instance.

* `split_keys` - (Optional) A list of predefined keys to split the table on.
Expand All @@ -319,7 +319,7 @@ index 78a591547..bbb602499 100644
## Attributes Reference

diff --git a/website/docs/r/certificate_manager_certificate.html.markdown b/website/docs/r/certificate_manager_certificate.html.markdown
index 81b3bf64f..21f87225b 100644
index 48be459a6..4b2a474e7 100644
--- a/website/docs/r/certificate_manager_certificate.html.markdown
+++ b/website/docs/r/certificate_manager_certificate.html.markdown
@@ -156,19 +156,38 @@ resource "google_privateca_certificate_authority" "ca_authority" {
Expand Down Expand Up @@ -388,7 +388,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 24fc2761d..5e9d1f68d 100644
index db315a058..05482b44b 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 @@ -484,7 +484,7 @@ index 24fc2761d..5e9d1f68d 100644
Structure is [documented below](#nested_liveness_probe).


@@ -998,7 +1054,7 @@ this field is set to false, the revision name will still autogenerate.)
@@ -996,7 +1052,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 @@ -507,7 +507,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 bc7b99b97..2e32cd9b9 100644
index 254316ed9..739d098c9 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 @@ -682,10 +682,10 @@ index f9cad9040..243ba6fd0 100644
## Attributes Reference

diff --git a/website/docs/r/compute_instance.html.markdown b/website/docs/r/compute_instance.html.markdown
index fa523ea69..54049658d 100644
index 20bd5f026..4337c5e3b 100644
--- a/website/docs/r/compute_instance.html.markdown
+++ b/website/docs/r/compute_instance.html.markdown
@@ -87,7 +87,7 @@ The following arguments are supported:
@@ -138,7 +138,7 @@ The following arguments are supported:

- - -

Expand All @@ -694,7 +694,7 @@ index fa523ea69..54049658d 100644
If you try to update a property that requires stopping the instance without setting this field, the update will fail.

* `attached_disk` - (Optional) Additional disks to attach to the instance. Can be repeated multiple times for multiple disks. Structure is [documented below](#nested_attached_disk).
@@ -102,7 +102,7 @@ The following arguments are supported:
@@ -153,7 +153,7 @@ The following arguments are supported:
`"RUNNING"` or `"TERMINATED"`.

* `deletion_protection` - (Optional) Enable deletion protection on this instance. Defaults to false.
Expand All @@ -703,7 +703,7 @@ index fa523ea69..54049658d 100644

* `hostname` - (Optional) A custom hostname for the instance. Must be a fully qualified DNS name and RFC-1035-valid.
Valid format is a series of labels 1-63 characters long matching the regular expression `[a-z]([-a-z0-9]*[a-z0-9])`, concatenated with periods.
@@ -110,11 +110,6 @@ The following arguments are supported:
@@ -161,11 +161,6 @@ The following arguments are supported:

* `guest_accelerator` - (Optional) List of the type and count of accelerator cards attached to the instance. Structure [documented below](#nested_guest_accelerator).
**Note:** GPU accelerators can only be used with [`on_host_maintenance`](#on_host_maintenance) option set to TERMINATE.
Expand All @@ -715,7 +715,7 @@ index fa523ea69..54049658d 100644

* `labels` - (Optional) A map of key/value label pairs to assign to the instance.
**Note**: This field is non-authoritative, and will only manage the labels present in your configuration.
@@ -149,8 +144,7 @@ only distinction is that this separate attribute will cause a recreate on
@@ -200,8 +195,7 @@ only distinction is that this separate attribute will cause a recreate on
modification. On import, `metadata_startup_script` will not be set - if you
choose to specify it you will see a diff immediately after import causing a
destroy/recreate operation. If importing an instance and specifying this value
Expand Down Expand Up @@ -811,7 +811,7 @@ index 5d846e846..8dda2ecb4 100644
instances = [
google_compute_instance.test.id,
diff --git a/website/docs/r/compute_instance_group_manager.html.markdown b/website/docs/r/compute_instance_group_manager.html.markdown
index 49cb8ccb6..992998e68 100644
index 4492397f2..26ec08096 100644
--- a/website/docs/r/compute_instance_group_manager.html.markdown
+++ b/website/docs/r/compute_instance_group_manager.html.markdown
@@ -165,7 +165,7 @@ The following arguments are supported:
Expand Down Expand Up @@ -839,7 +839,7 @@ index fe6888f17..64fce6636 100644
## Attributes Reference

diff --git a/website/docs/r/compute_instance_template.html.markdown b/website/docs/r/compute_instance_template.html.markdown
index cd97bf440..6b71a84cb 100644
index 5d66dca4c..7f60e238f 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" {
Expand Down Expand Up @@ -868,7 +868,7 @@ index cd97bf440..6b71a84cb 100644
Template and can then update the Instance Group manager without conflict before
destroying the previous Instance Template.

@@ -228,17 +227,17 @@ destroying the previous Instance Template.
@@ -269,17 +268,17 @@ resource "google_compute_instance_template" "confidential_instance_template" {

A common way to use instance templates and managed instance groups is to deploy the
latest image in a family, usually the latest build of your application. There are two
Expand All @@ -892,7 +892,7 @@ index cd97bf440..6b71a84cb 100644
the template to use that specific image:

```tf
@@ -291,8 +290,9 @@ The following arguments are supported:
@@ -332,8 +331,9 @@ The following arguments are supported:
To create a machine with a [custom type](https://cloud.google.com/dataproc/docs/concepts/compute/custom-machine-types) (such as extended memory), format the value like `custom-VCPUS-MEM_IN_MB` like `custom-6-20480` for 6 vCPU and 20GB of RAM.

- - -
Expand All @@ -903,7 +903,7 @@ index cd97bf440..6b71a84cb 100644

* `name_prefix` - (Optional) Creates a unique name beginning with the specified
prefix. Conflicts with `name`. Max length is 54 characters.
@@ -510,7 +510,7 @@ The following arguments are supported:
@@ -551,7 +551,7 @@ The following arguments are supported:
* `access_config` - (Optional) Access configurations, i.e. IPs via which this
instance can be accessed via the Internet. Omit to ensure that the instance
is not accessible from the Internet (this means that ssh provisioners will
Expand Down Expand Up @@ -1145,7 +1145,7 @@ index db7f57628..dceb98ac2 100644

```hcl
diff --git a/website/docs/r/compute_region_instance_group_manager.html.markdown b/website/docs/r/compute_region_instance_group_manager.html.markdown
index e0074ea64..2448154fd 100644
index cdc4e9963..0f0c5cb65 100644
--- a/website/docs/r/compute_region_instance_group_manager.html.markdown
+++ b/website/docs/r/compute_region_instance_group_manager.html.markdown
@@ -166,7 +166,7 @@ The following arguments are supported:
Expand Down Expand Up @@ -1595,7 +1595,7 @@ index f18c91533..924ad4cc0 100644
<div class = "oics-button" style="float: right; margin: 0 0 -15px">
<a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md&cloudshell_working_dir=vpn_tunnel_basic&open_in_editor=main.tf" target="_blank">
diff --git a/website/docs/r/container_cluster.html.markdown b/website/docs/r/container_cluster.html.markdown
index b11194f59..865b675aa 100644
index a6e83f152..2bc957a4f 100644
--- a/website/docs/r/container_cluster.html.markdown
+++ b/website/docs/r/container_cluster.html.markdown
@@ -13,15 +13,12 @@ To get more information about GKE clusters, see:
Expand Down Expand Up @@ -1759,7 +1759,7 @@ index b11194f59..865b675aa 100644
<a name="nested_ephemeral_storage_config"></a>The `ephemeral_storage_config` block supports:

* `local_ssd_count` (Required) - Number of local SSDs to use to back ephemeral storage. Uses NVMe interfaces. Each local SSD is 375 GB in size. If zero, it means to disable using local SSDs as ephemeral storage.
@@ -1171,7 +1199,7 @@ for more details. This field only applies to private clusters, when
@@ -1180,7 +1208,7 @@ for more details. This field only applies to private clusters, when
* `private_endpoint_subnetwork` - (Optional) Subnetwork in cluster's network where master's endpoint will be provisioned.

* `master_global_access_config` (Optional) - Controls cluster master global
Expand All @@ -1768,7 +1768,7 @@ index b11194f59..865b675aa 100644
not modify the previously-set value. Structure is [documented below](#nested_master_global_access_config).

In addition, the `private_cluster_config` allows access to the following read-only fields:
@@ -1273,9 +1301,9 @@ Enables monitoring and attestation of the boot integrity of the instance. The at
@@ -1282,9 +1310,9 @@ Enables monitoring and attestation of the boot integrity of the instance. The at

* `mode` (Required) How to expose the node metadata to the workload running on the node.
Accepted values are:
Expand Down Expand Up @@ -2691,10 +2691,10 @@ index 1e419d9e4..16c9465d2 100644
## Example Usage

diff --git a/website/docs/r/google_project.html.markdown b/website/docs/r/google_project.html.markdown
index 6d45074bb..81d97bb62 100644
index fea020389..e8792e772 100644
--- a/website/docs/r/google_project.html.markdown
+++ b/website/docs/r/google_project.html.markdown
@@ -11,15 +11,13 @@ Allows creation and management of a Google Cloud Platform project.
@@ -11,7 +11,7 @@ Allows creation and management of a Google Cloud Platform project.
Projects created with this resource must be associated with an Organization.
See the [Organization documentation](https://cloud.google.com/resource-manager/docs/quickstarts) for more details.

Expand All @@ -2703,15 +2703,7 @@ index 6d45074bb..81d97bb62 100644
resource must have `roles/resourcemanager.projectCreator` on the specified organization. See the
[Access Control for Organizations Using IAM](https://cloud.google.com/resource-manager/docs/access-control-org)
doc for more information.

~> This resource reads the specified billing account on every terraform apply and plan operation so you must have permissions on the specified billing account.

-~> It is recommended to use the `constraints/compute.skipDefaultNetworkCreation` [constraint](/docs/providers/google/r/google_organization_policy.html) to remove the default network instead of setting `auto_create_network` to false, when possible.
-
To get more information about projects, see:

* [API documentation](https://cloud.google.com/resource-manager/reference/rest/v1/projects)
@@ -73,8 +71,8 @@ The following arguments are supported:
@@ -86,8 +86,8 @@ The following arguments are supported:
project to be migrated to the newly specified folder.

* `billing_account` - (Optional) The alphanumeric ID of the billing account this project
Expand Down Expand Up @@ -3827,7 +3819,7 @@ index 368f1e7fd..57ee39c9d 100644

Only the arguments listed above are exposed as attributes.
diff --git a/website/docs/r/tpu_node.html.markdown b/website/docs/r/tpu_node.html.markdown
index fa6b38f47..751e0a8fb 100644
index 3420dc7dc..9af308f7c 100644
--- a/website/docs/r/tpu_node.html.markdown
+++ b/website/docs/r/tpu_node.html.markdown
@@ -66,7 +66,7 @@ resource "google_tpu_node" "tpu" {
Expand All @@ -3837,5 +3829,5 @@ index fa6b38f47..751e0a8fb 100644
- description = "Terraform Google Provider test TPU"
+ description = "Google Provider test TPU"
use_service_networking = true
network = google_service_networking_connection.private_service_connection.network

network = google_service_networking_connection.private_service_connection.network
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Bucket: Skip default labels for Import and Create


diff --git a/google-beta/services/storage/resource_storage_bucket.go b/google-beta/services/storage/resource_storage_bucket.go
index e4be7399d..8fbeee2ab 100644
index 2cbd3ab79..22c461cf6 100644
--- a/google-beta/services/storage/resource_storage_bucket.go
+++ b/google-beta/services/storage/resource_storage_bucket.go
@@ -1858,10 +1858,10 @@ func setStorageBucket(d *schema.ResourceData, config *transport_tpg.Config, res
@@ -1859,10 +1859,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)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 2c93a76fb..13baca8ef 100644
index 0cad3b9d7..db75b183d 100644
--- a/google-beta/transport/config.go
+++ b/google-beta/transport/config.go
@@ -642,7 +642,7 @@ var DefaultClientScopes = []string{
@@ -643,7 +643,7 @@ var DefaultClientScopes = []string{
"https://www.googleapis.com/auth/userinfo.email",
}

Expand Down
Loading

0 comments on commit a1f7fa3

Please sign in to comment.