`azurerm_postgresql_flexible_server`: add support for `cluster` by wuxu92 · Pull Request #31315 · hashicorp/terraform-provider-azurerm

wuxu92 · 2025-12-08T05:45:26Z

Community Note

Please vote on this PR by adding a 👍 reaction to the original PR to help the community and maintainers prioritize for review
Please do not leave comments along the lines of "+1", "me too" or "any updates", they generate extra noise for PR followers and do not help prioritize for review

Description

https://learn.microsoft.com/en-us/azure/postgresql/flexible-server/concepts-elastic-clusters

some items confirmed from service team but not mentioned in swagger or product doc:

the elastic cluster only support PG 17+, and can't do major version upgrade if enabled
only support to increase of cluster size, can't decrease it
there is a server side validation on the cluster size, currently it 1-20, but the server team plans to going up to 32 in a few months
the default server name is not configurable in Azure Portal and it can't be changed once set.

PR Checklist

I have followed the guidelines in our Contributing Documentation.
I have checked to ensure there aren't other open Pull Requests for the same update/change.
I have checked if my changes close any open issues. If so please include appropriate closing keywords below.
I have updated/added Documentation as required written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.
I have used a meaningful PR title to help maintainers and other users understand this change and help prevent duplicate work.
For example: “resource_name_here - description of change e.g. adding property new_property_name_here”

Changes to existing Resource / Data Source

I have added an explanation of what my changes do and why I'd like you to include them (This may be covered by linking to an issue above, but may benefit from additional explanation).
I have written new tests for my resource or datasource changes & updated any relevant documentation.
I have successfully run tests with my changes locally. If not, please provide details on testing challenges that prevented you running the tests.
(For changes that include a state migration only). I have manually tested the migration path between relevant versions of the provider.

Testing

My submission includes Test coverage as described in the Contribution Guide and the tests pass. (if this is not possible for any reason, please include details of why you did or could not add test coverage)

--- PASS: TestAccPostgresqlFlexibleServer_cluster (917.55s)
PASS
ok      github.com/hashicorp/terraform-provider-azurerm/internal/services/pos

Change Log

Below please provide what should go into the changelog (if anything) conforming to the Changelog Format documented here.

azurerm_postgresql_flexible_server - support for the cluster property

This is a (please select all that apply):

Bug Fix
New Feature (ie adding a service, resource, or data source)
Enhancement
Breaking Change

Related Issue(s)

Fixes #31212

AI Assistance Disclosure

AI Assisted - This contribution was made by, or with the assistance of, AI/LLMs

Rollback Plan

If a change needs to be reverted, we will publish an updated version of the provider.

Changes to Security Controls

Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.

Note

If this PR changes meaningfully during the course of review please update the title and description as required.

teowa

Hi @wuxu92, thank you for the PR. There are a few issues below that may need your attention. Otherwise, it looks good to me.

internal/services/postgres/postgresql_flexible_server_resource.go

website/docs/r/postgresql_flexible_server.html.markdown

internal/services/postgres/postgresql_flexible_server_resource_test.go

teowa · 2025-12-10T05:48:24Z

Thanks @wuxu92 , LGTM!

magodo

Thanks for this PR!
I have left some additional mostly minor comments that once addressed this should be good to merge 👍

internal/services/postgres/postgresql_flexible_server_resource.go

magodo · 2025-12-15T00:26:38Z

Thanks! LGTM!

ProbstenHias · 2026-01-27T12:49:20Z

@wuxu92
Hi
Are you still working on this feauture?
With cosmosdb posgres being depreated, we are really looking forward to this feature!

…uster

mbfrahry

Hey @wuxu92, this PR looks great but left some comments around some potential issues

mbfrahry · 2026-01-30T22:45:33Z

internal/services/postgres/postgresql_flexible_server_resource.go

