Add root user & password constants

Author: schlessera

.github/workflows/testing.yml

@@ -159,6 +159,8 @@ jobs:
         run: |
           export MYSQL_HOST=127.0.0.1
           export MYSQL_TCP_PORT=${{ job.services.mysql.ports['3306'] }}
+          echo "WP_CLI_TEST_DBROOTUSER=root" >> $GITHUB_ENV
+          echo "WP_CLI_TEST_DBROOTPASS=root" >> $GITHUB_ENV
           echo "WP_CLI_TEST_DBUSER=wp_cli_test" >> $GITHUB_ENV
           echo "WP_CLI_TEST_DBPASS=password1" >> $GITHUB_ENV
           echo "WP_CLI_TEST_DBHOST=$MYSQL_HOST:$MYSQL_TCP_PORT" >> $GITHUB_ENV

bin/install-package-tests

@@ -2,8 +2,10 @@
 
 # Database credentials can be provided via environment variables:
 # - WP_CLI_TEST_DBHOST is the host to use and can include a port, i.e "127.0.0.1:33060" (defaults to "localhost")
-# - WP_CLI_TEST_DBUSER is the user that has permission to administer databases and users (defaults to "root").
-# - WP_CLI_TEST_DBPASS is the password to use for the above user (defaults to an empty password).
+# - WP_CLI_TEST_DBROOTUSER is the user that has permission to administer databases and users (defaults to "root").
+# - WP_CLI_TEST_DBROOTPASS is the password to use for the above user (defaults to an empty password).
+# - WP_CLI_TEST_DBUSER is the user that the tests run under (defaults to "wp_cli_test").
+# - WP_CLI_TEST_DBPASS is the password to use for the above user (defaults to "password1").
 
 HOST=localhost
 PORT=""
@@ -20,28 +22,28 @@ if [ -n "$WP_CLI_TEST_DBHOST" ]; then
 fi
 
 USER=root
-if [ -n "$WP_CLI_TEST_DBUSER" ]; then
-  USER="$WP_CLI_TEST_DBUSER"
+if [ -n "$WP_CLI_TEST_DBROOTUSER" ]; then
+  USER="$WP_CLI_TEST_DBROOTUSER"
 fi
 
 PASSWORD_STRING=""
-if [ -n "$WP_CLI_TEST_DBPASS" ]; then
-  PASSWORD_STRING="-p$WP_CLI_TEST_DBPASS"
+if [ -n "$WP_CLI_TEST_DBROOTPASS" ]; then
+  PASSWORD_STRING="-p$WP_CLI_TEST_DBROOTPASS"
 fi
 
 # Prepare the database for running the tests with a MySQL version 8.0 or higher.
 install_db_8_0_plus() {
-	mysql -e "CREATE DATABASE IF NOT EXISTS wp_cli_test;" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
-	mysql -e "CREATE USER IF NOT EXISTS wp_cli_test@$HOST IDENTIFIED BY 'password1'" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
-	mysql -e "GRANT ALL PRIVILEGES ON wp_cli_test.* TO wp_cli_test@%" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
-	mysql -e "GRANT ALL PRIVILEGES ON wp_cli_test_scaffold.* TO wp_cli_test@%" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
+	mysql -e "CREATE DATABASE IF NOT EXISTS \`wp_cli_test\`;" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
+	mysql -e "CREATE USER IF NOT EXISTS \`wp_cli_test\`@$HOST IDENTIFIED BY '$TEST_PASSWORD'" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
+	mysql -e "GRANT ALL PRIVILEGES ON \`wp_cli_test\`.* TO '$TEST_USER'@'%'" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
+	mysql -e "GRANT ALL PRIVILEGES ON \`wp_cli_test_scaffold\`.* TO '$TEST_USER'@'%'" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
 }
 
 # Prepare the database for running the tests with a MySQL version lower than 8.0.
 install_db_lower_than_8_0() {
-	mysql -e "CREATE DATABASE IF NOT EXISTS wp_cli_test;" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
-	mysql -e "GRANT ALL ON wp_cli_test.* TO wp_cli_test@% IDENTIFIED BY 'password1'" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
-	mysql -e "GRANT ALL ON wp_cli_test_scaffold.* TO wp_cli_test@% IDENTIFIED BY 'password1'" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
+	mysql -e "CREATE DATABASE IF NOT EXISTS \`wp_cli_test\`;" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
+	mysql -e "GRANT ALL ON \`wp_cli_test\`.* TO '$TEST_USER'@'%' IDENTIFIED BY '$TEST_PASSWORD'" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
+	mysql -e "GRANT ALL ON \`wp_cli_test_scaffold\`.* TO '$TEST_USER'@'%' IDENTIFIED BY '$TEST_PASSWORD'" $HOST_STRING -u"$USER" "$PASSWORD_STRING"
 }
 
 set -ex