From 9c1ef5a701a0608d635922fdb6a7ae5e87d60103 Mon Sep 17 00:00:00 2001 From: Aris van Ommeren Date: Thu, 25 May 2023 11:58:49 +0200 Subject: [PATCH 1/3] `azurerm_postgresql_flexible_server` - Add version 15 --- .../postgresql_flexible_server_resource.go | 2 +- ...ostgresql_flexible_server_resource_test.go | 22 +++++++++++++++---- .../postgresql_flexible_server.html.markdown | 2 +- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/internal/services/postgres/postgresql_flexible_server_resource.go b/internal/services/postgres/postgresql_flexible_server_resource.go index a0b51428fe13..a3bba368f7ec 100644 --- a/internal/services/postgres/postgresql_flexible_server_resource.go +++ b/internal/services/postgres/postgresql_flexible_server_resource.go @@ -128,7 +128,7 @@ func resourcePostgresqlFlexibleServer() *pluginsdk.Resource { Type: pluginsdk.TypeString, Optional: true, Computed: true, - ValidateFunc: validation.StringInSlice(servers.PossibleValuesForServerVersion(), false), + ValidateFunc: validation.StringInSlice(append(servers.PossibleValuesForServerVersion(), "15"), false), }, "zone": commonschema.ZoneSingleOptional(), diff --git a/internal/services/postgres/postgresql_flexible_server_resource_test.go b/internal/services/postgres/postgresql_flexible_server_resource_test.go index 2a6d147e5164..51af78bfd448 100644 --- a/internal/services/postgres/postgresql_flexible_server_resource_test.go +++ b/internal/services/postgres/postgresql_flexible_server_resource_test.go @@ -343,7 +343,21 @@ func TestAccPostgresqlFlexibleServer_upgradeVersion(t *testing.T) { }, data.ImportStep("administrator_password", "create_mode"), { - Config: r.upgradeVersion(data), + Config: r.upgradeVersion(data, "13"), + Check: acceptance.ComposeTestCheckFunc( + check.That(data.ResourceName).ExistsInAzure(r), + ), + }, + data.ImportStep("administrator_password", "create_mode"), + { + Config: r.upgradeVersion(data, "14"), + Check: acceptance.ComposeTestCheckFunc( + check.That(data.ResourceName).ExistsInAzure(r), + ), + }, + data.ImportStep("administrator_password", "create_mode"), + { + Config: r.upgradeVersion(data, "15"), Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), @@ -876,7 +890,7 @@ resource "azurerm_postgresql_flexible_server" "replica" { `, r.basic(data), data.RandomInteger) } -func (r PostgresqlFlexibleServerResource) upgradeVersion(data acceptance.TestData) string { +func (r PostgresqlFlexibleServerResource) upgradeVersion(data acceptance.TestData, version string) string { return fmt.Sprintf(` %s @@ -888,9 +902,9 @@ resource "azurerm_postgresql_flexible_server" "test" { administrator_password = "QAZwsx123" storage_mb = 32768 create_mode = "Update" - version = "13" + version = "%s" sku_name = "GP_Standard_D2s_v3" zone = "2" } -`, r.template(data), data.RandomInteger) +`, r.template(data), data.RandomInteger, version) } diff --git a/website/docs/r/postgresql_flexible_server.html.markdown b/website/docs/r/postgresql_flexible_server.html.markdown index d1e83297e973..bf3483f86a72 100644 --- a/website/docs/r/postgresql_flexible_server.html.markdown +++ b/website/docs/r/postgresql_flexible_server.html.markdown @@ -134,7 +134,7 @@ The following arguments are supported: * `tags` - (Optional) A mapping of tags which should be assigned to the PostgreSQL Flexible Server. -* `version` - (Optional) The version of PostgreSQL Flexible Server to use. Possible values are `11`,`12`, `13` and `14`. Required when `create_mode` is `Default`. Changing this forces a new PostgreSQL Flexible Server to be created. +* `version` - (Optional) The version of PostgreSQL Flexible Server to use. Possible values are `11`,`12`, `13`, `14` and `15`. Required when `create_mode` is `Default`. Changing this forces a new PostgreSQL Flexible Server to be created. -> **Note:** When `create_mode` is `Update`, upgrading version wouldn't force a new resource to be created. From f6e51b6ad36a1db36b203b6aa0dca6e2dcfd6904 Mon Sep 17 00:00:00 2001 From: aristosvo <8375124+aristosvo@users.noreply.github.com> Date: Fri, 26 May 2023 08:41:34 +0200 Subject: [PATCH 2/3] Update internal/services/postgres/postgresql_flexible_server_resource.go --- .../services/postgres/postgresql_flexible_server_resource.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/services/postgres/postgresql_flexible_server_resource.go b/internal/services/postgres/postgresql_flexible_server_resource.go index a3bba368f7ec..f916599f60b8 100644 --- a/internal/services/postgres/postgresql_flexible_server_resource.go +++ b/internal/services/postgres/postgresql_flexible_server_resource.go @@ -128,6 +128,8 @@ func resourcePostgresqlFlexibleServer() *pluginsdk.Resource { Type: pluginsdk.TypeString, Optional: true, Computed: true, + // TODO: Remove "15" after this issue has been resolved: + // https://github.com/Azure/azure-rest-api-specs/issues/24186 ValidateFunc: validation.StringInSlice(append(servers.PossibleValuesForServerVersion(), "15"), false), }, From c7a08552782dcc724ff03c1489eda5ed6cc7ca72 Mon Sep 17 00:00:00 2001 From: Matthew Frahry Date: Fri, 26 May 2023 10:28:00 -0700 Subject: [PATCH 3/3] Update postgresql_flexible_server_resource.go make fmt --- .../postgres/postgresql_flexible_server_resource.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/services/postgres/postgresql_flexible_server_resource.go b/internal/services/postgres/postgresql_flexible_server_resource.go index f916599f60b8..5947bcb77090 100644 --- a/internal/services/postgres/postgresql_flexible_server_resource.go +++ b/internal/services/postgres/postgresql_flexible_server_resource.go @@ -125,9 +125,9 @@ func resourcePostgresqlFlexibleServer() *pluginsdk.Resource { }, "version": { - Type: pluginsdk.TypeString, - Optional: true, - Computed: true, + Type: pluginsdk.TypeString, + Optional: true, + Computed: true, // TODO: Remove "15" after this issue has been resolved: // https://github.com/Azure/azure-rest-api-specs/issues/24186 ValidateFunc: validation.StringInSlice(append(servers.PossibleValuesForServerVersion(), "15"), false),