+
+			versionOld, versionNew := diff.GetChange("version")
+			// version should be set since cluster only support pg17+
+			if version, err := strconv.ParseInt(versionNew.(string), 10, 32); err != nil {


This is great since the API errors but doesn't really explain why

│ Message: "Unsupported value \"12\" for parameter PGServerVersion"

mbfrahry · 2026-01-30T23:08:23Z

internal/services/postgres/postgresql_flexible_server_resource.go

+							// Confirmed with service team: the max size will be 32 whilst current is 20
+							ValidateFunc: validation.IntBetween(1, 32),
+						},
+						"default_database_name": {


It looks like a database name is provided for this if not specifed. Let's Default this to postgres

~ cluster { - default_database_name = "postgres" -> null # (1 unchanged attribute hidden) }

Thanks for the heads-up, schema updated

mbfrahry · 2026-02-02T17:30:03Z

internal/services/postgres/postgresql_flexible_server_resource.go


+			"cluster": {
+				Type:     pluginsdk.TypeList,
+				Optional: true,


This should be ForceNew since we can't add it after it's created or remove it.

mbfrahry · 2026-02-02T17:35:48Z

internal/services/postgres/postgresql_flexible_server_resource.go

+			newClusterObj := newCluster.([]interface{})
+			if len(oldClusterObj) > 0 && len(newClusterObj) > 0 {
+				// below type assertions are safe since schema ensure the types
+				oldClusterSize := oldClusterObj[0].(map[string]interface{})["size"].(int)


These can panic since we're only checking the length of oldClusterObj. Unfortunately, the following type assertions aren't safe because Terraform can set any of the following to nil. So we should take the time to ensure it's not nil before casting.

mbfrahry · 2026-02-02T17:37:10Z

internal/services/postgres/postgresql_flexible_server_resource.go

+	if len(input) == 0 {
+		return nil
+	}
+	v := input[0].(map[string]interface{})


We should a nil check when we check the len(input) to prevent a potential panic

right, nil check added.

mbfrahry · 2026-02-02T17:47:31Z

internal/services/postgres/postgresql_flexible_server_resource.go

+						"size": {
+							Type:     pluginsdk.TypeInt,
+							Required: true,
+							// Confirmed with service team: the max size will be 32 whilst current is 20


Since this causes an error from the api side, we should look to lock this to 20 until they add it

validate updated

mbfrahry · 2026-02-03T23:17:16Z

internal/services/postgres/postgresql_flexible_server_resource.go

+			}
+
+			// can't downgrade cluster size
+			oldCluster, newCluster := diff.GetChange("cluster")


We should wrap this block in diff.HasChange("cluster") so we don't do these checks unless the cluster has changed

got it, updated.

…uster

mbfrahry

LGTM!

Review addressed

rapiccolo · 2026-02-11T16:33:17Z

Hi @mbfrahry, Is this gonna be available in which version of the azurerm provider? Thanks!

…icorp#31315) [ENHANCEMENT] `azurerm_postgresql_flexible_server` - add support for `cluster`

add cluster support for postgresql flexible server

21ff315

github-actions bot added documentation service/postgresql size/L waiting-response labels Dec 8, 2025

code format

8645b1f

github-actions bot removed the waiting-response label Dec 8, 2025

fix acctest

89b3d82

github-actions bot added the waiting-response label Dec 8, 2025

tffmt

d0539c4

github-actions bot removed the waiting-response label Dec 8, 2025

wuxu92 marked this pull request as ready for review December 9, 2025 03:35

wuxu92 requested review from a team, WodansSon and magodo as code owners December 9, 2025 03:35

wuxu92 marked this pull request as draft December 9, 2025 22:21

update cluster size validation and doc

d564c55

wuxu92 marked this pull request as ready for review December 10, 2025 03:04

wuxu92 requested a review from teowa December 10, 2025 04:01

teowa reviewed Dec 10, 2025

View reviewed changes

internal/services/postgres/postgresql_flexible_server_resource.go Outdated Show resolved Hide resolved

website/docs/r/postgresql_flexible_server.html.markdown Outdated Show resolved Hide resolved

github-actions bot added the waiting-response label Dec 10, 2025

use forcenew for decrease cluster size

40c17a9

github-actions bot removed the waiting-response label Dec 10, 2025

teowa reviewed Dec 10, 2025

View reviewed changes

internal/services/postgres/postgresql_flexible_server_resource_test.go Outdated Show resolved Hide resolved

github-actions bot added the waiting-response label Dec 10, 2025

remove unnecessary tests

12460ee

github-actions bot removed the waiting-response label Dec 10, 2025

magodo previously requested changes Dec 12, 2025

View reviewed changes

internal/services/postgres/postgresql_flexible_server_resource.go Outdated Show resolved Hide resolved

github-actions bot assigned magodo Dec 12, 2025

github-actions bot added the waiting-response label Dec 12, 2025

update error handle

436ff0e

github-actions bot removed the waiting-response label Dec 12, 2025

mybayern1974 unassigned magodo Dec 15, 2025

Merge remote-tracking branch 'origin/main' into pg-flexible-server-cl…

481ad9d

…uster

github-actions bot added the waiting-response label Jan 29, 2026

mybayern1974 removed the waiting-response label Feb 3, 2026

Merge remote-tracking branch 'origin/main' into pg-flexible-server-cl…

4a5fcab

…uster

github-actions bot added the waiting-response label Feb 3, 2026

mbfrahry requested changes Feb 4, 2026

View reviewed changes

github-actions bot assigned mbfrahry Feb 4, 2026

wuxu92 added 2 commits February 4, 2026 14:05

updat schema and nil checks

0771cca

Merge remote-tracking branch 'origin/main' into pg-flexible-server-cl…

3f833d6

…uster

github-actions bot removed the waiting-response label Feb 4, 2026

mbfrahry approved these changes Feb 6, 2026

View reviewed changes

mbfrahry added this to the v4.60.0 milestone Feb 6, 2026

mbfrahry merged commit 3792f53 into hashicorp:main Feb 6, 2026
38 checks passed

github-actions bot added the enhancement label Feb 25, 2026

Conversation

wuxu92 commented Dec 8, 2025 • edited by rcskosir Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Community Note

Description

PR Checklist

Changes to existing Resource / Data Source

Testing

Change Log

Related Issue(s)

AI Assistance Disclosure

Rollback Plan

Changes to Security Controls

Uh oh!

teowa left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

teowa commented Dec 10, 2025

Uh oh!

magodo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

magodo commented Dec 15, 2025

Uh oh!

ProbstenHias commented Jan 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mbfrahry left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mbfrahry left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rapiccolo commented Feb 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

wuxu92 commented Dec 8, 2025 •

edited by rcskosir

Loading

ProbstenHias commented Jan 27, 2026 •

edited

Loading