Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade terraform-provider-google-beta to v6.18.1 #2930

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .pulumi-java-gen.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.0
1.1.0
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 aca7ba22c..79e0bbcff 100644
index b1bcc4ce4..3b58a6b32 100644
--- a/google-beta/provider/provider.go
+++ b/google-beta/provider/provider.go
@@ -125,6 +125,19 @@ func Provider() *schema.Provider {
Expand All @@ -29,7 +29,7 @@ index aca7ba22c..79e0bbcff 100644
"request_reason": {
Type: schema.TypeString,
Optional: true,
@@ -963,6 +976,21 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
@@ -968,6 +981,21 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
UserAgent: p.UserAgent("terraform-provider-google-beta", version.ProviderVersion),
}

Expand Down
2 changes: 1 addition & 1 deletion patches/0005-docs-patching.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1077,7 +1077,7 @@ index 2c406e0c7..8b2d102b8 100644

version {
diff --git a/website/docs/r/compute_project_metadata_item.html.markdown b/website/docs/r/compute_project_metadata_item.html.markdown
index 3c624d8fc..a7a982c18 100644
index ff0556f26..42a358a8a 100644
--- a/website/docs/r/compute_project_metadata_item.html.markdown
+++ b/website/docs/r/compute_project_metadata_item.html.markdown
@@ -8,7 +8,7 @@ description: |-
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 79e0bbcff..578b8360b 100644
index 3b58a6b32..7a9c9b4f9 100644
--- a/google-beta/provider/provider.go
+++ b/google-beta/provider/provider.go
@@ -936,6 +936,15 @@ func Provider() *schema.Provider {
@@ -941,6 +941,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 87d27968d..2ae7e8f5f 100644
index 2fb91eded..da5df499f 100644
--- a/google-beta/transport/config.go
+++ b/google-beta/transport/config.go
@@ -680,7 +680,7 @@ var DefaultClientScopes = []string{
@@ -683,7 +683,7 @@ var DefaultClientScopes = []string{
"https://www.googleapis.com/auth/userinfo.email",
}

Expand Down
Loading
Loading