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_mysql_server ssl_enforcement_enabled update fail #7307

Merged
merged 8 commits into from
Jul 13, 2020
Merged

azurerm_mysql_server ssl_enforcement_enabled update fail #7307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
691a829
update
Jun 10, 2020
49d9533
ri
Jun 12, 2020
6bbe8dd
Merge branch 'master' of https://github.com/terraform-providers/terra…
Jun 12, 2020
230d673
clear code
Jun 12, 2020
1d3cdc7
merge
Jul 8, 2020
c5f7efa
update
Jul 10, 2020
917fcc3
update
Jul 10, 2020
bca369e
update tests
Jul 10, 2020
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: 1 addition & 0 deletions azurerm/internal/services/mysql/mysql_server_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,6 +567,7 @@ func resourceArmMySqlServerUpdate(d *schema.ResourceData, meta interface{}) erro
AdministratorLoginPassword: utils.String(d.Get("administrator_login_password").(string)),
PublicNetworkAccess: publicAccess,
SslEnforcement: ssl,
MinimalTLSVersion: mysql.MinimalTLSVersionEnum(d.Get("ssl_minimal_tls_version_enforced").(string)),
StorageProfile: storageProfile,
Version: mysql.ServerVersion(d.Get("version").(string)),
},
Expand Down
84 changes: 45 additions & 39 deletions azurerm/internal/services/mysql/tests/mysql_server_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,15 +406,16 @@ resource "azurerm_resource_group" "test" {
}

resource "azurerm_mysql_server" "test" {
name = "acctestmysqlsvr-%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
sku_name = "GP_Gen5_2"
administrator_login = "acctestun"
administrator_login_password = "H@Sh1CoR3!"
ssl_enforcement_enabled = true
storage_mb = 51200
version = "%s"
name = "acctestmysqlsvr-%d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
sku_name = "GP_Gen5_2"
administrator_login = "acctestun"
administrator_login_password = "H@Sh1CoR3!"
ssl_enforcement_enabled = true
ssl_minimal_tls_version_enforced = "TLS1_1"
storage_mb = 51200
version = "%s"
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, version)
}
Expand All @@ -441,10 +442,11 @@ resource "azurerm_mysql_server" "test" {
storage_mb = 51200
}

administrator_login = "acctestun"
administrator_login_password = "H@Sh1CoR3!"
version = "%s"
ssl_enforcement_enabled = true
administrator_login = "acctestun"
administrator_login_password = "H@Sh1CoR3!"
version = "%s"
ssl_enforcement_enabled = true
ssl_minimal_tls_version_enforced = "TLS1_1"
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, version)
}
Expand All @@ -461,19 +463,20 @@ resource "azurerm_resource_group" "test" {
}

resource "azurerm_mysql_server" "test" {
name = "acctestmysqlsvr-%[1]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
sku_name = "GP_Gen5_2"
administrator_login = "acctestun"
administrator_login_password = "H@Sh1CoR3!"
auto_grow_enabled = true
backup_retention_days = 7
create_mode = "Default"
geo_redundant_backup_enabled = false
ssl_enforcement_enabled = true
storage_mb = 51200
version = "%[3]s"
name = "acctestmysqlsvr-%[1]d"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
sku_name = "GP_Gen5_2"
administrator_login = "acctestun"
administrator_login_password = "H@Sh1CoR3!"
auto_grow_enabled = true
backup_retention_days = 7
create_mode = "Default"
geo_redundant_backup_enabled = false
ssl_enforcement_enabled = true
ssl_minimal_tls_version_enforced = "TLS1_2"
storage_mb = 51200
version = "%[3]s"
threat_detection_policy {
enabled = true
disabled_alerts = ["Sql_Injection", "Data_Exfiltration"]
Expand Down Expand Up @@ -515,7 +518,7 @@ resource "azurerm_mysql_server" "test" {
backup_retention_days = 7
create_mode = "Default"
geo_redundant_backup_enabled = false
ssl_enforcement_enabled = true
ssl_enforcement_enabled = false
storage_mb = 51200
version = "%[3]s"
threat_detection_policy {
Expand Down Expand Up @@ -556,10 +559,11 @@ resource "azurerm_mysql_server" "test" {
auto_grow = "Enabled"
}

administrator_login = "acctestun"
administrator_login_password = "H@Sh1CoR3!"
version = "%s"
ssl_enforcement_enabled = true
administrator_login = "acctestun"
administrator_login_password = "H@Sh1CoR3!"
version = "%s"
ssl_enforcement_enabled = true
ssl_minimal_tls_version_enforced = "TLS1_2"
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, version)
}
Expand Down Expand Up @@ -652,9 +656,10 @@ resource "azurerm_mysql_server" "replica" {
version = "%s"
storage_mb = 51200

create_mode = "Replica"
creation_source_server_id = azurerm_mysql_server.test.id
ssl_enforcement_enabled = true
create_mode = "Replica"
creation_source_server_id = azurerm_mysql_server.test.id
ssl_enforcement_enabled = true
ssl_minimal_tls_version_enforced = "TLS1_1"
}
`, testAccAzureRMMySQLServer_basic(data, version), data.RandomInteger, version)
}
Expand All @@ -670,11 +675,12 @@ resource "azurerm_mysql_server" "restore" {
sku_name = "GP_Gen5_2"
version = "%s"

create_mode = "PointInTimeRestore"
creation_source_server_id = azurerm_mysql_server.test.id
restore_point_in_time = "%s"
ssl_enforcement_enabled = true
storage_mb = 51200
create_mode = "PointInTimeRestore"
creation_source_server_id = azurerm_mysql_server.test.id
restore_point_in_time = "%s"
ssl_enforcement_enabled = true
ssl_minimal_tls_version_enforced = "TLS1_1"
storage_mb = 51200
}
`, testAccAzureRMMySQLServer_basic(data, version), data.RandomInteger, version, restoreTime)
}