Skip to content

Commit 2eb04a0

Browse files
committed
Add principals to user config
1 parent cc8126f commit 2eb04a0

File tree

2 files changed

+19
-12
lines changed

2 files changed

+19
-12
lines changed

benches/load_configuration.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ use std::{io::Write, path::Path};
66
pub fn criterion_benchmark(c: &mut Criterion) {
77
let toml = indoc! {r#"
88
users = [
9-
{ name = "torvalds", sources = ["github"] },
10-
{ name = "gvanrossum", sources = ["github", "gitlab"] },
11-
{ name = "graydon", sources = ["github"] },
12-
{ name = "cwoods", sources = ["acme-corp"] },
13-
{ name = "rdavis", sources = ["acme-corp"] },
14-
{ name = "pbrock", sources = ["acme-corp"] }
9+
{ name = "torvalds", principals = ["torvalds@linux-foundation.org"], sources = ["github"] },
10+
{ name = "gvanrossum", principals = ["guido@python.org"], sources = ["github", "gitlab"] },
11+
{ name = "graydon", principals = ["graydon@pobox.com"], sources = ["github"] },
12+
{ name = "cwoods", principals = ["cwoods@acme.corp"], sources = ["acme-corp"] },
13+
{ name = "rdavis", principals = ["rdavis@acme.corp"], sources = ["acme-corp"] },
14+
{ name = "pbrock", principals = ["pbrock@acme.corp"], sources = ["acme-corp"] }
1515
]
1616
local = [
1717
"jdoe@example.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJHDGMF+tZQL3dcr1arPst+YP8v33Is0kAJVvyTKrxMw"

src/config.rs

+13-6
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ pub enum GitProviderType {
9393
#[derive(Debug, Deserialize, Serialize, PartialEq)]
9494
struct User {
9595
name: String,
96+
principals: Vec<String>,
9697
sources: Vec<String>,
9798
}
9899

@@ -122,12 +123,12 @@ mod tests {
122123
fn example_config() {
123124
let toml = indoc! {r#"
124125
users = [
125-
{ name = "torvalds", sources = ["github"] },
126-
{ name = "gvanrossum", sources = ["github", "gitlab"] },
127-
{ name = "graydon", sources = ["github"] },
128-
{ name = "cwoods", sources = ["acme-corp"] },
129-
{ name = "rdavis", sources = ["acme-corp"] },
130-
{ name = "pbrock", sources = ["acme-corp"] }
126+
{ name = "torvalds", principals = ["torvalds@linux-foundation.org"], sources = ["github"] },
127+
{ name = "gvanrossum", principals = ["guido@python.org"], sources = ["github", "gitlab"] },
128+
{ name = "graydon", principals = ["graydon@pobox.com"], sources = ["github"] },
129+
{ name = "cwoods", principals = ["cwoods@acme.corp"], sources = ["acme-corp"] },
130+
{ name = "rdavis", principals = ["rdavis@acme.corp"], sources = ["acme-corp"] },
131+
{ name = "pbrock", principals = ["pbrock@acme.corp"], sources = ["acme-corp"] }
131132
]
132133
local = [
133134
"jdoe@example.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJHDGMF+tZQL3dcr1arPst+YP8v33Is0kAJVvyTKrxMw"
@@ -143,26 +144,32 @@ mod tests {
143144
users: Some(vec![
144145
User {
145146
name: "torvalds".to_string(),
147+
principals: vec!["torvalds@linux-foundation.org".to_string()],
146148
sources: vec!["github".to_string()],
147149
},
148150
User {
149151
name: "gvanrossum".to_string(),
152+
principals: vec!["guido@python.org".to_string()],
150153
sources: vec!["github".to_string(), "gitlab".to_string()],
151154
},
152155
User {
153156
name: "graydon".to_string(),
157+
principals: vec!["graydon@pobox.com".to_string()],
154158
sources: vec!["github".to_string()],
155159
},
156160
User {
157161
name: "cwoods".to_string(),
162+
principals: vec!["cwoods@acme.corp".to_string()],
158163
sources: vec!["acme-corp".to_string()],
159164
},
160165
User {
161166
name: "rdavis".to_string(),
167+
principals: vec!["rdavis@acme.corp".to_string()],
162168
sources: vec!["acme-corp".to_string()],
163169
},
164170
User {
165171
name: "pbrock".to_string(),
172+
principals: vec!["pbrock@acme.corp".to_string()],
166173
sources: vec!["acme-corp".to_string()],
167174
},
168175
]),

0 commit comments

Comments
 (0)