diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e7aa982adc..9754e679e8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,6 @@ name: Tests -on: [pull_request] +on: [push, pull_request] jobs: test: diff --git a/crates/rover-client/src/query/partial/push.rs b/crates/rover-client/src/query/partial/push.rs index c1745d495d..d4baf6d2a5 100644 --- a/crates/rover-client/src/query/partial/push.rs +++ b/crates/rover-client/src/query/partial/push.rs @@ -31,7 +31,7 @@ pub fn run( ) -> Result { let data = client.post::(variables)?; let push_response = get_push_response_from_data(data)?; - build_response(push_response) + Ok(build_response(push_response)) } // alias this return type since it's disgusting @@ -48,9 +48,7 @@ fn get_push_response_from_data( Ok(service_data.upsert_implementing_service_and_trigger_composition) } -fn build_response( - push_response: UpdateResponse, -) -> Result { +fn build_response(push_response: UpdateResponse) -> PushPartialSchemaResponse { let composition_errors: Vec = push_response .errors .iter() @@ -67,7 +65,7 @@ fn build_response( None }; - Ok(PushPartialSchemaResponse { + PushPartialSchemaResponse { schema_hash: match push_response.composition_config { Some(config) => Some(config.schema_hash), None => None, @@ -75,7 +73,7 @@ fn build_response( did_update_gateway: push_response.did_update_gateway, service_was_created: push_response.service_was_created, composition_errors, - }) + } } #[cfg(test)] @@ -97,9 +95,8 @@ mod tests { let update_response: UpdateResponse = serde_json::from_value(json_response).unwrap(); let output = build_response(update_response); - assert!(output.is_ok()); assert_eq!( - output.unwrap(), + output, PushPartialSchemaResponse { schema_hash: Some("5gf564".to_string()), composition_errors: Some(vec![ @@ -123,9 +120,8 @@ mod tests { let update_response: UpdateResponse = serde_json::from_value(json_response).unwrap(); let output = build_response(update_response); - assert!(output.is_ok()); assert_eq!( - output.unwrap(), + output, PushPartialSchemaResponse { schema_hash: Some("5gf564".to_string()), composition_errors: None, @@ -148,9 +144,8 @@ mod tests { let update_response: UpdateResponse = serde_json::from_value(json_response).unwrap(); let output = build_response(update_response); - assert!(output.is_ok()); assert_eq!( - output.unwrap(), + output, PushPartialSchemaResponse { schema_hash: None, composition_errors: Some( diff --git a/src/telemetry.rs b/src/telemetry.rs index d92f3a80ee..d09c1b078c 100644 --- a/src/telemetry.rs +++ b/src/telemetry.rs @@ -21,12 +21,10 @@ fn get_command_from_args(mut raw_arguments: &mut serde_json::Value) -> Command { should_break = false; } - if let Some(leftover_arguments) = leftover_arguments { - if let serde_json::Value::Object(object) = leftover_arguments { - for argument in object.iter() { - let (key, value) = argument; - arguments.insert(key.to_lowercase(), value.to_owned()); - } + if let Some(serde_json::Value::Object(object)) = leftover_arguments { + for argument in object.iter() { + let (key, value) = argument; + arguments.insert(key.to_lowercase(), value.to_owned()); } }