mirror of
https://github.com/microsoft/vscode.git
synced 2025-12-24 12:19:20 +00:00
allow update endpoint in rs cli to be configurable by env var (#276761)
This commit is contained in:
@@ -56,8 +56,15 @@ fn quality_download_segment(quality: options::Quality) -> &'static str {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_update_endpoint() -> Result<&'static str, CodeError> {
|
fn get_update_endpoint() -> Result<String, CodeError> {
|
||||||
VSCODE_CLI_UPDATE_ENDPOINT.ok_or_else(|| CodeError::UpdatesNotConfigured("no service url"))
|
if let Ok(url) = std::env::var("VSCODE_CLI_UPDATE_URL") {
|
||||||
|
if !url.is_empty() {
|
||||||
|
return Ok(url);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
VSCODE_CLI_UPDATE_ENDPOINT
|
||||||
|
.map(|s| s.to_string())
|
||||||
|
.ok_or_else(|| CodeError::UpdatesNotConfigured("no service url"))
|
||||||
}
|
}
|
||||||
|
|
||||||
impl UpdateService {
|
impl UpdateService {
|
||||||
@@ -78,7 +85,7 @@ impl UpdateService {
|
|||||||
.ok_or_else(|| CodeError::UnsupportedPlatform(platform.to_string()))?;
|
.ok_or_else(|| CodeError::UnsupportedPlatform(platform.to_string()))?;
|
||||||
let download_url = format!(
|
let download_url = format!(
|
||||||
"{}/api/versions/{}/{}/{}",
|
"{}/api/versions/{}/{}/{}",
|
||||||
update_endpoint,
|
&update_endpoint,
|
||||||
version,
|
version,
|
||||||
download_segment,
|
download_segment,
|
||||||
quality_download_segment(quality),
|
quality_download_segment(quality),
|
||||||
@@ -119,7 +126,7 @@ impl UpdateService {
|
|||||||
.ok_or_else(|| CodeError::UnsupportedPlatform(platform.to_string()))?;
|
.ok_or_else(|| CodeError::UnsupportedPlatform(platform.to_string()))?;
|
||||||
let download_url = format!(
|
let download_url = format!(
|
||||||
"{}/api/latest/{}/{}",
|
"{}/api/latest/{}/{}",
|
||||||
update_endpoint,
|
&update_endpoint,
|
||||||
download_segment,
|
download_segment,
|
||||||
quality_download_segment(quality),
|
quality_download_segment(quality),
|
||||||
);
|
);
|
||||||
@@ -156,7 +163,7 @@ impl UpdateService {
|
|||||||
|
|
||||||
let download_url = format!(
|
let download_url = format!(
|
||||||
"{}/commit:{}/{}/{}",
|
"{}/commit:{}/{}/{}",
|
||||||
update_endpoint,
|
&update_endpoint,
|
||||||
release.commit,
|
release.commit,
|
||||||
download_segment,
|
download_segment,
|
||||||
quality_download_segment(release.quality),
|
quality_download_segment(release.quality),
|
||||||
|
|||||||
Reference in New Issue
Block a user