mirror of
https://github.com/astral-sh/uv.git
synced 2026-05-06 08:56:53 -04:00
Mark --native-tls and UV_NATIVE_TLS as deprecated (#18705)
## Summary Closes https://github.com/astral-sh/uv/issues/18689.
This commit is contained in:
@@ -236,8 +236,8 @@ pub struct GlobalArgs {
|
|||||||
)]
|
)]
|
||||||
pub color: Option<ColorChoice>,
|
pub color: Option<ColorChoice>,
|
||||||
|
|
||||||
/// Whether to load TLS certificates from the platform's native certificate store [env:
|
/// (Deprecated: use `--system-certs` instead.) Whether to load TLS certificates from the
|
||||||
/// UV_NATIVE_TLS=]
|
/// platform's native certificate store [env: UV_NATIVE_TLS=]
|
||||||
///
|
///
|
||||||
/// By default, uv uses bundled Mozilla root certificates. When enabled, this flag loads
|
/// By default, uv uses bundled Mozilla root certificates. When enabled, this flag loads
|
||||||
/// certificates from the platform's native certificate store instead.
|
/// certificates from the platform's native certificate store instead.
|
||||||
|
|||||||
@@ -110,6 +110,7 @@ impl EnvVars {
|
|||||||
/// Equivalent to the `--native-tls` command-line argument. If set to `true`, uv will
|
/// Equivalent to the `--native-tls` command-line argument. If set to `true`, uv will
|
||||||
/// load TLS certificates from the platform's native certificate store instead of the
|
/// load TLS certificates from the platform's native certificate store instead of the
|
||||||
/// bundled Mozilla root certificates.
|
/// bundled Mozilla root certificates.
|
||||||
|
/// (Deprecated: use `UV_SYSTEM_CERTS` instead.)
|
||||||
#[attr_added_in("0.1.19")]
|
#[attr_added_in("0.1.19")]
|
||||||
pub const UV_NATIVE_TLS: &'static str = "UV_NATIVE_TLS";
|
pub const UV_NATIVE_TLS: &'static str = "UV_NATIVE_TLS";
|
||||||
|
|
||||||
|
|||||||
@@ -293,6 +293,30 @@ impl NetworkSettings {
|
|||||||
Connectivity::Online
|
Connectivity::Online
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if args.native_tls {
|
||||||
|
warn_user_once!(
|
||||||
|
"The `--native-tls` flag is deprecated and will be removed in a future release. Use `--system-certs` instead."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if args.no_native_tls {
|
||||||
|
warn_user_once!(
|
||||||
|
"The `--no-native-tls` flag is deprecated and will be removed in a future release. Use `--no-system-certs` instead."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if environment.native_tls.value.is_some() {
|
||||||
|
warn_user_once!(
|
||||||
|
"The `UV_NATIVE_TLS` environment variable is deprecated and will be removed in a future release. Use `UV_SYSTEM_CERTS` instead."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if workspace
|
||||||
|
.and_then(|workspace| workspace.globals.native_tls)
|
||||||
|
.is_some()
|
||||||
|
{
|
||||||
|
warn_user_once!(
|
||||||
|
"The `native-tls` setting is deprecated and will be removed in a future release. Use `system-certs` instead."
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// Resolve whether to use system certificates.
|
// Resolve whether to use system certificates.
|
||||||
//
|
//
|
||||||
// `--native-tls` is a legacy alias for `--system-certs` — it enables system certificates
|
// `--native-tls` is a legacy alias for `--system-certs` — it enables system certificates
|
||||||
|
|||||||
@@ -9031,6 +9031,7 @@ fn system_certs_cli_aliases_override_env() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
----- stderr -----
|
----- stderr -----
|
||||||
|
warning: The `--no-native-tls` flag is deprecated and will be removed in a future release. Use `--no-system-certs` instead.
|
||||||
"#
|
"#
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -9155,6 +9156,7 @@ fn system_certs_cli_aliases_override_env() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
----- stderr -----
|
----- stderr -----
|
||||||
|
warning: The `UV_NATIVE_TLS` environment variable is deprecated and will be removed in a future release. Use `UV_SYSTEM_CERTS` instead.
|
||||||
"#
|
"#
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -9416,6 +9418,7 @@ fn system_certs_config_aliases() -> anyhow::Result<()> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
----- stderr -----
|
----- stderr -----
|
||||||
|
warning: The `native-tls` setting is deprecated and will be removed in a future release. Use `system-certs` instead.
|
||||||
"#
|
"#
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user