Skip to content

Commit f5e38bb

Browse files
committed
feat!: [#1006] remove config deafults for secrets
1 parent eaa86a7 commit f5e38bb

2 files changed

Lines changed: 17 additions & 10 deletions

File tree

packages/configuration/src/v2_0_0/tracker_api.rs

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,11 @@ impl HttpApi {
5252
}
5353

5454
fn default_access_tokens() -> AccessTokens {
55-
[(String::from("admin"), String::from("MyAccessToken"))]
56-
.iter()
57-
.cloned()
58-
.collect()
55+
[].iter().cloned().collect()
5956
}
6057

61-
pub fn override_admin_token(&mut self, api_admin_token: &str) {
62-
self.access_tokens.insert("admin".to_string(), api_admin_token.to_string());
58+
pub fn add_token(&mut self, key: &str, token: &str) {
59+
self.access_tokens.insert(key.to_string(), token.to_string());
6360
}
6461

6562
pub fn mask_secrets(&mut self) {
@@ -74,10 +71,18 @@ mod tests {
7471
use crate::v2_0_0::tracker_api::HttpApi;
7572

7673
#[test]
77-
fn http_api_configuration_should_check_if_it_contains_a_token() {
74+
fn default_http_api_configuration_should_not_contains_any_token() {
7875
let configuration = HttpApi::default();
7976

77+
assert_eq!(configuration.access_tokens.values().len(), 0);
78+
}
79+
80+
#[test]
81+
fn http_api_configuration_should_allow_adding_tokens() {
82+
let mut configuration = HttpApi::default();
83+
84+
configuration.add_token("admin", "MyAccessToken");
85+
8086
assert!(configuration.access_tokens.values().any(|t| t == "MyAccessToken"));
81-
assert!(!configuration.access_tokens.values().any(|t| t == "NonExistingToken"));
8287
}
8388
}

packages/test-helpers/src/configuration.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@ pub fn ephemeral() -> Configuration {
3232

3333
// Ephemeral socket address for API
3434
let api_port = 0u16;
35-
config.http_api = Some(HttpApi {
35+
let mut http_api = HttpApi {
3636
bind_address: SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), api_port),
3737
..Default::default()
38-
});
38+
};
39+
http_api.add_token("admin", "MyAccessToken");
40+
config.http_api = Some(http_api);
3941

4042
// Ephemeral socket address for Health Check API
4143
let health_check_api_port = 0u16;

0 commit comments

Comments
 (0)