chore: minor changes for consistency

Author: x0rw

examples/get_acl_tokens.rs

@@ -26,7 +26,6 @@ async fn main() {
             token
                 .policies
                 .iter()
-                .filter(|p| !p.is_empty())
                 .map(|p| format!(" ({:?})", p))
                 .collect::<Vec<_>>()
                 .join(", ")

src/acl.rs

@@ -119,6 +119,7 @@ impl Consul {
             .await?;
         serde_json::from_reader(resp.reader()).map_err(ConsulError::ResponseDeserializationFailed)
     }
+
     /// Creates a new ACL token.
     ///
     /// Sends a `PUT` to `/v1/acl/token` to generate a new token which can be attached to ACL policies.

src/acl_types.rs

@@ -16,7 +16,8 @@ pub struct ACLToken {
     /// Description
     pub description: String,
     /// Policies
-    pub policies: Option<Vec<ACLTokenPolicyLink>>,
+    #[serde(default)]
+    pub policies: Vec<ACLTokenPolicyLink>,
     /// Token only valid in this datacenter
     #[serde(default)]
     pub local: bool,
@@ -61,8 +62,8 @@ pub struct CreateACLTokenPayload {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub description: Option<String>,
     /// Policies
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub policies: Option<Vec<ACLTokenPolicyLink>>,
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    pub policies: Vec<ACLTokenPolicyLink>,
     /// Token only valid in this datacenter
     #[serde(default)]
     pub local: bool,
@@ -77,24 +78,26 @@ pub struct CreateACLTokenPayload {
     pub expiration_time: Option<Duration>,
 }
 
-/// Acl Policy
+/// Represents an ACL (Access Control List) policy.
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "PascalCase")]
 pub struct ACLPolicy {
-    /// id
+    /// Unique identifier for the policy.
     #[serde(rename = "ID")]
     pub id: String,
-    /// name
+    /// The name of the policy
     pub name: String,
-    /// Description
+    /// Description of the policy.
     pub description: String,
-    /// hash
+    /// Hash of the policy.
     pub hash: String,
-    /// Create index
+    /// Index at which the policy was created.
     pub create_index: u32,
-    /// Datacenters
-    pub datacenters: Option<String>,
-    /// modify index
+    // `datacenters` is Option::Vec because when `datacenters` is set to `null` we would need
+    // to define a custom deserializer in case we had `Vec` directly
+    /// List of applicable datacenters.
+    pub datacenters: Option<Vec<String>>,
+    /// Index at which the policy was last modified.
     pub modify_index: u32,
 }
 

tests/test_runner.rs

@@ -100,7 +100,7 @@ mod smoke_acl {
             description: Some("Smmoke test".to_owned()),
             secret_id: Some("00000000-9494-1111-1111-222222222229".to_owned()),
             accessor_id: Some("8d5faa9a-1111-1111-b0c8-52ea5346d814".to_owned()),
-            policies: Some(policy_link_vec),
+            policies: policy_link_vec,
             ..Default::default()
         };
         let _ = consul.create_acl_token(&token_payload).await.unwrap();
@@ -110,10 +110,7 @@ mod smoke_acl {
             .read_acl_token("8d5faa9a-1111-1111-b0c8-52ea5346d814".to_owned())
             .await
             .unwrap();
-        assert!(
-            result.policies.unwrap().first().unwrap().name
-                == Some("smoke_test_policy_1".to_owned())
-        );
+        assert!(result.policies.first().unwrap().name == Some("smoke_test_policy_1".to_owned()));
 
         assert!(result.secret_id == "00000000-9494-1111-1111-222222222229".to_owned());
 

tests/utils/test_setup.rs

@@ -1,5 +1,4 @@
 use rs_consul::*;
-use std::env;
 type Result<T> = std::result::Result<T, rs_consul::ConsulError>;
 
 pub(crate) fn get_client() -> Consul {
@@ -10,6 +9,7 @@ pub(crate) fn get_client() -> Consul {
 #[cfg(feature = "acl")]
 /// a consul client with write permission allows for manipulating tokens
 pub(crate) fn get_privileged_client() -> Consul {
+    use std::env;
     let addr = env::var("CONSUL_HTTP_ADDR").unwrap_or_else(|_| "http://127.0.0.1:8500".to_string());
     let conf: Config = Config {
         address: addr,