feat: add package install integration tests (#2075)

* feat: add package install integration tests

Author: alvarocabanas

agent-control/src/agent_control/run/on_host.rs

@@ -37,7 +37,7 @@ use crate::sub_agent::on_host::builder::SupervisorBuilderOnHost;
 use crate::sub_agent::remote_config_parser::AgentRemoteConfigParser;
 use crate::values::ConfigRepo;
 use fs::directory_manager::DirectoryManagerFs;
-use oci_client::client::ClientConfig;
+use oci_client::client::{ClientConfig, ClientProtocol};
 use opamp_client::operation::settings::DescriptionValueType;
 use resource_detection::cloud::http_client::DEFAULT_CLIENT_TIMEOUT;
 use std::collections::HashMap;
@@ -164,11 +164,17 @@ impl AgentControlRunner {
             &self.base_paths.remote_dir,
         ));
 
+        // We are setting client http in debug_assertions mode for tests
+        let oci_client_config = ClientConfig {
+            #[cfg(debug_assertions)]
+            protocol: ClientProtocol::Http,
+            ..Default::default()
+        };
+
         let packages_downloader =
-            OCIArtifactDownloader::try_new(self.proxy, self.runtime, ClientConfig::default())
-                .map_err(|err| {
-                    RunError(format!("failed to create OCIRefDownloader client: {err}"))
-                })?;
+            OCIArtifactDownloader::try_new(self.proxy, self.runtime, oci_client_config).map_err(
+                |err| RunError(format!("failed to create OCIRefDownloader client: {err}")),
+            )?;
 
         let package_manager = OCIPackageManager::new(
             packages_downloader,
@@ -227,6 +233,7 @@ impl AgentControlRunner {
         .map_err(|err| RunError(err.to_string()))
     }
 }
