Raise error when role name > 32 chars

Author: sinclert-canonical

docs/reference/software-testing.md

@@ -36,13 +36,13 @@ juju run mysql-test-app/leader get-inserted-data
 # Start "continuous write" test:
 juju run mysql-test-app/leader start-continuous-writes
 export password=$(juju run mysql/leader get-password username=root | yq '.. | select(. | has("password")).password')
-watch -n1 -x juju ssh mysql/leader "mysql -h 127.0.0.1 -uroot -p${password} -e \"select count(*) from continuous_writes_database.data\""
+watch -n1 -x juju ssh mysql/leader "mysql -h 127.0.0.1 -uroot -p${password} -e \"select count(*) from continuous_writes.data\""
 
 # Watch the counter is growing!
 ```
 Expected results:
 
-* mysql-test-app continuously inserts records in database `continuous_writes_database` table `data`.
+* mysql-test-app continuously inserts records in database `continuous_writes` table `data`.
 * the counters (amount of records in table) are growing on all cluster members
 
 Hints:

lib/charms/mysql/v0/mysql.py

@@ -1510,12 +1510,9 @@ def create_database(self, database: str) -> None:
         """Create an application database."""
         role_name = f"charmed_dba_{database}"
 
-        if len(database) >= ROLE_MAX_LENGTH:
-            logger.error(f"Failed to create application database {database}")
-            raise MySQLCreateApplicationDatabaseError("Name longer than 32 characters")
         if len(role_name) >= ROLE_MAX_LENGTH:
-            logger.warning(f"Pruning application database role name {role_name}")
-            role_name = role_name[:ROLE_MAX_LENGTH]
+            logger.error(f"Failed to create application database {database}")
+            raise MySQLCreateApplicationDatabaseError("Role name longer than 32 characters")
 
         create_database_commands = (
             "shell.connect_to_primary()",

tests/integration/high_availability/high_availability_helpers.py

@@ -21,7 +21,7 @@
 )
 
 # Copied these values from high_availability.application_charm.src.charm
-DATABASE_NAME = "continuous_writes_database"
+DATABASE_NAME = "continuous_writes"
 TABLE_NAME = "data"
 
 CLUSTER_NAME = "test_cluster"

tests/integration/relations/test_relation_mysql_legacy.py

@@ -29,7 +29,7 @@
 ENDPOINT = "mysql"
 
 TEST_USER = "testuser"
-TEST_DATABASE = "continuous_writes_database"
+TEST_DATABASE = "continuous_writes"
 TIMEOUT = 15 * 60
 
 

tests/integration/roles/test_instance_dba_role.py

@@ -50,7 +50,7 @@ async def test_build_and_deploy(ops_test: OpsTest, charm) -> None:
 async def test_charmed_dba_role(ops_test: OpsTest):
     """Test the instance-level DBA role."""
     await ops_test.model.applications[INTEGRATOR_APP_NAME].set_config({
-        "database-name": "charmed_dba_database",
+        "database-name": "charmed_dba_db",
         "extra-user-roles": "charmed_dba",
     })
     await ops_test.model.add_relation(INTEGRATOR_APP_NAME, DATABASE_APP_NAME)

tests/integration/roles/test_instance_roles.py

@@ -64,7 +64,7 @@ async def test_build_and_deploy(ops_test: OpsTest, charm) -> None:
 async def test_charmed_read_role(ops_test: OpsTest):
     """Test the instance-level charmed_read role."""
     await ops_test.model.applications[f"{INTEGRATOR_APP_NAME}1"].set_config({
-        "database-name": "charmed_read_database",
+        "database-name": "charmed_read_db",
         "extra-user-roles": "charmed_read",
     })
     await ops_test.model.add_relation(f"{INTEGRATOR_APP_NAME}1", DATABASE_APP_NAME)
@@ -83,8 +83,8 @@ async def test_charmed_read_role(ops_test: OpsTest):
         server_config_credentials["username"],
         server_config_credentials["password"],
         [
-            "CREATE TABLE charmed_read_database.test_table (`id` SERIAL PRIMARY KEY, `data` TEXT)",
-            "INSERT INTO charmed_read_database.test_table (`data`) VALUES ('test_data_1'), ('test_data_2')",
+            "CREATE TABLE charmed_read_db.test_table (`id` SERIAL PRIMARY KEY, `data` TEXT)",
+            "INSERT INTO charmed_read_db.test_table (`data`) VALUES ('test_data_1'), ('test_data_2')",
         ],
         commit=True,
     )
@@ -98,14 +98,14 @@ async def test_charmed_read_role(ops_test: OpsTest):
         results["mysql"]["username"],
         results["mysql"]["password"],
         [
-            "SELECT `data` FROM charmed_read_database.test_table",
+            "SELECT `data` FROM charmed_read_db.test_table",
         ],
         commit=True,
     )
     assert sorted(rows) == sorted([
         "test_data_1",
         "test_data_2",
-    ]), "Unexpected data in charmed_read_database with charmed_read role"
+    ]), "Unexpected data in charmed_read_db with charmed_read role"
 
     logger.info("Checking that the charmed_read role cannot write into an existing table")
     with pytest.raises(ProgrammingError):
@@ -114,7 +114,7 @@ async def test_charmed_read_role(ops_test: OpsTest):
             results["mysql"]["username"],
             results["mysql"]["password"],
             [
-                "INSERT INTO charmed_read_database.test_table (`data`) VALUES ('test_data_3')",
+                "INSERT INTO charmed_read_db.test_table (`data`) VALUES ('test_data_3')",
             ],
             commit=True,
         )
@@ -126,7 +126,7 @@ async def test_charmed_read_role(ops_test: OpsTest):
             results["mysql"]["username"],
             results["mysql"]["password"],
             [
-                "CREATE TABLE charmed_read_database.new_table (`id` SERIAL PRIMARY KEY, `data` TEXT)",
+                "CREATE TABLE charmed_read_db.new_table (`id` SERIAL PRIMARY KEY, `data` TEXT)",
             ],
             commit=True,
         )
@@ -145,7 +145,7 @@ async def test_charmed_read_role(ops_test: OpsTest):
 async def test_charmed_dml_role(ops_test: OpsTest):
     """Test the instance-level charmed_dml role."""
     await ops_test.model.applications[f"{INTEGRATOR_APP_NAME}1"].set_config({
-        "database-name": "charmed_dml_database",
+        "database-name": "charmed_dml_db",
         "extra-user-roles": "",
     })
     await ops_test.model.add_relation(f"{INTEGRATOR_APP_NAME}1", DATABASE_APP_NAME)
@@ -177,16 +177,16 @@ async def test_charmed_dml_role(ops_test: OpsTest):
         results["mysql"]["username"],
         results["mysql"]["password"],
         [
-            "CREATE TABLE charmed_dml_database.test_table (`id` SERIAL PRIMARY KEY, `data` TEXT)",
-            "INSERT INTO charmed_dml_database.test_table (`data`) VALUES ('test_data_1'), ('test_data_2')",
-            "SELECT `data` FROM charmed_dml_database.test_table",
+            "CREATE TABLE charmed_dml_db.test_table (`id` SERIAL PRIMARY KEY, `data` TEXT)",
+            "INSERT INTO charmed_dml_db.test_table (`data`) VALUES ('test_data_1'), ('test_data_2')",
+            "SELECT `data` FROM charmed_dml_db.test_table",
         ],
         commit=True,
     )
     assert sorted(rows) == sorted([
         "test_data_1",
         "test_data_2",
-    ]), "Unexpected data in charmed_dml_database with charmed_dml role"
+    ]), "Unexpected data in charmed_dml_db with charmed_dml role"
 
     data_integrator_2_unit = ops_test.model.applications[f"{INTEGRATOR_APP_NAME}2"].units[0]
     results = await juju_.run_action(data_integrator_2_unit, "get-credentials")
@@ -197,22 +197,22 @@ async def test_charmed_dml_role(ops_test: OpsTest):
         results["mysql"]["username"],
         results["mysql"]["password"],
         [
-            "SELECT `data` FROM charmed_dml_database.test_table",
+            "SELECT `data` FROM charmed_dml_db.test_table",
         ],
         commit=True,
     )
     assert sorted(rows) == sorted([
         "test_data_1",
         "test_data_2",
-    ]), "Unexpected data in charmed_dml_database with charmed_dml role"
+    ]), "Unexpected data in charmed_dml_db with charmed_dml role"
 
     logger.info("Checking that the charmed_dml role can write into an existing table")
     await execute_queries_on_unit(
         primary_unit_address,
         results["mysql"]["username"],
         results["mysql"]["password"],
         [
-            "INSERT INTO charmed_dml_database.test_table (`data`) VALUES ('test_data_3')",
+            "INSERT INTO charmed_dml_db.test_table (`data`) VALUES ('test_data_3')",
         ],
         commit=True,
     )
@@ -224,7 +224,7 @@ async def test_charmed_dml_role(ops_test: OpsTest):
             results["mysql"]["username"],
             results["mysql"]["password"],
             [
-                "CREATE TABLE charmed_dml_database.new_table (`id` SERIAL PRIMARY KEY, `data` TEXT)",
+                "CREATE TABLE charmed_dml_db.new_table (`id` SERIAL PRIMARY KEY, `data` TEXT)",
             ],
             commit=True,
         )

tests/unit/test_mysql.py

@@ -2610,8 +2610,8 @@ def test_strip_off_password(self):
   File "/var/lib/juju/agents/unit-mysql-k8s-edge-0/charm/venv/lib/python3.10/site-packages/ops/pebble.py", line 1771, in wait_output
     raise ExecError[AnyStr](self._command, exit_code, out_value, err_value)
 ops.pebble.ExecError: non-zero exit code 1 executing ['/usr/bin/mysqlsh', '--passwords-from-stdin', '--uri=serverconfig@mysql-k8s-edge-0.mysql-k8s-edge-endpoints.stg-alutay-datasql-juju361.svc.cluster.local:33062', '--python', '--verbose=0', '-c', 'shell.options.set(\'useWizards\', False)\nprint(\'###\')\nsh$
-ll.connect_to_primary()\nsession.run_sql("CREATE DATABASE IF NOT EXISTS `continuous_writes_database`;")\nsession.run_sql("CREATE USER `relation-21_ff7306c7454f44`@`%` IDENTIFIED BY \'s1ffxPedAmX58aOdCRSzxEpm\' ATTRIBUTE \'{}\';")\nsession.run_sql("GRANT USAGE ON *.* TO `relation-21_ff7306c7454f44`@`%`;")\nses
-sion.run_sql("GRANT ALL PRIVILEGES ON `continuous_writes_database`.* TO `relation-21_ff7306c7454f44`@`%`;")'], stdout="\x1b[1mPlease provide the password for 'serverconfig@mysql-k8s-edge-0.mysql-k8s-edge-endpoints.stg-alutay-datasql-juju361.svc.cluster.local:33062': \x1b[0m###\n", stderr='Cannot set LC_ALL to
+ll.connect_to_primary()\nsession.run_sql("CREATE DATABASE IF NOT EXISTS `continuous_writes`;")\nsession.run_sql("CREATE USER `relation-21_ff7306c7454f44`@`%` IDENTIFIED BY \'s1ffxPedAmX58aOdCRSzxEpm\' ATTRIBUTE \'{}\';")\nsession.run_sql("GRANT USAGE ON *.* TO `relation-21_ff7306c7454f44`@`%`;")\nses
+sion.run_sql("GRANT ALL PRIVILEGES ON `continuous_writes`.* TO `relation-21_ff7306c7454f44`@`%`;")'], stdout="\x1b[1mPlease provide the password for 'serverconfig@mysql-k8s-edge-0.mysql-k8s-edge-endpoints.stg-alutay-datasql-juju361.svc.cluster.local:33062': \x1b[0m###\n", stderr='Cannot set LC_ALL to
  locale en_US.UTF-8: No such file or directory\n\x1b[36mNOTE: \x1b[0mAlready connected to a PRIMARY.\nTraceback (most recent call last):\n  File "<string>", line 5, in <module>\nmysqlsh.DBError: MySQL Error (1396): ClassicSession.run_sql: Operation CREATE USER failed for \'relation-21_ff7306c7454f44\'@\'%\'\n
 """
         output = self.mysql.strip_off_passwords(_input)