limit permissions for crates-io-ops bot

nellshamrell · nellshamrell · commit 681d62d7df6f · 2020-05-18T11:17:17.000-07:00
Signed-off-by: Nell Shamrell &lt;nellshamrell@gmail.com&gt;

wip

Signed-off-by: Nell Shamrell &lt;nellshamrell@gmail.com&gt;

more refining

Signed-off-by: Nell Shamrell &lt;nellshamrell@gmail.com&gt;

straightens out permissions for crates_io_ops_bot apps

Signed-off-by: Nell Shamrell &lt;nellshamrell@gmail.com&gt;

last refinements

Signed-off-by: Nell Shamrell &lt;nellshamrell@gmail.com&gt;
diff --git a/people/jtgeibel.toml b/people/jtgeibel.toml
@@ -2,3 +2,6 @@ name = "Justin Geibel"
 github = "jtgeibel"
 github-id = 22186
 email = "jtgeibel@gmail.com"
+
+[permissions]
+crates-io-ops-bot.staging_crates_io = true
diff --git a/people/nellshamrell.toml b/people/nellshamrell.toml
@@ -2,3 +2,6 @@ name = "Nell Shamrell-Harrington"
 github = "nellshamrell"
 github-id = 813007
 email = "nellshamrell@gmail.com"
+
+[permissions]
+crates-io-ops-bot.staging_crates_io = true
diff --git a/people/pietroalbini.toml b/people/pietroalbini.toml
@@ -1,4 +1,7 @@
 name = "Pietro Albini"
 github = "pietroalbini"
 github-id = 2299951
-email = "pietro@pietroalbini.org"
+email = "pietro@pietroalbini.org"
+
+[permissions]
+crates-io-ops-bot.staging_crates_io = true
diff --git a/src/permissions.rs b/src/permissions.rs
@@ -59,6 +59,7 @@ macro_rules! permissions {
             )*
             #[serde(default)]
             bors: BorsPermissions,
+            #[serde(default)]
             crates_io_ops_bot: CratesIoOps,
         }
 
@@ -100,7 +101,7 @@ macro_rules! permissions {
                 )*
                 $(
                     if permission == concat!("crates_io_ops_app", stringify!($crates_io_ops_app)) {
-                        return self.$crates_io_ops_app;
+                        return self.crates_io_ops_bot.$crates_io_ops_app 
                     }
                 )*
                 false
@@ -153,8 +154,6 @@ macro_rules! permissions {
                 }
             }
         }
-
-
     }
 }
 
@@ -181,6 +180,8 @@ permissions! {
         team,
     }
     crates_io_ops_apps {
+        crates_io,
+        staging_crates_io,
     }
 }
 
diff --git a/teams/infra.toml b/teams/infra.toml
@@ -21,7 +21,6 @@ perf = true
 crater = true
 bors.rust.review = true
 bors.crater.review = true
-crates_io_ops_app.crates_io_staging = true
 
 [rfcbot]
 label = "T-infra"

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ macro_rules! permissions {`
`59`	`59`	`)*`
`60`	`60`	`#[serde(default)]`
`61`	`61`	`bors: BorsPermissions,`
	`62`	`+ #[serde(default)]`
`62`	`63`	`crates_io_ops_bot: CratesIoOps,`
`63`	`64`	`}`
`64`	`65`
`@@ -100,7 +101,7 @@ macro_rules! permissions {`
`100`	`101`	`)*`
`101`	`102`	`$(`
`102`	`103`	`if permission == concat!("crates_io_ops_app", stringify!($crates_io_ops_app)) {`
`103`		`- return self.$crates_io_ops_app;`
	`104`	`+ return self.crates_io_ops_bot.$crates_io_ops_app`
`104`	`105`	`}`
`105`	`106`	`)*`
`106`	`107`	`false`
`@@ -153,8 +154,6 @@ macro_rules! permissions {`
`153`	`154`	`}`
`154`	`155`	`}`
`155`	`156`	`}`
`156`		`-`
`157`		`-`
`158`	`157`	`}`
`159`	`158`	`}`
`160`	`159`
`@@ -181,6 +180,8 @@ permissions! {`
`181`	`180`	`team,`
`182`	`181`	`}`
`183`	`182`	`crates_io_ops_apps {`
	`183`	`+ crates_io,`
	`184`	`+ staging_crates_io,`
`184`	`185`	`}`
`185`	`186`	`}`
`186`	`187`