sqlvm upgrade include new features

internal/services/mssql/helper/sql_virtual_machine_storage_settings.go

@@ -28,3 +28,52 @@ func StorageSettingSchema() *pluginsdk.Schema {
 		},
 	}
 }
+
+func SQLTempDBStorageSettingSchema() *pluginsdk.Schema {
+	return &pluginsdk.Schema{
+		Type:     pluginsdk.TypeList,
+		Optional: true,
+		MaxItems: 1,
+		Elem: &pluginsdk.Resource{
+			Schema: map[string]*pluginsdk.Schema{
+				"data_file_count": {
+					Type:     pluginsdk.TypeInt,
+					Optional: true,
+					Default:  8,
+				},
+				"data_file_size_mb": {
+					Type:     pluginsdk.TypeInt,
+					Optional: true,
+					Default:  256,
+				},
+				"data_file_growth_in_mb": {
+					Type:     pluginsdk.TypeInt,
+					Optional: true,
+					Default:  512,
+				},
+				"default_file_path": {
+					Type:         pluginsdk.TypeString,
+					Required:     true,
+					ValidateFunc: validation.StringIsNotEmpty,
+				},
+				"log_file_size_mb": {
+					Type:     pluginsdk.TypeInt,
+					Optional: true,
+					Default:  256,
+				},
+				"log_file_growth_mb": {
+					Type:     pluginsdk.TypeInt,
+					Optional: true,
+					Default:  512,
+				},
+				"luns": {
+					Type:     pluginsdk.TypeList,
+					Required: true,
+					Elem: &pluginsdk.Schema{
+						Type: pluginsdk.TypeInt,
+					},
+				},
+			},
+		},
+	}
+}

internal/services/mssql/mssql_virtual_machine_resource.go

@@ -285,7 +285,12 @@ func resourceMsSqlVirtualMachine() *pluginsdk.Resource {
 						},
 						"data_settings":    helper.StorageSettingSchema(),
 						"log_settings":     helper.StorageSettingSchema(),
-						"temp_db_settings": helper.StorageSettingSchema(),
+						"temp_db_settings": helper.SQLTempDBStorageSettingSchema(),
+						"system_db_on_datadisk_enabled": {
+							Type:     pluginsdk.TypeBool,
+							Optional: true,
+							Default:  false,
+						},
 					},
 				},
 			},
@@ -798,6 +803,7 @@ func expandSqlVirtualMachineStorageConfigurationSettings(input []interface{}) *s
 		SQLDataSettings:       expandSqlVirtualMachineDataStorageSettings(storageSettings["data_settings"].([]interface{})),
 		SQLLogSettings:        expandSqlVirtualMachineDataStorageSettings(storageSettings["log_settings"].([]interface{})),
 		SQLTempDbSettings:     expandSqlVirtualMachineTempDbSettings(storageSettings["temp_db_settings"].([]interface{})),
+		SQLSystemDbOnDataDisk: utils.Bool(storageSettings["sql_system_db_on_datadisk"].(bool)),
 	}
 }
 
@@ -807,11 +813,12 @@ func flattenSqlVirtualMachineStorageConfigurationSettings(input *sqlvirtualmachi
 	}
 
 	output := map[string]interface{}{
-		"storage_workload_type": storageWorkloadType,
-		"disk_type":             string(input.DiskConfigurationType),
-		"data_settings":         flattenSqlVirtualMachineStorageSettings(input.SQLDataSettings),
-		"log_settings":          flattenSqlVirtualMachineStorageSettings(input.SQLLogSettings),
-		"temp_db_settings":      flattenSqlVirtualMachineTempDbSettings(input.SQLTempDbSettings),
+		"storage_workload_type":      storageWorkloadType,
+		"disk_type":                  string(input.DiskConfigurationType),
+		"data_settings":              flattenSqlVirtualMachineStorageSettings(input.SQLDataSettings),
+		"log_settings":               flattenSqlVirtualMachineStorageSettings(input.SQLLogSettings),
+		"temp_db_settings":           flattenSqlVirtualMachineTempDbSettings(input.SQLTempDbSettings),
+		"sql_system_db_on_datadisk":  input.SQLSystemDbOnDataDisk,
 	}
 
 	if output["storage_workload_type"].(string) == "" && output["disk_type"] == "" &&

website/docs/r/mssql_virtual_machine.html.markdown

@@ -129,7 +129,7 @@ The `storage_configuration` block supports the following:
 
 * `log_settings` - (Optional) An `storage_settings` as defined below.
 
-* `temp_db_settings` - (Optional) An `storage_settings` as defined below.
+* `temp_db_settings` - (Optional) An `sqltempdb_storage_settings` as defined below.
 
 ---
 
@@ -139,6 +139,24 @@ The `storage_settings` block supports the following:
 
 * `luns` - (Required) A list of Logical Unit Numbers for the disks. 
 
+---
+
+The `sqltempdb_storage_settings` block supports the following:
+
+* `default_file_path` - (Required) The SQL Server default path
+
+* `luns` - (Required) A list of Logical Unit Numbers for the disks. 
+
+* `data_file_count` - (Optional) SQL Server default file count - Default 8
+
+* `data_file_size` - (Optional) SQL Server default file size - Default 256
+
+* `data_growth` - (Optional) SQL Server default file size - Default 512
+
+* `log_file_size` - (Optional) SQL Server default file size - Default 256
+
+* `log_growth` - (Optional) SQL Server default file size - Default 512
+
 ## Attributes Reference
 
 The following attributes are exported: