Skip to content

Commit 46777c7

Browse files
authored
Merge pull request #205 from flavio/ci-test-all-features
ci test all features
2 parents f40be6a + 1c3159e commit 46777c7

File tree

18 files changed

+75
-56
lines changed

18 files changed

+75
-56
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ jobs:
3737
run: cargo test
3838
- name: test with default features disabled
3939
run: cargo test --no-default-features
40+
- name: test with all features enabled
41+
run: cargo test --all-features
4042

4143
fmt:
4244
name: Rustfmt

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ authors = [
77
]
88
description = "Kubewarden Policy SDK for the Rust language"
99
documentation = "https://docs.rs/kubewarden-policy-sdk"
10-
edition = "2021"
10+
edition = "2024"
1111
license = "Apache-2.0"
1212
name = "kubewarden-policy-sdk"
1313
repository = "https://github.com/kubewarden/policy-sdk-rust"

src/crd/policies/admission_policy.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use k8s_openapi::{
66
};
77

88
use crate::crd::policies::common::{
9-
default_policy_server, default_settings, BackgroundAudit, FailurePolicy, MatchPolicy,
10-
PolicyMode, SideEffects, TimeoutSeconds,
9+
BackgroundAudit, FailurePolicy, MatchPolicy, PolicyMode, SideEffects, TimeoutSeconds,
10+
default_policy_server, default_settings,
1111
};
1212

1313
#[derive(
@@ -259,8 +259,9 @@ spec:
259259
"#;
260260

261261
let err = serde_yaml::from_str::<AdmissionPolicy>(yaml).unwrap_err();
262-
assert!(err
263-
.to_string()
264-
.contains("unknown field `contextAwareResources`"));
262+
assert!(
263+
err.to_string()
264+
.contains("unknown field `contextAwareResources`")
265+
);
265266
}
266267
}

src/crd/policies/admission_policy_group.rs

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use k8s_openapi::{
88
};
99

1010
use crate::crd::policies::common::{
11-
default_policy_server, default_settings, BackgroundAudit, FailurePolicy, MatchPolicy,
12-
PolicyMode, SideEffects, TimeoutSeconds,
11+
BackgroundAudit, FailurePolicy, MatchPolicy, PolicyMode, SideEffects, TimeoutSeconds,
12+
default_policy_server, default_settings,
1313
};
1414

1515
#[derive(
@@ -238,6 +238,7 @@ spec:
238238
}
239239
]
240240
})),
241+
..Default::default()
241242
},
242243
);
243244
policies.insert(
@@ -253,6 +254,7 @@ spec:
253254
}
254255
]
255256
})),
257+
..Default::default()
256258
},
257259
);
258260
policies.insert(
@@ -264,6 +266,7 @@ spec:
264266
"reject": ["latest"]
265267
}
266268
})),
269+
..Default::default()
267270
},
268271
);
269272

@@ -277,20 +280,23 @@ spec:
277280
PolicyGroupMember {
278281
module: "ghcr.io/kubewarden/policies/verify-image-signatures:v0.3.0".to_string(),
279282
settings: RawExtension(serde_json::json!({})),
283+
..Default::default()
280284
},
281285
);
282286
policies.insert(
283287
"signed_by_bob".to_string(),
284288
PolicyGroupMember {
285289
module: "ghcr.io/kubewarden/policies/verify-image-signatures:v0.3.0".to_string(),
286290
settings: RawExtension(serde_json::json!({})),
291+
..Default::default()
287292
},
288293
);
289294
policies.insert(
290295
"reject_latest".to_string(),
291296
PolicyGroupMember {
292297
module: "registry://ghcr.io/kubewarden/policies/trusted-repos:v0.2.0".to_string(),
293298
settings: RawExtension(serde_json::json!({})),
299+
..Default::default()
294300
},
295301
);
296302

@@ -349,9 +355,10 @@ spec:
349355
"#;
350356

351357
let err = serde_yaml::from_str::<AdmissionPolicyGroup>(yaml).unwrap_err();
352-
assert!(err
353-
.to_string()
354-
.contains("unknown field `namespaceSelector`"),);
358+
assert!(
359+
err.to_string()
360+
.contains("unknown field `namespaceSelector`"),
361+
);
355362
}
356363

