Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ jobs:
- services-azblob
- services-google
- services-huaweicloud
- services-openstack
- services-oracle
- services-tencent
steps:
Expand Down
2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ services-all = [
"services-azblob",
"services-google",
"services-huaweicloud",
"services-openstack",
"services-oracle",
"services-tencent",
]
Expand Down Expand Up @@ -56,6 +57,7 @@ services-google = [
"dep:rsa",
]
services-huaweicloud = ["dep:serde", "dep:serde_json", "dep:once_cell"]
services-openstack = ["dep:reqwest", "dep:serde", "dep:serde_json"]
services-oracle = ["dep:reqwest", "dep:rsa", "dep:toml", "dep:serde"]
services-tencent = ["dep:reqwest", "dep:serde", "dep:serde_json"]

Expand Down
5 changes: 5 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ mod huaweicloud;
#[cfg(feature = "services-huaweicloud")]
pub use huaweicloud::*;

#[cfg(feature = "services-openstack")]
mod openstack;
#[cfg(feature = "services-openstack")]
pub use openstack::*;

#[cfg(feature = "services-oracle")]
mod oracle;
#[cfg(feature = "services-oracle")]
Expand Down
117 changes: 117 additions & 0 deletions src/openstack/config.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
use std::collections::HashMap;
use std::env;

// Env values used in OpenStack Keystone authentication.
const OPENSTACK_AUTH_URL: &str = "OPENSTACK_AUTH_URL";
const OPENSTACK_USERNAME: &str = "OPENSTACK_USERNAME";
const OPENSTACK_PASSWORD: &str = "OPENSTACK_PASSWORD";
const OPENSTACK_DOMAIN_NAME: &str = "OPENSTACK_DOMAIN_NAME";
const OPENSTACK_PROJECT_NAME: &str = "OPENSTACK_PROJECT_NAME";
const OPENSTACK_PROJECT_DOMAIN_NAME: &str = "OPENSTACK_PROJECT_DOMAIN_NAME";

/// Config carries all the configuration for OpenStack Keystone authentication.
#[derive(Clone, Default)]
#[cfg_attr(test, derive(Debug))]
pub struct Config {
/// The Keystone v3 identity endpoint URL.
///
/// Loaded from env: [`OPENSTACK_AUTH_URL`]
pub auth_url: Option<String>,
/// The username for password authentication.
///
/// Loaded from env: [`OPENSTACK_USERNAME`]
pub username: Option<String>,
/// The password for password authentication.
///
/// Loaded from env: [`OPENSTACK_PASSWORD`]
pub password: Option<String>,
/// The user domain name. Defaults to "Default" if not set.
///
/// Loaded from env: [`OPENSTACK_DOMAIN_NAME`]
pub user_domain_name: Option<String>,
/// The project name for scoped tokens.
///
/// Loaded from env: [`OPENSTACK_PROJECT_NAME`]
pub project_name: Option<String>,
/// The project domain name. Falls back to `user_domain_name` if not set.
///
/// Loaded from env: [`OPENSTACK_PROJECT_DOMAIN_NAME`]
pub project_domain_name: Option<String>,
}

impl Config {
/// Load config from environment variables.
pub fn from_env(mut self) -> Self {
let envs = env::vars().collect::<HashMap<_, _>>();

if let Some(v) = envs.get(OPENSTACK_AUTH_URL) {
self.auth_url.get_or_insert(v.clone());
}
if let Some(v) = envs.get(OPENSTACK_USERNAME) {
self.username.get_or_insert(v.clone());
}
if let Some(v) = envs.get(OPENSTACK_PASSWORD) {
self.password.get_or_insert(v.clone());
}
if let Some(v) = envs.get(OPENSTACK_DOMAIN_NAME) {
self.user_domain_name.get_or_insert(v.clone());
}
if let Some(v) = envs.get(OPENSTACK_PROJECT_NAME) {
self.project_name.get_or_insert(v.clone());
}
if let Some(v) = envs.get(OPENSTACK_PROJECT_DOMAIN_NAME) {
self.project_domain_name.get_or_insert(v.clone());
}

self
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_config_from_env() {
temp_env::with_vars(
vec![
(OPENSTACK_AUTH_URL, Some("https://keystone.example.com/v3")),
(OPENSTACK_USERNAME, Some("testuser")),
(OPENSTACK_PASSWORD, Some("testpass")),
(OPENSTACK_DOMAIN_NAME, Some("Default")),
(OPENSTACK_PROJECT_NAME, Some("myproject")),
],
|| {
let config = Config::default().from_env();
assert_eq!(
config.auth_url.as_deref(),
Some("https://keystone.example.com/v3")
);
assert_eq!(config.username.as_deref(), Some("testuser"));
assert_eq!(config.password.as_deref(), Some("testpass"));
assert_eq!(config.user_domain_name.as_deref(), Some("Default"));
assert_eq!(config.project_name.as_deref(), Some("myproject"));
assert!(config.project_domain_name.is_none());
},
);
}

#[test]
fn test_config_field_takes_priority_over_env() {
temp_env::with_vars(
vec![(OPENSTACK_AUTH_URL, Some("https://from-env.example.com/v3"))],
|| {
let config = Config {
auth_url: Some("https://from-field.example.com/v3".to_string()),
..Default::default()
}
.from_env();
// Field value should not be overwritten by env
assert_eq!(
config.auth_url.as_deref(),
Some("https://from-field.example.com/v3")
);
},
);
}
}
Loading