From f71b79e4d01339cd39d517cd9636074f96b23f8c Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 1 Aug 2019 13:58:18 -0700 Subject: [PATCH 1/2] only remove 10.2 --- azurerm/resource_arm_postgresql_server.go | 1 - .../resource_arm_postgresql_server_test.go | 34 ------------------- 2 files changed, 35 deletions(-) diff --git a/azurerm/resource_arm_postgresql_server.go b/azurerm/resource_arm_postgresql_server.go index bf68b9786a64..61c8f2dfae48 100644 --- a/azurerm/resource_arm_postgresql_server.go +++ b/azurerm/resource_arm_postgresql_server.go @@ -133,7 +133,6 @@ func resourceArmPostgreSQLServer() *schema.Resource { string(postgresql.OneOne), string(postgresql.OneZero), string(postgresql.OneZeroFullStopZero), - string(postgresql.OneZeroFullStopTwo), }, true), DiffSuppressFunc: suppress.CaseDifference, }, diff --git a/azurerm/resource_arm_postgresql_server_test.go b/azurerm/resource_arm_postgresql_server_test.go index e54c99ff6bc3..f1b8b03ae9d1 100644 --- a/azurerm/resource_arm_postgresql_server_test.go +++ b/azurerm/resource_arm_postgresql_server_test.go @@ -102,36 +102,6 @@ func TestAccAzureRMPostgreSQLServer_basicTenPointZero(t *testing.T) { }) } -func TestAccAzureRMPostgreSQLServer_basicTenPointTwo(t *testing.T) { - resourceName := "azurerm_postgresql_server.test" - ri := tf.AccRandTimeInt() - - resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testCheckAzureRMPostgreSQLServerDestroy, - Steps: []resource.TestStep{ - { - Config: testAccAzureRMPostgreSQLServer_basicTenPointTwo(ri, testLocation()), - Check: resource.ComposeTestCheckFunc( - testCheckAzureRMPostgreSQLServerExists(resourceName), - resource.TestCheckResourceAttr(resourceName, "administrator_login", "acctestun"), - resource.TestCheckResourceAttr(resourceName, "version", "10.2"), - resource.TestCheckResourceAttr(resourceName, "ssl_enforcement", "Enabled"), - ), - }, - { - ResourceName: resourceName, - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{ - "administrator_login_password", // not returned as sensitive - }, - }, - }, - }) -} - func TestAccAzureRMPostgreSQLServer_basicEleven(t *testing.T) { resourceName := "azurerm_postgresql_server.test" ri := tf.AccRandTimeInt() @@ -489,10 +459,6 @@ func testAccAzureRMPostgreSQLServer_basicTenPointZero(rInt int, location string) return testAccAzureRMPostgreSQLServer_basic(rInt, location, "10.0") } -func testAccAzureRMPostgreSQLServer_basicTenPointTwo(rInt int, location string) string { - return testAccAzureRMPostgreSQLServer_basic(rInt, location, "10.2") -} - func testAccAzureRMPostgreSQLServer_basicEleven(rInt int, location string) string { return testAccAzureRMPostgreSQLServer_basic(rInt, location, "11") } From 9f3ee588f5cf8ba9440fafe1153f92f2f5420c16 Mon Sep 17 00:00:00 2001 From: kt Date: Thu, 1 Aug 2019 14:03:53 -0700 Subject: [PATCH 2/2] update docs --- website/docs/r/postgresql_server.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/r/postgresql_server.html.markdown b/website/docs/r/postgresql_server.html.markdown index ab39582fc755..d5d8e3c1356b 100644 --- a/website/docs/r/postgresql_server.html.markdown +++ b/website/docs/r/postgresql_server.html.markdown @@ -61,7 +61,7 @@ The following arguments are supported: * `administrator_login_password` - (Required) The Password associated with the `administrator_login` for the PostgreSQL Server. -* `version` - (Required) Specifies the version of PostgreSQL to use. Valid values are `9.5`, `9.6`, `10`, `10.0`, and `10.2`. Changing this forces a new resource to be created. +* `version` - (Required) Specifies the version of PostgreSQL to use. Valid values are `9.5`, `9.6`, `10`, `10.0`, and `11`. Changing this forces a new resource to be created. * `ssl_enforcement` - (Required) Specifies if SSL should be enforced on connections. Possible values are `Enabled` and `Disabled`.