From bf20c6160225c0164c97dabd0a1aa38d6f262a43 Mon Sep 17 00:00:00 2001 From: kt Date: Sun, 12 Jan 2020 13:41:24 -0800 Subject: [PATCH 1/4] azurerm_mysql_server: deprecate sku in favour of sku_name --- .../mysql/resource_arm_mysql_server.go | 138 ++++++++++++++---- .../resource_arm_mysql_configuration_test.go | 7 +- .../tests/resource_arm_mysql_database_test.go | 21 +-- .../resource_arm_mysql_firewall_rule_test.go | 7 +- .../tests/resource_arm_mysql_server_test.go | 98 +++++++------ ...rce_arm_mysql_virtual_network_rule_test.go | 28 +--- .../guides/2.0-upgrade-guide.html.markdown | 4 + .../docs/r/mysql_configuration.html.markdown | 7 +- website/docs/r/mysql_database.html.markdown | 7 +- website/docs/r/mysql_server.html.markdown | 21 +-- .../mysql_virtual_network_rule.html.markdown | 7 +- 11 files changed, 181 insertions(+), 164 deletions(-) diff --git a/azurerm/internal/services/mysql/resource_arm_mysql_server.go b/azurerm/internal/services/mysql/resource_arm_mysql_server.go index 743a63c379cc..181beac15866 100644 --- a/azurerm/internal/services/mysql/resource_arm_mysql_server.go +++ b/azurerm/internal/services/mysql/resource_arm_mysql_server.go @@ -3,6 +3,7 @@ package mysql import ( "fmt" "log" + "strconv" "strings" "time" @@ -50,10 +51,43 @@ func resourceArmMySqlServer() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), + "sku_name": { + Type: schema.TypeString, + Optional: true, // required in 2.0 + Computed: true, // remove in 2.0 + ConflictsWith: []string{"sku"}, + ValidateFunc: validation.StringInSlice([]string{ + "B_Gen4_1", + "B_Gen4_2", + "B_Gen5_1", + "B_Gen5_2", + "GP_Gen4_2", + "GP_Gen4_4", + "GP_Gen4_8", + "GP_Gen4_16", + "GP_Gen4_32", + "GP_Gen5_2", + "GP_Gen5_4", + "GP_Gen5_8", + "GP_Gen5_16", + "GP_Gen5_32", + "GP_Gen5_64", + "MO_Gen5_2", + "MO_Gen5_4", + "MO_Gen5_8", + "MO_Gen5_16", + "MO_Gen5_32", + }, false), + }, + + // remove in 2.0 "sku": { - Type: schema.TypeList, - Required: true, - MaxItems: 1, + Type: schema.TypeList, + Optional: true, + Computed: true, + ConflictsWith: []string{"sku_name"}, + Deprecated: "This property has been deprecated in favour of the 'sku_name' property and will be removed in version 2.0 of the provider", + MaxItems: 1, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { @@ -226,13 +260,6 @@ func resourceArmMySqlServerCreate(d *schema.ResourceData, meta interface{}) erro location := azure.NormalizeLocation(d.Get("location").(string)) resourceGroup := d.Get("resource_group_name").(string) - adminLogin := d.Get("administrator_login").(string) - adminLoginPassword := d.Get("administrator_login_password").(string) - sslEnforcement := d.Get("ssl_enforcement").(string) - version := d.Get("version").(string) - createMode := "Default" - t := d.Get("tags").(map[string]interface{}) - if features.ShouldResourcesBeImported() && d.IsNewResource() { existing, err := client.Get(ctx, resourceGroup, name) if err != nil { @@ -246,21 +273,31 @@ func resourceArmMySqlServerCreate(d *schema.ResourceData, meta interface{}) erro } } - sku := expandMySQLServerSku(d) - storageProfile := expandMySQLStorageProfile(d) + var sku *mysql.Sku + if b, ok := d.GetOk("sku_name"); ok { + var err error + sku, err = expandServerSkuName(b.(string)) + if err != nil { + return fmt.Errorf("error expanding sku_name for MySQL Server %q (Resource Group %q): %v", name, resourceGroup, err) + } + } else if _, ok := d.GetOk("sku"); ok { + sku = expandMySQLServerSku(d) + } else { + return fmt.Errorf("One of `sku` or `sku_name` must be set for MySQL Server %q (Resource Group %q)", name, resourceGroup) + } properties := mysql.ServerForCreate{ Location: &location, Properties: &mysql.ServerPropertiesForDefaultCreate{ - AdministratorLogin: utils.String(adminLogin), - AdministratorLoginPassword: utils.String(adminLoginPassword), - Version: mysql.ServerVersion(version), - SslEnforcement: mysql.SslEnforcementEnum(sslEnforcement), - StorageProfile: storageProfile, - CreateMode: mysql.CreateMode(createMode), + AdministratorLogin: utils.String(d.Get("administrator_login").(string)), + AdministratorLoginPassword: utils.String(d.Get("administrator_login_password").(string)), + Version: mysql.ServerVersion(d.Get("version").(string)), + SslEnforcement: mysql.SslEnforcementEnum(d.Get("ssl_enforcement").(string)), + StorageProfile: expandMySQLStorageProfile(d), + CreateMode: mysql.CreateMode("Default"), }, Sku: sku, - Tags: tags.Expand(t), + Tags: tags.Expand(d.Get("tags").(map[string]interface{})), } future, err := client.Create(ctx, resourceGroup, name, properties) @@ -296,22 +333,28 @@ func resourceArmMySqlServerUpdate(d *schema.ResourceData, meta interface{}) erro name := d.Get("name").(string) resourceGroup := d.Get("resource_group_name").(string) - adminLoginPassword := d.Get("administrator_login_password").(string) - sslEnforcement := d.Get("ssl_enforcement").(string) - version := d.Get("version").(string) - sku := expandMySQLServerSku(d) - storageProfile := expandMySQLStorageProfile(d) - t := d.Get("tags").(map[string]interface{}) + var sku *mysql.Sku + if b, ok := d.GetOk("sku_name"); ok { + var err error + sku, err = expandServerSkuName(b.(string)) + if err != nil { + return fmt.Errorf("error expanding sku_name for MySQL Server %q (Resource Group %q): %v", name, resourceGroup, err) + } + } else if _, ok := d.GetOk("sku"); ok { + sku = expandMySQLServerSku(d) + } else { + return fmt.Errorf("One of `sku` or `sku_name` must be set for MySQL Server %q (Resource Group %q)", name, resourceGroup) + } properties := mysql.ServerUpdateParameters{ ServerUpdateParametersProperties: &mysql.ServerUpdateParametersProperties{ - StorageProfile: storageProfile, - AdministratorLoginPassword: utils.String(adminLoginPassword), - Version: mysql.ServerVersion(version), - SslEnforcement: mysql.SslEnforcementEnum(sslEnforcement), + StorageProfile: expandMySQLStorageProfile(d), + AdministratorLoginPassword: utils.String(d.Get("administrator_login_password").(string)), + Version: mysql.ServerVersion(d.Get("version").(string)), + SslEnforcement: mysql.SslEnforcementEnum(d.Get("ssl_enforcement").(string)), }, Sku: sku, - Tags: tags.Expand(t), + Tags: tags.Expand(d.Get("tags").(map[string]interface{})), } future, err := client.Update(ctx, resourceGroup, name, properties) @@ -366,6 +409,10 @@ func resourceArmMySqlServerRead(d *schema.ResourceData, meta interface{}) error d.Set("location", azure.NormalizeLocation(*location)) } + if sku := resp.Sku; sku != nil { + d.Set("sku_name", sku.Name) + } + d.Set("administrator_login", resp.AdministratorLogin) d.Set("version", string(resp.Version)) d.Set("ssl_enforcement", string(resp.SslEnforcement)) @@ -408,6 +455,37 @@ func resourceArmMySqlServerDelete(d *schema.ResourceData, meta interface{}) erro return nil } +func expandServerSkuName(skuName string) (*mysql.Sku, error) { + parts := strings.Split(skuName, "_") + if len(parts) != 3 { + return nil, fmt.Errorf("sku_name (%s) has the worng numberof parts (%d) after splitting on _", skuName, len(parts)) + } + + var tier mysql.SkuTier + switch parts[0] { + case "B": + tier = mysql.Basic + case "GP": + tier = mysql.GeneralPurpose + case "MO": + tier = mysql.MemoryOptimized + default: + return nil, fmt.Errorf("sku_name %s has unknown sku tier %s", skuName, parts[0]) + } + + capacity, err := strconv.Atoi(parts[2]) + if err != nil { + return nil, fmt.Errorf("cannot convert skuname %s capcity %s to int", skuName, parts[2]) + } + + return &mysql.Sku{ + Name: utils.String(skuName), + Tier: tier, + Capacity: utils.Int32(int32(capacity)), + Family: utils.String(parts[1]), + }, nil +} + func expandMySQLServerSku(d *schema.ResourceData) *mysql.Sku { skus := d.Get("sku").([]interface{}) sku := skus[0].(map[string]interface{}) diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_configuration_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_configuration_test.go index 0c899876118f..6b68a341db64 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_configuration_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_configuration_test.go @@ -215,12 +215,7 @@ resource "azurerm_mysql_server" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_database_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_database_test.go index ab85f3fe6a2a..b4d5f340de50 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_database_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_database_test.go @@ -166,12 +166,7 @@ resource "azurerm_mysql_server" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 @@ -221,12 +216,7 @@ resource "azurerm_mysql_server" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 @@ -262,12 +252,7 @@ resource "azurerm_mysql_server" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_firewall_rule_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_firewall_rule_test.go index 749022d43364..9a4d515168ce 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_firewall_rule_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_firewall_rule_test.go @@ -127,12 +127,7 @@ resource "azurerm_mysql_server" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go index db347afd078f..b97425bd6887 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go @@ -31,6 +31,25 @@ func TestAccAzureRMMySQLServer_basicFiveSix(t *testing.T) { }) } +func TestAccAzureRMMySQLServer_basicFiveSixOldSku(t *testing.T) { + data := acceptance.BuildTestData(t, "azurerm_mysql_server", "test") + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { acceptance.PreCheck(t) }, + Providers: acceptance.SupportedProviders, + CheckDestroy: testCheckAzureRMMySQLServerDestroy, + Steps: []resource.TestStep{ + { + Config: testAccAzureRMMySQLServer_basicFiveSixOldSku(data), + Check: resource.ComposeTestCheckFunc( + testCheckAzureRMMySQLServerExists(data.ResourceName), + ), + }, + data.ImportStep("administrator_login_password"), // not returned as sensitive + }, + }) +} + func TestAccAzureRMMySQLServer_requiresImport(t *testing.T) { if !features.ShouldResourcesBeImported() { t.Skip("Skipping since resources aren't required to be imported") @@ -297,6 +316,34 @@ resource "azurerm_resource_group" "test" { location = "%s" } +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" + + storage_profile { + storage_mb = 51200 + backup_retention_days = 7 + geo_redundant_backup = "Disabled" + } + + administrator_login = "acctestun" + administrator_login_password = "H@Sh1CoR3!" + version = "5.6" + ssl_enforcement = "Enabled" +} +`, data.RandomInteger, data.Locations.Primary, data.RandomInteger) +} + +func testAccAzureRMMySQLServer_basicFiveSixOldSku(data acceptance.TestData) string { + return fmt.Sprintf(` +resource "azurerm_resource_group" "test" { + name = "acctestRG-%d" + location = "%s" +} + resource "azurerm_mysql_server" "test" { name = "acctestmysqlsvr-%d" location = "${azurerm_resource_group.test.location}" @@ -335,12 +382,7 @@ resource "azurerm_mysql_server" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 @@ -368,12 +410,7 @@ resource "azurerm_mysql_server" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 @@ -396,14 +433,9 @@ func testAccAzureRMMySQLServer_requiresImport(data acceptance.TestData) string { resource "azurerm_mysql_server" "import" { name = "${azurerm_mysql_server.test.name}" location = "${azurerm_mysql_server.test.location}" - resource_group_name = "${azurerm_mysql_server.test.name}" + resource_group_name = "${azurerm_mysql_server.test.resource_group_name}" - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 @@ -431,12 +463,7 @@ resource "azurerm_mysql_server" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku { - name = "GP_Gen5_4" - capacity = 4 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_4" storage_profile { storage_mb = 640000 @@ -497,12 +524,7 @@ resource "azurerm_mysql_server" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku { - name = "MO_Gen5_16" - capacity = 16 - tier = "MemoryOptimized" - family = "Gen5" - } + sku_name = "MO_Gen5_16" storage_profile { storage_mb = 4194304 @@ -530,12 +552,7 @@ resource "azurerm_mysql_server" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku { - name = "MO_Gen5_16" - capacity = 16 - tier = "MemoryOptimized" - family = "Gen5" - } + sku_name = "MO_Gen5_16" storage_profile { storage_mb = 4194304 @@ -563,12 +580,7 @@ resource "azurerm_mysql_server" "test" { location = "${azurerm_resource_group.test.location}" resource_group_name = "${azurerm_resource_group.test.name}" - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go index 68af5adf091f..32d667386f89 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go @@ -257,12 +257,7 @@ resource "azurerm_mysql_server" "test" { version = "5.6" ssl_enforcement = "Enabled" - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 @@ -332,12 +327,7 @@ resource "azurerm_mysql_server" "test" { version = "5.6" ssl_enforcement = "Enabled" - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 @@ -394,12 +384,7 @@ resource "azurerm_mysql_server" "test" { version = "5.6" ssl_enforcement = "Enabled" - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 @@ -471,12 +456,7 @@ resource "azurerm_mysql_server" "test" { version = "5.6" ssl_enforcement = "Enabled" - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 51200 diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index a3b41e341ecf..f2efa7de23e8 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -339,6 +339,10 @@ This resource has been renamed to `azurerm_log_analytics_linked_service` which i The deprecated field `linked_service_properties` will be removed. This has been replaced by the `resource_id` resource. +### Resource: `azurerm_mysql_server` + +The deprecated `sku` block has been simplified and replaced by the `sku_name` block and will be removed. + ### Resource: `azurerm_mssql_elasticpool` The deprecated `elastic_pool_properties` block will be removed. The fields inside this block have been moved to the top-level. diff --git a/website/docs/r/mysql_configuration.html.markdown b/website/docs/r/mysql_configuration.html.markdown index 40b5a84369bc..a95ffeacd868 100644 --- a/website/docs/r/mysql_configuration.html.markdown +++ b/website/docs/r/mysql_configuration.html.markdown @@ -23,12 +23,7 @@ resource "azurerm_mysql_server" "example" { location = "${azurerm_resource_group.example.location}" resource_group_name = "${azurerm_resource_group.example.name}" - sku { - name = "B_Gen5_2" - capacity = 2 - tier = "Basic" - family = "Gen4" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 5120 diff --git a/website/docs/r/mysql_database.html.markdown b/website/docs/r/mysql_database.html.markdown index c582ee0ca76d..71e59b53f26c 100644 --- a/website/docs/r/mysql_database.html.markdown +++ b/website/docs/r/mysql_database.html.markdown @@ -23,12 +23,7 @@ resource "azurerm_mysql_server" "example" { location = "${azurerm_resource_group.example.location}" resource_group_name = "${azurerm_resource_group.example.name}" - sku { - name = "B_Gen5_2" - capacity = 2 - tier = "Basic" - family = "Gen5" - } + sku_name = "B_Gen5_2" storage_profile { storage_mb = 5120 diff --git a/website/docs/r/mysql_server.html.markdown b/website/docs/r/mysql_server.html.markdown index 5812a328f67f..5d9f0d3ce7a0 100644 --- a/website/docs/r/mysql_server.html.markdown +++ b/website/docs/r/mysql_server.html.markdown @@ -24,12 +24,7 @@ resource "azurerm_mysql_server" "example" { location = "${azurerm_resource_group.example.location}" resource_group_name = "${azurerm_resource_group.example.name}" - sku { - name = "B_Gen5_2" - capacity = 2 - tier = "Basic" - family = "Gen5" - } + sku_name = "B_Gen5_2" storage_profile { storage_mb = 5120 @@ -54,7 +49,7 @@ The following arguments are supported: * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. -* `sku` - (Required) A `sku` block as defined below. +* `sku_name` - (Required) Specifies the SKU Name for this MySQL Server. The name of the SKU, follows the `tier` + `family` + `cores` pattern (e.g. `B_Gen4_1`, `GP_Gen5_8`). For more information see the [product documentation](https://docs.microsoft.com/en-us/rest/api/mysql/servers/create#sku). * `storage_profile` - (Required) A `storage_profile` block as defined below. @@ -70,18 +65,6 @@ The following arguments are supported: --- -`sku` supports the following: - -* `name` - (Required) Specifies the SKU Name for this MySQL Server. The name of the SKU, follows the `tier` + `family` + `cores` pattern (e.g. B_Gen4_1, GP_Gen5_8). For more information see the [product documentation](https://docs.microsoft.com/en-us/rest/api/mysql/servers/create#sku). - -* `capacity` - (Required) The scale up/out capacity, representing server's compute units. - -* `tier` - (Required) The tier of the particular SKU. Possible values are `Basic`, `GeneralPurpose`, and `MemoryOptimized`. For more information see the [product documentation](https://docs.microsoft.com/en-us/azure/mysql/concepts-pricing-tiers). - -* `family` - (Required) The `family` of hardware `Gen4` or `Gen5`, before selecting your `family` check the [product documentation](https://docs.microsoft.com/en-us/azure/mysql/concepts-pricing-tiers#compute-generations-vcores-and-memory) for availability in your region. - ---- - `storage_profile` supports the following: * `storage_mb` - (Required) Max storage allowed for a server. Possible values are between `5120` MB(5GB) and `1048576` MB(1TB) for the Basic SKU and between `5120` MB(5GB) and `4194304` MB(4TB) for General Purpose/Memory Optimized SKUs. For more information see the [product documentation](https://docs.microsoft.com/en-us/rest/api/mysql/servers/create#StorageProfile). diff --git a/website/docs/r/mysql_virtual_network_rule.html.markdown b/website/docs/r/mysql_virtual_network_rule.html.markdown index 5a605fa324e1..a08970b03841 100644 --- a/website/docs/r/mysql_virtual_network_rule.html.markdown +++ b/website/docs/r/mysql_virtual_network_rule.html.markdown @@ -44,12 +44,7 @@ resource "azurerm_mysql_server" "example" { version = "5.7" ssl_enforcement = "Enabled" - sku { - name = "GP_Gen5_2" - capacity = 2 - tier = "GeneralPurpose" - family = "Gen5" - } + sku_name = "GP_Gen5_2" storage_profile { storage_mb = 5120 From 191ccab3b5e8b48c877451cac754fa8c12cdeee2 Mon Sep 17 00:00:00 2001 From: kt Date: Sun, 12 Jan 2020 14:48:04 -0800 Subject: [PATCH 2/4] tidy up guide wording --- website/docs/guides/2.0-upgrade-guide.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index f2efa7de23e8..9f953eb398c8 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -341,7 +341,7 @@ The deprecated field `linked_service_properties` will be removed. This has been ### Resource: `azurerm_mysql_server` -The deprecated `sku` block has been simplified and replaced by the `sku_name` block and will be removed. +The deprecated `sku` block has been simplified and replaced by the `sku_name` property and will be removed. ### Resource: `azurerm_mssql_elasticpool` From 7d34c133216846fa745ee3a18eb084bccaa5d5e2 Mon Sep 17 00:00:00 2001 From: kt Date: Sun, 12 Jan 2020 14:52:02 -0800 Subject: [PATCH 3/4] fix test --- .../mysql/tests/resource_arm_mysql_virtual_network_rule_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go index 32d667386f89..6f4407f447b9 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go @@ -110,7 +110,7 @@ func TestAccAzureRMMySqlVirtualNetworkRule_disappears(t *testing.T) { } func TestAccAzureRMMySqlVirtualNetworkRule_multipleSubnets(t *testing.T) { - data := acceptance.BuildTestData(t, "azurerm_mysql_server", "rule1") + data := acceptance.BuildTestData(t, "azurerm_mysql_virtual_network_rule", "rule1") resourceName2 := "azurerm_mysql_virtual_network_rule.rule2" resourceName3 := "azurerm_mysql_virtual_network_rule.rule3" From 631492515518f9655b98ad3af2a516ae70e3e4cd Mon Sep 17 00:00:00 2001 From: kt Date: Mon, 13 Jan 2020 18:49:59 -0800 Subject: [PATCH 4/4] fix guide wording --- website/docs/guides/2.0-upgrade-guide.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/guides/2.0-upgrade-guide.html.markdown b/website/docs/guides/2.0-upgrade-guide.html.markdown index 9f953eb398c8..d77daea7c1b2 100644 --- a/website/docs/guides/2.0-upgrade-guide.html.markdown +++ b/website/docs/guides/2.0-upgrade-guide.html.markdown @@ -341,7 +341,7 @@ The deprecated field `linked_service_properties` will be removed. This has been ### Resource: `azurerm_mysql_server` -The deprecated `sku` block has been simplified and replaced by the `sku_name` property and will be removed. +The deprecated `sku` block has been replaced by the `sku_name` field and will be removed. ### Resource: `azurerm_mssql_elasticpool`