Fix idempotency with create-user-db command to allow changing password

Author: macropin

commands/create-user-db

@@ -34,7 +34,9 @@ if [ "$CREATE_DB" == 'true' ]; then
     echo "CREATE DATABASE IF NOT EXISTS ${NEW_NAME};" | $MYSQL
 fi
 # Create user first (MySQL 8 compatible)
-echo "CREATE USER ${NEW_NAME}@'%' IDENTIFIED BY '$NEW_PASS';" | $MYSQL
+echo "CREATE USER IF NOT EXISTS ${NEW_NAME}@'%' IDENTIFIED BY '$NEW_PASS';" | $MYSQL
+# Change the password if the user already existed
+echo "ALTER USER ${NEW_NAME}@'%' IDENTIFIED BY '$NEW_PASS';" | $MYSQL
 # Specifiy the exact permissions. NB. This is also RDS compatible as GRANT ALL not possible.
 echo "GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EXECUTE, EVENT, TRIGGER ON ${NEW_NAME}.* TO ${NEW_NAME}@'%';" | $MYSQL
 

tests/test.sh

@@ -37,6 +37,15 @@ docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password ${MARI
 docker run -i --name $TEST_NAME --link mariadb -e BACKUP_DIR=/backup $TEST_CONTAINER create-user-db foo foopass
 cleanup mariadb $TEST_NAME
 
+echo "=> Test create-user-db command (idempotency / password change)"
+docker run -d --name mariadb -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password ${MARIADB_IMAGE}:${MARIADB_TAG} > /dev/null
+docker run -i --name $TEST_NAME --link mariadb $TEST_CONTAINER create-user-db foo origpass && cleanup $TEST_NAME
+# password should be changed
+docker run -i --name $TEST_NAME --link mariadb $TEST_CONTAINER create-user-db foo changedpass && cleanup $TEST_NAME
+echo "SHOW VARIABLES LIKE 'version';" | docker run -i --name $TEST_NAME --link mariadb -e DATABASE_USER=foo -e DATABASE_PASS=changedpass $TEST_CONTAINER mysql
+cleanup $TEST_NAME
+cleanup mariadb $TEST_NAME
+
 echo "=> Test import command"
 mkdir -p /tmp/data
 (