Skip to content

Commit 68e6947

Browse files
committed
fix(providers): resolve main rebase lint
1 parent 3189d22 commit 68e6947

7 files changed

Lines changed: 32 additions & 38 deletions

File tree

‎crates/openshell-cli/tests/provider_commands_integration.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ impl OpenShell for TestOpenShell {
209209
openshell_core::proto::ListProviderProfilesResponse {
210210
profiles: openshell_providers::default_profiles()
211211
.iter()
212-
.map(|profile| profile.to_proto())
212+
.map(openshell_providers::ProviderTypeProfile::to_proto)
213213
.collect(),
214214
},
215215
))

‎crates/openshell-policy/src/compose.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ pub fn compose_effective_policy(
5151
let key = unique_provider_rule_key(&effective, &layer.rule_name);
5252
let mut rule = layer.rule.clone();
5353
if rule.name.is_empty() {
54-
rule.name = key.clone();
54+
rule.name.clone_from(&key);
5555
}
5656
effective.network_policies.insert(key, rule);
5757
}

‎crates/openshell-providers/src/profiles.rs‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,7 @@ where
169169

170170
fn provider_profile_category_from_yaml(raw: &str) -> Option<ProviderProfileCategory> {
171171
match raw.trim().to_ascii_lowercase().replace('-', "_").as_str() {
172-
"" => Some(ProviderProfileCategory::Other),
173-
"other" => Some(ProviderProfileCategory::Other),
172+
"" | "other" => Some(ProviderProfileCategory::Other),
174173
"inference" => Some(ProviderProfileCategory::Inference),
175174
"agent" => Some(ProviderProfileCategory::Agent),
176175
"source_control" => Some(ProviderProfileCategory::SourceControl),
@@ -313,13 +312,13 @@ mod tests {
313312
#[test]
314313
fn parse_profile_yaml_reads_single_provider_document() {
315314
let profile = parse_profile_yaml(
316-
r#"
315+
r"
317316
id: example
318317
display_name: Example
319318
credentials:
320319
- name: api_key
321320
env_vars: [EXAMPLE_API_KEY]
322-
"#,
321+
",
323322
)
324323
.expect("profile should parse");
325324

@@ -331,14 +330,14 @@ credentials:
331330
#[test]
332331
fn parse_profile_catalog_yamls_rejects_duplicate_ids() {
333332
let err = parse_profile_catalog_yamls(&[
334-
r#"
333+
r"
335334
id: duplicate
336335
display_name: First
337-
"#,
338-
r#"
336+
",
337+
r"
339338
id: duplicate
340339
display_name: Second
341-
"#,
340+
",
342341
])
343342
.unwrap_err();
344343

@@ -347,13 +346,13 @@ display_name: Second
347346

348347
#[test]
349348
fn parse_profile_catalog_yamls_rejects_invalid_endpoint_ports() {
350-
let err = parse_profile_catalog_yamls(&[r#"
349+
let err = parse_profile_catalog_yamls(&[r"
351350
id: bad-endpoint
352351
display_name: Bad Endpoint
353352
endpoints:
354353
- host: api.example.com
355354
port: 0
356-
"#])
355+
"])
357356
.unwrap_err();
358357

359358
assert!(matches!(err, ProfileError::InvalidEndpoint { id, .. } if id == "bad-endpoint"));

‎crates/openshell-server/src/grpc/mod.rs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,14 +258,17 @@ impl OpenShell for OpenShellService {
258258
&self,
259259
request: Request<ListProviderProfilesRequest>,
260260
) -> Result<Response<ListProviderProfilesResponse>, Status> {
261-
provider::handle_list_provider_profiles(&self.state, request).await
261+
Ok(provider::handle_list_provider_profiles(
262+
&self.state,
263+
request,
264+
))
262265
}
263266

264267
async fn get_provider_profile(
265268
&self,
266269
request: Request<GetProviderProfileRequest>,
267270
) -> Result<Response<ProviderProfileResponse>, Status> {
268-
provider::handle_get_provider_profile(&self.state, request).await
271+
provider::handle_get_provider_profile(&self.state, request)
269272
}
270273

271274
async fn update_provider(

‎crates/openshell-server/src/grpc/policy.rs‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2693,7 +2693,7 @@ mod tests {
26932693
metadata: Some(openshell_core::proto::datamodel::v1::ObjectMeta {
26942694
id: format!("provider-{name}"),
26952695
name: name.to_string(),
2696-
created_at_ms: 1000000,
2696+
created_at_ms: 1_000_000,
26972697
labels: HashMap::new(),
26982698
}),
26992699
r#type: provider_type.to_string(),
@@ -2705,7 +2705,7 @@ mod tests {
27052705

27062706
fn test_policy_with_rule(rule_name: &str, host: &str) -> ProtoSandboxPolicy {
27072707
ProtoSandboxPolicy {
2708-
network_policies: [(
2708+
network_policies: std::iter::once((
27092709
rule_name.to_string(),
27102710
NetworkPolicyRule {
27112711
name: rule_name.to_string(),
@@ -2716,8 +2716,7 @@ mod tests {
27162716
}],
27172717
..Default::default()
27182718
},
2719-
)]
2720-
.into_iter()
2719+
))
27212720
.collect(),
27222721
..Default::default()
27232722
}
@@ -2751,11 +2750,10 @@ mod tests {
27512750
async fn enable_providers_v2(state: &Arc<ServerState>) {
27522751
let global_settings = StoredSettings {
27532752
revision: 1,
2754-
settings: [(
2753+
settings: std::iter::once((
27552754
settings::USE_PROVIDERS_V2_KEY.to_string(),
27562755
StoredSettingValue::Bool(true),
2757-
)]
2758-
.into_iter()
2756+
))
27592757
.collect(),
27602758
};
27612759
save_global_settings(state.store.as_ref(), &global_settings)
@@ -3099,7 +3097,7 @@ mod tests {
30993097
.unwrap();
31003098

31013099
let sandbox_policy = SandboxPolicy {
3102-
network_policies: [(
3100+
network_policies: std::iter::once((
31033101
"sandbox_only".to_string(),
31043102
NetworkPolicyRule {
31053103
name: "sandbox_only".to_string(),
@@ -3110,8 +3108,7 @@ mod tests {
31103108
}],
31113109
..Default::default()
31123110
},
3113-
)]
3114-
.into_iter()
3111+
))
31153112
.collect(),
31163113
..Default::default()
31173114
};
@@ -3133,7 +3130,7 @@ mod tests {
31333130
state.store.put_message(&sandbox).await.unwrap();
31343131

31353132
let global_policy = SandboxPolicy {
3136-
network_policies: [(
3133+
network_policies: std::iter::once((
31373134
"global_only".to_string(),
31383135
NetworkPolicyRule {
31393136
name: "global_only".to_string(),
@@ -3144,8 +3141,7 @@ mod tests {
31443141
}],
31453142
..Default::default()
31463143
},
3147-
)]
3148-
.into_iter()
3144+
))
31493145
.collect(),
31503146
..Default::default()
31513147
};

‎crates/openshell-server/src/grpc/provider.rs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -320,24 +320,24 @@ pub(super) async fn handle_list_providers(
320320
Ok(Response::new(ListProvidersResponse { providers }))
321321
}
322322

323-
pub(super) async fn handle_list_provider_profiles(
323+
pub(super) fn handle_list_provider_profiles(
324324
_state: &Arc<ServerState>,
325325
request: Request<ListProviderProfilesRequest>,
326-
) -> Result<Response<ListProviderProfilesResponse>, Status> {
326+
) -> Response<ListProviderProfilesResponse> {
327327
let request = request.into_inner();
328328
let limit = clamp_limit(request.limit, 100, MAX_PAGE_SIZE) as usize;
329329
let offset = request.offset as usize;
330330
let profiles = default_profiles()
331331
.iter()
332332
.skip(offset)
333333
.take(limit)
334-
.map(|profile| profile.to_proto())
334+
.map(openshell_providers::ProviderTypeProfile::to_proto)
335335
.collect();
336336

337-
Ok(Response::new(ListProviderProfilesResponse { profiles }))
337+
Response::new(ListProviderProfilesResponse { profiles })
338338
}
339339

340-
pub(super) async fn handle_get_provider_profile(
340+
pub(super) fn handle_get_provider_profile(
341341
_state: &Arc<ServerState>,
342342
request: Request<GetProviderProfileRequest>,
343343
) -> Result<Response<ProviderProfileResponse>, Status> {
@@ -473,8 +473,6 @@ mod tests {
473473
offset: 0,
474474
}),
475475
)
476-
.await
477-
.unwrap()
478476
.into_inner();
479477

480478
let github = response
@@ -504,7 +502,6 @@ mod tests {
504502
id: "github".to_string(),
505503
}),
506504
)
507-
.await
508505
.unwrap()
509506
.into_inner()
510507
.profile
@@ -521,7 +518,6 @@ mod tests {
521518
id: "generic".to_string(),
522519
}),
523520
)
524-
.await
525521
.unwrap_err();
526522
assert_eq!(generic_err.code(), Code::NotFound);
527523
}

‎crates/openshell-tui/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1568,7 +1568,7 @@ fn spawn_create_provider(app: &App, tx: mpsc::UnboundedSender<Event>) {
15681568
}),
15691569
r#type: ptype.clone(),
15701570
credentials: credentials.clone(),
1571-
config: Default::default(),
1571+
config: HashMap::default(),
15721572
}),
15731573
};
15741574

@@ -1658,7 +1658,7 @@ fn spawn_update_provider(app: &App, tx: mpsc::UnboundedSender<Event>) {
16581658
}),
16591659
r#type: ptype,
16601660
credentials,
1661-
config: Default::default(),
1661+
config: HashMap::default(),
16621662
}),
16631663
};
16641664

0 commit comments

Comments
 (0)