Skip to content

Commit 45e4331

Browse files
Fix perma-diff in google_identity_platform_config for default false values (#13622) (#22384)
[upstream:a44a0e051327ef244f6e89f403e70d3fd28b017f] Signed-off-by: Modular Magician <[email protected]>
1 parent 0415826 commit 45e4331

File tree

3 files changed

+70
-39
lines changed

3 files changed

+70
-39
lines changed

.changelog/13622.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
identityplatform: Fixed perma-diff in `google_identity_platform_config`
3+
```

google/services/identityplatform/resource_identity_platform_config.go

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,32 +1016,35 @@ func flattenIdentityPlatformConfigBlockingFunctionsTriggersUpdateTime(v interfac
10161016
}
10171017

10181018
func flattenIdentityPlatformConfigBlockingFunctionsForwardInboundCredentials(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1019-
if v == nil {
1020-
return nil
1021-
}
1022-
original := v.(map[string]interface{})
1023-
if len(original) == 0 {
1024-
return nil
1025-
}
10261019
transformed := make(map[string]interface{})
1027-
transformed["id_token"] =
1028-
flattenIdentityPlatformConfigBlockingFunctionsForwardInboundCredentialsIdToken(original["idToken"], d, config)
1029-
transformed["access_token"] =
1030-
flattenIdentityPlatformConfigBlockingFunctionsForwardInboundCredentialsAccessToken(original["accessToken"], d, config)
1031-
transformed["refresh_token"] =
1032-
flattenIdentityPlatformConfigBlockingFunctionsForwardInboundCredentialsRefreshToken(original["refreshToken"], d, config)
1033-
return []interface{}{transformed}
1034-
}
1035-
func flattenIdentityPlatformConfigBlockingFunctionsForwardInboundCredentialsIdToken(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1036-
return v
1037-
}
10381020

1039-
func flattenIdentityPlatformConfigBlockingFunctionsForwardInboundCredentialsAccessToken(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1040-
return v
1041-
}
1021+
if v == nil {
1022+
transformed["id_token"] = false
1023+
transformed["access_token"] = false
1024+
transformed["refresh_token"] = false
1025+
} else {
1026+
original := v.(map[string]interface{})
10421027

1043-
func flattenIdentityPlatformConfigBlockingFunctionsForwardInboundCredentialsRefreshToken(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1044-
return v
1028+
if original["idToken"] == nil {
1029+
transformed["id_token"] = false
1030+
} else {
1031+
transformed["id_token"] = original["idToken"]
1032+
}
1033+
1034+
if original["accessToken"] == nil {
1035+
transformed["access_token"] = false
1036+
} else {
1037+
transformed["access_token"] = original["accessToken"]
1038+
}
1039+
1040+
if original["refreshToken"] == nil {
1041+
transformed["refresh_token"] = false
1042+
} else {
1043+
transformed["refresh_token"] = original["refreshToken"]
1044+
}
1045+
}
1046+
1047+
return []interface{}{transformed}
10451048
}
10461049

10471050
func flattenIdentityPlatformConfigQuota(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
@@ -1279,26 +1282,25 @@ func flattenIdentityPlatformConfigMfaProviderConfigsTotpProviderConfigAdjacentIn
12791282
}
12801283

12811284
func flattenIdentityPlatformConfigMultiTenant(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1285+
transformed := make(map[string]interface{})
1286+
12821287
if v == nil {
12831288
return nil
1289+
} else {
1290+
original := v.(map[string]interface{})
1291+
1292+
if original["allowTenants"] == nil {
1293+
transformed["allow_tenants"] = false
1294+
} else {
1295+
transformed["allow_tenants"] = original["allowTenants"]
1296+
}
1297+
1298+
if original["defaultTenantLocation"] != nil {
1299+
transformed["default_tenant_location"] = original["defaultTenantLocation"]
1300+
}
12841301
}
1285-
original := v.(map[string]interface{})
1286-
if len(original) == 0 {
1287-
return nil
1288-
}
1289-
transformed := make(map[string]interface{})
1290-
transformed["allow_tenants"] =
1291-
flattenIdentityPlatformConfigMultiTenantAllowTenants(original["allowTenants"], d, config)
1292-
transformed["default_tenant_location"] =
1293-
flattenIdentityPlatformConfigMultiTenantDefaultTenantLocation(original["defaultTenantLocation"], d, config)
1294-
return []interface{}{transformed}
1295-
}
1296-
func flattenIdentityPlatformConfigMultiTenantAllowTenants(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1297-
return v
1298-
}
12991302

1300-
func flattenIdentityPlatformConfigMultiTenantDefaultTenantLocation(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1301-
return v
1303+
return []interface{}{transformed}
13021304
}
13031305

13041306
func flattenIdentityPlatformConfigMonitoring(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {

google/services/identityplatform/resource_identity_platform_config_generated_test.go

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ resource "google_identity_platform_config" "default" {
257257
project = google_project.default.project_id
258258
autodelete_anonymous_users = false
259259
sign_in {
260+
allow_duplicate_emails = false
260261
261262
anonymous {
262263
enabled = false
@@ -268,6 +269,31 @@ resource "google_identity_platform_config" "default" {
268269
enabled = false
269270
}
270271
}
272+
blocking_functions {
273+
triggers {
274+
event_type = "beforeSignIn"
275+
function_uri = "https://us-east1-tf-test-my-project-2%{random_suffix}.cloudfunctions.net/before-sign-in"
276+
}
277+
forward_inbound_credentials {
278+
refresh_token = false
279+
access_token = false
280+
id_token = false
281+
}
282+
}
283+
client {
284+
permissions {
285+
disabled_user_signup = false
286+
disabled_user_deletion = false
287+
}
288+
}
289+
multi_tenant {
290+
allow_tenants = false
291+
}
292+
monitoring {
293+
request_logging {
294+
enabled = false
295+
}
296+
}
271297
}
272298
`, context)
273299
}

0 commit comments

Comments
 (0)