Skip to content

Commit

Permalink
Upgrade terraform-provider-google-beta to v6.4.0 (#2436)
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.3.0  to 6.4.0.
	Fixes #2428
- Upgrading pulumi-terraform-bridge from v3.91.0 to v3.91.1.
- Upgrading pulumi-terraform-bridge/pf from v0.44.0 to v0.44.1.
  • Loading branch information
guineveresaenger authored Sep 25, 2024
1 parent 9a0c771 commit 00557a0
Show file tree
Hide file tree
Showing 518 changed files with 133,049 additions and 40,257 deletions.
2 changes: 1 addition & 1 deletion examples/labels-combinations-go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.21

require (
github.com/pulumi/pulumi-gcp/sdk/v8 v8.0.0-alpha.0
github.com/pulumi/pulumi/sdk/v3 v3.130.0
github.com/pulumi/pulumi/sdk/v3 v3.133.0
)

replace github.com/pulumi/pulumi-gcp/sdk/v8 => ../../sdk
Expand Down
1 change: 1 addition & 0 deletions examples/labels-combinations-go/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ github.com/pulumi/esc v0.9.1 h1:HH5eEv8sgyxSpY5a8yePyqFXzA8cvBvapfH8457+mIs=
github.com/pulumi/esc v0.9.1/go.mod h1:oEJ6bOsjYlQUpjf70GiX+CXn3VBmpwFDxUTlmtUN84c=
github.com/pulumi/pulumi/sdk/v3 v3.130.0 h1:gGJNd+akPqhZ+vrsZmAjSNJn6kGJkitjjkwrmIQMmn8=
github.com/pulumi/pulumi/sdk/v3 v3.130.0/go.mod h1:p1U24en3zt51agx+WlNboSOV8eLlPWYAkxMzVEXKbnY=
github.com/pulumi/pulumi/sdk/v3 v3.133.0/go.mod h1:J5kQEX8v87aeUhk6NdQXnjCo1DbiOnOiL3Sf2DuDda8=
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
Expand Down
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 30a9ab658..693fb4c78 100644
index 26c04953d..db8f8792e 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 30a9ab658..693fb4c78 100644
"request_reason": {
Type: schema.TypeString,
Optional: true,
@@ -910,6 +923,21 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
@@ -915,6 +928,21 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
UserAgent: p.UserAgent("terraform-provider-google-beta", version.ProviderVersion),
}

Expand Down
8 changes: 4 additions & 4 deletions patches/0005-docs-patching.patch
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ index 02f68ce79..07ddfeefe 100644
```hcl
data "google_iam_policy" "admin" {
diff --git a/website/docs/r/apigee_instance.html.markdown b/website/docs/r/apigee_instance.html.markdown
index eea4d065c..a75990e47 100644
index 2dbadf3dd..7e3e047fe 100644
--- a/website/docs/r/apigee_instance.html.markdown
+++ b/website/docs/r/apigee_instance.html.markdown
@@ -195,7 +195,7 @@ resource "google_kms_crypto_key_iam_member" "apigee_sa_keyuser" {
Expand Down Expand Up @@ -551,7 +551,7 @@ index 254316ed9..739d098c9 100644
## Example Usage

diff --git a/website/docs/r/compute_attached_disk.html.markdown b/website/docs/r/compute_attached_disk.html.markdown
index 41d360860..96f45ea70 100644
index 4ec98cbfa..6eddeae81 100644
--- a/website/docs/r/compute_attached_disk.html.markdown
+++ b/website/docs/r/compute_attached_disk.html.markdown
@@ -6,8 +6,8 @@ description: |-
Expand Down Expand Up @@ -590,7 +590,7 @@ index 0a305240d..845f44993 100644
## Example Usage - Backend Bucket Signed Url Key

diff --git a/website/docs/r/compute_backend_service.html.markdown b/website/docs/r/compute_backend_service.html.markdown
index 696a907a2..0ed5ab32d 100644
index ed4537219..973c11834 100644
--- a/website/docs/r/compute_backend_service.html.markdown
+++ b/website/docs/r/compute_backend_service.html.markdown
@@ -36,7 +36,6 @@ To get more information about BackendService, see:
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%2Fgit.luolix.top%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 5f3e93f2f..5c14761ac 100644
index df2af254e..3d40c2391 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
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 693fb4c78..aac0d73cf 100644
index db8f8792e..3cbb8b62e 100644
--- a/google-beta/provider/provider.go
+++ b/google-beta/provider/provider.go
@@ -883,6 +883,15 @@ func Provider() *schema.Provider {
@@ -888,6 +888,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 92bc74fd6..bbeb33008 100644
index 6753e1bda..73ec7089f 100644
--- a/google-beta/transport/config.go
+++ b/google-beta/transport/config.go
@@ -649,7 +649,7 @@ var DefaultClientScopes = []string{
@@ -652,7 +652,7 @@ var DefaultClientScopes = []string{
"https://www.googleapis.com/auth/userinfo.email",
}

Expand Down
Loading

0 comments on commit 00557a0

Please sign in to comment.