New attributes, flatten storage_profile block

- `create_mode`, `creation_source_server_id`, `infrastructure_encryption_enabled`, `ssl_minimal_tls_version_enforced` - Support replicas and point-in-time restores - Use booleans for toggle properties, renaming * `auto_grow` -> `auto_grow_enabled` * `geo_redundant_backup` -> `geo_redundant_backup_enabled` * `ssl_enforcement` -> `ssl_enforcement_enabled` - Remove redundant `storage_profile` block and move all properties within to top level Fixes: #4756 Related: #6459
hashicorp · May 11, 2020 · 0d0f704 · 0d0f704
1 parent a1ad233
commit 0d0f704
Show file tree

Hide file tree

Showing 13 changed files with 874 additions and 303 deletions.
diff --git a/azurerm/helpers/azure/mysql.go b/azurerm/helpers/azure/mysql.go
diff --git a/azurerm/internal/services/mysql/mysql_configuration_resource.go b/azurerm/internal/services/mysql/mysql_configuration_resource.go
@@ -2,6 +2,7 @@ package mysql
 
 import (
 	"fmt"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mysql/validate"
 	"log"
 	"time"
 
@@ -43,7 +44,7 @@ func resourceArmMySQLConfiguration() *schema.Resource {
 				Type:         schema.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: azure.ValidateMySqlServerName,
+				ValidateFunc: validate.MysqlServerServerName,
 			},
 
 			"value": {

diff --git a/azurerm/internal/services/mysql/mysql_database_resource.go b/azurerm/internal/services/mysql/mysql_database_resource.go
@@ -2,6 +2,7 @@ package mysql
 
 import (
 	"fmt"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mysql/validate"
 	"log"
 	"time"
 
@@ -46,7 +47,7 @@ func resourceArmMySqlDatabase() *schema.Resource {
 				Type:         schema.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: azure.ValidateMySqlServerName,
+				ValidateFunc: validate.MysqlServerServerName,
 			},
 
 			"charset": {

diff --git a/azurerm/internal/services/mysql/mysql_firewall_rule_resource.go b/azurerm/internal/services/mysql/mysql_firewall_rule_resource.go
@@ -2,6 +2,7 @@ package mysql
 
 import (
 	"fmt"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mysql/validate"
 	"log"
 	"time"
 
@@ -46,7 +47,7 @@ func resourceArmMySqlFirewallRule() *schema.Resource {
 				Type:         schema.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: azure.ValidateMySqlServerName,
+				ValidateFunc: validate.MysqlServerServerName,
 			},
 
 			"start_ip_address": {