New attributes, flatten storage_profile block

- `create_mode`, `creation_source_server_id` - 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 - Remove unpopulated attribute `administrator_login_password` from `mariadb_server` data source Fixes: #4296, #6521 Related: #6459
hashicorp · May 12, 2020 · 2db44ac · 2db44ac
1 parent a1ad233
commit 2db44ac
Show file tree

Hide file tree

Showing 16 changed files with 891 additions and 463 deletions.
diff --git a/azurerm/helpers/validate/database.go b/azurerm/helpers/validate/database.go
diff --git a/azurerm/helpers/validate/mariadb.go b/azurerm/helpers/validate/mariadb.go
diff --git a/azurerm/internal/services/mariadb/mariadb_configuration_resource.go b/azurerm/internal/services/mariadb/mariadb_configuration_resource.go
@@ -3,9 +3,10 @@ package mariadb
 import (
 	"fmt"
 	"log"
-	"regexp"
 	"time"
 
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mariadb/validate"
+
 	"github.com/Azure/azure-sdk-for-go/services/mariadb/mgmt/2018-06-01/mariadb"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
@@ -43,13 +44,10 @@ func resourceArmMariaDbConfiguration() *schema.Resource {
 			"resource_group_name": azure.SchemaResourceGroupName(),
 
 			"server_name": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-				ValidateFunc: validation.StringMatch(
-					regexp.MustCompile("^[-a-zA-Z0-9]{3,50}$"),
-					"server_name must be 3 - 50 characters long, and contain only letters, numbers and hyphens",
-				),
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validate.MariaDbServerServerName,
 			},
 
 			"value": {

diff --git a/azurerm/internal/services/mariadb/mariadb_database_resource.go b/azurerm/internal/services/mariadb/mariadb_database_resource.go
@@ -6,13 +6,14 @@ import (
 	"regexp"
 	"time"
 
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mariadb/validate"
+
 	"github.com/Azure/azure-sdk-for-go/services/mariadb/mgmt/2018-06-01/mariadb"
 	"github.com/hashicorp/go-azure-helpers/response"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts"
@@ -49,13 +50,10 @@ func resourceArmMariaDbDatabase() *schema.Resource {
 			"resource_group_name": azure.SchemaResourceGroupName(),
 
 			"server_name": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
-				ValidateFunc: validation.StringMatch(
-					regexp.MustCompile("^[-a-zA-Z0-9]{3,50}$"),
-					"server_name must be 3 - 50 characters long, and contain only letters, numbers and hyphens",
-				),
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: validate.MariaDbServerServerName,
 			},
 
 			"charset": {
@@ -69,10 +67,13 @@ func resourceArmMariaDbDatabase() *schema.Resource {
 			},
 
 			"collation": {
-				Type:         schema.TypeString,
-				Required:     true,
-				ForceNew:     true,
-				ValidateFunc: validate.MariaDatabaseCollation,
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+				ValidateFunc: validation.StringMatch(
+					regexp.MustCompile("^[A-Za-z0-9_. ]+$"),
+					"collation must contain only alphanumeric, underscore, space and dot characters",
+				),
 			},
 		},
 	}

diff --git a/azurerm/internal/services/mariadb/mariadb_firewall_rule_resource.go b/azurerm/internal/services/mariadb/mariadb_firewall_rule_resource.go
@@ -3,13 +3,17 @@ package mariadb
 import (
 	"fmt"
 	"log"
+	"regexp"
 	"time"
 
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
+	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mariadb/validate"
+
 	"github.com/Azure/azure-sdk-for-go/services/mariadb/mgmt/2018-06-01/mariadb"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
-	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
+	azValidate "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts"
@@ -35,10 +39,13 @@ func resourceArmMariaDBFirewallRule() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"name": {
-				Type:         schema.TypeString,
-				Required:     true,
-				ForceNew:     true,
-				ValidateFunc: validate.MariaDBFirewallRuleName,
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+				ValidateFunc: validation.StringMatch(
+					regexp.MustCompile("^[-a-z0-9]{1,128}$"),
+					"name must be 1-128 characters long and contain only letters, numbers and hyphens",
+				),
 			},
 
 			"resource_group_name": azure.SchemaResourceGroupName(),
@@ -47,19 +54,19 @@ func resourceArmMariaDBFirewallRule() *schema.Resource {
 				Type:         schema.TypeString,
 				Required:     true,
 				ForceNew:     true,
-				ValidateFunc: validate.MariaDBServerName,
+				ValidateFunc: validate.MariaDbServerServerName,
 			},
 
 			"start_ip_address": {
 				Type:         schema.TypeString,
 				Required:     true,
-				ValidateFunc: validate.IPv4Address,
+				ValidateFunc: azValidate.IPv4Address,
 			},
 
 			"end_ip_address": {
 				Type:         schema.TypeString,
 				Required:     true,
-				ValidateFunc: validate.IPv4Address,
+				ValidateFunc: azValidate.IPv4Address,
 			},
 		},
 	}

diff --git a/azurerm/internal/services/mariadb/mariadb_server_data_source.go b/azurerm/internal/services/mariadb/mariadb_server_data_source.go
@@ -46,12 +46,6 @@ func dataSourceMariaDbServer() *schema.Resource {
 				Computed: true,
 			},
 
-			"administrator_login_password": {
-				Type:      schema.TypeString,
-				Computed:  true,
-				Sensitive: true,
-			},
-
 			"version": {
 				Type:     schema.TypeString,
 				Computed: true,