From 8dca60b8483bf59efa7936a31419fe90714ad38b Mon Sep 17 00:00:00 2001
From: Dingjia Chen <48020536+Pumpkin-3906@users.noreply.github.com>
Date: Wed, 1 Mar 2023 20:54:49 -0600
Subject: [PATCH] 201-mysql-fs-db patch (#182)

* fix example

* fix example

* fix example
---
 quickstart/201-mysql-fs-db/main.tf        |  4 ++--
 quickstart/201-mysql-fs-db/mysql-fs-db.tf |  8 ++++----
 quickstart/201-mysql-fs-db/outputs.tf     | 11 ++++++++++-
 quickstart/201-mysql-fs-db/variables.tf   |  4 +++-
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/quickstart/201-mysql-fs-db/main.tf b/quickstart/201-mysql-fs-db/main.tf
index 6d6a1238..d7d88c09 100644
--- a/quickstart/201-mysql-fs-db/main.tf
+++ b/quickstart/201-mysql-fs-db/main.tf
@@ -51,7 +51,7 @@ resource "azurerm_subnet" "default" {
     name = "fs"
 
     service_delegation {
-      name    = "Microsoft.DBforMySQL/flexibleServers"
+      name = "Microsoft.DBforMySQL/flexibleServers"
       actions = [
         "Microsoft.Network/virtualNetworks/subnets/join/action",
       ]
@@ -103,4 +103,4 @@ resource "azurerm_mysql_flexible_server" "default" {
   }
 
   depends_on = [azurerm_private_dns_zone_virtual_network_link.default]
-}
+}
\ No newline at end of file
diff --git a/quickstart/201-mysql-fs-db/mysql-fs-db.tf b/quickstart/201-mysql-fs-db/mysql-fs-db.tf
index 4ed02a76..2dfd96b0 100644
--- a/quickstart/201-mysql-fs-db/mysql-fs-db.tf
+++ b/quickstart/201-mysql-fs-db/mysql-fs-db.tf
@@ -1,8 +1,8 @@
 # Manages the MySQL Flexible Server Database
-resource "azurerm_mysql_flexible_database" "default" {
-  charset             = "utf8"
-  collation           = "utf8_unicode_ci"
+resource "azurerm_mysql_flexible_database" "main" {
+  charset             = "utf8mb4"
+  collation           = "utf8mb4_unicode_ci"
   name                = "mysqlfsdb_${random_string.name.result}"
   resource_group_name = azurerm_resource_group.rg.name
   server_name         = azurerm_mysql_flexible_server.default.name
-}
+}
\ No newline at end of file
diff --git a/quickstart/201-mysql-fs-db/outputs.tf b/quickstart/201-mysql-fs-db/outputs.tf
index 74fb49c0..e5bf1806 100644
--- a/quickstart/201-mysql-fs-db/outputs.tf
+++ b/quickstart/201-mysql-fs-db/outputs.tf
@@ -2,8 +2,17 @@ output "azurerm_mysql_flexible_server" {
   value = azurerm_mysql_flexible_server.default.name
 }
 
+output "admin_login" {
+  value = azurerm_mysql_flexible_server.default.administrator_login
+}
+
+output "admin_password" {
+  sensitive = true
+  value     = azurerm_mysql_flexible_server.default.administrator_password
+}
+
 output "mysql_flexible_server_database_name" {
-  value = azurerm_mysql_flexible_database.default.name
+  value = azurerm_mysql_flexible_database.main.name
 }
 
 output "resource_group_name" {
diff --git a/quickstart/201-mysql-fs-db/variables.tf b/quickstart/201-mysql-fs-db/variables.tf
index e8396125..485aa101 100644
--- a/quickstart/201-mysql-fs-db/variables.tf
+++ b/quickstart/201-mysql-fs-db/variables.tf
@@ -1,9 +1,11 @@
 variable "resource_group_location" {
+  type        = string
   default     = "eastus"
   description = "Location of the resource group."
 }
 
 variable "resource_group_name_prefix" {
-  default     = "rg"
+  type        = string
+  default     = "mysql-fs-db-rg"
   description = "Prefix of the resource group name that's combined with a random ID so name is unique in your Azure subscription."
 }
\ No newline at end of file