Skip to content

Commit 18bb6cb

Browse files
committed
rust: remove dead code
Signed-off-by: Piyush Jena <[email protected]>
1 parent c6ce463 commit 18bb6cb

File tree

4 files changed

+1
-121
lines changed

4 files changed

+1
-121
lines changed

sources/bloodhound/src/bin/kubernetes-cis-checks/checks.rs

Lines changed: 0 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -522,53 +522,6 @@ impl Checker for K8S04020900Checker {
522522

523523
// =>o.o<= =>o.o<= =>o.o<= =>o.o<= =>o.o<= =>o.o<= =>o.o<= =>o.o<= =>o.o<= =>o.o<=
524524

525-
pub struct K8S04021000Checker {}
526-
527-
// Not actually applicable for Bottlerocket, but leaving logic here in case we
528-
// make any changes in the future.
529-
impl Checker for K8S04021000Checker {
530-
fn execute(&self, sac: &dyn SystemAccess) -> CheckerResult {
531-
#[derive(Deserialize)]
532-
struct KubeletConfig {
533-
#[serde(rename = "rotateCertificates")]
534-
rotate_certificates: bool,
535-
}
536-
537-
let mut result = CheckerResult::default();
538-
539-
if let Ok(kubelet_file) = sac.open(KUBELET_CONF_FILE) {
540-
if let Ok(config) = serde_yaml::from_reader::<_, KubeletConfig>(kubelet_file) {
541-
if !config.rotate_certificates {
542-
result.error = "Kubelet rotateCertificates is disabled".to_string();
543-
result.status = CheckStatus::FAIL;
544-
} else {
545-
result.status = CheckStatus::PASS;
546-
}
547-
} else {
548-
// Default value is `false`, so it is a failure if this is not in the config file.
549-
result.error = "Kubelet rotateCertificates is disabled".to_string();
550-
result.status = CheckStatus::FAIL;
551-
}
552-
} else {
553-
result.error = format!("unable to read '{KUBELET_CONF_FILE}'");
554-
}
555-
556-
result
557-
}
558-
559-
fn metadata(&self) -> CheckerMetadata {
560-
CheckerMetadata {
561-
title: "Ensure that the --rotate-certificates argument is not set to false".to_string(),
562-
id: "4.2.10".to_string(),
563-
level: 1,
564-
name: "k8s04021000".to_string(),
565-
mode: Mode::Automatic,
566-
}
567-
}
568-
}
569-
570-
// =>o.o<= =>o.o<= =>o.o<= =>o.o<= =>o.o<= =>o.o<= =>o.o<= =>o.o<= =>o.o<= =>o.o<=
571-
572525
pub struct K8S04021100Checker {}
573526

574527
impl Checker for K8S04021100Checker {
@@ -1476,51 +1429,6 @@ tlsPrivateKeyFile: ""
14761429
assert_eq!(result.status, CheckStatus::SKIP);
14771430
}
14781431

1479-
// K8S04021000Checker tests - rotate certificates
1480-
#[test]
1481-
pub fn test_k8s04021000checker_pass() {
1482-
let mut sac = UnitTestSystemAccess::default();
1483-
let config = r#"
1484-
rotateCertificates: true
1485-
"#;
1486-
sac.register_file(KUBELET_CONF_FILE, config);
1487-
let checker = K8S04021000Checker {};
1488-
let result = checker.execute(&sac);
1489-
assert_eq!(result.status, CheckStatus::PASS);
1490-
}
1491-
1492-
#[test]
1493-
pub fn test_k8s04021000checker_fail_disabled() {
1494-
let mut sac = UnitTestSystemAccess::default();
1495-
let config = r#"
1496-
rotateCertificates: false
1497-
"#;
1498-
sac.register_file(KUBELET_CONF_FILE, config);
1499-
let checker = K8S04021000Checker {};
1500-
let result = checker.execute(&sac);
1501-
assert_eq!(result.status, CheckStatus::FAIL);
1502-
}
1503-
1504-
#[test]
1505-
pub fn test_k8s04021000checker_fail_not_present() {
1506-
let mut sac = UnitTestSystemAccess::default();
1507-
let config = r#"
1508-
someOtherSetting: value
1509-
"#;
1510-
sac.register_file(KUBELET_CONF_FILE, config);
1511-
let checker = K8S04021000Checker {};
1512-
let result = checker.execute(&sac);
1513-
assert_eq!(result.status, CheckStatus::FAIL);
1514-
}
1515-
1516-
#[test]
1517-
pub fn test_k8s04021000checker_file_missing() {
1518-
let sac = UnitTestSystemAccess::default();
1519-
let checker = K8S04021000Checker {};
1520-
let result = checker.execute(&sac);
1521-
assert_eq!(result.status, CheckStatus::SKIP);
1522-
}
1523-
15241432
// K8S04021100Checker tests - rotate kubelet server certificate
15251433
#[test]
15261434
pub fn test_k8s04021100checker_pass_enabled() {

sources/netdog/src/cli/mod.rs

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use crate::{
1414
pub(crate) use generate_hostname::GenerateHostnameArgs;
1515
pub(crate) use generate_net_config::GenerateNetConfigArgs;
1616
pub(crate) use node_ip::NodeIpArgs;
17-
use serde::{Deserialize, Serialize};
17+
use serde::Serialize;
1818
pub(crate) use set_hostname::SetHostnameArgs;
1919
use snafu::{ensure, OptionExt, ResultExt};
2020
use std::fmt::Write;
@@ -25,24 +25,6 @@ use std::{fs, io};
2525
pub(crate) use write_network_status::WriteNetworkStatusArgs;
2626
pub(crate) use write_resolv_conf::WriteResolvConfArgs;
2727

28-
#[derive(Debug, PartialEq, Deserialize)]
29-
#[serde(rename_all = "kebab-case")]
30-
enum InterfaceType {
31-
Dhcp,
32-
Static,
33-
}
34-
35-
#[derive(Debug, PartialEq, Deserialize)]
36-
#[serde(rename_all = "kebab-case")]
37-
enum InterfaceFamily {
38-
Ipv4,
39-
Ipv6,
40-
}
41-
42-
// Implement `from_str()` so argh can attempt to deserialize args into their proper types
43-
derive_fromstr_from_deserialize!(InterfaceType);
44-
derive_fromstr_from_deserialize!(InterfaceFamily);
45-
4628
/// Helper function that serializes the input to JSON and prints it
4729
fn print_json<S>(val: S) -> Result<()>
4830
where

sources/netdog/src/main.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ supplementing any missing settings with DNS settings from the primary interface'
2626
is meant to be used as a restart command for DNS API settings.
2727
*/
2828

29-
#[macro_use]
3029
extern crate serde_plain;
3130

3231
mod addressing;

sources/netdog/src/net_config/devices/mod.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,6 @@ impl Validate for NetworkDeviceV1 {
4242
}
4343
}
4444

45-
#[derive(Debug, Deserialize)]
46-
#[serde(untagged)]
47-
pub(crate) enum DeviceType {
48-
#[serde(rename = "bond")]
49-
Bond,
50-
#[serde(rename = "vlan")]
51-
Vlan,
52-
}
53-
5445
pub(crate) trait HasIpAddressing {
5546
fn has_static(&self) -> bool;
5647

0 commit comments

Comments
 (0)