+
 pub fn agent_control_opamp_non_identifying_attributes(
     identifiers: &Identifiers,
 ) -> HashMap<String, DescriptionValueType> {

agent-control/tests/common/attributes.rs

@@ -36,6 +36,22 @@ pub fn check_latest_non_identifying_attributes_match_expected(
     .map_err(|e| format!("Non identifying attributes don't match: {e}"))
 }
 
+pub fn check_identifying_attributes_contains_expected(
+    opamp_server: &FakeServer,
+    instance_id: &InstanceID,
+    expected_subset: Vec<KeyValue>,
+) -> Result<(), String> {
+    let current_attributes = opamp_server
+        .get_attributes(instance_id)
+        .ok_or_else(|| "Identifying attributes not found".to_string())?;
+
+    check_opamp_attributes_contains(
+        expected_subset,
+        current_attributes.identifying_attributes.clone(),
+    )
+    .map_err(|e| format!("Identifying attributes missing required elements: {e}"))
+}
+
 fn check_opamp_attributes(
     mut expected_vec: Vec<KeyValue>,
     mut current_vec: Vec<KeyValue>,
@@ -50,6 +66,25 @@ fn check_opamp_attributes(
     Ok(())
 }
 
+fn check_opamp_attributes_contains(
+    subset_vec: Vec<KeyValue>,
+    superset_vec: Vec<KeyValue>,
+) -> Result<(), String> {
+    for expected in subset_vec {
+        let found = superset_vec
+            .iter()
+            .find(|&current| current.key == expected.key && current.value == expected.value);
+
+        if found.is_none() {
+            return Err(format!(
+                "Required attribute key '{}' with value '{:?}' not found in actual attributes.",
+                expected.key, expected.value
+            ));
+        }
+    }
+    Ok(())
+}
+
 pub fn convert_to_vec_key_value(data: Vec<(&str, Value)>) -> Vec<KeyValue> {
     data.into_iter()
         .map(|(k, v)| KeyValue {

agent-control/tests/on_host/oci_package_management.rs

@@ -1,25 +1,34 @@
+use crate::on_host::tools::oci_artifact::REGISTRY_URL;
 use crate::on_host::tools::oci_package_manager::TestDataHelper;
 use crate::on_host::tools::{
     oci_artifact::push_agent_package, oci_package_manager::new_testing_oci_package_manager,
 };
 use newrelic_agent_control::agent_control::agent_id::AgentID;
 use newrelic_agent_control::package::manager::{PackageData, PackageManager};
+use newrelic_agent_control::package::oci::artifact_definitions::PackageMediaType;
 use newrelic_agent_control::package::oci::package_manager::get_package_path;
 use tempfile::tempdir;
 
-// Registry created in the make target executing oci-registry.sh
-const REGISTRY_URL: &str = "localhost:5001";
-
 #[test]
 #[ignore = "needs oci registry (use *with_oci_registry suffix), needs elevated privileges on Windows"]
 fn test_install_and_uninstall_with_oci_registry() {
+    const FILENAME: &str = "file1.txt";
     let dir = tempdir().unwrap();
     let tmp_dir_to_compress = tempdir().unwrap();
     let file_to_push = dir.path().join("layer_digest.tar.gz");
 
-    TestDataHelper::compress_tar_gz(tmp_dir_to_compress.path(), file_to_push.as_path());
+    TestDataHelper::compress_tar_gz(
+        tmp_dir_to_compress.path(),
+        file_to_push.as_path(),
+        "important content",
+        FILENAME,
+    );
 
-    let (_artifact_digest, reference) = push_agent_package(&file_to_push, REGISTRY_URL);
+    let (_artifact_digest, reference) = push_agent_package(
+        &file_to_push,
+        REGISTRY_URL,
+        PackageMediaType::AgentPackageLayerTarGz,
+    );
 
     let temp_dir = tempdir().unwrap();
     let base_path = temp_dir.path().to_path_buf();
@@ -43,7 +52,10 @@ fn test_install_and_uninstall_with_oci_registry() {
     );
 
     let installed_package = installed_package_result.unwrap();
-    TestDataHelper::test_data_uncompressed(installed_package.installation_path.as_path());
+    TestDataHelper::test_tar_gz_uncompressed(
+        installed_package.installation_path.as_path(),
+        FILENAME,
+    );
     // Verify location
     // The path should be base_path/agent_id/oci_registry__port__repo_tag
     let expected_path = get_package_path(&base_path, &agent_id, &pkg_id, &reference).unwrap();
@@ -61,17 +73,25 @@ fn test_install_and_uninstall_with_oci_registry() {
 #[test]
 #[ignore = "needs oci registry, needs elevated privileges on Windows"]
 fn test_install_skips_download_if_exists_with_oci_registry() {
+    const FILENAME: &str = "payload.txt";
+
     let dir = tempdir().unwrap();
     let content_dir = tempdir().unwrap();
 
-    let payload_file_source = content_dir.path().join("payload.txt");
-    std::fs::write(&payload_file_source, "ORIGINAL_CONTENT").unwrap();
-
     let file_to_push = dir.path().join("layer_digest.tar.gz");
 
-    TestDataHelper::compress_tar_gz(content_dir.path(), file_to_push.as_path());
+    TestDataHelper::compress_tar_gz(
+        content_dir.path(),
+        file_to_push.as_path(),
+        "ORIGINAL_CONTENT",
+        FILENAME,
+    );
 
-    let (_artifact_digest, reference) = push_agent_package(&file_to_push, REGISTRY_URL);
+    let (_artifact_digest, reference) = push_agent_package(
+        &file_to_push,
+        REGISTRY_URL,
+        PackageMediaType::AgentPackageLayerTarGz,
+    );
 
     let temp_dir = tempdir().unwrap();
     let base_path = temp_dir.path().to_path_buf();
@@ -89,7 +109,7 @@ fn test_install_skips_download_if_exists_with_oci_registry() {
         .install(&agent_id, package_data.clone())
         .expect("First install failed");
 
-    let installed_file_path = installed_1.installation_path.join("payload.txt");
+    let installed_file_path = installed_1.installation_path.join(FILENAME);
     assert!(
         installed_file_path.exists(),
         "Payload file should exist after install"

agent-control/tests/on_host/oci_registry.rs

@@ -1,25 +1,32 @@
-use crate::on_host::tools::oci_artifact::push_agent_package;
+use crate::on_host::tools::oci_artifact::{REGISTRY_URL, push_agent_package};
 use crate::on_host::tools::oci_package_manager::TestDataHelper;
 use httpmock::{MockServer, When};
 use newrelic_agent_control::http::config::ProxyConfig;
+use newrelic_agent_control::package::oci::artifact_definitions::PackageMediaType;
 use newrelic_agent_control::package::oci::downloader::{OCIAgentDownloader, OCIArtifactDownloader};
 use oci_client::client::{ClientConfig, ClientProtocol};
 use std::sync::{Arc, Mutex};
 use std::time::Duration;
 use tempfile::tempdir;
 
-// Registry created in the make target executing oci-registry.sh
-const REGISTRY_URL: &str = "localhost:5001";
-
 #[test]
 #[ignore = "needs oci registry (use *with_oci_registry suffix)"]
 fn test_download_artifact_from_local_registry_with_oci_registry() {
     let dir = tempdir().unwrap();
     let tmp_dir_to_compress = tempdir().unwrap();
     let file_to_push = dir.path().join("layer_digest.tar.gz");
-    TestDataHelper::compress_tar_gz(tmp_dir_to_compress.path(), file_to_push.as_path());
+    TestDataHelper::compress_tar_gz(
+        tmp_dir_to_compress.path(),
+        file_to_push.as_path(),
+        "important content",
+        "file1.txt",
+    );
 
-    let (artifact_digest, reference) = push_agent_package(&file_to_push, REGISTRY_URL);
+    let (artifact_digest, reference) = push_agent_package(
+        &file_to_push,
+        REGISTRY_URL,
+        PackageMediaType::AgentPackageLayerTarGz,
+    );
 
     let temp_dir = tempdir().unwrap();
     let local_agent_data_dir = temp_dir.path();
@@ -56,9 +63,18 @@ fn test_download_artifact_from_local_registry_using_proxy_with_retries_with_oci_
     let dir = tempdir().unwrap();
     let tmp_dir_to_compress = tempdir().unwrap();
     let file_to_push = dir.path().join("layer_digest.tar.gz");
-    TestDataHelper::compress_tar_gz(tmp_dir_to_compress.path(), file_to_push.as_path());
+    TestDataHelper::compress_tar_gz(
+        tmp_dir_to_compress.path(),
+        file_to_push.as_path(),
+        "important content",
+        "file1.txt",
+    );
 
-    let (artifact_digest, reference) = push_agent_package(&file_to_push, REGISTRY_URL);
+    let (artifact_digest, reference) = push_agent_package(
+        &file_to_push,
+        REGISTRY_URL,
+        PackageMediaType::AgentPackageLayerTarGz,
+    );
 
     // Proxy server will request the target server, allowing requests to that host only
     let proxy_server = MockServer::start();

agent-control/tests/on_host/scenarios.rs

@@ -2,6 +2,7 @@ mod attributes;
 mod empty_config;
 mod filesystem_ops;
 mod health_check;
+mod install_remote_package;
 mod invalid_remote_config;
 mod multiple_executables;
 mod multiple_remote_config;