Skip to content

Commit

Permalink
Upgrade terraform-provider-google-beta to v6.3.0 (#2392)
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.2.0  to 6.3.0.
	Fixes #2388
- Upgrading pulumi-terraform-bridge from
v3.90.1-0.20240918114950-4954882afe70 to v3.90.0.
- Upgrading pulumi-terraform-bridge/pf from
v0.43.1-0.20240918114950-4954882afe70 to v0.43.0.
  • Loading branch information
iwahbe authored Sep 18, 2024
1 parent f8d6d51 commit e92f37f
Show file tree
Hide file tree
Showing 355 changed files with 86,751 additions and 36,033 deletions.
4 changes: 2 additions & 2 deletions patches/0001-Allow-disabling-the-partner-name.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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 e57ae1dad..4d0ade23b 100644
index 30a9ab658..693fb4c78 100644
--- a/google-beta/provider/provider.go
+++ b/google-beta/provider/provider.go
@@ -122,6 +122,19 @@ func Provider() *schema.Provider {
Expand All @@ -29,7 +29,7 @@ index e57ae1dad..4d0ade23b 100644
"request_reason": {
Type: schema.TypeString,
Optional: true,
@@ -900,6 +913,21 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
@@ -910,6 +923,21 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
UserAgent: p.UserAgent("terraform-provider-google-beta", version.ProviderVersion),
}

Expand Down
6 changes: 3 additions & 3 deletions 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 c52917b0f..62383a602 100644
index c30d589a7..d0b83924e 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 Expand Up @@ -77,7 +77,7 @@ index c52917b0f..62383a602 100644

---

@@ -148,9 +147,9 @@ The following arguments are supported:
@@ -150,9 +149,9 @@ The following arguments are supported:

* `network` - The name or self_link of the network attached to this interface.

Expand All @@ -89,7 +89,7 @@ index c52917b0f..62383a602 100644

* `network_ip` - The private IP address assigned to the instance.

@@ -197,7 +196,7 @@ The following arguments are supported:
@@ -199,7 +198,7 @@ The following arguments are supported:

* `provisioning_model` - Describe the type of preemptible VM.

Expand Down
14 changes: 7 additions & 7 deletions patches/0005-docs-patching.patch
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ 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 20bd5f026..4337c5e3b 100644
index 2b931df48..bfc1ab89d 100644
--- a/website/docs/r/compute_instance.html.markdown
+++ b/website/docs/r/compute_instance.html.markdown
@@ -138,7 +138,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 a6e83f152..2bc957a4f 100644
index 5f3e93f2f..5c14761ac 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 @@ -1716,7 +1716,7 @@ index a6e83f152..2bc957a4f 100644

* `service_account` - (Optional) The service account to be used by the Node VMs.
If not specified, the "default" service account is used.
@@ -946,13 +959,14 @@ gvnic {
@@ -948,13 +961,14 @@ gvnic {

* `resource_manager_tags` - (Optional) A map of resource manager tag keys and values to be attached to the nodes for managing Compute Engine firewalls using Network Firewall Policies. Tags must be according to specifications found [here](https://cloud.google.com/vpc/docs/tags-firewalls-overview#specifications). A maximum of 5 tag key-value pairs can be specified. Existing tags will be replaced with new values. Tags must be in one of the following formats ([KEY]=[VALUE]) 1. `tagKeys/{tag_key_id}=tagValues/{tag_value_id}` 2. `{org_id}/{tag_key_name}={tag_value_name}` 3. `{project_id}/{tag_key_name}={tag_value_name}`.

Expand All @@ -1738,7 +1738,7 @@ index a6e83f152..2bc957a4f 100644

* `workload_metadata_config` - (Optional) Metadata configuration to expose to workloads on the node pool.
Structure is [documented below](#nested_workload_metadata_config).
@@ -1011,6 +1025,20 @@ sole_tenant_config {
@@ -1013,6 +1027,20 @@ sole_tenant_config {

* `enable_nested_virtualization`- (Optional) Defines whether the instance should have nested virtualization enabled. Defaults to false.

Expand All @@ -1759,7 +1759,7 @@ index a6e83f152..2bc957a4f 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.
@@ -1180,7 +1208,7 @@ for more details. This field only applies to private clusters, when
@@ -1182,7 +1210,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 a6e83f152..2bc957a4f 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:
@@ -1282,9 +1310,9 @@ Enables monitoring and attestation of the boot integrity of the instance. The at
@@ -1284,9 +1312,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 @@ -2315,7 +2315,7 @@ index 3ee7bcb3d..752a8ebbb 100644

## Attributes Reference
diff --git a/website/docs/r/google_folder.html.markdown b/website/docs/r/google_folder.html.markdown
index e0f47767a..ee7c29d7a 100644
index 8d977035e..b92f93979 100644
--- a/website/docs/r/google_folder.html.markdown
+++ b/website/docs/r/google_folder.html.markdown
@@ -15,7 +15,7 @@ A folder can contain projects, other folders, or a combination of both. You can
Expand Down
4 changes: 2 additions & 2 deletions patches/0007-Remove-duplicative-resource-token.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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 4d0ade23b..b217b1919 100644
index 693fb4c78..aac0d73cf 100644
--- a/google-beta/provider/provider.go
+++ b/google-beta/provider/provider.go
@@ -873,6 +873,15 @@ func Provider() *schema.Provider {
@@ -883,6 +883,15 @@ func Provider() *schema.Provider {

func DatasourceMap() map[string]*schema.Resource {
datasourceMap, _ := DatasourceMapWithErrors()
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 0cad3b9d7..db75b183d 100644
index 92bc74fd6..bbeb33008 100644
--- a/google-beta/transport/config.go
+++ b/google-beta/transport/config.go
@@ -643,7 +643,7 @@ var DefaultClientScopes = []string{
@@ -649,7 +649,7 @@ var DefaultClientScopes = []string{
"https://www.googleapis.com/auth/userinfo.email",
}

Expand Down
Loading

0 comments on commit e92f37f

Please sign in to comment.