Skip to content

Commit

Permalink
Upgrade terraform-provider-google-beta to v4.79.0 (#1164)
Browse files Browse the repository at this point in the history
* make tfgen

* make tfgen

* Remove changelog related patches

* Rename patches to be sequential
  • Loading branch information
rquitales authored Aug 24, 2023
1 parent ba10793 commit 9928b68
Show file tree
Hide file tree
Showing 354 changed files with 22,732 additions and 2,167 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From ffa4f56d985c1ac9cdc5b4b50a0636a172cbc6c1 Mon Sep 17 00:00:00 2001
From 32b5559ce04aa464c2f1d25585e9ffc1ac609f4a Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Tue, 7 Mar 2023 11:09:59 +0000
Subject: [PATCH 04/12] Allow disabling the partner name
Subject: [PATCH 1/9] Allow disabling the partner name

Add options to set or disable partner name.
---
Expand All @@ -10,10 +10,10 @@ Add options to set or disable partner name.
2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/google-beta/provider/provider.go b/google-beta/provider/provider.go
index aecc42137..9804a42cd 100644
index 2b894c5fb..6944d78b0 100644
--- a/google-beta/provider/provider.go
+++ b/google-beta/provider/provider.go
@@ -227,6 +227,19 @@ func Provider() *schema.Provider {
@@ -231,6 +231,19 @@ func Provider() *schema.Provider {
Optional: true,
},

Expand All @@ -33,7 +33,7 @@ index aecc42137..9804a42cd 100644
"request_reason": {
Type: schema.TypeString,
Optional: true,
@@ -1839,6 +1852,21 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
@@ -1870,6 +1883,21 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
UserAgent: p.UserAgent("terraform-provider-google-beta", version.ProviderVersion),
}

Expand Down Expand Up @@ -74,5 +74,5 @@ index d0f4777ca..dc0f460e4 100644

// Deprecated: For backward compatibility snakeToPascalCase is still working,
--
2.39.1
2.39.2 (Apple Git-143)

43 changes: 0 additions & 43 deletions patches/0001-Release-4.75.0-changelog-5925.patch

This file was deleted.

25 changes: 0 additions & 25 deletions patches/0002-Add-changelog-4.75.1.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From 7488000e4a09f4a8a57b772439c134f5fd437836 Mon Sep 17 00:00:00 2001
From 6101049171c65b529ca7359437ec40237a85f669 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Tue, 7 Mar 2023 11:50:33 +0000
Subject: [PATCH 05/12] Add nil checks for sql database instance flattening
Subject: [PATCH 2/9] Add nil checks for sql database instance flattening

---
.../sql/resource_sql_database_instance.go | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)

diff --git a/google-beta/services/sql/resource_sql_database_instance.go b/google-beta/services/sql/resource_sql_database_instance.go
index 4fee002e8..f64b03a67 100644
index 95f4c4064..735b003c1 100644
--- a/google-beta/services/sql/resource_sql_database_instance.go
+++ b/google-beta/services/sql/resource_sql_database_instance.go
@@ -1937,6 +1937,10 @@ func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta interface{})
Expand Down Expand Up @@ -78,5 +78,5 @@ index 4fee002e8..f64b03a67 100644
"query_insights_enabled": insightsConfig.QueryInsightsEnabled,
"query_string_length": insightsConfig.QueryStringLength,
--
2.39.1
2.39.2 (Apple Git-143)

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 4c05672e76e0e676753c3257d0caa15b095eba86 Mon Sep 17 00:00:00 2001
From 4baf5b1f56a6bafa64ea914e7fd31908c1975299 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Tue, 7 Mar 2023 11:55:24 +0000
Subject: [PATCH 06/12] Only set bigquery dataset selflink if available
Subject: [PATCH 3/9] Only set bigquery dataset selflink if available

---
.../services/bigquery/resource_bigquery_dataset.go | 9 +++++++--
Expand All @@ -28,5 +28,5 @@ index 96cf5c7b6..7086541bd 100644

return nil
--
2.39.1
2.39.2 (Apple Git-143)

