[DPE-4118] Port mysql lib changes from k8s + increment tls lib for local changes (#487)

* Port mysql lib changes from k8s + increment tls lib for local changes

* Fix lint warnings

* Add a kwargs to force remove instances from cluster + add unit test

Author: shayancanonical

lib/charms/mysql/v0/mysql.py

@@ -128,7 +128,7 @@ def wait_until_mysql_connection(self) -> None:
 # Increment this major API version when introducing breaking changes
 LIBAPI = 0
 
-LIBPATCH = 63
+LIBPATCH = 64
 
 UNIT_TEARDOWN_LOCKNAME = "unit-teardown"
 UNIT_ADD_LOCKNAME = "unit-add"
@@ -1778,6 +1778,27 @@ def _get_host_ip(host: str) -> str:
 
         return ",".join(rw_endpoints), ",".join(ro_endpoints), ",".join(no_endpoints)
 
+    def execute_remove_instance(
+        self, connect_instance: Optional[str] = None, force: bool = False
+    ) -> None:
+        """Execute the remove_instance() script with mysqlsh.
+
+        Args:
+            connect_instance: (optional) The instance from where to run the remove_instance()
+            force: (optional) Whether to force the removal of the instance
+        """
+        remove_instance_options = {
+            "password": self.cluster_admin_password,
+            "force": "true" if force else "false",
+        }
+        remove_instance_commands = (
+            f"shell.connect('{self.cluster_admin_user}:{self.cluster_admin_password}@{connect_instance or self.instance_address}')",
+            f"cluster = dba.get_cluster('{self.cluster_name}')",
+            "cluster.remove_instance("
+            f"'{self.cluster_admin_user}@{self.instance_address}', {remove_instance_options})",
+        )
+        self._run_mysqlsh_script("\n".join(remove_instance_commands))
+
     @retry(
         retry=retry_if_exception_type(MySQLRemoveInstanceRetryError),
         stop=stop_after_attempt(15),
@@ -1841,17 +1862,7 @@ def remove_instance(self, unit_label: str, lock_instance: Optional[str] = None)
                     )
 
                 # Just remove instance
-                remove_instance_options = {
-                    "password": self.cluster_admin_password,
-                    "force": "true",
-                }
-                remove_instance_commands = (
-                    f"shell.connect('{self.cluster_admin_user}:{self.cluster_admin_password}@{self.instance_address}')",
-                    f"cluster = dba.get_cluster('{self.cluster_name}')",
-                    "cluster.remove_instance("
-                    f"'{self.cluster_admin_user}@{self.instance_address}', {remove_instance_options})",
-                )
-                self._run_mysqlsh_script("\n".join(remove_instance_commands))
+                self.execute_remove_instance(force=True)
         except MySQLClientError as e:
             # In case of an error, raise an error and retry
             logger.warning(

lib/charms/mysql/v0/tls.py

@@ -52,7 +52,7 @@
 
 LIBID = "eb73947deedd4380a3a90d527e0878eb"
 LIBAPI = 0
-LIBPATCH = 5
+LIBPATCH = 6
 
 SCOPE = "unit"
 

poetry.lock

@@ -488,6 +488,19 @@ def test_is_instance_configured_for_innodb_exceptions(self, _run_mysqlsh_script)
         )
         self.assertFalse(is_instance_configured)
 
+    @patch("charms.mysql.v0.mysql.MySQLBase._run_mysqlsh_script")
+    def test_execute_remove_instance(self, _run_mysqlsh_script):
+        expected_remove_instance_commands = (
+            "shell.connect('clusteradmin:[email protected]')\n"
+            "cluster = dba.get_cluster('test_cluster')\n"
+            "cluster.remove_instance('[email protected]', "
+            "{'password': 'clusteradminpassword', 'force': 'false'})"
+        )
+
+        self.mysql.execute_remove_instance(connect_instance="1.2.3.4", force=False)
+
+        _run_mysqlsh_script.assert_called_once_with(expected_remove_instance_commands)
+
     @patch("charms.mysql.v0.mysql.MySQLBase.get_cluster_node_count")
     @patch("charms.mysql.v0.mysql.MySQLBase.get_cluster_primary_address")
     @patch("charms.mysql.v0.mysql.MySQLBase._acquire_lock")