[TEST II]

Author: sinclert-canonical

lib/charms/mysql/v0/mysql.py

@@ -1130,12 +1130,8 @@ def configure_mysql_router_roles(self) -> None:
             configure_role_commands = [
                 f"CREATE ROLE {role}",
                 f"GRANT CREATE ON *.* TO {role}",
-                f"GRANT CREATE USER ON *.* TO {role} WITH GRANT OPTION",
-                f"GRANT SELECT, INSERT, UPDATE, DELETE, EXECUTE ON mysql_innodb_cluster_metadata.* TO {role}",
-                f"GRANT SELECT ON mysql.user TO {role}",
-                f"GRANT SELECT ON performance_schema.replication_group_members TO {role}",
-                f"GRANT SELECT ON performance_schema.replication_group_member_stats TO {role}",
-                f"GRANT SELECT ON performance_schema.global_variables TO {role}",
+                f"GRANT CREATE USER ON *.* TO {role}",
+                f"GRANT SELECT, INSERT, UPDATE, DELETE, EXECUTE ON *.* TO {role} WITH GRANT OPTION",
             ]
 
             try:

tests/integration/high_availability/test_async_replication.py

@@ -163,7 +163,9 @@ async def test_deploy_router_and_app(first_model: Model) -> None:
     await first_model.integrate(MYSQL_ROUTER_APP_NAME, MYSQL_APP1)
 
     await first_model.block_until(
-        lambda: first_model.applications[APPLICATION_APP_NAME].units[0].workload_status == "active"
+        lambda: first_model.applications[APPLICATION_APP_NAME].units[0].workload_status
+        == "active",
+        timeout=5 * MINUTE,  # TODO: Remove
     )
 
 

tests/unit/test_mysql.py

@@ -148,12 +148,8 @@ def test_configure_mysql_router_roles(self, _run_mysqlcli_script, _list_mysql_ro
             _expected_configure_role_commands = [
                 f"CREATE ROLE {role}",
                 f"GRANT CREATE ON *.* TO {role}",
-                f"GRANT CREATE USER ON *.* TO {role} WITH GRANT OPTION",
-                f"GRANT SELECT, INSERT, UPDATE, DELETE, EXECUTE ON mysql_innodb_cluster_metadata.* TO {role}",
-                f"GRANT SELECT ON mysql.user TO {role}",
-                f"GRANT SELECT ON performance_schema.replication_group_members TO {role}",
-                f"GRANT SELECT ON performance_schema.replication_group_member_stats TO {role}",
-                f"GRANT SELECT ON performance_schema.global_variables TO {role}",
+                f"GRANT CREATE USER ON *.* TO {role}",
+                f"GRANT SELECT, INSERT, UPDATE, DELETE, EXECUTE ON *.* TO {role} WITH GRANT OPTION",
             ]
 
             self.mysql.configure_mysql_router_roles()