Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

azurerm_postgresql_server - remove unsupported version 10.2 #3915

Merged
merged 2 commits into from
Aug 1, 2019
Merged

azurerm_postgresql_server - remove unsupported version 10.2 #3915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f71b79e
only remove 10.2
katbyte Aug 1, 2019
9f3ee58
update docs
katbyte Aug 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion azurerm/resource_arm_postgresql_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ func resourceArmPostgreSQLServer() *schema.Resource {
string(postgresql.OneOne),
string(postgresql.OneZero),
string(postgresql.OneZeroFullStopZero),
string(postgresql.OneZeroFullStopTwo),
}, true),
DiffSuppressFunc: suppress.CaseDifference,
},
Expand Down
34 changes: 0 additions & 34 deletions azurerm/resource_arm_postgresql_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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")
}
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/postgresql_server.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

Expand Down