357364
#[test]

src/crd/policies/cluster_admission_policy.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ use k8s_openapi::{
66
};
77

88
use crate::crd::policies::common::{
9-
default_policy_server, default_settings, BackgroundAudit, ContextAwareResource, FailurePolicy,
10-
MatchPolicy, PolicyMode, SideEffects, TimeoutSeconds,
9+
BackgroundAudit, ContextAwareResource, FailurePolicy, MatchPolicy, PolicyMode, SideEffects,
10+
TimeoutSeconds, default_policy_server, default_settings,
1111
};
1212

1313
#[derive(

src/crd/policies/cluster_admission_policy_group.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ use k8s_openapi::{
88
};
99

1010
use crate::crd::policies::common::{
11-
default_policy_server, default_settings, BackgroundAudit, ContextAwareResource, FailurePolicy,
12-
MatchPolicy, PolicyMode, SideEffects, TimeoutSeconds,
11+
BackgroundAudit, ContextAwareResource, FailurePolicy, MatchPolicy, PolicyMode, SideEffects,
12+
TimeoutSeconds, default_policy_server, default_settings,
1313
};
1414

1515
#[derive(
@@ -258,6 +258,7 @@ spec:
258258
]
259259
})),
260260
context_aware_resources: vec![],
261+
..Default::default()
261262
},
262263
);
263264
policies.insert(
@@ -274,6 +275,7 @@ spec:
274275
]
275276
})),
276277
context_aware_resources: vec![],
278+
..Default::default()
277279
},
278280
);
279281
policies.insert(
@@ -286,6 +288,7 @@ spec:
286288
}
287289
})),
288290
context_aware_resources: vec![],
291+
..Default::default()
289292
},
290293
);
291294

@@ -300,6 +303,7 @@ spec:
300303
module: "ghcr.io/kubewarden/policies/verify-image-signatures:v0.3.0".to_string(),
301304
settings: RawExtension(serde_json::json!({})),
302305
context_aware_resources: vec![],
306+
..Default::default()
303307
},
304308
);
305309
policies.insert(
@@ -308,6 +312,7 @@ spec:
308312
module: "ghcr.io/kubewarden/policies/verify-image-signatures:v0.3.0".to_string(),
309313
settings: RawExtension(serde_json::json!({})),
310314
context_aware_resources: vec![],
315+
..Default::default()
311316
},
312317
);
313318
policies.insert(
@@ -316,6 +321,7 @@ spec:
316321
module: "registry://ghcr.io/kubewarden/policies/trusted-repos:v0.2.0".to_string(),
317322
settings: RawExtension(serde_json::json!({})),
318323
context_aware_resources: vec![],
324+
..Default::default()
319325
},
320326
);
321327

src/host_capabilities/crypto.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::fmt;
22

3-
use anyhow::{anyhow, Result};
3+
use anyhow::{Result, anyhow};
44
use serde::{Deserialize, Serialize};
55

66
use crate::host_capabilities::crypto_v1::{

src/host_capabilities/kubernetes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use anyhow::{anyhow, Result};
1+
use anyhow::{Result, anyhow};
22
use k8s_openapi::api::authorization::v1::{SubjectAccessReviewSpec, SubjectAccessReviewStatus};
33
use serde::{Deserialize, Serialize};
44

src/host_capabilities/mod.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,8 @@ pub mod crypto_v1 {
141141
where
142142
D: Deserializer<'de>,
143143
{
144-
Ok(Option::<String>::deserialize(deserializer)?.and_then(|s| {
145-
if s.is_empty() {
146-
None
147-
} else {
148-
Some(s)
149-
}
150-
}))
144+
Ok(Option::<String>::deserialize(deserializer)?
145+
.and_then(|s| if s.is_empty() { None } else { Some(s) }))
151146
}
152147

153148
pub fn serialize<S>(

src/host_capabilities/net.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use anyhow::{anyhow, Result};
1+
use anyhow::{Result, anyhow};
22
use serde::{Deserialize, Serialize};
33
use serde_json::json;
44

0 commit comments

Comments
 (0)