From e171e1c0567537c0e41f31ea34292dd7a077048b Mon Sep 17 00:00:00 2001 From: Ae Date: Fri, 1 Mar 2024 13:09:33 -0800 Subject: [PATCH 1/2] tests/refactor-sqs --- src/sqs.rs | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/src/sqs.rs b/src/sqs.rs index 3f6844c..21e13bd 100644 --- a/src/sqs.rs +++ b/src/sqs.rs @@ -1,9 +1,8 @@ use aws_sdk_sqs::{Client, Error as SqsError}; use aws_sdk_sqs::operation::receive_message::{ReceiveMessageOutput}; -use aws_config; +use aws_config::{SdkConfig}; use std::env; use std::error::Error; -use serde_json::{json, Value}; fn get_sqs_url_from_env_var() -> Result> { return env::var(get_sqs_url_env_key()).map_err(|_| "Missing AWS_SQS_URL environment var".into()); @@ -14,7 +13,7 @@ fn get_sqs_url_env_key() -> &'static str { } pub async fn send_to_sqs(data: String) -> Result<(), SqsError> { - let config = aws_config::load_from_env().await; + let config: SdkConfig = aws_config::load_from_env().await; let sqs_client = Client::new(&config); let message_body = &data; let queue_url = get_sqs_url_from_env_var().unwrap(); @@ -29,7 +28,7 @@ pub async fn send_to_sqs(data: String) -> Result<(), SqsError> { } pub async fn receive_from_sqs() -> Result { - let config = aws_config::load_from_env().await; + let config: SdkConfig = aws_config::load_from_env().await; let sqs_client = Client::new(&config); let queue_url = get_sqs_url_from_env_var().unwrap(); let data = sqs_client @@ -38,30 +37,34 @@ pub async fn receive_from_sqs() -> Result { .send() .await?; + println!("Data: {:?}", data); Ok(data) } -pub fn create_mock_object() -> Value { - json!({ "hello": "world" }) -} - #[cfg(test)] +mod tests { + use serde_json::{json, Value}; -#[tokio::test] #[ignore = "ignore for now"] -async fn test_send_to_sqs() { - env::set_var(get_sqs_url_env_key(), "https://sqs.us-east-1.amazonaws.com/0000000000/foo-bar"); + fn create_mock_object() -> Value { + json!({ "hello": "world" }) + } - let data = create_mock_object(); - let client = send_to_sqs(data.to_string()).await.unwrap(); + #[tokio::test] #[ignore = "ignore for now"] + async fn test_send_to_sqs() { + env::set_var(get_sqs_url_env_key(), "https://sqs.us-east-1.amazonaws.com/0000000000/foo-bar"); - assert_eq!(client, ()); -} + let data = create_mock_object(); + let client = send_to_sqs(data.to_string()).await.unwrap(); + + assert_eq!(client, ()); + } -#[tokio::test] #[ignore = "ignore for now"] -async fn test_receive_from_sqs() { - env::set_var(get_sqs_url_env_key(), "https://sqs.us-east-1.amazonaws.com/0000000000/foo-bar"); + #[tokio::test] #[ignore = "ignore for now"] + async fn test_receive_from_sqs() { + env::set_var(get_sqs_url_env_key(), "https://sqs.us-east-1.amazonaws.com/0000000000/foo-bar"); - let data: ReceiveMessageOutput = receive_from_sqs().await.unwrap(); + let data: ReceiveMessageOutput = receive_from_sqs().await.unwrap(); - assert_eq!(data.messages.unwrap().len(), 0); + assert_eq!(data.messages.unwrap().len(), 0); + } } From c932f22f515bf288eb0bac0cefaca16bb6f05d6f Mon Sep 17 00:00:00 2001 From: Ae Date: Fri, 1 Mar 2024 17:00:58 -0800 Subject: [PATCH 2/2] tests/refactor-sqs --- src/sqs.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sqs.rs b/src/sqs.rs index 21e13bd..cfb80ed 100644 --- a/src/sqs.rs +++ b/src/sqs.rs @@ -37,7 +37,6 @@ pub async fn receive_from_sqs() -> Result { .send() .await?; - println!("Data: {:?}", data); Ok(data) }