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.

Sign up for GitHub

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

WIP upgrade terraform provider google beta to v6.13.0 #2733

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

WIP upgrade terraform provider google beta to v6.13.0 #2733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
354e371
make tfgen
iwahbe Dec 10, 2024
5bbabd9
make build_sdks
iwahbe Dec 10, 2024
fae4761
WIP Upgrade terraform-provider-google-beta to v6.13.0
iwahbe Dec 12, 2024
7f4fe42
make tfgen build_sdks
iwahbe Dec 12, 2024
677ae54
Upgrade the version of github.com/pulumi/pulumi/sdk/v3 used in /sdk
iwahbe Dec 12, 2024
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
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions patches/0001-Allow-disabling-the-partner-name.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ 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 b23f8b0d0..4861208ef 100644
index 16a0bcf26..8f31ba934 100644
--- a/google-beta/provider/provider.go
+++ b/google-beta/provider/provider.go
@@ -122,6 +122,19 @@ func Provider() *schema.Provider {
@@ -125,6 +125,19 @@ func Provider() *schema.Provider {
Optional: true,
},

Expand All @@ -29,7 +29,7 @@ index b23f8b0d0..4861208ef 100644
"request_reason": {
Type: schema.TypeString,
Optional: true,
@@ -935,6 +948,21 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
@@ -943,6 +956,21 @@ func ProviderConfigure(ctx context.Context, d *schema.ResourceData, p *schema.Pr
UserAgent: p.UserAgent("terraform-provider-google-beta", version.ProviderVersion),
}

Expand Down
14 changes: 7 additions & 7 deletions patches/0002-Add-nil-checks-for-sql-database-instance-flattening.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Add nil checks for sql database instance flattening


diff --git a/google-beta/services/sql/resource_sql_database_instance.go b/google-beta/services/sql/resource_sql_database_instance.go
index 34aa20f72..af14d90a7 100644
index f4b874dc3..7d6b2c6e0 100644
--- a/google-beta/services/sql/resource_sql_database_instance.go
+++ b/google-beta/services/sql/resource_sql_database_instance.go
@@ -2179,6 +2179,10 @@ func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta interface{})
@@ -2180,6 +2180,10 @@ func resourceSqlDatabaseInstanceImport(d *schema.ResourceData, meta interface{})
}

func flattenSettings(settings *sqladmin.Settings, d *schema.ResourceData) []map[string]interface{} {
Expand All @@ -19,7 +19,7 @@ index 34aa20f72..af14d90a7 100644
data := map[string]interface{}{
"version": settings.SettingsVersion,
"tier": settings.Tier,
@@ -2269,6 +2273,10 @@ func flattenDataCacheConfig(d *sqladmin.DataCacheConfig) []map[string]interface{
@@ -2270,6 +2274,10 @@ func flattenDataCacheConfig(d *sqladmin.DataCacheConfig) []map[string]interface{
}

func flattenBackupConfiguration(backupConfiguration *sqladmin.BackupConfiguration) []map[string]interface{} {
Expand All @@ -30,7 +30,7 @@ index 34aa20f72..af14d90a7 100644
data := map[string]interface{}{
"binary_log_enabled": backupConfiguration.BinaryLogEnabled,
"enabled": backupConfiguration.Enabled,
@@ -2361,6 +2369,10 @@ func flattenDatabaseFlags(databaseFlags []*sqladmin.DatabaseFlags) []map[string]
@@ -2362,6 +2370,10 @@ func flattenDatabaseFlags(databaseFlags []*sqladmin.DatabaseFlags) []map[string]
}

func flattenIpConfiguration(ipConfiguration *sqladmin.IpConfiguration, d *schema.ResourceData) interface{} {
Expand All @@ -41,7 +41,7 @@ index 34aa20f72..af14d90a7 100644
data := map[string]interface{}{
"ipv4_enabled": ipConfiguration.Ipv4Enabled,
"private_network": ipConfiguration.PrivateNetwork,
@@ -2423,6 +2435,10 @@ func flattenAuthorizedNetworks(entries []*sqladmin.AclEntry) interface{} {
@@ -2424,6 +2436,10 @@ func flattenAuthorizedNetworks(entries []*sqladmin.AclEntry) interface{} {
}

func flattenLocationPreference(locationPreference *sqladmin.LocationPreference) interface{} {
Expand All @@ -52,7 +52,7 @@ index 34aa20f72..af14d90a7 100644
data := map[string]interface{}{
"follow_gae_application": locationPreference.FollowGaeApplication,
"zone": locationPreference.Zone,
@@ -2433,6 +2449,10 @@ func flattenLocationPreference(locationPreference *sqladmin.LocationPreference)
@@ -2434,6 +2450,10 @@ func flattenLocationPreference(locationPreference *sqladmin.LocationPreference)
}

func flattenMaintenanceWindow(maintenanceWindow *sqladmin.MaintenanceWindow) interface{} {
Expand All @@ -63,7 +63,7 @@ index 34aa20f72..af14d90a7 100644
data := map[string]interface{}{
"day": maintenanceWindow.Day,
"hour": maintenanceWindow.Hour,
@@ -2508,6 +2528,10 @@ func flattenServerCaCerts(caCerts []*sqladmin.SslCert) []map[string]interface{}
@@ -2509,6 +2529,10 @@ func flattenServerCaCerts(caCerts []*sqladmin.SslCert) []map[string]interface{}
}

func flattenInsightsConfig(insightsConfig *sqladmin.InsightsConfig) interface{} {
Expand Down
6 changes: 3 additions & 3 deletions patches/0004-website-docs-d-tweaks.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ index 67ad0b8ea..285ef9cd8 100644
-See [google_runtimeconfig_variable](https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/runtimeconfig_variable#argument-reference) resource for details of the available attributes.
+See google_runtimeconfig_variable resource for details of the available attributes.
diff --git a/website/docs/d/service_account_id_token.html.markdown b/website/docs/d/service_account_id_token.html.markdown
index 733ba1cc4..13605b227 100644
index 845f692d3..8b602f986 100644
--- a/website/docs/d/service_account_id_token.html.markdown
+++ b/website/docs/d/service_account_id_token.html.markdown
@@ -12,7 +12,7 @@ For more information see
Expand All @@ -413,8 +413,8 @@ index 733ba1cc4..13605b227 100644
```

## Example Usage - Service Account Impersonation.
- `google_service_account_access_token` will use background impersonated credentials provided by [google_service_account_access_token](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/service_account_access_token).
+ `google_service_account_access_token` will use background impersonated credentials provided by `google_service_account_access_token`.
- `google_service_account_id_token` will use background impersonated credentials provided by [google_service_account_access_token](https://registry.terraform.io/providers/hashicorp/google/latest/docs/data-sources/service_account_access_token).
+ `google_service_account_id_token` will use background impersonated credentials provided by `google_service_account_access_token`.

Note: to use the following, you must grant `target_service_account` the
`roles/iam.serviceAccountTokenCreator` role on itself.
Expand Down
Loading
Loading