fixes

Author: pront

lib/vector-core/src/tls/settings.rs

@@ -27,16 +27,17 @@ use super::{
 
 pub const PEM_START_MARKER: &str = "-----BEGIN ";
 
-pub const TEST_PEM_CA_PATH: &str = "tests/data/ca/certs/ca.cert.pem";
+pub const TEST_PEM_CA_PATH: &str = "tests/integration/shared/data/ca/certs/ca.cert.pem";
 pub const TEST_PEM_INTERMEDIATE_CA_PATH: &str =
-    "tests/data/ca/intermediate_server/certs/ca-chain.cert.pem";
+    "tests/integration/shared/data/ca/intermediate_server/certs/ca-chain.cert.pem";
 pub const TEST_PEM_CRT_PATH: &str =
-    "tests/data/ca/intermediate_server/certs/localhost-chain.cert.pem";
-pub const TEST_PEM_KEY_PATH: &str = "tests/data/ca/intermediate_server/private/localhost.key.pem";
+    "tests/integration/shared/data/ca/intermediate_server/certs/localhost-chain.cert.pem";
+pub const TEST_PEM_KEY_PATH: &str =
+    "tests/integration/shared/data/ca/intermediate_server/private/localhost.key.pem";
 pub const TEST_PEM_CLIENT_CRT_PATH: &str =
-    "tests/data/ca/intermediate_client/certs/localhost-chain.cert.pem";
+    "tests/integration/shared/data/ca/intermediate_client/certs/localhost-chain.cert.pem";
 pub const TEST_PEM_CLIENT_KEY_PATH: &str =
-    "tests/data/ca/intermediate_client/private/localhost.key.pem";
+    "tests/integration/shared/data/ca/intermediate_client/private/localhost.key.pem";
 
 /// Configures the TLS options for incoming/outgoing connections.
 #[configurable_component]
@@ -675,11 +676,14 @@ fn open_read(filename: &Path, note: &'static str) -> Result<(Vec<u8>, PathBuf)>
 mod test {
     use super::*;
 
-    const TEST_PKCS12_PATH: &str = "tests/data/ca/intermediate_client/private/localhost.p12";
-    const TEST_PEM_CRT_BYTES: &[u8] =
-        include_bytes!("../../../../tests/data/ca/intermediate_server/certs/localhost.cert.pem");
-    const TEST_PEM_KEY_BYTES: &[u8] =
-        include_bytes!("../../../../tests/data/ca/intermediate_server/private/localhost.key.pem");
+    const TEST_PKCS12_PATH: &str =
+        "tests/integration/shared/data/ca/intermediate_client/private/localhost.p12";
+    const TEST_PEM_CRT_BYTES: &[u8] = include_bytes!(
+        "../../../../tests/integration/shared/data/ca/intermediate_server/certs/localhost.cert.pem"
+    );
+    const TEST_PEM_KEY_BYTES: &[u8] = include_bytes!(
+        "../../../../tests/integration/shared/data/ca/intermediate_server/private/localhost.key.pem"
+    );
 
     #[test]
     fn parse_alpn_protocols() {
@@ -749,7 +753,8 @@ mod test {
     #[test]
     fn from_options_inline_ca() {
         let ca = String::from_utf8(
-            include_bytes!("../../../../tests/data/ca/certs/ca.cert.pem").to_vec(),
+            include_bytes!("../../../../tests/integration/shared/data/ca/certs/ca.cert.pem")
+                .to_vec(),
         )
         .unwrap();
         let options = TlsConfig {
@@ -765,7 +770,10 @@ mod test {
     #[test]
     fn from_options_intermediate_ca() {
         let options = TlsConfig {
-            ca_file: Some("tests/data/ca/intermediate_server/certs/ca-chain.cert.pem".into()),
+            ca_file: Some(
+                "tests/integration/shared/data/ca/intermediate_server/certs/ca-chain.cert.pem"
+                    .into(),
+            ),
             ..Default::default()
         };
         let settings = TlsSettings::from_options(Some(&options))
@@ -777,7 +785,7 @@ mod test {
     #[test]
     fn from_options_multi_ca() {
         let options = TlsConfig {
-            ca_file: Some("tests/data/Multi_CA.crt".into()),
+            ca_file: Some("tests/integration/shared/data/Multi_CA.crt".into()),
             ..Default::default()
         };
         let settings = TlsSettings::from_options(Some(&options))

tests/integration/amqp/config/compose.yaml

@@ -7,9 +7,9 @@ services:
       - 5672:5672
       - 5671:5671
     environment:
-      - RABBITMQ_SSL_KEYFILE=/code/tests/data/ca/intermediate_server/private/rabbitmq.key.pem
-      - RABBITMQ_SSL_CERTFILE=/code/tests/data/ca/intermediate_server/certs/rabbitmq.cert.pem
-      - RABBITMQ_SSL_CACERTFILE=/code/tests/data/ca/intermediate_server/certs/ca-chain.cert.pem
+      - RABBITMQ_SSL_KEYFILE=/code/tests/integration/shared/data/ca/intermediate_server/private/rabbitmq.key.pem
+      - RABBITMQ_SSL_CERTFILE=/code/tests/integration/shared/data/ca/intermediate_server/certs/rabbitmq.cert.pem
+      - RABBITMQ_SSL_CACERTFILE=/code/tests/integration/shared/data/ca/intermediate_server/certs/ca-chain.cert.pem
       - RABBITMQ_SSL_FAIL_IF_NO_PEER_CERT=false
     volumes:
       - ../../..:/code