41 changes: 0 additions & 41 deletions patches/0003-Update-CHANGELOG-5801.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
From e5a28e54fa97dffd3c0519e23184560bbe2668a3 Mon Sep 17 00:00:00 2001
From 08925784e03693273729d3126f412180fa48eb9b Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Tue, 7 Mar 2023 11:57:44 +0000
Subject: [PATCH 07/12] Add flattening of self managed certificates
Subject: [PATCH 4/9] Add flattening of self managed certificates

---
...esource_certificate_manager_certificate.go | 27 +++++++++++++++++++
1 file changed, 27 insertions(+)

diff --git a/google-beta/services/certificatemanager/resource_certificate_manager_certificate.go b/google-beta/services/certificatemanager/resource_certificate_manager_certificate.go
index 83f1b5161..cb5c32779 100644
index 4216aac73..93c74f611 100644
--- a/google-beta/services/certificatemanager/resource_certificate_manager_certificate.go
+++ b/google-beta/services/certificatemanager/resource_certificate_manager_certificate.go
@@ -411,6 +411,9 @@ func resourceCertificateManagerCertificateRead(d *schema.ResourceData, meta inte
@@ -414,6 +414,9 @@ func resourceCertificateManagerCertificateRead(d *schema.ResourceData, meta inte
if err := d.Set("scope", flattenCertificateManagerCertificateScope(res["scope"], d, config)); err != nil {
return fmt.Errorf("Error reading Certificate: %s", err)
}
Expand All @@ -21,7 +21,7 @@ index 83f1b5161..cb5c32779 100644
if err := d.Set("managed", flattenCertificateManagerCertificateManaged(res["managed"], d, config)); err != nil {
return fmt.Errorf("Error reading Certificate: %s", err)
}
@@ -586,6 +589,30 @@ func flattenCertificateManagerCertificateScope(v interface{}, d *schema.Resource
@@ -589,6 +592,30 @@ func flattenCertificateManagerCertificateScope(v interface{}, d *schema.Resource
return v
}

Expand Down Expand Up @@ -53,5 +53,5 @@ index 83f1b5161..cb5c32779 100644
if v == nil {
return nil
--
2.39.1
2.39.2 (Apple Git-143)

Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
From b96486cd8e943fcfebef438cb29436e7ce6069b2 Mon Sep 17 00:00:00 2001
From d015070b956d755f60298d4f18cedfee9e46ad64 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Tue, 7 Mar 2023 12:00:07 +0000
Subject: [PATCH 08/12] Remove security policy default versioned_expr
Subject: [PATCH 5/9] Remove security policy default versioned_expr

---
google-beta/services/compute/resource_compute_security_policy.go | 1 -
1 file changed, 1 deletion(-)

diff --git a/google-beta/services/compute/resource_compute_security_policy.go b/google-beta/services/compute/resource_compute_security_policy.go
index 298e92165..81597972a 100644
index f54f5e74d..fdcf16433 100644
--- a/google-beta/services/compute/resource_compute_security_policy.go
+++ b/google-beta/services/compute/resource_compute_security_policy.go
@@ -115,7 +115,6 @@ func ResourceComputeSecurityPolicy() *schema.Resource {
Expand All @@ -20,5 +20,5 @@ index 298e92165..81597972a 100644
Description: `Predefined rule expression. If this field is specified, config must also be specified. Available options: SRC_IPS_V1: Must specify the corresponding src_ip_ranges field in config.`,
},
--
2.39.1
2.39.2 (Apple Git-143)

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From be30819b2997f735de1e411d02b72a8765566bc6 Mon Sep 17 00:00:00 2001
From 14d85b3a5fe0975cd5f9ce2552de04810f14b589 Mon Sep 17 00:00:00 2001
From: Daniel Bradley <[email protected]>
Date: Tue, 7 Mar 2023 11:16:06 +0000
Subject: [PATCH 09/12] website/docs/d tweaks
Subject: [PATCH 6/9] website/docs/d tweaks

---
website/docs/d/cloud_run_service.html.markdown | 2 +-
Expand Down Expand Up @@ -503,5 +503,5 @@ index d0494f08b..0ebec0d7e 100644
For more information see
[the API reference](https://cloud.google.com/storage/docs/json_api/v1/projects/serviceAccount).
--
2.39.1
2.39.2 (Apple Git-143)

Loading

0 comments on commit 9928b68

Please sign in to comment.