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
7 changes: 4 additions & 3 deletions rsworkspace/crates/acp-nats/src/jetstream/provision.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ mod tests {
use trogon_nats::jetstream::MockJetStreamContext;

#[tokio::test]
async fn provision_creates_four_streams() {
async fn provision_creates_five_streams() {
let ctx = MockJetStreamContext::new();
provision_streams(&ctx, "acp").await.unwrap();
assert_eq!(ctx.created_streams().len(), 4);
assert_eq!(ctx.created_streams().len(), 5);
}

#[tokio::test]
Expand All @@ -53,6 +53,7 @@ mod tests {
assert!(names.contains(&"ACP_RESPONSES".to_string()));
assert!(names.contains(&"ACP_CLIENT_OPS".to_string()));
assert!(names.contains(&"ACP_NOTIFICATIONS".to_string()));
assert!(names.contains(&"ACP_GLOBAL".to_string()));
}

#[tokio::test]
Expand Down Expand Up @@ -81,6 +82,6 @@ mod tests {
let ctx = MockJetStreamContext::new();
provision_streams(&ctx, "acp").await.unwrap();
provision_streams(&ctx, "acp").await.unwrap();
assert_eq!(ctx.created_streams().len(), 8);
assert_eq!(ctx.created_streams().len(), 10);
}
}
69 changes: 66 additions & 3 deletions rsworkspace/crates/acp-nats/src/jetstream/streams.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ pub fn commands_stream_name(prefix: &str) -> String {
stream_name(prefix, "COMMANDS")
}

pub fn global_stream_name(prefix: &str) -> String {
stream_name(prefix, "GLOBAL")
}

pub fn commands_config(prefix: &str) -> Config {
Config {
name: stream_name(prefix, "COMMANDS"),
Expand Down Expand Up @@ -81,12 +85,30 @@ pub fn notifications_config(prefix: &str) -> Config {
}
}

pub fn all_configs(prefix: &str) -> [Config; 4] {
pub fn global_config(prefix: &str) -> Config {
Config {
name: stream_name(prefix, "GLOBAL"),
subjects: vec![
format!("{prefix}.agent.initialize"),
format!("{prefix}.agent.authenticate"),
format!("{prefix}.agent.session.new"),
format!("{prefix}.agent.ext.>"),
],
storage: StorageType::File,
retention: RetentionPolicy::Limits,
max_age: DEFAULT_STREAM_MAX_AGE,
discard: DiscardPolicy::Old,
..Default::default()
}
}

pub fn all_configs(prefix: &str) -> [Config; 5] {
[
commands_config(prefix),
responses_config(prefix),
client_ops_config(prefix),
notifications_config(prefix),
global_config(prefix),
]
}

Expand All @@ -100,6 +122,7 @@ mod tests {
assert_eq!(responses_config("acp").name, "ACP_RESPONSES");
assert_eq!(client_ops_config("acp").name, "ACP_CLIENT_OPS");
assert_eq!(notifications_config("acp").name, "ACP_NOTIFICATIONS");
assert_eq!(global_config("acp").name, "ACP_GLOBAL");
}

#[test]
Expand Down Expand Up @@ -173,6 +196,7 @@ mod tests {
assert_eq!(responses_config("acp").storage, StorageType::File);
assert_eq!(client_ops_config("acp").storage, StorageType::File);
assert_eq!(notifications_config("acp").storage, StorageType::File);
assert_eq!(global_config("acp").storage, StorageType::File);
}

#[test]
Expand All @@ -181,6 +205,7 @@ mod tests {
assert_eq!(responses_config("acp").max_age, DEFAULT_STREAM_MAX_AGE);
assert_eq!(client_ops_config("acp").max_age, DEFAULT_STREAM_MAX_AGE);
assert_eq!(notifications_config("acp").max_age, DEFAULT_STREAM_MAX_AGE);
assert_eq!(global_config("acp").max_age, DEFAULT_STREAM_MAX_AGE);
}

#[test]
Expand Down Expand Up @@ -216,8 +241,46 @@ mod tests {
}

#[test]
fn all_configs_returns_four_streams() {
assert_eq!(all_configs("acp").len(), 4);
fn global_stream_name_formats_correctly() {
assert_eq!(global_stream_name("acp"), "ACP_GLOBAL");
assert_eq!(global_stream_name("myapp"), "MYAPP_GLOBAL");
}

#[test]
fn global_subjects_include_expected() {
let config = global_config("acp");
assert!(
config
.subjects
.contains(&"acp.agent.initialize".to_string())
);
assert!(
config
.subjects
.contains(&"acp.agent.authenticate".to_string())
);
assert!(
config
.subjects
.contains(&"acp.agent.session.new".to_string())
);
assert!(config.subjects.contains(&"acp.agent.ext.>".to_string()));
}

#[test]
fn global_excludes_session_list() {
let config = global_config("acp");
assert!(
!config
.subjects
.contains(&"acp.agent.session.list".to_string())
);
assert!(!config.subjects.contains(&"acp.agent.>".to_string()));
}

#[test]
fn all_configs_returns_five_streams() {
assert_eq!(all_configs("acp").len(), 5);
}

#[test]
Expand Down
Loading