Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ jobs:
AGENTOS_SIDECAR_BIN: ${{ github.workspace }}/target/debug/agentos-native-sidecar
run: |
cargo test -p agentos-client \
--features service-internals \
--lib \
--test scaffold \
--test e2e_smoke \
Expand All @@ -163,6 +164,7 @@ jobs:
--test sidecar_pool_e2e \
--test cron_e2e \
--test cron_grammar_e2e \
--test vm_config_compare_e2e \
-- --test-threads=1
- name: Stage stripped sidecar artifacts
run: |
Expand Down
35 changes: 33 additions & 2 deletions crates/client/src/software.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1563,7 +1563,10 @@ fn validate_package_file_sync(path: &Path, size: u64) -> Result<PackageManifestI
)));
}
for command in &manifest.commands {
validate_manifest_component("command", &command.command, MAX_PACKAGE_COMMAND_BYTES)?;
// `[` is the POSIX name of `test`. It contains no path separator.
if command.command != "[" {
validate_manifest_component("command", &command.command, MAX_PACKAGE_COMMAND_BYTES)?;
}
validate_relative_manifest_path("command entry", &command.entry)?;
}
if let Some(provides) = &manifest.provides {
Expand Down Expand Up @@ -1908,6 +1911,10 @@ mod tests {
}

fn test_package_with_version(version: &str) -> Vec<u8> {
test_package_with(version, "demo")
}

fn test_package_with(version: &str, command_name: &str) -> Vec<u8> {
let mut builder = tar::Builder::new(Vec::<u8>::new());
let manifest = format!(r#"{{"name":"demo","version":"{version}"}}"#);
let mut header = tar::Header::new_gnu();
Expand All @@ -1923,7 +1930,7 @@ mod tests {
header.set_mode(0o755);
header.set_cksum();
builder
.append_data(&mut header, "bin/demo", &command[..])
.append_data(&mut header, format!("bin/{command_name}"), &command[..])
.unwrap();
let tar = builder.into_inner().unwrap();
vfs::package_format::pack::pack_aospkg_from_tar_bytes(&tar)
Expand Down Expand Up @@ -2178,6 +2185,30 @@ mod tests {
}
}

#[tokio::test]
async fn bracket_command_resolves_but_other_bracket_names_are_rejected() {
let resolver = PackageResolver::new(PackageResolverOptions::default()).unwrap();
for (command, accepted) in [("[", true), ("[x", false), ("]", false)] {
let package = tempfile::NamedTempFile::new().unwrap();
std::fs::write(package.path(), test_package_with("1.0.0", command)).unwrap();
let result = resolver
.resolve(PackageSource::Path {
path: package.path().to_string_lossy().into_owned(),
expected_digest: None,
})
.await;
if accepted {
let package = result.expect("`[` is a valid command name");
assert_eq!(package.manifest.commands, vec![command.to_owned()]);
} else {
assert!(
matches!(result, Err(ClientError::InvalidPackageFormat(_))),
"{command:?} must be rejected, got {result:?}"
);
}
}
}

#[tokio::test]
async fn digest_mismatch_is_typed() {
let package = tempfile::NamedTempFile::new().unwrap();
Expand Down
45 changes: 45 additions & 0 deletions crates/client/tests/vm_config_compare_e2e.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
//! Config comparison against a running VM through a real `agentos-native-sidecar`.
#![cfg(feature = "service-internals")]

mod common;

use std::collections::BTreeMap;

use agentos_client::config::AgentOsConfig;
use agentos_client::service_internals::vm_config_equivalent;
use agentos_client::AgentOs;

fn config(environment: Option<BTreeMap<String, String>>) -> AgentOsConfig {
AgentOsConfig {
environment,
..Default::default()
}
}

#[tokio::test]
async fn running_vm_compares_configs_through_the_sidecar() {
if !common::require_sidecar("running_vm_compares_configs_through_the_sidecar") {
return;
}
let vm = AgentOs::create(config(None))
.await
.expect("create VM against real sidecar");

let same = vm_config_equivalent(&vm, &config(None), &config(None), Vec::new(), Vec::new())
.await
.expect("compare an unchanged config");
let changed_environment = Some(BTreeMap::from([(String::from("DEBUG"), String::from("1"))]));
let changed = vm_config_equivalent(
&vm,
&config(None),
&config(changed_environment),
Vec::new(),
Vec::new(),
)
.await
.expect("compare a config with a changed environment");
vm.shutdown().await.expect("shutdown VM");

assert!(same);
assert!(!changed);
}
Loading
Loading