github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-21 16:57:08 +00:00
Code Issues Projects Releases Wiki Activity

genpolicy: fix clippy v1.78.0 warnings

Browse Source 
cargo clippy has two new warnings that need addressing:
- assigning_clones
  These were fixed by clippy itself.
- suspicious_open_options
  I added truncate(false) because we're opening the file for reading.

Signed-off-by: Markus Rudy <mr@edgeless.systems>
This commit is contained in:
Markus Rudy
2024-07-25 10:18:21 +02:00
parent 43dca8deb4
commit 4d1416529d
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/genpolicy/src/mount_and_storage.rs
View File

@@ -57,8 +57,8 @@ pub fn get_policy_mounts(
.find(|m| m.destination.eq(&s_mount.destination)) .find(|m| m.destination.eq(&s_mount.destination))
{ {
// Update an already existing mount. // Update an already existing mount.
policy_mount.type_ = mount.type_.clone(); policy_mount.type_.clone_from(&mount.type_);
policy_mount.source = mount.source.clone(); policy_mount.source.clone_from(&mount.source);
policy_mount.options = mount.options.iter().map(String::from).collect(); policy_mount.options = mount.options.iter().map(String::from).collect();
} else { } else {
// Add a new mount. // Add a new mount.
@@ -94,7 +94,7 @@ fn keep_settings_mount(
fn adjust_termination_path(mount: &mut policy::KataMount, yaml_container: &pod::Container) { fn adjust_termination_path(mount: &mut policy::KataMount, yaml_container: &pod::Container) {
if mount.destination == "/dev/termination-log" { if mount.destination == "/dev/termination-log" {
if let Some(path) = &yaml_container.terminationMessagePath { if let Some(path) = &yaml_container.terminationMessagePath {
mount.destination = path.clone(); mount.destination.clone_from(path);
} }
} }
} }

8
src/tools/genpolicy/src/policy.rs
View File

@@ -570,10 +570,12 @@ impl AgentPolicy {
linux.Namespaces = get_kata_namespaces(is_pause_container, use_host_network); linux.Namespaces = get_kata_namespaces(is_pause_container, use_host_network);
if !c_settings.Linux.MaskedPaths.is_empty() { if !c_settings.Linux.MaskedPaths.is_empty() {
linux.MaskedPaths = c_settings.Linux.MaskedPaths.clone(); linux.MaskedPaths.clone_from(&c_settings.Linux.MaskedPaths);
} }
if !c_settings.Linux.ReadonlyPaths.is_empty() { if !c_settings.Linux.ReadonlyPaths.is_empty() {
linux.ReadonlyPaths = c_settings.Linux.ReadonlyPaths.clone(); linux
.ReadonlyPaths
.clone_from(&c_settings.Linux.ReadonlyPaths);
} }
let sandbox_pidns = if is_pause_container { let sandbox_pidns = if is_pause_container {
@@ -722,7 +724,7 @@ fn get_image_layer_storages(
"previous_chain_id = {}, chain_id = {}", "previous_chain_id = {}, chain_id = {}",
&previous_chain_id, &chain_id &previous_chain_id, &chain_id
); );
previous_chain_id = chain_id.clone(); previous_chain_id.clone_from(&chain_id);
layer_names.push(name_to_hash(&chain_id)); layer_names.push(name_to_hash(&chain_id));
layer_hashes.push(layer.verity_hash.to_string()); layer_hashes.push(layer.verity_hash.to_string());

3
src/tools/genpolicy/src/registry.rs
View File

@@ -215,7 +215,7 @@ impl Container {
if let Some(working_dir) = &docker_config.WorkingDir { if let Some(working_dir) = &docker_config.WorkingDir {
if !working_dir.is_empty() { if !working_dir.is_empty() {
process.Cwd = working_dir.clone(); process.Cwd.clone_from(working_dir);
} }
} }
@@ -344,6 +344,7 @@ pub fn add_verity_to_store(cache_file: &str, diff_id: &str, verity_hash: &str) -
.read(true) .read(true)
.write(true) .write(true)
.create(true) .create(true)
.truncate(false)
.open(cache_file)?; .open(cache_file)?;
let mut data: Vec<ImageLayer> = if let Ok(vec) = serde_json::from_reader(read_file) { let mut data: Vec<ImageLayer> = if let Ok(vec) = serde_json::from_reader(read_file) {