feat(tvix/store): enable tls[-roots] feature in tonic

This teaches tonic to speak https, so `grpc+https` becomes a working
connection string.

Change-Id: I9c550ea665b829725b545a164cf6f78587bd5213
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9714
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: Brian McGee <brian@bmcgee.ie>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2023-10-12 20:38:28 +02:00 committed by clbot
parent be32ab1eb2
commit a9e5a7cec9
3 changed files with 564 additions and 5 deletions

View file

@ -1411,6 +1411,33 @@ rec {
];
};
"core-foundation" = rec {
crateName = "core-foundation";
version = "0.9.3";
edition = "2015";
sha256 = "0ii1ihpjb30fk38gdikm5wqlkmyr8k46fh4k2r8sagz5dng7ljhr";
authors = [
"The Servo Project Developers"
];
dependencies = [
{
name = "core-foundation-sys";
packageId = "core-foundation-sys";
}
{
name = "libc";
packageId = "libc";
}
];
features = {
"chrono" = [ "dep:chrono" ];
"mac_os_10_7_support" = [ "core-foundation-sys/mac_os_10_7_support" ];
"mac_os_10_8_features" = [ "core-foundation-sys/mac_os_10_8_features" ];
"uuid" = [ "dep:uuid" ];
"with-chrono" = [ "chrono" ];
"with-uuid" = [ "uuid" ];
};
};
"core-foundation-sys" = rec {
crateName = "core-foundation-sys";
version = "0.8.4";
@ -4365,6 +4392,16 @@ rec {
"Simon Heath <icefox@dreamquest.io>"
];
};
"openssl-probe" = rec {
crateName = "openssl-probe";
version = "0.1.5";
edition = "2015";
sha256 = "1kq18qm48rvkwgcggfkqq6pm948190czqc94d6bm2sir5hq1l0gz";
authors = [
"Alex Crichton <alex@alexcrichton.com>"
];
};
"os_str_bytes" = rec {
crateName = "os_str_bytes";
@ -5664,6 +5701,84 @@ rec {
};
resolvedDefaultFeatures = [ "default" "std" "unicode" "unicode-age" "unicode-bool" "unicode-case" "unicode-gencat" "unicode-perl" "unicode-script" "unicode-segment" ];
};
"ring" = rec {
crateName = "ring";
version = "0.16.20";
edition = "2018";
sha256 = "1z682xp7v38ayq9g9nkbhhfpj6ygralmlx7wdmsfv8rnw99cylrh";
authors = [
"Brian Smith <brian@briansmith.org>"
];
dependencies = [
{
name = "libc";
packageId = "libc";
usesDefaultFeatures = false;
target = { target, features }: (("android" == target."os") || ("linux" == target."os"));
}
{
name = "once_cell";
packageId = "once_cell";
optional = true;
usesDefaultFeatures = false;
target = { target, features }: (("android" == target."os") || ("linux" == target."os"));
features = [ "std" ];
}
{
name = "once_cell";
packageId = "once_cell";
usesDefaultFeatures = false;
target = { target, features }: (("dragonfly" == target."os") || ("freebsd" == target."os") || ("illumos" == target."os") || ("netbsd" == target."os") || ("openbsd" == target."os") || ("solaris" == target."os"));
features = [ "std" ];
}
{
name = "spin";
packageId = "spin";
usesDefaultFeatures = false;
target = { target, features }: (("x86" == target."arch") || ("x86_64" == target."arch") || ((("aarch64" == target."arch") || ("arm" == target."arch")) && (("android" == target."os") || ("fuchsia" == target."os") || ("linux" == target."os"))));
}
{
name = "untrusted";
packageId = "untrusted";
}
{
name = "web-sys";
packageId = "web-sys";
usesDefaultFeatures = false;
target = { target, features }: (("wasm32" == target."arch") && ("unknown" == target."vendor") && ("unknown" == target."os") && ("" == target."env"));
features = [ "Crypto" "Window" ];
}
{
name = "winapi";
packageId = "winapi";
usesDefaultFeatures = false;
target = { target, features }: ("windows" == target."os");
features = [ "ntsecapi" "wtypesbase" ];
}
];
buildDependencies = [
{
name = "cc";
packageId = "cc";
usesDefaultFeatures = false;
}
];
devDependencies = [
{
name = "libc";
packageId = "libc";
usesDefaultFeatures = false;
target = { target, features }: ((target."unix" or false) || (target."windows" or false));
}
];
features = {
"default" = [ "alloc" "dev_urandom_fallback" ];
"dev_urandom_fallback" = [ "once_cell" ];
"once_cell" = [ "dep:once_cell" ];
"std" = [ "alloc" ];
};
resolvedDefaultFeatures = [ "alloc" "default" "dev_urandom_fallback" "once_cell" ];
};
"rnix" = rec {
crateName = "rnix";
version = "0.11.0";
@ -5865,6 +5980,112 @@ rec {
};
resolvedDefaultFeatures = [ "default" "fs" "io-lifetimes" "libc" "std" "termios" "use-libc-auxv" ];
};
"rustls" = rec {
crateName = "rustls";
version = "0.21.7";
edition = "2021";
sha256 = "1n1z1k9ap7sr6pirwjc4ma3z5j5fd4p67ncas726ni2s0agnr3fd";
dependencies = [
{
name = "log";
packageId = "log";
optional = true;
}
{
name = "ring";
packageId = "ring";
}
{
name = "rustls-webpki";
packageId = "rustls-webpki";
rename = "webpki";
features = [ "alloc" "std" ];
}
{
name = "sct";
packageId = "sct";
}
];
devDependencies = [
{
name = "log";
packageId = "log";
}
];
features = {
"default" = [ "logging" "tls12" ];
"log" = [ "dep:log" ];
"logging" = [ "log" ];
"read_buf" = [ "rustversion" ];
"rustversion" = [ "dep:rustversion" ];
};
resolvedDefaultFeatures = [ "default" "log" "logging" "tls12" ];
};
"rustls-native-certs" = rec {
crateName = "rustls-native-certs";
version = "0.6.3";
edition = "2021";
sha256 = "007zind70rd5rfsrkdcfm8vn09j8sg02phg9334kark6rdscxam9";
dependencies = [
{
name = "openssl-probe";
packageId = "openssl-probe";
target = { target, features }: ((target."unix" or false) && (!("macos" == target."os")));
}
{
name = "rustls-pemfile";
packageId = "rustls-pemfile";
}
{
name = "schannel";
packageId = "schannel";
target = { target, features }: (target."windows" or false);
}
{
name = "security-framework";
packageId = "security-framework";
target = { target, features }: ("macos" == target."os");
}
];
};
"rustls-pemfile" = rec {
crateName = "rustls-pemfile";
version = "1.0.3";
edition = "2018";
sha256 = "1cplx6hgkr32nq31p3613b2sj7csrrq3zp6znx9vc1qx9c4qff9d";
dependencies = [
{
name = "base64";
packageId = "base64";
}
];
};
"rustls-webpki" = rec {
crateName = "rustls-webpki";
version = "0.101.6";
edition = "2021";
sha256 = "1zil7pjvqnbvg25l0d9vhx5ibq73r88969adlfdhv4a2wgn5sz9w";
libName = "webpki";
dependencies = [
{
name = "ring";
packageId = "ring";
usesDefaultFeatures = false;
}
{
name = "untrusted";
packageId = "untrusted";
}
];
features = {
"alloc" = [ "ring/alloc" ];
"default" = [ "std" ];
"std" = [ "alloc" ];
};
resolvedDefaultFeatures = [ "alloc" "default" "std" ];
};
"rustversion" = rec {
crateName = "rustversion";
version = "1.0.12";
@ -6033,6 +6254,31 @@ rec {
}
];
};
"schannel" = rec {
crateName = "schannel";
version = "0.1.22";
edition = "2018";
sha256 = "126zy5jb95fc5hvzyjwiq6lc81r08rdcn6affn00ispp9jzk6dqc";
authors = [
"Steven Fackler <sfackler@gmail.com>"
"Steffen Butzer <steffen.butzer@outlook.com>"
];
dependencies = [
{
name = "windows-sys";
packageId = "windows-sys 0.48.0";
features = [ "Win32_Foundation" "Win32_Security_Cryptography" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_System_Memory" ];
}
];
devDependencies = [
{
name = "windows-sys";
packageId = "windows-sys 0.48.0";
features = [ "Win32_System_SystemInformation" "Win32_System_Time" ];
}
];
};
"scopeguard" = rec {
crateName = "scopeguard";
@ -6047,6 +6293,102 @@ rec {
};
resolvedDefaultFeatures = [ "default" "use_std" ];
};
"sct" = rec {
crateName = "sct";
version = "0.7.0";
edition = "2018";
sha256 = "193w3dg2pcn7138ab4c586pl76nkryn4h6wqlwvqj5gqr6vwsgfm";
authors = [
"Joseph Birr-Pixton <jpixton@gmail.com>"
];
dependencies = [
{
name = "ring";
packageId = "ring";
}
{
name = "untrusted";
packageId = "untrusted";
}
];
};
"security-framework" = rec {
crateName = "security-framework";
version = "2.9.2";
edition = "2021";
sha256 = "1pplxk15s5yxvi2m1sz5xfmjibp96cscdcl432w9jzbk0frlzdh5";
authors = [
"Steven Fackler <sfackler@gmail.com>"
"Kornel <kornel@geekhood.net>"
];
dependencies = [
{
name = "bitflags";
packageId = "bitflags";
}
{
name = "core-foundation";
packageId = "core-foundation";
}
{
name = "core-foundation-sys";
packageId = "core-foundation-sys";
}
{
name = "libc";
packageId = "libc";
}
{
name = "security-framework-sys";
packageId = "security-framework-sys";
usesDefaultFeatures = false;
}
];
features = {
"OSX_10_10" = [ "OSX_10_9" "security-framework-sys/OSX_10_10" ];
"OSX_10_11" = [ "OSX_10_10" "security-framework-sys/OSX_10_11" ];
"OSX_10_12" = [ "OSX_10_11" "security-framework-sys/OSX_10_12" ];
"OSX_10_13" = [ "OSX_10_12" "security-framework-sys/OSX_10_13" "alpn" "session-tickets" "serial-number-bigint" ];
"OSX_10_14" = [ "OSX_10_13" "security-framework-sys/OSX_10_14" ];
"OSX_10_15" = [ "OSX_10_14" "security-framework-sys/OSX_10_15" ];
"OSX_10_9" = [ "security-framework-sys/OSX_10_9" ];
"default" = [ "OSX_10_9" ];
"log" = [ "dep:log" ];
"serial-number-bigint" = [ "dep:num-bigint" ];
};
resolvedDefaultFeatures = [ "OSX_10_9" "default" ];
};
"security-framework-sys" = rec {
crateName = "security-framework-sys";
version = "2.9.1";
edition = "2021";
sha256 = "0yhciwlsy9dh0ps1gw3197kvyqx1bvc4knrhiznhid6kax196cp9";
authors = [
"Steven Fackler <sfackler@gmail.com>"
"Kornel <kornel@geekhood.net>"
];
dependencies = [
{
name = "core-foundation-sys";
packageId = "core-foundation-sys";
}
{
name = "libc";
packageId = "libc";
}
];
features = {
"OSX_10_10" = [ "OSX_10_9" ];
"OSX_10_11" = [ "OSX_10_10" ];
"OSX_10_12" = [ "OSX_10_11" ];
"OSX_10_13" = [ "OSX_10_12" ];
"OSX_10_14" = [ "OSX_10_13" ];
"OSX_10_15" = [ "OSX_10_14" ];
"default" = [ "OSX_10_9" ];
};
resolvedDefaultFeatures = [ "OSX_10_9" ];
};
"serde" = rec {
crateName = "serde";
version = "1.0.162";
@ -6418,6 +6760,17 @@ rec {
features = { };
resolvedDefaultFeatures = [ "all" ];
};
"spin" = rec {
crateName = "spin";
version = "0.5.2";
edition = "2015";
sha256 = "0b84m6dbzrwf2kxylnw82d3dr8w06av7rfkr8s85fb5f43rwyqvf";
authors = [
"Mathijs van de Nes <git@mathijs.vd-nes.nl>"
"John Ericson <git@JohnEricson.me>"
];
};
"static_assertions" = rec {
crateName = "static_assertions";
version = "1.1.0";
@ -7259,6 +7612,38 @@ rec {
];
};
"tokio-rustls" = rec {
crateName = "tokio-rustls";
version = "0.24.1";
edition = "2018";
sha256 = "10bhibg57mqir7xjhb2xmf24xgfpx6fzpyw720a4ih8a737jg0y2";
dependencies = [
{
name = "rustls";
packageId = "rustls";
usesDefaultFeatures = false;
}
{
name = "tokio";
packageId = "tokio";
}
];
devDependencies = [
{
name = "tokio";
packageId = "tokio";
features = [ "full" ];
}
];
features = {
"dangerous_configuration" = [ "rustls/dangerous_configuration" ];
"default" = [ "logging" "tls12" ];
"logging" = [ "rustls/logging" ];
"secret_extraction" = [ "rustls/secret_extraction" ];
"tls12" = [ "rustls/tls12" ];
};
resolvedDefaultFeatures = [ "default" "logging" "tls12" ];
};
"tokio-stream" = rec {
crateName = "tokio-stream";
version = "0.1.14";
@ -7548,10 +7933,30 @@ rec {
usesDefaultFeatures = false;
features = [ "std" ];
}
{
name = "rustls";
packageId = "rustls";
optional = true;
}
{
name = "rustls-native-certs";
packageId = "rustls-native-certs";
optional = true;
}
{
name = "rustls-pemfile";
packageId = "rustls-pemfile";
optional = true;
}
{
name = "tokio";
packageId = "tokio";
}
{
name = "tokio-rustls";
packageId = "tokio-rustls";
optional = true;
}
{
name = "tokio-stream";
packageId = "tokio-stream";
@ -7599,7 +8004,7 @@ rec {
"tls-webpki-roots" = [ "tls-roots-common" "dep:webpki-roots" ];
"transport" = [ "dep:async-stream" "dep:axum" "channel" "dep:h2" "dep:hyper" "tokio/net" "tokio/time" "dep:tower" "dep:hyper-timeout" ];
};
resolvedDefaultFeatures = [ "channel" "codegen" "default" "prost" "transport" ];
resolvedDefaultFeatures = [ "channel" "codegen" "default" "prost" "tls" "tls-roots" "tls-roots-common" "transport" ];
};
"tonic-build" = rec {
crateName = "tonic-build";
@ -8612,6 +9017,7 @@ rec {
{
name = "tonic";
packageId = "tonic";
features = [ "tls" "tls-roots" ];
}
{
name = "tonic-reflection";
@ -8819,6 +9225,17 @@ rec {
features = { };
resolvedDefaultFeatures = [ "default" ];
};
"untrusted" = rec {
crateName = "untrusted";
version = "0.7.1";
edition = "2018";
sha256 = "0jkbqaj9d3v5a91pp3wp9mffvng1nhycx6sh4qkdd9qyr62ccmm1";
libPath = "src/untrusted.rs";
authors = [
"Brian Smith <brian@briansmith.org>"
];
};
"url" = rec {
crateName = "url";
version = "2.4.0";
@ -9764,7 +10181,7 @@ rec {
"XrViewerPose" = [ "XrPose" ];
"XrWebGlLayer" = [ "EventTarget" "XrLayer" ];
};
resolvedDefaultFeatures = [ "CanvasRenderingContext2d" "Document" "DomRect" "DomRectReadOnly" "Element" "EventTarget" "HtmlCanvasElement" "HtmlElement" "Node" "Window" ];
resolvedDefaultFeatures = [ "CanvasRenderingContext2d" "Crypto" "Document" "DomRect" "DomRectReadOnly" "Element" "EventTarget" "HtmlCanvasElement" "HtmlElement" "Node" "Window" ];
};
"which" = rec {
crateName = "which";
@ -9816,7 +10233,7 @@ rec {
features = {
"debug" = [ "impl-debug" ];
};
resolvedDefaultFeatures = [ "basetsd" "consoleapi" "errhandlingapi" "fileapi" "handleapi" "knownfolders" "minwinbase" "minwindef" "ntstatus" "objbase" "processenv" "processthreadsapi" "shellapi" "shlobj" "std" "stringapiset" "synchapi" "sysinfoapi" "winbase" "wincon" "winerror" "winnt" "winuser" "ws2ipdef" "ws2tcpip" ];
resolvedDefaultFeatures = [ "basetsd" "consoleapi" "errhandlingapi" "fileapi" "handleapi" "knownfolders" "minwinbase" "minwindef" "ntsecapi" "ntstatus" "objbase" "processenv" "processthreadsapi" "shellapi" "shlobj" "std" "stringapiset" "synchapi" "sysinfoapi" "winbase" "wincon" "winerror" "winnt" "winuser" "ws2ipdef" "ws2tcpip" "wtypesbase" ];
};
"winapi-i686-pc-windows-gnu" = rec {
crateName = "winapi-i686-pc-windows-gnu";
@ -10433,7 +10850,7 @@ rec {
"Win32_Web" = [ "Win32" ];
"Win32_Web_InternetExplorer" = [ "Win32_Web" ];
};
resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_NetworkManagement" "Win32_NetworkManagement_IpHelper" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Console" "Win32_System_Diagnostics" "Win32_System_Diagnostics_Debug" "Win32_System_IO" "Win32_System_Pipes" "Win32_System_SystemServices" "Win32_System_Threading" "Win32_System_WindowsProgramming" "default" ];
resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_NetworkManagement" "Win32_NetworkManagement_IpHelper" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Security_Authentication" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_Security_Cryptography" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Console" "Win32_System_Diagnostics" "Win32_System_Diagnostics_Debug" "Win32_System_IO" "Win32_System_Memory" "Win32_System_Pipes" "Win32_System_SystemServices" "Win32_System_Threading" "Win32_System_WindowsProgramming" "default" ];
};
"windows-targets 0.42.2" = rec {
crateName = "windows-targets";