Update to zbus 4

[nc7s]

Mainly adapting to API changes.

Especially note the error messages, I'm certainly not knowledgeable enough to properly write them, plus there's one with TODO.

There is an apparent repeating pattern (below), which I feel suboptimal, but can't yet find a better alternative. Please enlighten me if you can.

if let Value::Variant(val) = raw {
    Some(val)
} else {
    None
}
.and_then(|val| val.try_clone().ok())
.ok_or_else(|| NetavarkError::msg("..."))?

[openshift-ci]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: nc7s
Once this PR has been reviewed and has the lgtm label, please assign vrothberg for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[Luap99]

Note you have validate failures (make validate) that have to be fixed.

@mheon PTAL

[mheon]

I'm still thinking we replace zbus entirely with a simpler library at some point, but I have no objection to merging this in the interim.

[mheon]

Changes look fine once you can get CI to pass.

[nc7s]

centos9_build and ubuntu20_build failed because the zbus & zvariant 4 series require rustc 1.75; if you don't want to lift build requirements that's a hard no I guess.

[Luap99]

centos9_build and ubuntu20_build failed because the zbus & zvariant 4 series require rustc 1.75; if you don't want to lift build requirements that's a hard no I guess.

That should not a problem, they are ancient and mostly useless anyway as nobody takes care of these build images
ref: #775

We need to merge #1015 and then I guess we should just drop ubuntu job as well

[Luap99]

Also

diff --git a/src/firewall/firewalld.rs b/src/firewall/firewalld.rs
index ab2dcaf..501eb4f 100644
--- a/src/firewall/firewalld.rs
+++ b/src/firewall/firewalld.rs
@@ -129,7 +129,7 @@ impl firewall::FirewallDriver for FirewallD {
             &(PORTPOLICYNAME),
         )?;
         let body = policy_config_msg.body();
-        let policy_config: HashMap<&str, Value> = body.deserialize().map_err(|e| {
+        let mut policy_config: HashMap<&str, Value> = body.deserialize().map_err(|e| {
             NetavarkError::wrap(
                 format!("Error decoding DBus message for policy {PORTPOLICYNAME} configuration"),
                 e.into(),
@@ -137,17 +137,15 @@ impl firewall::FirewallDriver for FirewallD {
         })?;
 
         let mut port_forwarding_rules: Array;
-        match policy_config.get("forward_ports") {
+        match policy_config.remove("forward_ports") {
             Some(a) => {
                 port_forwarding_rules = if let Value::Array(arr) = a {
-                    Some(arr)
+                    arr
                 } else {
-                    None
-                }
-                .and_then(|arr| arr.try_clone().ok())
-                .ok_or_else(|| {
-                    NetavarkError::msg("forward-port in firewalld policy object has a bad type")
-                })?
+                    return Err(NetavarkError::msg(
+                        "forward-port in firewalld policy object has a bad type",
+                    ));
+                };
             }
             None => {
                 // No existing rules

You can do the same for the other policy_config.get() call

I am sure there are more tricks to avoid some more clones.

[nc7s]

Updated with @Luap99's suggestions; I think I'll leave further refactoring out of this PR ;)

[openshift-merge-robot]

PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.