Port changes from K8s PR to avoid --initialize-insecure (#625)

Author: shayancanonical

lib/charms/mysql/v0/mysql.py

@@ -133,7 +133,7 @@ def wait_until_mysql_connection(self) -> None:
 # Increment this major API version when introducing breaking changes
 LIBAPI = 0
 
-LIBPATCH = 83
+LIBPATCH = 84
 
 UNIT_TEARDOWN_LOCKNAME = "unit-teardown"
 UNIT_ADD_LOCKNAME = "unit-add"
@@ -1027,7 +1027,7 @@ def render_mysqld_configuration(  # noqa: C901
             config.write(string_io)
             return string_io.getvalue(), dict(config["mysqld"])
 
-    def configure_mysql_users(self, password_needed: bool = True) -> None:
+    def configure_mysql_users(self) -> None:
         """Configure the MySQL users for the instance."""
         # SYSTEM_USER and SUPER privileges to revoke from the root users
         # Reference: https://dev.mysql.com/doc/refman/8.0/en/privileges-provided.html#priv_super
@@ -1065,13 +1065,10 @@ def configure_mysql_users(self, password_needed: bool = True) -> None:
 
         try:
             logger.debug(f"Configuring MySQL users for {self.instance_address}")
-            if password_needed:
-                self._run_mysqlcli_script(
-                    configure_users_commands,
-                    password=self.root_password,
-                )
-            else:
-                self._run_mysqlcli_script(configure_users_commands)
+            self._run_mysqlcli_script(
+                configure_users_commands,
+                password=self.root_password,
+            )
         except MySQLClientError:
             logger.error(f"Failed to configure users for: {self.instance_address}")
             raise MySQLConfigureMySQLUsersError

src/mysql_vm_helpers.py

@@ -353,12 +353,6 @@ def reset_root_password_and_start_mysqld(self) -> None:
                 mode="w",
                 encoding="utf-8",
             ) as _sql_file:
-                _sql_file.write(
-                    f"ALTER USER 'root'@'localhost' IDENTIFIED BY '{self.root_password}';\n"
-                    "FLUSH PRIVILEGES;"
-                )
-                _sql_file.flush()
-
                 try:
                     subprocess.check_output([
                         "sudo",
@@ -371,6 +365,12 @@ def reset_root_password_and_start_mysqld(self) -> None:
                         "Failed to change permissions for temp SQL file"
                     )
 
+                _sql_file.write(
+                    f"ALTER USER 'root'@'localhost' IDENTIFIED BY '{self.root_password}';\n"
+                    "FLUSH PRIVILEGES;"
+                )
+                _sql_file.flush()
+
                 _custom_config_file.write(f"[mysqld]\ninit_file = {_sql_file.name}")
                 _custom_config_file.flush()