Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cli: don't allow/check for updates when integrated #166759

Merged
merged 1 commit into from Nov 19, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions cli/src/tunnels/control_server.rs
Expand Up @@ -17,6 +17,7 @@ use crate::util::http::{
DelegatedHttpRequest, DelegatedSimpleHttp, FallbackSimpleHttp, ReqwestSimpleHttp,
};
use crate::util::io::SilentCopyProgress;
use crate::util::is_integrated_cli;
use crate::util::sync::{new_barrier, Barrier};
use opentelemetry::trace::SpanKind;
use opentelemetry::KeyValue;
Expand Down Expand Up @@ -773,6 +774,13 @@ async fn handle_update(
log: &log::Logger,
params: &UpdateParams,
) -> Result<UpdateResult, AnyError> {
if let Ok(true) = is_integrated_cli() {
return Ok(UpdateResult {
up_to_date: true,
did_update: false,
});
}

let update_service = UpdateService::new(log.clone(), http.clone());
let updater = SelfUpdate::new(&update_service)?;
let latest_release = updater.get_current_release().await?;
Expand Down