Skip to content

Commit fbf3cae

Browse files
ci: fix lint and clippy errors (#842)
* ci: fix lint and clippy errors updated clippy version has strict check for dead code detection Signed-off-by: okozachenko1203 <[email protected]> * fix flake error Signed-off-by: okozachenko1203 <[email protected]> * Ignore E203, whitespace before ':' Currently flake8 gives false positives on the spaces black uses for slices, which flake8 reports as E203: whitespace before ':'. Signed-off-by: okozachenko <[email protected]> * fix lint at mod leve Signed-off-by: okozachenko1203 <[email protected]> --------- Signed-off-by: okozachenko1203 <[email protected]> Signed-off-by: okozachenko <[email protected]>
1 parent d5c50af commit fbf3cae

24 files changed

+25
-4
lines changed

magnum_cluster_api/tests/unit/go_template.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ def parse_template(self, tmpl_str: str) -> TemplateNode:
381381

382382
# Add text before this expression
383383
if match.start() > 0:
384-
text = tmpl_str[pos : pos + match.start()]
384+
text = tmpl_str[pos : pos + match.start()] # noqa: E203
385385
if text:
386386
children.append(TextNode(text))
387387

@@ -397,9 +397,7 @@ def parse_template(self, tmpl_str: str) -> TemplateNode:
397397

398398
while depth > 0 and search_pos < len(tmpl_str):
399399
next_if = re.search(r"\{\{\s*if\s+", tmpl_str[search_pos:])
400-
next_end = re.search(
401-
r"\{\{\s*end\s*\}\}", tmpl_str[search_pos:]
402-
)
400+
next_end = re.search(r"\{\{\s*end\s*\}\}", tmpl_str[search_pos:])
403401

404402
if next_end:
405403
if next_if and next_if.start() < next_end.start():

src/cluster_api/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#![allow(clippy::all)]
2+
#![allow(dead_code)]
23
pub mod clusterclasses;
34
pub mod clusterresourcesets;
45
pub mod clusters;

src/features/admission_plugins.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use kube::CustomResourceExt;
2020
use serde::{Deserialize, Serialize};
2121

2222
#[derive(Serialize, Deserialize, ClusterFeatureValues)]
23+
#[allow(dead_code)]
2324
pub struct FeatureValues {
2425
#[serde(rename = "admissionControlList")]
2526
pub admission_control_list: String,

src/features/api_server_floating_ip.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use kube::CustomResourceExt;
2020
use serde::{Deserialize, Serialize};
2121

2222
#[derive(Serialize, Deserialize, ClusterFeatureValues)]
23+
#[allow(dead_code)]
2324
pub struct FeatureValues {
2425
#[serde(rename = "apiServerFloatingIP")]
2526
pub api_server_floating_ip: String,

src/features/api_server_load_balancer.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ pub struct APIServerLoadBalancerConfig {
3434
}
3535

3636
#[derive(Serialize, Deserialize, ClusterFeatureValues)]
37+
#[allow(dead_code)]
3738
pub struct FeatureValues {
3839
#[serde(rename = "apiServerLoadBalancer")]
3940
pub api_server_load_balancer: APIServerLoadBalancerConfig,

src/features/audit_log.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ pub struct AuditLogConfig {
4040
}
4141

4242
#[derive(Serialize, Deserialize, ClusterFeatureValues)]
43+
#[allow(dead_code)]
4344
pub struct FeatureValues {
4445
#[serde(rename = "auditLog")]
4546
pub audit_log: AuditLogConfig,

src/features/boot_volume.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ pub struct BootVolumeConfig {
3030
}
3131

3232
#[derive(Serialize, Deserialize, ClusterFeatureValues)]
33+
#[allow(dead_code)]
3334
pub struct FeatureValues {
3435
#[serde(rename = "bootVolume")]
3536
pub boot_volume: BootVolumeConfig,

src/features/cloud_provider.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use kube::CustomResourceExt;
1414
use serde::{Deserialize, Serialize};
1515

1616
#[derive(Serialize, Deserialize, ClusterFeatureValues)]
17+
#[allow(dead_code)]
1718
pub struct FeatureValues {}
1819

1920
pub struct Feature {}

src/features/cluster_identity.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ use kube::CustomResourceExt;
2222
use serde::{Deserialize, Serialize};
2323

2424
#[derive(Serialize, Deserialize, ClusterFeatureValues)]
25+
#[allow(dead_code)]
2526
pub struct FeatureValues {
2627
#[serde(rename = "clusterIdentityRefName")]
2728
pub cluster_identity_ref_name: String,

src/features/containerd_config.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ use kube::CustomResourceExt;
2929
use serde::{Deserialize, Serialize};
3030

3131
#[derive(Serialize, Deserialize, ClusterFeatureValues)]
32+
#[allow(dead_code)]
3233
pub struct FeatureValues {
3334
#[serde(rename = "containerdConfig")]
3435
pub containerd_config: String,

0 commit comments

Comments
 (0)