From 5963c3f52bac695b95740d1bc410c2276d692544 Mon Sep 17 00:00:00 2001 From: neil-yechenwei Date: Fri, 8 Mar 2024 17:51:03 +0800 Subject: [PATCH 1/8] azurerm_mysql_server - deprecate this resource --- website/docs/d/mysql_server.html.markdown | 2 ++ website/docs/r/mysql_server.html.markdown | 2 ++ 2 files changed, 4 insertions(+) diff --git a/website/docs/d/mysql_server.html.markdown b/website/docs/d/mysql_server.html.markdown index 289028bb7a92..227ddc1978f5 100644 --- a/website/docs/d/mysql_server.html.markdown +++ b/website/docs/d/mysql_server.html.markdown @@ -11,6 +11,8 @@ description: |- Use this data source to access information about an existing MySQL Server. +-> **Note:** Azure Database for MySQL - Single Server is scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024. Migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL- Flexible Server now. + ## Example Usage ```hcl diff --git a/website/docs/r/mysql_server.html.markdown b/website/docs/r/mysql_server.html.markdown index db00abc57c3f..456d945747f9 100644 --- a/website/docs/r/mysql_server.html.markdown +++ b/website/docs/r/mysql_server.html.markdown @@ -11,6 +11,8 @@ description: |- Manages a MySQL Server. +-> **Note:** Azure Database for MySQL - Single Server is scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024. Migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL- Flexible Server now. + ## Example Usage ```hcl From d5b36f860d60ab6f73a9cb3a913360b7ca0bbad8 Mon Sep 17 00:00:00 2001 From: neil-yechenwei Date: Mon, 11 Mar 2024 14:58:12 +0800 Subject: [PATCH 2/8] update code --- internal/services/mysql/mysql_server_data_source.go | 2 ++ internal/services/mysql/mysql_server_resource.go | 2 ++ website/docs/d/mysql_server.html.markdown | 2 +- website/docs/r/mysql_server.html.markdown | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/internal/services/mysql/mysql_server_data_source.go b/internal/services/mysql/mysql_server_data_source.go index 11611a47098e..205e72f170e0 100644 --- a/internal/services/mysql/mysql_server_data_source.go +++ b/internal/services/mysql/mysql_server_data_source.go @@ -25,6 +25,8 @@ func dataSourceMySqlServer() *pluginsdk.Resource { return &pluginsdk.Resource{ Read: dataSourceMySqlServerRead, + DeprecationMessage: "The `azurerm_mysql_server` data source will be deprecated since Azure Database for MySQL - Single Server is scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and it migrates (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server now. Please use the `azurerm_mysql_flexible_server` data source instead.", + Timeouts: &pluginsdk.ResourceTimeout{ Read: pluginsdk.DefaultTimeout(5 * time.Minute), }, diff --git a/internal/services/mysql/mysql_server_resource.go b/internal/services/mysql/mysql_server_resource.go index 99b9550833f2..ccbec692cd30 100644 --- a/internal/services/mysql/mysql_server_resource.go +++ b/internal/services/mysql/mysql_server_resource.go @@ -40,6 +40,8 @@ func resourceMySqlServer() *pluginsdk.Resource { Update: resourceMySqlServerUpdate, Delete: resourceMySqlServerDelete, + DeprecationMessage: "The `azurerm_mysql_server` resource will be deprecated since Azure Database for MySQL - Single Server is scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and it migrates (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server now. Please use the `azurerm_mysql_flexible_server` resource instead.", + Importer: pluginsdk.ImporterValidatingResourceIdThen(func(id string) error { _, err := servers.ParseServerID(id) return err diff --git a/website/docs/d/mysql_server.html.markdown b/website/docs/d/mysql_server.html.markdown index 227ddc1978f5..4bb7f3732d79 100644 --- a/website/docs/d/mysql_server.html.markdown +++ b/website/docs/d/mysql_server.html.markdown @@ -11,7 +11,7 @@ description: |- Use this data source to access information about an existing MySQL Server. --> **Note:** Azure Database for MySQL - Single Server is scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024. Migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL- Flexible Server now. +-> **Note:** The `azurerm_mysql_server` resource will be deprecated since Azure Database for MySQL - Single Server is scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and it migrates (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server now. Please use the `azurerm_mysql_flexible_server` resource instead. ## Example Usage diff --git a/website/docs/r/mysql_server.html.markdown b/website/docs/r/mysql_server.html.markdown index 456d945747f9..f2d3053540f7 100644 --- a/website/docs/r/mysql_server.html.markdown +++ b/website/docs/r/mysql_server.html.markdown @@ -11,7 +11,7 @@ description: |- Manages a MySQL Server. --> **Note:** Azure Database for MySQL - Single Server is scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024. Migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL- Flexible Server now. +-> **Note:** The `azurerm_mysql_server` resource will be deprecated since Azure Database for MySQL - Single Server is scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and it migrates (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server now. Please use the `azurerm_mysql_flexible_server` resource instead. ## Example Usage From 636b929bab5fd1b5bdebbf1e6518732c59a6835b Mon Sep 17 00:00:00 2001 From: neil-yechenwei Date: Mon, 11 Mar 2024 14:59:35 +0800 Subject: [PATCH 3/8] update code --- website/docs/d/mysql_server.html.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/docs/d/mysql_server.html.markdown b/website/docs/d/mysql_server.html.markdown index 4bb7f3732d79..8a6d18a4d7b5 100644 --- a/website/docs/d/mysql_server.html.markdown +++ b/website/docs/d/mysql_server.html.markdown @@ -11,7 +11,7 @@ description: |- Use this data source to access information about an existing MySQL Server. --> **Note:** The `azurerm_mysql_server` resource will be deprecated since Azure Database for MySQL - Single Server is scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and it migrates (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server now. Please use the `azurerm_mysql_flexible_server` resource instead. +-> **Note:** The `azurerm_mysql_server` data source will be deprecated since Azure Database for MySQL - Single Server is scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and it migrates (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server now. Please use the `azurerm_mysql_flexible_server` data source instead. ## Example Usage From 50cd8c788f06ec3158c0fb15fd679ce25264aee4 Mon Sep 17 00:00:00 2001 From: neil-yechenwei Date: Fri, 15 Mar 2024 10:11:47 +0800 Subject: [PATCH 4/8] update code --- internal/services/mysql/mysql_aad_administrator_resource.go | 3 +++ internal/services/mysql/mysql_configuration_resource.go | 2 ++ internal/services/mysql/mysql_database_resource.go | 3 +++ internal/services/mysql/mysql_firewall_rule_resource.go | 2 ++ internal/services/mysql/mysql_server_data_source.go | 2 +- internal/services/mysql/mysql_server_key_resource.go | 2 ++ internal/services/mysql/mysql_server_resource.go | 2 +- internal/services/mysql/mysql_virtual_network_rule_resource.go | 2 ++ 8 files changed, 16 insertions(+), 2 deletions(-) diff --git a/internal/services/mysql/mysql_aad_administrator_resource.go b/internal/services/mysql/mysql_aad_administrator_resource.go index 478f2b38afd2..03dc0f0a2665 100644 --- a/internal/services/mysql/mysql_aad_administrator_resource.go +++ b/internal/services/mysql/mysql_aad_administrator_resource.go @@ -25,6 +25,9 @@ func resourceMySQLAdministrator() *pluginsdk.Resource { Read: resourceMySQLAdministratorRead, Update: resourceMySQLAdministratorCreateUpdate, Delete: resourceMySQLAdministratorDelete, + + DeprecationMessage: "The `azurerm_mysql_active_directory_administrator` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server_active_directory_administrator` resource instead.", + Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error { _, err := parse.AzureActiveDirectoryAdministratorID(id) return err diff --git a/internal/services/mysql/mysql_configuration_resource.go b/internal/services/mysql/mysql_configuration_resource.go index f97268926a75..266fcf406852 100644 --- a/internal/services/mysql/mysql_configuration_resource.go +++ b/internal/services/mysql/mysql_configuration_resource.go @@ -24,6 +24,8 @@ func resourceMySQLConfiguration() *pluginsdk.Resource { Read: resourceMySQLConfigurationRead, Delete: resourceMySQLConfigurationDelete, + DeprecationMessage: "The `azurerm_mysql_configuration` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server_configuration` resource instead.", + Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error { _, err := configurations.ParseConfigurationID(id) return err diff --git a/internal/services/mysql/mysql_database_resource.go b/internal/services/mysql/mysql_database_resource.go index b71b10bf5098..cb9e91c90e66 100644 --- a/internal/services/mysql/mysql_database_resource.go +++ b/internal/services/mysql/mysql_database_resource.go @@ -25,6 +25,9 @@ func resourceMySqlDatabase() *pluginsdk.Resource { Create: resourceMySqlDatabaseCreate, Read: resourceMySqlDatabaseRead, Delete: resourceMySqlDatabaseDelete, + + DeprecationMessage: "The `azurerm_mysql_database` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_database` resource instead.", + Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error { _, err := databases.ParseDatabaseID(id) return err diff --git a/internal/services/mysql/mysql_firewall_rule_resource.go b/internal/services/mysql/mysql_firewall_rule_resource.go index 4b7d297cde7d..35ca85eaaef6 100644 --- a/internal/services/mysql/mysql_firewall_rule_resource.go +++ b/internal/services/mysql/mysql_firewall_rule_resource.go @@ -26,6 +26,8 @@ func resourceMySqlFirewallRule() *pluginsdk.Resource { Update: resourceMySqlFirewallRuleCreateUpdate, Delete: resourceMySqlFirewallRuleDelete, + DeprecationMessage: "The `azurerm_mysql_firewall_rule` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server_firewall_rule` resource instead.", + Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error { _, err := firewallrules.ParseFirewallRuleID(id) return err diff --git a/internal/services/mysql/mysql_server_data_source.go b/internal/services/mysql/mysql_server_data_source.go index 205e72f170e0..414f73e734b2 100644 --- a/internal/services/mysql/mysql_server_data_source.go +++ b/internal/services/mysql/mysql_server_data_source.go @@ -25,7 +25,7 @@ func dataSourceMySqlServer() *pluginsdk.Resource { return &pluginsdk.Resource{ Read: dataSourceMySqlServerRead, - DeprecationMessage: "The `azurerm_mysql_server` data source will be deprecated since Azure Database for MySQL - Single Server is scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and it migrates (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server now. Please use the `azurerm_mysql_flexible_server` data source instead.", + DeprecationMessage: "The `azurerm_mysql_server` data source will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server` data source instead.", Timeouts: &pluginsdk.ResourceTimeout{ Read: pluginsdk.DefaultTimeout(5 * time.Minute), diff --git a/internal/services/mysql/mysql_server_key_resource.go b/internal/services/mysql/mysql_server_key_resource.go index a0bfcc759b12..a93377541b61 100644 --- a/internal/services/mysql/mysql_server_key_resource.go +++ b/internal/services/mysql/mysql_server_key_resource.go @@ -31,6 +31,8 @@ func resourceMySQLServerKey() *pluginsdk.Resource { Update: resourceMySQLServerKeyCreateUpdate, Delete: resourceMySQLServerKeyDelete, + DeprecationMessage: "The `azurerm_mysql_server_key` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now.", + Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error { _, err := serverkeys.ParseKeyID(id) return err diff --git a/internal/services/mysql/mysql_server_resource.go b/internal/services/mysql/mysql_server_resource.go index ccbec692cd30..8cb489f37ece 100644 --- a/internal/services/mysql/mysql_server_resource.go +++ b/internal/services/mysql/mysql_server_resource.go @@ -40,7 +40,7 @@ func resourceMySqlServer() *pluginsdk.Resource { Update: resourceMySqlServerUpdate, Delete: resourceMySqlServerDelete, - DeprecationMessage: "The `azurerm_mysql_server` resource will be deprecated since Azure Database for MySQL - Single Server is scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and it migrates (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server now. Please use the `azurerm_mysql_flexible_server` resource instead.", + DeprecationMessage: "The `azurerm_mysql_server` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server` resource instead.", Importer: pluginsdk.ImporterValidatingResourceIdThen(func(id string) error { _, err := servers.ParseServerID(id) diff --git a/internal/services/mysql/mysql_virtual_network_rule_resource.go b/internal/services/mysql/mysql_virtual_network_rule_resource.go index 050849dfae44..2d6c46e8c680 100644 --- a/internal/services/mysql/mysql_virtual_network_rule_resource.go +++ b/internal/services/mysql/mysql_virtual_network_rule_resource.go @@ -29,6 +29,8 @@ func resourceMySQLVirtualNetworkRule() *pluginsdk.Resource { Update: resourceMySQLVirtualNetworkRuleCreateUpdate, Delete: resourceMySQLVirtualNetworkRuleDelete, + DeprecationMessage: "The `azurerm_mysql_virtual_network_rule` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now.", + Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error { _, err := virtualnetworkrules.ParseVirtualNetworkRuleID(id) return err From 12ec47bb61731abac315935a7ef4aca4025135c1 Mon Sep 17 00:00:00 2001 From: neil-yechenwei Date: Fri, 15 Mar 2024 10:22:49 +0800 Subject: [PATCH 5/8] update code --- website/docs/d/mysql_server.html.markdown | 2 +- .../docs/r/mysql_active_directory_administrator.html.markdown | 2 ++ website/docs/r/mysql_configuration.html.markdown | 2 ++ website/docs/r/mysql_database.html.markdown | 2 ++ website/docs/r/mysql_firewall_rule.html.markdown | 2 ++ website/docs/r/mysql_server.html.markdown | 2 +- website/docs/r/mysql_server_key.html.markdown | 2 ++ website/docs/r/mysql_virtual_network_rule.html.markdown | 2 ++ 8 files changed, 14 insertions(+), 2 deletions(-) diff --git a/website/docs/d/mysql_server.html.markdown b/website/docs/d/mysql_server.html.markdown index 8a6d18a4d7b5..dbe0574a98b9 100644 --- a/website/docs/d/mysql_server.html.markdown +++ b/website/docs/d/mysql_server.html.markdown @@ -11,7 +11,7 @@ description: |- Use this data source to access information about an existing MySQL Server. --> **Note:** The `azurerm_mysql_server` data source will be deprecated since Azure Database for MySQL - Single Server is scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and it migrates (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server now. Please use the `azurerm_mysql_flexible_server` data source instead. +~> **Note:** The `azurerm_mysql_server` data source will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server` data source instead. ## Example Usage diff --git a/website/docs/r/mysql_active_directory_administrator.html.markdown b/website/docs/r/mysql_active_directory_administrator.html.markdown index f340e6f3eebb..52277cd68e60 100644 --- a/website/docs/r/mysql_active_directory_administrator.html.markdown +++ b/website/docs/r/mysql_active_directory_administrator.html.markdown @@ -10,6 +10,8 @@ description: |- Allows you to set a user or group as the AD administrator for an MySQL server in Azure +~> **Note:** The `azurerm_mysql_active_directory_administrator` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server_active_directory_administrator` resource instead. + ## Example Usage ```hcl diff --git a/website/docs/r/mysql_configuration.html.markdown b/website/docs/r/mysql_configuration.html.markdown index 1fce7108e1b3..01a96831792f 100644 --- a/website/docs/r/mysql_configuration.html.markdown +++ b/website/docs/r/mysql_configuration.html.markdown @@ -10,6 +10,8 @@ description: |- Sets a MySQL Configuration value on a MySQL Server. +~> **Note:** The `azurerm_mysql_configuration` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server_configuration` resource instead. + ## Disclaimers ~> **Note:** Since this resource is provisioned by default, the Azure Provider will not check for the presence of an existing resource prior to attempting to create it. diff --git a/website/docs/r/mysql_database.html.markdown b/website/docs/r/mysql_database.html.markdown index d0fb55e91c46..e165adcc9186 100644 --- a/website/docs/r/mysql_database.html.markdown +++ b/website/docs/r/mysql_database.html.markdown @@ -10,6 +10,8 @@ description: |- Manages a MySQL Database within a MySQL Server +~> **Note:** The `azurerm_mysql_database` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_database` resource instead. + !>**IMPORTANT:** To mitigate the possibility of accidental data loss it is highly recommended that you use the `prevent_destroy` lifecycle argument in your configuration file for this resource. For more information on the `prevent_destroy` lifecycle argument please see the [terraform documentation](https://developer.hashicorp.com/terraform/tutorials/state/resource-lifecycle#prevent-resource-deletion). ## Example Usage diff --git a/website/docs/r/mysql_firewall_rule.html.markdown b/website/docs/r/mysql_firewall_rule.html.markdown index 648aafc45fe6..241dea024c91 100644 --- a/website/docs/r/mysql_firewall_rule.html.markdown +++ b/website/docs/r/mysql_firewall_rule.html.markdown @@ -10,6 +10,8 @@ description: |- Manages a Firewall Rule for a MySQL Server. +~> **Note:** The `azurerm_mysql_firewall_rule` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server_firewall_rule` resource instead. + ## Example Usage (Single IP Address) ```hcl diff --git a/website/docs/r/mysql_server.html.markdown b/website/docs/r/mysql_server.html.markdown index f2d3053540f7..50aeb23fbd61 100644 --- a/website/docs/r/mysql_server.html.markdown +++ b/website/docs/r/mysql_server.html.markdown @@ -11,7 +11,7 @@ description: |- Manages a MySQL Server. --> **Note:** The `azurerm_mysql_server` resource will be deprecated since Azure Database for MySQL - Single Server is scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and it migrates (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server now. Please use the `azurerm_mysql_flexible_server` resource instead. +~> **Note:** The `azurerm_mysql_server` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server` resource instead. ## Example Usage diff --git a/website/docs/r/mysql_server_key.html.markdown b/website/docs/r/mysql_server_key.html.markdown index 9e8c01b725bb..80254ed50298 100644 --- a/website/docs/r/mysql_server_key.html.markdown +++ b/website/docs/r/mysql_server_key.html.markdown @@ -10,6 +10,8 @@ description: |- Manages a Customer Managed Key for a MySQL Server. +~> **Note:** The `azurerm_mysql_server_key` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. + ## Example Usage ```hcl diff --git a/website/docs/r/mysql_virtual_network_rule.html.markdown b/website/docs/r/mysql_virtual_network_rule.html.markdown index 307626a76746..aabc7a9aff51 100644 --- a/website/docs/r/mysql_virtual_network_rule.html.markdown +++ b/website/docs/r/mysql_virtual_network_rule.html.markdown @@ -10,6 +10,8 @@ description: |- Manages a MySQL Virtual Network Rule. +~> **Note:** The `azurerm_mysql_virtual_network_rule` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. + -> **NOTE:** MySQL Virtual Network Rules [can only be used with SKU Tiers of `GeneralPurpose` or `MemoryOptimized`](https://docs.microsoft.com/azure/mysql/concepts-data-access-and-security-vnet) ## Example Usage From bd940fce1ff6752740dafa7ee713139f78837f8d Mon Sep 17 00:00:00 2001 From: neil-yechenwei Date: Fri, 15 Mar 2024 15:43:30 +0800 Subject: [PATCH 6/8] update code --- internal/services/mysql/mysql_server_key_resource.go | 2 +- website/docs/r/mysql_server_key.html.markdown | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/services/mysql/mysql_server_key_resource.go b/internal/services/mysql/mysql_server_key_resource.go index a93377541b61..1f6d5a196019 100644 --- a/internal/services/mysql/mysql_server_key_resource.go +++ b/internal/services/mysql/mysql_server_key_resource.go @@ -31,7 +31,7 @@ func resourceMySQLServerKey() *pluginsdk.Resource { Update: resourceMySQLServerKeyCreateUpdate, Delete: resourceMySQLServerKeyDelete, - DeprecationMessage: "The `azurerm_mysql_server_key` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now.", + DeprecationMessage: "The `azurerm_mysql_server_key` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `customer_managed_key` property of the `azurerm_mysql_flexible_server` resource instead.", Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error { _, err := serverkeys.ParseKeyID(id) diff --git a/website/docs/r/mysql_server_key.html.markdown b/website/docs/r/mysql_server_key.html.markdown index 80254ed50298..0bfb9ee67bfc 100644 --- a/website/docs/r/mysql_server_key.html.markdown +++ b/website/docs/r/mysql_server_key.html.markdown @@ -10,7 +10,7 @@ description: |- Manages a Customer Managed Key for a MySQL Server. -~> **Note:** The `azurerm_mysql_server_key` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. +~> **Note:** The `azurerm_mysql_server_key` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `customer_managed_key` property of the `azurerm_mysql_flexible_server` resource instead. ## Example Usage From abbf697787e3d8459700279505031d710f57ecf3 Mon Sep 17 00:00:00 2001 From: neil-yechenwei Date: Fri, 15 Mar 2024 18:22:11 +0800 Subject: [PATCH 7/8] update code --- internal/services/mysql/mysql_aad_administrator_resource.go | 2 +- internal/services/mysql/mysql_configuration_resource.go | 2 +- internal/services/mysql/mysql_database_resource.go | 2 +- internal/services/mysql/mysql_firewall_rule_resource.go | 2 +- internal/services/mysql/mysql_server_data_source.go | 2 +- internal/services/mysql/mysql_server_key_resource.go | 2 +- internal/services/mysql/mysql_server_resource.go | 2 +- internal/services/mysql/mysql_virtual_network_rule_resource.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/services/mysql/mysql_aad_administrator_resource.go b/internal/services/mysql/mysql_aad_administrator_resource.go index 03dc0f0a2665..20913d0f067e 100644 --- a/internal/services/mysql/mysql_aad_administrator_resource.go +++ b/internal/services/mysql/mysql_aad_administrator_resource.go @@ -26,7 +26,7 @@ func resourceMySQLAdministrator() *pluginsdk.Resource { Update: resourceMySQLAdministratorCreateUpdate, Delete: resourceMySQLAdministratorDelete, - DeprecationMessage: "The `azurerm_mysql_active_directory_administrator` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server_active_directory_administrator` resource instead.", + DeprecationMessage: "Azure Database for MySQL Single Server and its sub resources are scheduled for retirement by 2024-09-16 and will migrate to using Azure Database for MySQL Flexible Server: https://go.microsoft.com/fwlink/?linkid=2216041. The `azurerm_mysql_active_directory_administrator` resource is deprecated and will be removed in v4.0 of the AzureRM Provider. Please use the `azurerm_mysql_flexible_server_active_directory_administrator` resource instead.", Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error { _, err := parse.AzureActiveDirectoryAdministratorID(id) diff --git a/internal/services/mysql/mysql_configuration_resource.go b/internal/services/mysql/mysql_configuration_resource.go index 266fcf406852..83ab734366c8 100644 --- a/internal/services/mysql/mysql_configuration_resource.go +++ b/internal/services/mysql/mysql_configuration_resource.go @@ -24,7 +24,7 @@ func resourceMySQLConfiguration() *pluginsdk.Resource { Read: resourceMySQLConfigurationRead, Delete: resourceMySQLConfigurationDelete, - DeprecationMessage: "The `azurerm_mysql_configuration` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server_configuration` resource instead.", + DeprecationMessage: "Azure Database for MySQL Single Server and its sub resources are scheduled for retirement by 2024-09-16 and will migrate to using Azure Database for MySQL Flexible Server: https://go.microsoft.com/fwlink/?linkid=2216041. The `azurerm_mysql_configuration` resource is deprecated and will be removed in v4.0 of the AzureRM Provider. Please use the `azurerm_mysql_flexible_server_configuration` resource instead.", Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error { _, err := configurations.ParseConfigurationID(id) diff --git a/internal/services/mysql/mysql_database_resource.go b/internal/services/mysql/mysql_database_resource.go index cb9e91c90e66..d35307b3209f 100644 --- a/internal/services/mysql/mysql_database_resource.go +++ b/internal/services/mysql/mysql_database_resource.go @@ -26,7 +26,7 @@ func resourceMySqlDatabase() *pluginsdk.Resource { Read: resourceMySqlDatabaseRead, Delete: resourceMySqlDatabaseDelete, - DeprecationMessage: "The `azurerm_mysql_database` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_database` resource instead.", + DeprecationMessage: "Azure Database for MySQL Single Server and its sub resources are scheduled for retirement by 2024-09-16 and will migrate to using Azure Database for MySQL Flexible Server: https://go.microsoft.com/fwlink/?linkid=2216041. The `azurerm_mysql_database` resource is deprecated and will be removed in v4.0 of the AzureRM Provider. Please use the `azurerm_mysql_flexible_database` resource instead.", Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error { _, err := databases.ParseDatabaseID(id) diff --git a/internal/services/mysql/mysql_firewall_rule_resource.go b/internal/services/mysql/mysql_firewall_rule_resource.go index 35ca85eaaef6..c556183e5f45 100644 --- a/internal/services/mysql/mysql_firewall_rule_resource.go +++ b/internal/services/mysql/mysql_firewall_rule_resource.go @@ -26,7 +26,7 @@ func resourceMySqlFirewallRule() *pluginsdk.Resource { Update: resourceMySqlFirewallRuleCreateUpdate, Delete: resourceMySqlFirewallRuleDelete, - DeprecationMessage: "The `azurerm_mysql_firewall_rule` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server_firewall_rule` resource instead.", + DeprecationMessage: "Azure Database for MySQL Single Server and its sub resources are scheduled for retirement by 2024-09-16 and will migrate to using Azure Database for MySQL Flexible Server: https://go.microsoft.com/fwlink/?linkid=2216041. The `azurerm_mysql_firewall_rule` resource is deprecated and will be removed in v4.0 of the AzureRM Provider. Please use the `azurerm_mysql_flexible_server_firewall_rule` resource instead.", Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error { _, err := firewallrules.ParseFirewallRuleID(id) diff --git a/internal/services/mysql/mysql_server_data_source.go b/internal/services/mysql/mysql_server_data_source.go index 414f73e734b2..6b7ffd167f33 100644 --- a/internal/services/mysql/mysql_server_data_source.go +++ b/internal/services/mysql/mysql_server_data_source.go @@ -25,7 +25,7 @@ func dataSourceMySqlServer() *pluginsdk.Resource { return &pluginsdk.Resource{ Read: dataSourceMySqlServerRead, - DeprecationMessage: "The `azurerm_mysql_server` data source will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server` data source instead.", + DeprecationMessage: "Azure Database for MySQL Single Server and its sub resources are scheduled for retirement by 2024-09-16 and will migrate to using Azure Database for MySQL Flexible Server: https://go.microsoft.com/fwlink/?linkid=2216041. The `azurerm_mysql_server` data source is deprecated and will be removed in v4.0 of the AzureRM Provider. Please use the `azurerm_mysql_flexible_server` data source instead.", Timeouts: &pluginsdk.ResourceTimeout{ Read: pluginsdk.DefaultTimeout(5 * time.Minute), diff --git a/internal/services/mysql/mysql_server_key_resource.go b/internal/services/mysql/mysql_server_key_resource.go index 1f6d5a196019..f766b2a7af2a 100644 --- a/internal/services/mysql/mysql_server_key_resource.go +++ b/internal/services/mysql/mysql_server_key_resource.go @@ -31,7 +31,7 @@ func resourceMySQLServerKey() *pluginsdk.Resource { Update: resourceMySQLServerKeyCreateUpdate, Delete: resourceMySQLServerKeyDelete, - DeprecationMessage: "The `azurerm_mysql_server_key` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `customer_managed_key` property of the `azurerm_mysql_flexible_server` resource instead.", + DeprecationMessage: "Azure Database for MySQL Single Server and its sub resources are scheduled for retirement by 2024-09-16 and will migrate to using Azure Database for MySQL Flexible Server: https://go.microsoft.com/fwlink/?linkid=2216041. The `azurerm_mysql_server_key` resource is deprecated and will be removed in v4.0 of the AzureRM Provider. Please use the `customer_managed_key` property of the `azurerm_mysql_flexible_server` resource instead.", Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error { _, err := serverkeys.ParseKeyID(id) diff --git a/internal/services/mysql/mysql_server_resource.go b/internal/services/mysql/mysql_server_resource.go index 8cb489f37ece..a7553589e1ff 100644 --- a/internal/services/mysql/mysql_server_resource.go +++ b/internal/services/mysql/mysql_server_resource.go @@ -40,7 +40,7 @@ func resourceMySqlServer() *pluginsdk.Resource { Update: resourceMySqlServerUpdate, Delete: resourceMySqlServerDelete, - DeprecationMessage: "The `azurerm_mysql_server` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server` resource instead.", + DeprecationMessage: "Azure Database for MySQL Single Server and its sub resources are scheduled for retirement by 2024-09-16 and will migrate to using Azure Database for MySQL Flexible Server: https://go.microsoft.com/fwlink/?linkid=2216041. The `azurerm_mysql_server` resource is deprecated and will be removed in v4.0 of the AzureRM Provider. Please use the `azurerm_mysql_flexible_server` resource instead.", Importer: pluginsdk.ImporterValidatingResourceIdThen(func(id string) error { _, err := servers.ParseServerID(id) diff --git a/internal/services/mysql/mysql_virtual_network_rule_resource.go b/internal/services/mysql/mysql_virtual_network_rule_resource.go index 2d6c46e8c680..38781e6d584d 100644 --- a/internal/services/mysql/mysql_virtual_network_rule_resource.go +++ b/internal/services/mysql/mysql_virtual_network_rule_resource.go @@ -29,7 +29,7 @@ func resourceMySQLVirtualNetworkRule() *pluginsdk.Resource { Update: resourceMySQLVirtualNetworkRuleCreateUpdate, Delete: resourceMySQLVirtualNetworkRuleDelete, - DeprecationMessage: "The `azurerm_mysql_virtual_network_rule` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now.", + DeprecationMessage: "Azure Database for MySQL Single Server and its sub resources are scheduled for retirement by 2024-09-16 and will migrate to using Azure Database for MySQL Flexible Server: https://go.microsoft.com/fwlink/?linkid=2216041. The `azurerm_mysql_virtual_network_rule` resource is deprecated and will be removed in v4.0 of the AzureRM Provider.", Importer: pluginsdk.ImporterValidatingResourceId(func(id string) error { _, err := virtualnetworkrules.ParseVirtualNetworkRuleID(id) From e7e7aee9f69a1be830c56c557c556b7701ac2394 Mon Sep 17 00:00:00 2001 From: neil-yechenwei Date: Fri, 15 Mar 2024 18:27:10 +0800 Subject: [PATCH 8/8] update code --- website/docs/d/mysql_server.html.markdown | 2 +- .../docs/r/mysql_active_directory_administrator.html.markdown | 2 +- website/docs/r/mysql_configuration.html.markdown | 2 +- website/docs/r/mysql_database.html.markdown | 2 +- website/docs/r/mysql_firewall_rule.html.markdown | 2 +- website/docs/r/mysql_server.html.markdown | 2 +- website/docs/r/mysql_server_key.html.markdown | 2 +- website/docs/r/mysql_virtual_network_rule.html.markdown | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/website/docs/d/mysql_server.html.markdown b/website/docs/d/mysql_server.html.markdown index dbe0574a98b9..6007018bf0d7 100644 --- a/website/docs/d/mysql_server.html.markdown +++ b/website/docs/d/mysql_server.html.markdown @@ -11,7 +11,7 @@ description: |- Use this data source to access information about an existing MySQL Server. -~> **Note:** The `azurerm_mysql_server` data source will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server` data source instead. +~> **Note:** Azure Database for MySQL Single Server and its sub resources are scheduled for retirement by 2024-09-16 and will migrate to using Azure Database for MySQL Flexible Server: https://go.microsoft.com/fwlink/?linkid=2216041. The `azurerm_mysql_server` data source is deprecated and will be removed in v4.0 of the AzureRM Provider. Please use the `azurerm_mysql_flexible_server` data source instead. ## Example Usage diff --git a/website/docs/r/mysql_active_directory_administrator.html.markdown b/website/docs/r/mysql_active_directory_administrator.html.markdown index 52277cd68e60..cdd30517fe5d 100644 --- a/website/docs/r/mysql_active_directory_administrator.html.markdown +++ b/website/docs/r/mysql_active_directory_administrator.html.markdown @@ -10,7 +10,7 @@ description: |- Allows you to set a user or group as the AD administrator for an MySQL server in Azure -~> **Note:** The `azurerm_mysql_active_directory_administrator` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server_active_directory_administrator` resource instead. +~> **Note:** Azure Database for MySQL Single Server and its sub resources are scheduled for retirement by 2024-09-16 and will migrate to using Azure Database for MySQL Flexible Server: https://go.microsoft.com/fwlink/?linkid=2216041. The `azurerm_mysql_active_directory_administrator` resource is deprecated and will be removed in v4.0 of the AzureRM Provider. Please use the `azurerm_mysql_flexible_server_active_directory_administrator` resource instead. ## Example Usage diff --git a/website/docs/r/mysql_configuration.html.markdown b/website/docs/r/mysql_configuration.html.markdown index 01a96831792f..c3157f38c653 100644 --- a/website/docs/r/mysql_configuration.html.markdown +++ b/website/docs/r/mysql_configuration.html.markdown @@ -10,7 +10,7 @@ description: |- Sets a MySQL Configuration value on a MySQL Server. -~> **Note:** The `azurerm_mysql_configuration` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server_configuration` resource instead. +~> **Note:** Azure Database for MySQL Single Server and its sub resources are scheduled for retirement by 2024-09-16 and will migrate to using Azure Database for MySQL Flexible Server: https://go.microsoft.com/fwlink/?linkid=2216041. The `azurerm_mysql_configuration` resource is deprecated and will be removed in v4.0 of the AzureRM Provider. Please use the `azurerm_mysql_flexible_server_configuration` resource instead. ## Disclaimers diff --git a/website/docs/r/mysql_database.html.markdown b/website/docs/r/mysql_database.html.markdown index e165adcc9186..4917b16d650b 100644 --- a/website/docs/r/mysql_database.html.markdown +++ b/website/docs/r/mysql_database.html.markdown @@ -10,7 +10,7 @@ description: |- Manages a MySQL Database within a MySQL Server -~> **Note:** The `azurerm_mysql_database` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_database` resource instead. +~> **Note:** Azure Database for MySQL Single Server and its sub resources are scheduled for retirement by 2024-09-16 and will migrate to using Azure Database for MySQL Flexible Server: https://go.microsoft.com/fwlink/?linkid=2216041. The `azurerm_mysql_database` resource is deprecated and will be removed in v4.0 of the AzureRM Provider. Please use the `azurerm_mysql_flexible_database` resource instead. !>**IMPORTANT:** To mitigate the possibility of accidental data loss it is highly recommended that you use the `prevent_destroy` lifecycle argument in your configuration file for this resource. For more information on the `prevent_destroy` lifecycle argument please see the [terraform documentation](https://developer.hashicorp.com/terraform/tutorials/state/resource-lifecycle#prevent-resource-deletion). diff --git a/website/docs/r/mysql_firewall_rule.html.markdown b/website/docs/r/mysql_firewall_rule.html.markdown index 241dea024c91..9606d52c02a8 100644 --- a/website/docs/r/mysql_firewall_rule.html.markdown +++ b/website/docs/r/mysql_firewall_rule.html.markdown @@ -10,7 +10,7 @@ description: |- Manages a Firewall Rule for a MySQL Server. -~> **Note:** The `azurerm_mysql_firewall_rule` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server_firewall_rule` resource instead. +~> **Note:** Azure Database for MySQL Single Server and its sub resources are scheduled for retirement by 2024-09-16 and will migrate to using Azure Database for MySQL Flexible Server: https://go.microsoft.com/fwlink/?linkid=2216041. The `azurerm_mysql_firewall_rule` resource is deprecated and will be removed in v4.0 of the AzureRM Provider. Please use the `azurerm_mysql_flexible_server_firewall_rule` resource instead. ## Example Usage (Single IP Address) diff --git a/website/docs/r/mysql_server.html.markdown b/website/docs/r/mysql_server.html.markdown index 50aeb23fbd61..3d6f518841a1 100644 --- a/website/docs/r/mysql_server.html.markdown +++ b/website/docs/r/mysql_server.html.markdown @@ -11,7 +11,7 @@ description: |- Manages a MySQL Server. -~> **Note:** The `azurerm_mysql_server` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `azurerm_mysql_flexible_server` resource instead. +~> **Note:** Azure Database for MySQL Single Server and its sub resources are scheduled for retirement by 2024-09-16 and will migrate to using Azure Database for MySQL Flexible Server: https://go.microsoft.com/fwlink/?linkid=2216041. The `azurerm_mysql_server` resource is deprecated and will be removed in v4.0 of the AzureRM Provider. Please use the `azurerm_mysql_flexible_server` resource instead. ## Example Usage diff --git a/website/docs/r/mysql_server_key.html.markdown b/website/docs/r/mysql_server_key.html.markdown index 0bfb9ee67bfc..47de0b296733 100644 --- a/website/docs/r/mysql_server_key.html.markdown +++ b/website/docs/r/mysql_server_key.html.markdown @@ -10,7 +10,7 @@ description: |- Manages a Customer Managed Key for a MySQL Server. -~> **Note:** The `azurerm_mysql_server_key` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. Please use the `customer_managed_key` property of the `azurerm_mysql_flexible_server` resource instead. +~> **Note:** Azure Database for MySQL Single Server and its sub resources are scheduled for retirement by 2024-09-16 and will migrate to using Azure Database for MySQL Flexible Server: https://go.microsoft.com/fwlink/?linkid=2216041. The `azurerm_mysql_server_key` resource is deprecated and will be removed in v4.0 of the AzureRM Provider. Please use the `customer_managed_key` property of the `azurerm_mysql_flexible_server` resource instead. ## Example Usage diff --git a/website/docs/r/mysql_virtual_network_rule.html.markdown b/website/docs/r/mysql_virtual_network_rule.html.markdown index aabc7a9aff51..a28f55218ff1 100644 --- a/website/docs/r/mysql_virtual_network_rule.html.markdown +++ b/website/docs/r/mysql_virtual_network_rule.html.markdown @@ -10,7 +10,7 @@ description: |- Manages a MySQL Virtual Network Rule. -~> **Note:** The `azurerm_mysql_virtual_network_rule` resource will be deprecated since Azure Database for MySQL - Single Server and its sub resources are scheduled for retirement (https://go.microsoft.com/fwlink/?linkid=2216041) by September 16, 2024 and they migrate (https://go.microsoft.com/fwlink/?linkid=2202255) to Azure Database for MySQL - Flexible Server and its sub resources now. +~> **Note:** Azure Database for MySQL Single Server and its sub resources are scheduled for retirement by 2024-09-16 and will migrate to using Azure Database for MySQL Flexible Server: https://go.microsoft.com/fwlink/?linkid=2216041. The `azurerm_mysql_virtual_network_rule` resource is deprecated and will be removed in v4.0 of the AzureRM Provider. -> **NOTE:** MySQL Virtual Network Rules [can only be used with SKU Tiers of `GeneralPurpose` or `MemoryOptimized`](https://docs.microsoft.com/azure/mysql/concepts-data-access-and-security-vnet)