formatting
Some checks failed
CI / Security Blocking Checks (push) Successful in 34s
CI / Web Blocking Checks (push) Failing after 1m44s
CI / Rust Blocking Checks (push) Failing after 9m57s
CI / Web Advisory Checks (push) Successful in 1m14s
CI / Security Advisory Checks (push) Successful in 1m28s
Some checks failed
CI / Security Blocking Checks (push) Successful in 34s
CI / Web Blocking Checks (push) Failing after 1m44s
CI / Rust Blocking Checks (push) Failing after 9m57s
CI / Web Advisory Checks (push) Successful in 1m14s
CI / Security Advisory Checks (push) Successful in 1m28s
This commit is contained in:
@@ -947,60 +947,61 @@ async fn register_pack_internal(
|
||||
// where the API host has the interpreter available.
|
||||
if let Some(ref env_cfg) = exec_config.environment {
|
||||
if env_cfg.env_type != "none"
|
||||
&& !env_dir.exists() && !env_cfg.create_command.is_empty() {
|
||||
// Ensure parent directories exist
|
||||
if let Some(parent) = env_dir.parent() {
|
||||
let _ = std::fs::create_dir_all(parent);
|
||||
}
|
||||
&& !env_dir.exists()
|
||||
&& !env_cfg.create_command.is_empty()
|
||||
{
|
||||
// Ensure parent directories exist
|
||||
if let Some(parent) = env_dir.parent() {
|
||||
let _ = std::fs::create_dir_all(parent);
|
||||
}
|
||||
|
||||
let vars = exec_config
|
||||
.build_template_vars_with_env(&pack_path, Some(&env_dir));
|
||||
let resolved_cmd = attune_common::models::runtime::RuntimeExecutionConfig::resolve_command(
|
||||
let vars = exec_config
|
||||
.build_template_vars_with_env(&pack_path, Some(&env_dir));
|
||||
let resolved_cmd = attune_common::models::runtime::RuntimeExecutionConfig::resolve_command(
|
||||
&env_cfg.create_command,
|
||||
&vars,
|
||||
);
|
||||
|
||||
tracing::info!(
|
||||
"Attempting to create {} environment (best-effort) at {}: {:?}",
|
||||
env_cfg.env_type,
|
||||
env_dir.display(),
|
||||
resolved_cmd
|
||||
);
|
||||
tracing::info!(
|
||||
"Attempting to create {} environment (best-effort) at {}: {:?}",
|
||||
env_cfg.env_type,
|
||||
env_dir.display(),
|
||||
resolved_cmd
|
||||
);
|
||||
|
||||
if let Some((program, args)) = resolved_cmd.split_first() {
|
||||
match tokio::process::Command::new(program)
|
||||
.args(args)
|
||||
.current_dir(&pack_path)
|
||||
.output()
|
||||
.await
|
||||
{
|
||||
Ok(output) if output.status.success() => {
|
||||
tracing::info!(
|
||||
"Created {} environment at {}",
|
||||
env_cfg.env_type,
|
||||
env_dir.display()
|
||||
);
|
||||
}
|
||||
Ok(output) => {
|
||||
let stderr =
|
||||
String::from_utf8_lossy(&output.stderr);
|
||||
tracing::info!(
|
||||
if let Some((program, args)) = resolved_cmd.split_first() {
|
||||
match tokio::process::Command::new(program)
|
||||
.args(args)
|
||||
.current_dir(&pack_path)
|
||||
.output()
|
||||
.await
|
||||
{
|
||||
Ok(output) if output.status.success() => {
|
||||
tracing::info!(
|
||||
"Created {} environment at {}",
|
||||
env_cfg.env_type,
|
||||
env_dir.display()
|
||||
);
|
||||
}
|
||||
Ok(output) => {
|
||||
let stderr = String::from_utf8_lossy(&output.stderr);
|
||||
tracing::info!(
|
||||
"Environment creation skipped in API service (exit {}): {}. \
|
||||
The worker will create it on first execution.",
|
||||
output.status.code().unwrap_or(-1),
|
||||
stderr.trim()
|
||||
);
|
||||
}
|
||||
Err(e) => {
|
||||
tracing::info!(
|
||||
}
|
||||
Err(e) => {
|
||||
tracing::info!(
|
||||
"Runtime '{}' not available in API service: {}. \
|
||||
The worker will create the environment on first execution.",
|
||||
program, e
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Attempt to install dependencies if manifest file exists.
|
||||
|
||||
@@ -180,16 +180,18 @@ impl ApiClient {
|
||||
let req = self.attach_body(self.build_request(method.clone(), path), body);
|
||||
let response = req.send().await.context("Failed to send request to API")?;
|
||||
|
||||
if response.status() == StatusCode::UNAUTHORIZED && self.refresh_token.is_some()
|
||||
&& self.refresh_auth_token().await? {
|
||||
// Retry with new token
|
||||
let req = self.attach_body(self.build_request(method, path), body);
|
||||
let response = req
|
||||
.send()
|
||||
.await
|
||||
.context("Failed to send request to API (retry)")?;
|
||||
return self.handle_response(response).await;
|
||||
}
|
||||
if response.status() == StatusCode::UNAUTHORIZED
|
||||
&& self.refresh_token.is_some()
|
||||
&& self.refresh_auth_token().await?
|
||||
{
|
||||
// Retry with new token
|
||||
let req = self.attach_body(self.build_request(method, path), body);
|
||||
let response = req
|
||||
.send()
|
||||
.await
|
||||
.context("Failed to send request to API (retry)")?;
|
||||
return self.handle_response(response).await;
|
||||
}
|
||||
|
||||
self.handle_response(response).await
|
||||
}
|
||||
@@ -204,15 +206,17 @@ impl ApiClient {
|
||||
let req = self.attach_body(self.build_request(method.clone(), path), body);
|
||||
let response = req.send().await.context("Failed to send request to API")?;
|
||||
|
||||
if response.status() == StatusCode::UNAUTHORIZED && self.refresh_token.is_some()
|
||||
&& self.refresh_auth_token().await? {
|
||||
let req = self.attach_body(self.build_request(method, path), body);
|
||||
let response = req
|
||||
.send()
|
||||
.await
|
||||
.context("Failed to send request to API (retry)")?;
|
||||
return self.handle_empty_response(response).await;
|
||||
}
|
||||
if response.status() == StatusCode::UNAUTHORIZED
|
||||
&& self.refresh_token.is_some()
|
||||
&& self.refresh_auth_token().await?
|
||||
{
|
||||
let req = self.attach_body(self.build_request(method, path), body);
|
||||
let response = req
|
||||
.send()
|
||||
.await
|
||||
.context("Failed to send request to API (retry)")?;
|
||||
return self.handle_empty_response(response).await;
|
||||
}
|
||||
|
||||
self.handle_empty_response(response).await
|
||||
}
|
||||
@@ -391,16 +395,18 @@ impl ApiClient {
|
||||
.await
|
||||
.context("Failed to send multipart request to API")?;
|
||||
|
||||
if response.status() == StatusCode::UNAUTHORIZED && self.refresh_token.is_some()
|
||||
&& self.refresh_auth_token().await? {
|
||||
// Retry with new token
|
||||
let req = build_multipart_request(self, &file_bytes)?;
|
||||
let response = req
|
||||
.send()
|
||||
.await
|
||||
.context("Failed to send multipart request to API (retry)")?;
|
||||
return self.handle_response(response).await;
|
||||
}
|
||||
if response.status() == StatusCode::UNAUTHORIZED
|
||||
&& self.refresh_token.is_some()
|
||||
&& self.refresh_auth_token().await?
|
||||
{
|
||||
// Retry with new token
|
||||
let req = build_multipart_request(self, &file_bytes)?;
|
||||
let response = req
|
||||
.send()
|
||||
.await
|
||||
.context("Failed to send multipart request to API (retry)")?;
|
||||
return self.handle_response(response).await;
|
||||
}
|
||||
|
||||
self.handle_response(response).await
|
||||
}
|
||||
|
||||
@@ -730,8 +730,7 @@ impl SensorInstance {
|
||||
}
|
||||
|
||||
/// Sensor status information
|
||||
#[derive(Clone, Debug)]
|
||||
#[derive(Default)]
|
||||
#[derive(Clone, Debug, Default)]
|
||||
pub struct SensorStatus {
|
||||
/// Whether the sensor is running
|
||||
pub running: bool,
|
||||
@@ -746,7 +745,6 @@ pub struct SensorStatus {
|
||||
pub last_poll: Option<chrono::DateTime<chrono::Utc>>,
|
||||
}
|
||||
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
Reference in New Issue
Block a user