Skip to content

Commit 4865d53

Browse files
romuszromusz
authored
fix(linter): fix linter errors for implicit cloning (lakekeeper#1477)
1 parent db30a44 commit 4865d53

22 files changed

Lines changed: 57 additions & 57 deletions

File tree

‎crates/authz-openfga/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ license = { workspace = true }
1010
description = "OpenFGA Authorizer for Lakekeeper"
1111
keywords = ["iceberg", "rest", "lakekeeper", "openfga"]
1212

13+
[lib]
14+
1315
[features]
1416
open-api = ["dep:utoipa", "lakekeeper/open-api"]
1517

16-
[lib]
17-
1818
[dependencies]
1919
anyhow = { workspace = true }
2020
figment = { workspace = true }

‎crates/authz-openfga/src/api.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ async fn get_server_access<C: CatalogStore, S: SecretStore>(
402402
) -> Result<(StatusCode, Json<GetServerAccessResponse>)> {
403403
let authorizer = api_context.v1_state.authz;
404404
let query = ParsedAccessQuery::try_from(query)?;
405-
let openfga_server = authorizer.openfga_server().to_string();
405+
let openfga_server = authorizer.openfga_server().clone();
406406
let relations = get_allowed_actions(
407407
authorizer,
408408
metadata.actor(),
@@ -836,7 +836,7 @@ async fn get_server_assignments<C: CatalogStore, S: SecretStore>(
836836
Query(query): Query<GetServerAssignmentsQuery>,
837837
) -> Result<(StatusCode, Json<GetServerAssignmentsResponse>)> {
838838
let authorizer = api_context.v1_state.authz;
839-
let server_id = authorizer.openfga_server().to_string();
839+
let server_id = authorizer.openfga_server().clone();
840840
authorizer
841841
.require_action(&metadata, AllServerAction::CanReadAssignments, &server_id)
842842
.await?;
@@ -1073,7 +1073,7 @@ async fn update_server_assignments<C: CatalogStore, S: SecretStore>(
10731073
Json(request): Json<UpdateServerAssignmentsRequest>,
10741074
) -> Result<StatusCode> {
10751075
let authorizer = api_context.v1_state.authz;
1076-
let server_id = authorizer.openfga_server().to_string();
1076+
let server_id = authorizer.openfga_server().clone();
10771077
checked_write(
10781078
authorizer,
10791079
metadata.actor(),
@@ -1522,7 +1522,7 @@ async fn get_allowed_actions<A: ReducedRelation + IntoEnumIterator>(
15221522
let actions = A::iter().collect::<Vec<_>>();
15231523
let for_principal = for_principal
15241524
.map(super::entities::OpenFgaEntity::to_openfga)
1525-
.unwrap_or(openfga_actor.to_string());
1525+
.unwrap_or(openfga_actor.clone());
15261526

15271527
let actions = actions.iter().map(|action| async {
15281528
let key = CheckRequestTupleKey {
@@ -1764,7 +1764,7 @@ mod tests {
17641764
Some(vec![TupleKey {
17651765
user: user_id.to_openfga(),
17661766
relation: ServerRelation::Admin.to_openfga().to_string(),
1767-
object: openfga_server.to_string(),
1767+
object: openfga_server.clone(),
17681768
condition: None,
17691769
}]),
17701770
None,
@@ -1900,7 +1900,7 @@ mod tests {
19001900
Some(vec![TupleKey {
19011901
user: user_id.to_openfga(),
19021902
relation: ServerRelation::Admin.to_openfga().to_string(),
1903-
object: openfga_server.to_string(),
1903+
object: openfga_server.clone(),
19041904
condition: None,
19051905
}]),
19061906
None,
@@ -1938,7 +1938,7 @@ mod tests {
19381938
Some(vec![TupleKey {
19391939
user: role_id.into_assignees().to_openfga(),
19401940
relation: ServerRelation::Admin.to_openfga().to_string(),
1941-
object: openfga_server.to_string(),
1941+
object: openfga_server.clone(),
19421942
condition: None,
19431943
}]),
19441944
None,
@@ -1968,7 +1968,7 @@ mod tests {
19681968
Some(vec![TupleKey {
19691969
user: user_id.to_openfga(),
19701970
relation: ServerRelation::Admin.to_openfga().to_string(),
1971-
object: openfga_server.to_string(),
1971+
object: openfga_server.clone(),
19721972
condition: None,
19731973
}]),
19741974
None,
@@ -1991,7 +1991,7 @@ mod tests {
19911991
Some(vec![TupleKey {
19921992
user: role_id.into_assignees().to_openfga(),
19931993
relation: ServerRelation::Admin.to_openfga().to_string(),
1994-
object: openfga_server.to_string(),
1994+
object: openfga_server.clone(),
19951995
condition: None,
19961996
}]),
19971997
None,
@@ -2026,7 +2026,7 @@ mod tests {
20262026
Some(vec![TupleKey {
20272027
user: user1_id.to_openfga(),
20282028
relation: ServerRelation::Admin.to_openfga().to_string(),
2029-
object: openfga_server.to_string(),
2029+
object: openfga_server.clone(),
20302030
condition: None,
20312031
}]),
20322032
None,

‎crates/authz-openfga/src/authorizer.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ impl Authorizer for OpenFGAAuthorizer {
172172
Some(vec![TupleKey {
173173
user: user.to_openfga(),
174174
relation: relation.to_string(),
175-
object: self.openfga_server().to_string(),
175+
object: self.openfga_server().clone(),
176176
condition: None,
177177
}]),
178178
None,
@@ -235,7 +235,7 @@ impl Authorizer for OpenFGAAuthorizer {
235235
};
236236
}
237237

238-
let server_id = self.openfga_server().to_string();
238+
let server_id = self.openfga_server().clone();
239239
match action {
240240
// Currently, given a user-id, all information about a user can be retrieved.
241241
// For multi-tenant setups, we need to restrict this to a tenant.
@@ -268,7 +268,7 @@ impl Authorizer for OpenFGAAuthorizer {
268268
self.check(CheckRequestTupleKey {
269269
user: metadata.actor().to_openfga(),
270270
relation: action.to_string(),
271-
object: self.openfga_server().to_string(),
271+
object: self.openfga_server().clone(),
272272
})
273273
.await
274274
.map_err(Into::into)
@@ -471,7 +471,7 @@ impl Authorizer for OpenFGAAuthorizer {
471471
let actor = metadata.actor();
472472

473473
self.require_no_relations(project_id).await?;
474-
let server = self.openfga_server().to_string();
474+
let server = self.openfga_server().clone();
475475
let this_id = project_id.to_openfga();
476476
self.write(
477477
Some(vec![
@@ -725,7 +725,7 @@ impl OpenFGAAuthorizer {
725725
.check(CheckRequestTupleKey {
726726
user: actor.to_openfga(),
727727
relation: ServerRelation::CanListAllProjects.to_string(),
728-
object: self.openfga_server().to_string(),
728+
object: self.openfga_server().clone(),
729729
})
730730
.await?;
731731

‎crates/authz-openfga/src/check.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ async fn check_warehouse(
146146
.await?;
147147
Ok((
148148
action.to_openfga().to_string(),
149-
warehouse_id.to_openfga().to_string(),
149+
warehouse_id.to_openfga().clone(),
150150
))
151151
}
152152

@@ -181,7 +181,7 @@ async fn check_server(
181181
for_principal: &mut Option<UserOrRole>,
182182
action: &APIServerAction,
183183
) -> Result<(String, String)> {
184-
let openfga_server = authorizer.openfga_server().to_string();
184+
let openfga_server = authorizer.openfga_server().clone();
185185
if for_principal.is_some() {
186186
authorizer
187187
.require_action(

‎crates/authz-openfga/src/health.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ impl HealthExt for OpenFGAAuthorizer {
1717
.check(CheckRequestTupleKey {
1818
user: ProjectId::new_random().to_openfga(),
1919
relation: ServerRelation::Project.to_string(),
20-
object: self.openfga_server().to_string(),
20+
object: self.openfga_server().clone(),
2121
})
2222
.await;
2323

‎crates/authz-openfga/src/migration/migration_fns_v4.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ async fn get_all_warehouses(
238238
let tuples = client
239239
.read_all_pages(
240240
Some(ReadRequestTupleKey {
241-
user: p.to_string(),
241+
user: p.clone(),
242242
relation: WarehouseRelation::Project.to_string(),
243243
object: "warehouse:".to_string(),
244244
}),
@@ -597,13 +597,13 @@ mod openfga_integration_tests {
597597
.write(
598598
Some(vec![
599599
TupleKey {
600-
user: authorizer.openfga_server().to_string(),
600+
user: authorizer.openfga_server().clone(),
601601
relation: ProjectRelation::Server.to_string(),
602602
object: "project:p1".to_string(),
603603
condition: None,
604604
},
605605
TupleKey {
606-
user: authorizer.openfga_server().to_string(),
606+
user: authorizer.openfga_server().clone(),
607607
relation: ProjectRelation::Server.to_string(),
608608
object: "project:p2".to_string(),
609609
condition: None,
@@ -1733,7 +1733,7 @@ mod openfga_integration_tests {
17331733
Some(vec![
17341734
// Project structure
17351735
TupleKey {
1736-
user: authorizer.openfga_server().to_string(),
1736+
user: authorizer.openfga_server().clone(),
17371737
relation: ProjectRelation::Server.to_string(),
17381738
object: project_openfga.clone(),
17391739
condition: None,

‎crates/io/src/gcs/gcs_storage.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ impl LakekeeperStorage for GcsStorage {
158158
};
159159

160160
if bytes.len() < MAX_BYTES_PER_REQUEST {
161-
let mut media = Media::new(location.object_name().to_string());
161+
let mut media = Media::new(location.object_name().clone());
162162
media.content_length = Some(bytes.len() as u64);
163163
let upload_type = UploadType::Simple(media);
164164

‎crates/lakekeeper/src/api/endpoints.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ mod test {
440440
// Remove leading "/" to match normalized paths from YAML
441441
assert!(path.starts_with('/'), "Path should start with '/'");
442442
let normalized_path = path.trim_start_matches('/');
443-
actual_endpoints.insert((method.to_string(), normalized_path.to_string()));
443+
actual_endpoints.insert((method.clone(), normalized_path.to_string()));
444444
}
445445

446446
// Find missing endpoints

‎crates/lakekeeper/src/implementations/postgres/endpoint_statistics/sink.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ async fn resolve_warehouses(
230230
e.keys().filter_map(|epi| {
231231
epi.warehouse_name
232232
.as_ref()
233-
.map(|warehouse| (p.to_string(), warehouse.to_string()))
233+
.map(|warehouse| (p.to_string(), warehouse.clone()))
234234
})
235235
})
236236
.unique()

‎crates/lakekeeper/src/implementations/postgres/role.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ pub(crate) async fn list_roles<'e, 'c: 'e, E: sqlx::Executor<'c, Database = sqlx
203203
.map(|id| Uuid::from(id))
204204
.collect::<Vec<uuid::Uuid>>() as Vec<Uuid>,
205205
filter_name.is_empty(),
206-
filter_name.to_string(),
206+
filter_name.clone(),
207207
token_ts,
208208
token_id,
209209
page_size,

0 commit comments

Comments
 (0)