Skip to content

Commit 2b9f298

Browse files
chore(style): follow style guide (#1741)
1 parent 4023850 commit 2b9f298

File tree

14 files changed

+38
-59
lines changed

14 files changed

+38
-59
lines changed

agent-control/src/agent_control/run.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ use crate::agent_control::http_server::runner::Runner;
99
use crate::agent_type::embedded_registry::EmbeddedRegistry;
1010
use crate::agent_type::variable::constraints::VariableConstraints;
1111
use crate::event::broadcaster::unbounded::UnboundedBroadcast;
12-
1312
use crate::event::{AgentControlEvent, ApplicationEvent, SubAgentEvent, channel::EventConsumer};
1413
use crate::http::config::ProxyConfig;
1514
use crate::opamp::auth::token_retriever::TokenRetrieverImpl;

agent-control/src/agent_control/run/k8s.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ impl AgentControlRunner {
143143
let template_renderer = TemplateRenderer::default()
144144
.with_agent_control_variables(agent_control_variables.clone().into_iter());
145145

146-
let mut secrets_providers = SecretsProviders::new()
146+
let mut secrets_providers = SecretsProviders::default()
147147
.with_env()
148148
.with_k8s_secret(k8s_client.clone());
149149
if let Some(config) = &agent_control_config.secrets_providers {

agent-control/src/agent_control/run/on_host.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ impl AgentControlRunner {
137137
let template_renderer = TemplateRenderer::default()
138138
.with_agent_control_variables(agent_control_variables.clone().into_iter());
139139

140-
let mut secrets_providers = SecretsProviders::new().with_env();
140+
let mut secrets_providers = SecretsProviders::default().with_env();
141141
if let Some(config) = &agent_control_config.secrets_providers {
142142
secrets_providers = secrets_providers.with_config(config.clone()).map_err(|e| {
143143
AgentError::ConfigResolve(AgentControlConfigError::Load(format!(

agent-control/src/agent_type/variable/secret_variables.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ eof"#;
217217
let secrets = SecretVariables {
218218
variables: HashMap::new(),
219219
};
220-
let result = secrets.load_secrets(&SecretsProviders::new()).unwrap();
220+
let result = secrets.load_secrets(&SecretsProviders::default()).unwrap();
221221
assert!(result.is_empty());
222222
}
223223
}

agent-control/src/context.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ impl<T> Context<T>
77
where
88
T: Default,
99
{
10-
pub fn new() -> Self {
11-
Self::default()
12-
}
13-
1410
/// Sets the cancellation signal. All threads that are waiting for this signal (i.e. were passed this [`Context`] are notified so they unblock and finish execution, cancelling the processes.
1511
pub fn cancel_all(&self, val: T) -> Result<(), PoisonError<MutexGuard<'_, T>>> /* this is the error type returned by a failed `lock()` */
1612
{
@@ -48,7 +44,7 @@ mod tests {
4844
fn test_context_can_be_cancelled_while_waiting() {
4945
let after_cancel = Arc::new(Mutex::new(()));
5046
let after_cancel_clone = after_cancel.clone();
51-
let ctx: Context<bool> = Context::new();
47+
let ctx: Context<bool> = Context::default();
5248
let ctx_clone = ctx.clone();
5349
let guard = after_cancel.lock().unwrap();
5450
thread::spawn(move || {

agent-control/src/health/with_start_time.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,6 @@ impl HealthWithStartTime {
9494
}
9595
}
9696

97-
pub fn is_same_without_times(&self, other: &Self) -> bool {
98-
self.health == other.health
99-
}
100-
10197
pub fn as_health(&self) -> &Health {
10298
&self.health
10399
}

agent-control/src/secrets_provider.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,19 +90,20 @@ impl SecretsProvider for SecretsProviderType {
9090
/// Collection of [SecretsProviderType]s.
9191
pub type SecretsProviders = Registry<SecretsProviderType>;
9292

93-
#[derive(Default)]
9493
pub struct Registry<S: SecretsProvider>(HashMap<Namespace, S>);
9594

9695
impl<S: SecretsProvider> Registry<S> {
97-
pub fn new() -> Self {
98-
Registry(HashMap::new())
99-
}
100-
10196
pub fn is_empty(&self) -> bool {
10297
self.0.is_empty()
10398
}
10499
}
105100

101+
impl Default for Registry<SecretsProviderType> {
102+
fn default() -> Self {
103+
Self(HashMap::new())
104+
}
105+
}
106+
106107
impl Registry<SecretsProviderType> {
107108
pub fn with_env(mut self) -> Self {
108109
self.0.insert(

agent-control/src/sub_agent.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ deployment:
996996
Arc::new(TestAgent::agent_type_definition().into()),
997997
TemplateRenderer::default(),
998998
VariableConstraints::default(),
999-
SecretsProviders::new(),
999+
SecretsProviders::default(),
10001000
PathBuf::default().as_path(),
10011001
));
10021002

@@ -1082,7 +1082,7 @@ deployment:
10821082
Arc::new(EmbeddedRegistry::from(TestAgent::agent_type_definition())),
10831083
TemplateRenderer::default(),
10841084
VariableConstraints::default(),
1085-
SecretsProviders::new(),
1085+
SecretsProviders::default(),
10861086
PathBuf::default().as_path(),
10871087
));
10881088

@@ -1531,7 +1531,7 @@ deployment:
15311531
Arc::new(TestAgent::agent_type_definition_with_required_var().into()),
15321532
TemplateRenderer::default(),
15331533
VariableConstraints::default(),
1534-
SecretsProviders::new(),
1534+
SecretsProviders::default(),
15351535
PathBuf::default().as_path(),
15361536
));
15371537

agent-control/src/sub_agent/effective_agents_assembler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ pub(crate) mod tests {
279279
registry: Arc::new(registry),
280280
renderer: TemplateRenderer::default(),
281281
variable_constraints: VariableConstraints::default(),
282-
secrets_providers: SecretsProviders::new(),
282+
secrets_providers: SecretsProviders::default(),
283283
auto_generated_dir: PathBuf::default(),
284284
}
285285
}

agent-control/src/sub_agent/on_host/builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ impl SupervisorBuilder for SupervisortBuilderOnHost {
170170
let executable_supervisors = NotStartedSupervisorOnHost::new(
171171
effective_agent.get_agent_identity().clone(),
172172
executables,
173-
Context::new(),
173+
Context::default(),
174174
on_host.health,
175175
on_host.version,
176176
)

0 commit comments

Comments
 (0)