Skip to content

Commit 9f6e82c

Browse files
authored
azurerm_postgres_flexible_server - fix identity (hashicorp#29080)
1 parent 81f991a commit 9f6e82c

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

internal/services/postgres/postgresql_flexible_server_resource.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ func resourcePostgresqlFlexibleServerCreate(d *pluginsdk.ResourceData, meta inte
612612
parameters.Properties.AuthConfig = authConfig
613613
}
614614

615-
identity, err := identity.ExpandSystemOrUserAssignedMap(d.Get("identity").([]interface{}))
615+
identity, err := identity.ExpandLegacySystemAndUserAssignedMap(d.Get("identity").([]interface{}))
616616
if err != nil {
617617
return fmt.Errorf("expanding `identity`")
618618
}
@@ -734,7 +734,7 @@ func resourcePostgresqlFlexibleServerRead(d *pluginsdk.ResourceData, meta interf
734734
return fmt.Errorf("setting `customer_managed_key`: %+v", err)
735735
}
736736

737-
identity, err := identity.FlattenSystemOrUserAssignedMap(model.Identity)
737+
identity, err := identity.FlattenLegacySystemAndUserAssignedMap(model.Identity)
738738
if err != nil {
739739
return fmt.Errorf("flattening `identity`: %+v", err)
740740
}
@@ -931,7 +931,7 @@ func resourcePostgresqlFlexibleServerUpdate(d *pluginsdk.ResourceData, meta inte
931931
}
932932

933933
if d.HasChange("identity") {
934-
identity, err := identity.ExpandSystemOrUserAssignedMap(d.Get("identity").([]interface{}))
934+
identity, err := identity.ExpandLegacySystemAndUserAssignedMap(d.Get("identity").([]interface{}))
935935
if err != nil {
936936
return fmt.Errorf("expanding `identity` for %s: %+v", *id, err)
937937
}

vendor/github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/servers/model_server.go

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/hashicorp/go-azure-sdk/resource-manager/postgresql/2024-08-01/servers/model_serverforupdate.go

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)