Skip to content

Commit

Permalink
3.0 test fixes for pgsql and trafficmanager (#16008)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jackofallops
jackofallops authored Mar 24, 2022
1 parent f74d027 commit 19c9403
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 70 deletions.
16 changes: 6 additions & 10 deletions internal/services/postgres/postgresql_aad_administrator_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,9 @@ resource "azurerm_postgresql_server" "test" {
sku_name = "GP_Gen5_2"
storage_profile {
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup = "Disabled"
}
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup_enabled = false
administrator_login = "acctestun"
administrator_login_password = "H@Sh1CoR3!"
Expand Down Expand Up @@ -174,11 +172,9 @@ resource "azurerm_postgresql_server" "test" {
sku_name = "GP_Gen5_2"
storage_profile {
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup = "Disabled"
}
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup_enabled = false
administrator_login = "acctestun"
administrator_login_password = "H@Sh1CoR3!"
Expand Down
8 changes: 3 additions & 5 deletions internal/services/postgres/postgresql_configuration_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,11 +200,9 @@ resource "azurerm_postgresql_server" "test" {
sku_name = "GP_Gen5_2"
storage_profile {
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup = "Disabled"
}
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup_enabled = false
administrator_login = "acctestun"
administrator_login_password = "H@Sh1CoR3!"
Expand Down
32 changes: 12 additions & 20 deletions internal/services/postgres/postgresql_database_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,9 @@ resource "azurerm_postgresql_server" "test" {
sku_name = "GP_Gen5_2"
storage_profile {
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup = "Disabled"
}
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup_enabled = false
administrator_login = "acctestun"
administrator_login_password = "H@Sh1CoR3!"
Expand Down Expand Up @@ -177,11 +175,9 @@ resource "azurerm_postgresql_server" "test" {
sku_name = "GP_Gen5_2"
storage_profile {
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup = "Disabled"
}
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup_enabled = false
administrator_login = "acctestun"
administrator_login_password = "H@Sh1CoR3!"
Expand Down Expand Up @@ -217,11 +213,9 @@ resource "azurerm_postgresql_server" "test" {
sku_name = "GP_Gen5_2"
storage_profile {
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup = "Disabled"
}
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup_enabled = false
administrator_login = "acctestun"
administrator_login_password = "H@Sh1CoR3!"
Expand Down Expand Up @@ -257,11 +251,9 @@ resource "azurerm_postgresql_server" "test" {
sku_name = "GP_Gen5_2"
storage_profile {
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup = "Disabled"
}
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup_enabled = false
administrator_login = "acctestun"
administrator_login_password = "H@Sh1CoR3!"
Expand Down
8 changes: 3 additions & 5 deletions internal/services/postgres/postgresql_firewall_rule_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,9 @@ resource "azurerm_postgresql_server" "test" {
sku_name = "GP_Gen5_2"
storage_profile {
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup = "Disabled"
}
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup_enabled = false
administrator_login = "acctestun"
administrator_login_password = "H@Sh1CoR3!"
Expand Down
40 changes: 15 additions & 25 deletions internal/services/postgres/postgresql_virtual_network_rule_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,9 @@ resource "azurerm_postgresql_server" "test" {
sku_name = "GP_Gen5_2"
storage_profile {
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup = "Disabled"
}
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup_enabled = false
}
resource "azurerm_postgresql_virtual_network_rule" "test" {
Expand Down Expand Up @@ -251,11 +249,9 @@ resource "azurerm_postgresql_server" "test" {
sku_name = "GP_Gen5_2"
storage_profile {
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup = "Disabled"
}
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup_enabled = false
}
resource "azurerm_postgresql_virtual_network_rule" "test" {
Expand Down Expand Up @@ -312,11 +308,9 @@ resource "azurerm_postgresql_server" "test" {
sku_name = "GP_Gen5_2"
storage_profile {
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup = "Disabled"
}
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup_enabled = false
}
resource "azurerm_postgresql_virtual_network_rule" "test" {
Expand Down Expand Up @@ -388,11 +382,9 @@ resource "azurerm_postgresql_server" "test" {
sku_name = "GP_Gen5_2"
storage_profile {
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup = "Disabled"
}
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup_enabled = false
}
resource "azurerm_postgresql_virtual_network_rule" "rule1" {
Expand Down Expand Up @@ -454,11 +446,9 @@ resource "azurerm_postgresql_server" "test" {
sku_name = "GP_Gen5_2"
storage_profile {
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup = "Disabled"
}
storage_mb = 51200
backup_retention_days = 7
geo_redundant_backup_enabled = false
administrator_login = "acctestun"
administrator_login_password = "H@Sh1CoR3!"
Expand Down
9 changes: 4 additions & 5 deletions internal/services/trafficmanager/traffic_manager_profile_resource_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -429,11 +429,10 @@ resource "azurerm_traffic_manager_profile" "test" {
func (r TrafficManagerProfileResource) endpointResource(data acceptance.TestData) string {
return fmt.Sprintf(`
resource "azurerm_traffic_manager_external_endpoint" "test" {
name = "acctestend-external%d"
resource_group_name = azurerm_resource_group.test.name
profile_name = azurerm_traffic_manager_profile.test.name
target = "pluginsdk.io"
weight = 100
name = "acctestend-external%d"
profile_id = azurerm_traffic_manager_profile.test.id
target = "pluginsdk.io"
weight = 100
}
`, data.RandomInteger)
}
Expand Down

0 comments on commit 19c9403

Please sign in to comment.