From c26258168863fb6f3f15307411be1665edfac90c Mon Sep 17 00:00:00 2001
From: Vasilii Polikarpov
 <126792224+vpolikarpov-akvelon@users.noreply.github.com>
Date: Sun, 18 Jun 2023 20:21:53 +0200
Subject: [PATCH] Revert "[Windows] download MySQL from SA (#6769)" (#7732)

---
 images/win/scripts/Installers/Install-MysqlCli.ps1 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/images/win/scripts/Installers/Install-MysqlCli.ps1 b/images/win/scripts/Installers/Install-MysqlCli.ps1
index 5b5c1f0d..300e3b0c 100644
--- a/images/win/scripts/Installers/Install-MysqlCli.ps1
+++ b/images/win/scripts/Installers/Install-MysqlCli.ps1
@@ -14,14 +14,14 @@ Install-Binary -Url $InstallerURI -Name $InstallerName -ArgumentList $ArgumentLi
 [version]$MysqlVersion = (Get-ToolsetContent).mysql.version
 $MysqlVersionMajorMinor = $MysqlVersion.ToString(2)
 
-# Temporary move to SA as Oracle's site is unavailable
-if (Test-IsWin19) {
-    $MysqlVersionUrl = "https://githubpackercipoolmysql.blob.core.windows.net/mysql/mysql-5.7.40-winx64.zip"
-    $MysqlVersionFull = "5.7.40"
-} elseif (Test-IsWin22) {
-    $MysqlVersionUrl = "https://githubpackercipoolmysql.blob.core.windows.net/mysql/mysql-8.0.31-winx64.zip"
-    $MysqlVersionFull = "8.0.31"
+if ($MysqlVersion.Build -lt 0) {
+    $MysqlVersion = (Invoke-RestMethod -Uri "https://dev.mysql.com/downloads/mysql/${MysqlVersionMajorMinor}.html" |
+        Select-String -Pattern "${MysqlVersionMajorMinor}\.\d+").Matches.Value
 }
+
+$MysqlVersionFull = $MysqlVersion.ToString()
+$MysqlVersionUrl = "https://cdn.mysql.com/Downloads/MySQL-${MysqlVersionMajorMinor}/mysql-${MysqlVersionFull}-winx64.zip"
+
 $MysqlArchPath = Start-DownloadWithRetry -Url $MysqlVersionUrl -Name "mysql.zip"
 
 # Expand the zip