Editing asset cache output when using x-script

azure-pipelines/e2e-assets/asset-caching/failing-script.ps1

@@ -0,0 +1 @@
+throw "Script download error"

azure-pipelines/e2e-assets/asset-caching/success-script.ps1

@@ -0,0 +1,22 @@
+param (
+    [string]$Url,
+    [string]$ExpectedSHA512,
+    [string]$Destination
+)
+
+# Ensure the destination folder exists
+$downloadFolder = Split-Path -Path $Destination -Parent
+if (-not (Test-Path $downloadFolder)) {
+    New-Item -Path $downloadFolder -ItemType Directory | Out-Null
+}
+
+# Download the file directly to the specified destination path
+Invoke-WebRequest -Uri $Url -OutFile $Destination
+
+# Confirm that the file exists and is accessible
+if (-not (Test-Path $Destination)) {
+    Throw "Download failed: File not found at $Destination"
+    exit 1
+}
+
+exit 0

azure-pipelines/end-to-end-tests-dir/asset-caching.ps1

@@ -197,3 +197,31 @@ $actual = Run-VcpkgAndCaptureOutput -TestArgs ($commonArgs + @("x-download", "$d
 if (-not ($actual.Contains("Asset cache hit for example3.html; downloaded from: file://$AssetCache"))) {
     throw "Failure: azurl (yes), x-block-origin (yes), asset-cache (hit), download (n/a)"
 }
+
+# Testing x-download failure with asset cache (x-script) and x-block-origin settings
+$env:X_VCPKG_ASSET_SOURCES = "clear;x-script,pwsh $PSScriptRoot/../e2e-assets/asset-caching/failing-script.ps1 {url} {sha512} {dst};x-block-origin"
+$actual = Run-VcpkgAndCaptureOutput -TestArgs ($commonArgs + @("x-download", "$downloadsRoot/example3.html", "--url", "https://example.com", "--sha512", "d06b93c883f8126a04589937a884032df031b05518eed9d433efb6447834df2596aebd500d69b8283e5702d988ed49655ae654c1683c7a4ae58bfa6b92f2b73a"))
+if (-not ($actual.Contains("The script download failed.") -and
+          $actual.Contains("error: <mirror-script> failed with exit code: (1).") -and
+          $actual.Contains("error: Missing example3.html and downloads are blocked by x-block-origin."))) {
+    throw "Failure: x-script downloads failure messaging"
+}
+
+# Testing x-download success with asset cache (x-script) and x-block-origin settings
+Refresh-TestRoot
+$env:X_VCPKG_ASSET_SOURCES = "clear;x-script,pwsh $PSScriptRoot/../e2e-assets/asset-caching/success-script.ps1 {url} {sha512} {dst};x-block-origin"
+$actual = Run-VcpkgAndCaptureOutput -TestArgs ($commonArgs + @("x-download", "$downloadsRoot/example3.html", "--url", "https://example.com", "--sha512", "d06b93c883f8126a04589937a884032df031b05518eed9d433efb6447834df2596aebd500d69b8283e5702d988ed49655ae654c1683c7a4ae58bfa6b92f2b73a"))
+if (-not ($actual.Contains("Successfully downloaded example3.html."))) {
+    throw "Failure: x-script download success message"
+}
+
+# Testing x-download failure with mismatched sha
+Refresh-TestRoot
+$env:X_VCPKG_ASSET_SOURCES = "clear;x-script,pwsh $PSScriptRoot/../e2e-assets/asset-caching/success-script.ps1 {url} {sha512} {dst};x-block-origin"
+$actual = Run-VcpkgAndCaptureOutput -TestArgs ($commonArgs + @("x-download", "$downloadsRoot/example3.html", "--url", "https://example.com", "--sha512", "d06b93c883f8126a04589937a884032df031b05518eed9d433efb6447834df2596aebd500d69b8283e5702d988ed49655ae654c1683c7a4ae58bfa6b92f2b73b"))
+if (-not ($actual.Contains("error: File does not have the expected hash:") -and
+          $actual.Contains("url: <mirror-script>") -and
+          $actual.Contains("Expected hash: d06b93c883f8126a04589937a884032df031b05518eed9d433efb6447834df2596aebd500d69b8283e5702d988ed49655ae654c1683c7a4ae58bfa6b92f2b73b") -and
+          $actual.Contains("Actual hash: d06b93c883f8126a04589937a884032df031b05518eed9d433efb6447834df2596aebd500d69b8283e5702d988ed49655ae654c1683c7a4ae58bfa6b92f2b73a"))) {
+    throw "Failure: x-script download failure message - sha mismatch"
+}

include/vcpkg/base/message-data.inc.h

@@ -1144,6 +1144,7 @@ DECLARE_MESSAGE(ErrorRequirePackagesList,
                 (),
                 "",
                 "`vcpkg install` requires a list of packages to install in classic mode.")
+DECLARE_MESSAGE(ErrorScriptDownloadFailed, (msg::error_msg), "", "The script download failed.\n{error_msg}.")
 DECLARE_MESSAGE(ErrorInvalidExtractOption,
                 (msg::option, msg::value),
                 "The keyword 'AUTO' should not be localized",

locales/messages.json

@@ -663,6 +663,8 @@
   "_ErrorParsingBinaryParagraph.comment": "An example of {spec} is zlib:x64-windows.",
   "ErrorRequireBaseline": "this vcpkg instance requires a manifest with a specified baseline in order to interact with ports. Please add 'builtin-baseline' to the manifest or add a 'vcpkg-configuration.json' that redefines the default registry.",
   "ErrorRequirePackagesList": "`vcpkg install` requires a list of packages to install in classic mode.",
+  "ErrorScriptDownloadFailed": "The script download failed.\n{error_msg}.",
+  "_ErrorScriptDownloadFailed.comment": "An example of {error_msg} is File Not Found.",
   "ErrorUnableToDetectCompilerInfo": "vcpkg was unable to detect the active compiler's information. See above for the CMake failure output.",
   "_ErrorUnableToDetectCompilerInfo.comment": "failure output will be displayed at the top of this",
   "ErrorVcvarsUnsupported": "in triplet {triplet}: Use of Visual Studio's Developer Prompt is unsupported on non-Windows hosts.\nDefine 'VCPKG_CMAKE_SYSTEM_NAME' or 'VCPKG_CHAINLOAD_TOOLCHAIN_FILE' in the triplet file.",

src/vcpkg/base/downloads.cpp

@@ -974,6 +974,7 @@ namespace vcpkg
                     RedirectedProcessLaunchSettings settings;
                     settings.environment = get_clean_environment();
                     settings.echo_in_debug = EchoInDebug::Show;
+
                     auto maybe_res = flatten(cmd_execute_and_capture_output(cmd, settings), "<mirror-script>");
                     if (maybe_res)
                     {
@@ -982,14 +983,14 @@ namespace vcpkg
                         if (maybe_success)
                         {
                             fs.rename(download_path_part_path, download_path, VCPKG_LINE_INFO);
+                            msg::println(msgDownloadSuccesful, msg::path = download_path.filename());
                             return urls[0];
                         }
-
-                        errors.push_back(std::move(maybe_success).error());
+                        msg::println_error(maybe_success.error());
                     }
                     else
                     {
-                        errors.push_back(std::move(maybe_res).error());
+                        msg::println(msgErrorScriptDownloadFailed, msg::error_msg = maybe_res.error());
                     }
                 }
             }