review comments

Author: stephybun

internal/services/mysql/mysql_flexible_server_resource.go

@@ -97,6 +97,7 @@ func resourceMysqlFlexibleServer() *pluginsdk.Resource {
 				WriteOnly:     true,
 				ConflictsWith: []string{"administrator_password"},
 				RequiredWith:  []string{"administrator_password_wo_version"},
+				ValidateFunc:  validate.FlexibleServerAdministratorPassword,
 			},
 
 			"administrator_password_wo_version": {

internal/services/mysql/mysql_flexible_server_resource_test.go

@@ -521,7 +521,7 @@ func TestAccMySqlFlexibleServer_writeOnlyPassword(t *testing.T) {
 
 	resource.ParallelTest(t, resource.TestCase{
 		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
-			tfversion.SkipBelow(version.Must(version.NewVersion("1.11.0-beta1"))),
+			tfversion.SkipBelow(version.Must(version.NewVersion("1.11.0"))),
 		},
 		ProtoV5ProviderFactories: framework.ProtoV5ProviderFactoriesInit(context.Background(), "azurerm"),
 		Steps: []resource.TestStep{
@@ -545,7 +545,7 @@ func TestAccMySqlFlexibleServer_updateToWriteOnlyPassword(t *testing.T) {
 
 	resource.ParallelTest(t, resource.TestCase{
 		TerraformVersionChecks: []tfversion.TerraformVersionCheck{
-			tfversion.SkipBelow(version.Must(version.NewVersion("1.11.0-beta1"))),
+			tfversion.SkipBelow(version.Must(version.NewVersion("1.11.0"))),
 		},
 		ProtoV5ProviderFactories: framework.ProtoV5ProviderFactoriesInit(context.Background(), "azurerm"),
 		Steps: []resource.TestStep{

website/docs/r/mysql_flexible_server.html.markdown

@@ -85,12 +85,14 @@ The following arguments are supported:
 
 * `administrator_login` - (Optional) The Administrator login for the MySQL Flexible Server. Required when `create_mode` is `Default`. Changing this forces a new MySQL Flexible Server to be created.
 
-* `administrator_password` - (Optional) The Password associated with the `administrator_login` for the MySQL Flexible Server. Either `administrator_password` or `administrator_password_wo` is required when `create_mode` is `Default`.
+* `administrator_password` - (Optional) The Password associated with the `administrator_login` for the MySQL Flexible Server.
 
-* `administrator_password_wo` - (Optional, Write-Only) The Password associated with the `administrator_login` for the MySQL Flexible Server. Either `administrator_password_wo` or `administrator_password` is required when `create_mode` is `Default`.
+* `administrator_password_wo` - (Optional, Write-Only) The Password associated with the `administrator_login` for the MySQL Flexible Server.
 
 * `administrator_password_wo_version` - (Optional) An integer value used to trigger an update for `administrator_password_wo`. This property should be incremented when updating `administrator_password_wo`.
 
+~> **Note:** Either `administrator_password` or `administrator_password_wo` is required when `create_mode` is `Default`.
+
 * `backup_retention_days` - (Optional) The backup retention days for the MySQL Flexible Server. Possible values are between `1` and `35` days. Defaults to `7`.
 
 * `create_mode` - (Optional)The creation mode which can be used to restore or replicate existing servers. Possible values are `Default`, `PointInTimeRestore`, `GeoRestore`, and `Replica`. Changing this forces a new MySQL Flexible Server to be created.