Skip to content

Commit dfcddb7

Browse files
committed
platform/#3349: allow minor version in MySQL configuration
1 parent 07ccc33 commit dfcddb7

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ data "google_sql_database_instance" "cloudsql_instance" {
2525
lifecycle {
2626

2727
postcondition {
28-
condition = self.database_version == "MYSQL_5_7" || self.database_version == "MYSQL_8_0"
28+
condition = startswith(self.database_version, "MYSQL_5_7") || startswith(self.database_version, "MYSQL_8_0")
2929
error_message = "Database version must be \"MYSQL_5_7\" or \"MYSQL_8_0\". Other versions are not supported."
3030
}
3131
}

scripts/execute_sql.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ for j in $(seq 1 10); do
2020
done
2121

2222
if [ "$READY" -eq 0 ]; then
23-
if [ "$MYSQL_VERSION" = "MYSQL_5_7" ]; then
23+
if [ "${MYSQL_VERSION:0:9}" = "MYSQL_5_7" ]; then
2424
mysql --host=${CLOUDSQL_PROXY_HOST} --port=${CLOUDSQL_PROXY_PORT} --user=${CLOUDSQL_PRIVILEGED_USER_NAME} --password=${CLOUDSQL_PRIVILEGED_USER_PASSWORD} --execute="REVOKE ALL PRIVILEGES, GRANT OPTION FROM '${USER}'@'${USER_HOST}'; GRANT ALL ON ${DATABASE}.* TO ${USER}@'${USER_HOST}';"
2525
fi
2626

27-
if [ "$MYSQL_VERSION" = "MYSQL_8_0" ]; then
27+
if [ "${MYSQL_VERSION:0:9}" = "MYSQL_8_0" ]; then
2828
mysql --host=${CLOUDSQL_PROXY_HOST} --port=${CLOUDSQL_PROXY_PORT} --user=${CLOUDSQL_PRIVILEGED_USER_NAME} --password=${CLOUDSQL_PRIVILEGED_USER_PASSWORD} --execute="REVOKE cloudsqlsuperuser FROM '${USER}'@'${USER_HOST}'; GRANT ALL ON ${DATABASE}.* TO ${USER}@'${USER_HOST}';"
2929
fi
3030

0 commit comments

Comments
 (0)