From: Gabriel Goller <g.goller@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH] metrics: influxdb test uri creation
Date: Tue, 30 Apr 2024 12:10:44 +0200 [thread overview]
Message-ID: <20240430101050.128143-1-g.goller@proxmox.com> (raw)
Extract the URI creation for write and health URIs. Add unit test to
test the encoding of special characters in the organization and bucket
parameters.
This is a follow-up to:
https://lists.proxmox.com/pipermail/pbs-devel/2024-April/009096.html
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
proxmox-metrics/src/influxdb/http.rs | 93 ++++++++++++++++++++--------
1 file changed, 67 insertions(+), 26 deletions(-)
diff --git a/proxmox-metrics/src/influxdb/http.rs b/proxmox-metrics/src/influxdb/http.rs
index 8167b59..1d53794 100644
--- a/proxmox-metrics/src/influxdb/http.rs
+++ b/proxmox-metrics/src/influxdb/http.rs
@@ -84,6 +84,25 @@ impl InfluxDbHttp {
Client::with_ssl_connector(ssl_connector.build(), HttpOptions::default())
};
+ let (writeuri, healthuri) = Self::create_uris(uri, organization, bucket)?;
+
+ Ok(InfluxDbHttp {
+ client,
+ writeuri,
+ healthuri,
+ token: token.map(String::from),
+ max_body_size,
+ data: String::new(),
+ channel,
+ })
+ }
+
+ /// Return a tuple with the write_uri and the health_uri
+ fn create_uris(
+ uri: &str,
+ org: &str,
+ bucket: &str,
+ ) -> Result<(http::uri::Uri, http::uri::Uri), anyhow::Error> {
let uri: http::uri::Uri = uri.parse()?;
let uri_parts = uri.into_parts();
@@ -93,35 +112,25 @@ impl InfluxDbHttp {
""
};
- let encoded_org: String =
- url::form_urlencoded::byte_serialize(organization.as_bytes()).collect();
+ let encoded_org: String = url::form_urlencoded::byte_serialize(org.as_bytes()).collect();
let encoded_bucket: String =
url::form_urlencoded::byte_serialize(bucket.as_bytes()).collect();
- let writeuri = http::uri::Builder::new()
- .scheme(uri_parts.scheme.clone().unwrap())
- .authority(uri_parts.authority.clone().unwrap())
- .path_and_query(format!(
- "{}/api/v2/write?org={}&bucket={}",
- base_path, encoded_org, encoded_bucket
- ))
- .build()?;
-
- let healthuri = http::uri::Builder::new()
- .scheme(uri_parts.scheme.unwrap())
- .authority(uri_parts.authority.unwrap())
- .path_and_query(format!("{}/health", base_path))
- .build()?;
-
- Ok(InfluxDbHttp {
- client,
- writeuri,
- healthuri,
- token: token.map(String::from),
- max_body_size,
- data: String::new(),
- channel,
- })
+ Ok((
+ http::uri::Builder::new()
+ .scheme(uri_parts.scheme.clone().unwrap())
+ .authority(uri_parts.authority.clone().unwrap())
+ .path_and_query(format!(
+ "{}/api/v2/write?org={}&bucket={}",
+ base_path, encoded_org, encoded_bucket
+ ))
+ .build()?,
+ http::uri::Builder::new()
+ .scheme(uri_parts.scheme.unwrap())
+ .authority(uri_parts.authority.unwrap())
+ .path_and_query(format!("{}/health", base_path))
+ .build()?,
+ ))
}
async fn test_connection(&self) -> Result<(), Error> {
@@ -188,3 +197,35 @@ impl InfluxDbHttp {
Ok(())
}
}
+
+#[cfg(test)]
+mod test {
+ use super::InfluxDbHttp;
+
+ #[test]
+ fn uri_encoding() {
+ let (writeuri, healthuri) =
+ InfluxDbHttp::create_uris("http://localhost/", "c ool/org", "a🔒nother&bu=ck?et")
+ .unwrap();
+ assert_eq!(writeuri.host(), Some("localhost"));
+ assert_eq!(writeuri.path(), "/api/v2/write");
+ assert_eq!(
+ writeuri.query(),
+ Some("org=c+ool%2Forg&bucket=a%F0%9F%94%92nother%26bu%3Dck%3Fet")
+ );
+
+ assert_eq!(healthuri.host(), Some("localhost"));
+ assert_eq!(healthuri.path(), "/health");
+ assert_eq!(healthuri.query(), None);
+
+ let (writeuri, healthuri) =
+ InfluxDbHttp::create_uris("http://localhost/", "org", "bucket").unwrap();
+ assert_eq!(writeuri.host(), Some("localhost"));
+ assert_eq!(writeuri.path(), "/api/v2/write");
+ assert_eq!(writeuri.query(), Some("org=org&bucket=bucket"));
+
+ assert_eq!(healthuri.host(), Some("localhost"));
+ assert_eq!(healthuri.path(), "/health");
+ assert_eq!(healthuri.query(), None);
+ }
+}
--
2.43.0
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next reply other threads:[~2024-04-30 10:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-30 10:10 Gabriel Goller [this message]
2024-05-23 10:22 ` Fabian Grünbichler
2024-05-23 11:07 ` Gabriel Goller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240430101050.128143-1-g.goller@proxmox.com \
--to=g.goller@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal