33
44//! Shared TLS export scenario for the one-test-per-binary TLS tests.
55
6+ use openshell_crypto:: pki:: { self , Certificate , KeyPair } ;
67use openshell_otel:: { OtlpExportConfig , ServiceName , provider_for} ;
78use openshell_otel_test_support:: { OtlpTestServer , ReceivedTraces } ;
8- use rcgen:: {
9- BasicConstraints , Certificate , CertificateParams , ExtendedKeyUsagePurpose , IsCa , KeyPair ,
10- } ;
9+ use rcgen:: { BasicConstraints , CertificateParams , ExtendedKeyUsagePurpose , IsCa } ;
1110use tonic:: transport:: Identity ;
1211use tracing_subscriber:: layer:: SubscriberExt as _;
1312
1413fn new_ca ( ) -> ( Certificate , KeyPair ) {
15- let key = KeyPair :: generate ( ) . unwrap ( ) ;
14+ let key = pki :: generate_keypair ( ) . unwrap ( ) ;
1615 let mut params = CertificateParams :: new ( Vec :: < String > :: new ( ) ) . unwrap ( ) ;
1716 params. is_ca = IsCa :: Ca ( BasicConstraints :: Unconstrained ) ;
18- ( params . self_signed ( & key) . unwrap ( ) , key)
17+ ( pki :: self_signed ( params , & key) . unwrap ( ) , key)
1918}
2019
2120/// Export one gzip span to a TLS collector and return the flush outcome and
@@ -35,12 +34,10 @@ pub async fn export_span_over_tls(server_trusted: bool) -> (bool, ReceivedTraces
3534 ( & other_ca, & other_key)
3635 } ;
3736
38- let server_key = KeyPair :: generate ( ) . unwrap ( ) ;
37+ let server_key = pki :: generate_keypair ( ) . unwrap ( ) ;
3938 let mut server_params = CertificateParams :: new ( vec ! [ "localhost" . to_string( ) ] ) . unwrap ( ) ;
4039 server_params. extended_key_usages = vec ! [ ExtendedKeyUsagePurpose :: ServerAuth ] ;
41- let server_cert = server_params
42- . signed_by ( & server_key, signer, signer_key)
43- . unwrap ( ) ;
40+ let server_cert = pki:: signed_by ( server_params, & server_key, signer, signer_key) . unwrap ( ) ;
4441
4542 let roots = tempfile:: NamedTempFile :: new ( ) . unwrap ( ) ;
4643 std:: fs:: write ( roots. path ( ) , trusted_ca. pem ( ) ) . unwrap ( ) ;
@@ -52,7 +49,7 @@ pub async fn export_span_over_tls(server_trusted: bool) -> (bool, ReceivedTraces
5249
5350 let collector = OtlpTestServer :: start_tls ( Identity :: from_pem (
5451 server_cert. pem ( ) ,
55- server_key. serialize_pem ( ) ,
52+ server_key. serialize_pem ( ) . unwrap ( ) ,
5653 ) )
5754 . await ;
5855 let ( provider, error) = provider_for ( Some ( OtlpExportConfig {
0 commit comments