Auto merge of #1945 - iliana:unlimited-teams, r=carols10cents

bors · bors · commit 5a8b4ca5229f · 2019-12-11T22:11:53.000Z
Query GitHub teams directly by name I was having trouble adding the `github:awslabs:tough` team to [one of our new crates](https://crates.io/crates/tough) because the awslabs org has over 100 teams. This allows users to use the 101st-created team on their GitHub organization for staggeringly large organizations by querying the team directly. Test data was updated by hand per guidance in #crates-io, based on similar queries I made manually, but I would greatly appreciate if someone with access to actually make these API calls tested things work. :)
diff --git a/src/models/team.rs b/src/models/team.rs
@@ -135,26 +135,18 @@ impl Team {
 
         #[derive(Deserialize)]
         struct GithubTeam {
-            slug: String,         // the name we want to find
             id: i32,              // unique GH id (needed for membership queries)
             name: Option<String>, // Pretty name
         }
 
-        // FIXME: we just set per_page=100 and don't bother chasing pagination
-        // links. A hundred teams should be enough for any org, right?
-        let url = format!("/orgs/{}/teams?per_page=100", org_name);
+        let url = format!("/orgs/{}/teams/{}", org_name, team_name);
         let token = AccessToken::new(req_user.gh_access_token.clone());
-        let teams = github_api::<Vec<GithubTeam>>(app, &url, &token)?;
-
-        let team = teams
-            .into_iter()
-            .find(|team| team.slug.to_lowercase() == team_name.to_lowercase())
-            .ok_or_else(|| {
-                cargo_err(&format_args!(
-                    "could not find the github team {}/{}",
-                    org_name, team_name
-                ))
-            })?;
+        let team = github_api::<GithubTeam>(app, &url, &token).map_err(|_| {
+            cargo_err(&format_args!(
+                "could not find the github team {}/{}",
+                org_name, team_name
+            ))
+        })?;
 
         if !team_with_gh_id_contains_user(app, team.id, req_user)? {
             return Err(cargo_err("only members of a team can add it as an owner"));
diff --git a/src/tests/http-data/team_add_owners_as_team_owner b/src/tests/http-data/team_add_owners_as_team_owner
@@ -1,7 +1,7 @@
 [
   {
     "request": {
-      "uri": "http://api.github.com/orgs/crates-test-org/teams?per_page=100",
+      "uri": "http://api.github.com/orgs/crates-test-org/teams/core",
       "method": "GET",
       "headers": [
         [
@@ -88,7 +88,7 @@
         ],
         [
           "content-length",
-          "905"
+          "318"
         ],
         [
           "content-type",
@@ -127,7 +127,7 @@
           "CB3E:6F2D:2A3E4D:5FAD3B:59D4F801"
         ]
       ],
-      "body": "W3sibmFtZSI6ImNvcmUiLCJpZCI6MTY5OTM3Nywic2x1ZyI6ImNvcmUiLCJkZXNjcmlwdGlvbiI6bnVsbCwicHJpdmFjeSI6InNlY3JldCIsInVybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3NyIsIm1lbWJlcnNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L21lbWJlcnN7L21lbWJlcn0iLCJyZXBvc2l0b3JpZXNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L3JlcG9zIiwicGVybWlzc2lvbiI6ImFkbWluIn0seyJuYW1lIjoianVzdC1mb3ItY3JhdGVzLTIiLCJpZCI6MTY5OTM3OSwic2x1ZyI6Imp1c3QtZm9yLWNyYXRlcy0yIiwiZGVzY3JpcHRpb24iOiJKdXN0IGZvciBDcmF0ZXMgMiIsInByaXZhY3kiOiJzZWNyZXQiLCJ1cmwiOiJodHRwczovL2FwaS5naXRodWIuY29tL3RlYW1zLzE2OTkzNzkiLCJtZW1iZXJzX3VybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OS9tZW1iZXJzey9tZW1iZXJ9IiwicmVwb3NpdG9yaWVzX3VybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OS9yZXBvcyIsInBlcm1pc3Npb24iOiJwdWxsIn0seyJuYW1lIjoianVzdC1mb3ItY3JhdGVzMSIsImlkIjoxNjk5Mzc4LCJzbHVnIjoianVzdC1mb3ItY3JhdGVzMSIsImRlc2NyaXB0aW9uIjoiIiwicHJpdmFjeSI6InNlY3JldCIsInVybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OCIsIm1lbWJlcnNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc4L21lbWJlcnN7L21lbWJlcn0iLCJyZXBvc2l0b3JpZXNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc4L3JlcG9zIiwicGVybWlzc2lvbiI6InB1bGwifV0="
+      "body": "ewogICJuYW1lIjogImNvcmUiLAogICJpZCI6IDE2OTkzNzcsCiAgInNsdWciOiAiY29yZSIsCiAgImRlc2NyaXB0aW9uIjogbnVsbCwKICAicHJpdmFjeSI6ICJzZWNyZXQiLAogICJ1cmwiOiAiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3IiwKICAibWVtYmVyc191cmwiOiAiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L21lbWJlcnN7L21lbWJlcn0iLAogICJyZXBvc2l0b3JpZXNfdXJsIjogImh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3Ny9yZXBvcyIsCiAgInBlcm1pc3Npb24iOiAiYWRtaW4iCn0K"
     }
   },
   {
diff --git a/src/tests/http-data/team_add_team_as_non_member b/src/tests/http-data/team_add_team_as_non_member
@@ -1,7 +1,7 @@
 [
   {
     "request": {
-      "uri": "http://api.github.com/orgs/crates-test-org/teams?per_page=100",
+      "uri": "http://api.github.com/orgs/crates-test-org/teams/just-for-crates-2",
       "method": "GET",
       "headers": [
         [
@@ -32,7 +32,7 @@
       "headers": [
         [
           "content-length",
-          "905"
+          "358"
         ],
         [
           "X-accepted-OAuth-Scopes",
@@ -127,7 +127,7 @@
           "GitHub.com"
         ]
       ],
-      "body": "W3sibmFtZSI6ImNvcmUiLCJpZCI6MTY5OTM3Nywic2x1ZyI6ImNvcmUiLCJkZXNjcmlwdGlvbiI6bnVsbCwicHJpdmFjeSI6InNlY3JldCIsInVybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3NyIsIm1lbWJlcnNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L21lbWJlcnN7L21lbWJlcn0iLCJyZXBvc2l0b3JpZXNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L3JlcG9zIiwicGVybWlzc2lvbiI6ImFkbWluIn0seyJuYW1lIjoianVzdC1mb3ItY3JhdGVzLTIiLCJpZCI6MTY5OTM3OSwic2x1ZyI6Imp1c3QtZm9yLWNyYXRlcy0yIiwiZGVzY3JpcHRpb24iOiJKdXN0IGZvciBDcmF0ZXMgMiIsInByaXZhY3kiOiJzZWNyZXQiLCJ1cmwiOiJodHRwczovL2FwaS5naXRodWIuY29tL3RlYW1zLzE2OTkzNzkiLCJtZW1iZXJzX3VybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OS9tZW1iZXJzey9tZW1iZXJ9IiwicmVwb3NpdG9yaWVzX3VybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OS9yZXBvcyIsInBlcm1pc3Npb24iOiJwdWxsIn0seyJuYW1lIjoianVzdC1mb3ItY3JhdGVzMSIsImlkIjoxNjk5Mzc4LCJzbHVnIjoianVzdC1mb3ItY3JhdGVzMSIsImRlc2NyaXB0aW9uIjoiIiwicHJpdmFjeSI6InNlY3JldCIsInVybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OCIsIm1lbWJlcnNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc4L21lbWJlcnN7L21lbWJlcn0iLCJyZXBvc2l0b3JpZXNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc4L3JlcG9zIiwicGVybWlzc2lvbiI6InB1bGwifV0="
+      "body": "ewogICJuYW1lIjogImp1c3QtZm9yLWNyYXRlcy0yIiwKICAiaWQiOiAxNjk5Mzc5LAogICJzbHVnIjogImp1c3QtZm9yLWNyYXRlcy0yIiwKICAiZGVzY3JpcHRpb24iOiAiSnVzdCBmb3IgQ3JhdGVzIDIiLAogICJwcml2YWN5IjogInNlY3JldCIsCiAgInVybCI6ICJodHRwczovL2FwaS5naXRodWIuY29tL3RlYW1zLzE2OTkzNzkiLAogICJtZW1iZXJzX3VybCI6ICJodHRwczovL2FwaS5naXRodWIuY29tL3RlYW1zLzE2OTkzNzkvbWVtYmVyc3svbWVtYmVyfSIsCiAgInJlcG9zaXRvcmllc191cmwiOiAiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc5L3JlcG9zIiwKICAicGVybWlzc2lvbiI6ICJwdWxsIgp9Cg=="
     }
   },
   {
diff --git a/src/tests/http-data/team_add_team_mixed_case b/src/tests/http-data/team_add_team_mixed_case
@@ -1,7 +1,7 @@
 [
   {
     "request": {
-      "uri": "http://api.github.com/orgs/Crates-Test-Org/teams?per_page=100",
+      "uri": "http://api.github.com/orgs/Crates-Test-Org/teams/Core",
       "method": "GET",
       "headers": [
         [
@@ -92,7 +92,7 @@
         ],
         [
           "content-length",
-          "905"
+          "318"
         ],
         [
           "Status",
@@ -127,7 +127,7 @@
           "4995"
         ]
       ],
-      "body": "W3sibmFtZSI6ImNvcmUiLCJpZCI6MTY5OTM3Nywic2x1ZyI6ImNvcmUiLCJkZXNjcmlwdGlvbiI6bnVsbCwicHJpdmFjeSI6InNlY3JldCIsInVybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3NyIsIm1lbWJlcnNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L21lbWJlcnN7L21lbWJlcn0iLCJyZXBvc2l0b3JpZXNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L3JlcG9zIiwicGVybWlzc2lvbiI6ImFkbWluIn0seyJuYW1lIjoianVzdC1mb3ItY3JhdGVzLTIiLCJpZCI6MTY5OTM3OSwic2x1ZyI6Imp1c3QtZm9yLWNyYXRlcy0yIiwiZGVzY3JpcHRpb24iOiJKdXN0IGZvciBDcmF0ZXMgMiIsInByaXZhY3kiOiJzZWNyZXQiLCJ1cmwiOiJodHRwczovL2FwaS5naXRodWIuY29tL3RlYW1zLzE2OTkzNzkiLCJtZW1iZXJzX3VybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OS9tZW1iZXJzey9tZW1iZXJ9IiwicmVwb3NpdG9yaWVzX3VybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OS9yZXBvcyIsInBlcm1pc3Npb24iOiJwdWxsIn0seyJuYW1lIjoianVzdC1mb3ItY3JhdGVzMSIsImlkIjoxNjk5Mzc4LCJzbHVnIjoianVzdC1mb3ItY3JhdGVzMSIsImRlc2NyaXB0aW9uIjoiIiwicHJpdmFjeSI6InNlY3JldCIsInVybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OCIsIm1lbWJlcnNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc4L21lbWJlcnN7L21lbWJlcn0iLCJyZXBvc2l0b3JpZXNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc4L3JlcG9zIiwicGVybWlzc2lvbiI6InB1bGwifV0="
+      "body": "ewogICJuYW1lIjogImNvcmUiLAogICJpZCI6IDE2OTkzNzcsCiAgInNsdWciOiAiY29yZSIsCiAgImRlc2NyaXB0aW9uIjogbnVsbCwKICAicHJpdmFjeSI6ICJzZWNyZXQiLAogICJ1cmwiOiAiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3IiwKICAibWVtYmVyc191cmwiOiAiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L21lbWJlcnN7L21lbWJlcn0iLAogICJyZXBvc2l0b3JpZXNfdXJsIjogImh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3Ny9yZXBvcyIsCiAgInBlcm1pc3Npb24iOiAiYWRtaW4iCn0K"
     }
   },
   {
diff --git a/src/tests/http-data/team_crates_by_team_id_not_including_deleted_owners b/src/tests/http-data/team_crates_by_team_id_not_including_deleted_owners
@@ -1,7 +1,7 @@
 [
   {
     "request": {
-      "uri": "http://api.github.com/orgs/crates-test-org/teams?per_page=100",
+      "uri": "http://api.github.com/orgs/crates-test-org/teams/core",
       "method": "GET",
       "headers": [
         [
@@ -100,7 +100,7 @@
         ],
         [
           "content-length",
-          "905"
+          "318"
         ],
         [
           "Status",
@@ -127,7 +127,7 @@
           "GitHub.com"
         ]
       ],
-      "body": "W3sibmFtZSI6ImNvcmUiLCJpZCI6MTY5OTM3Nywic2x1ZyI6ImNvcmUiLCJkZXNjcmlwdGlvbiI6bnVsbCwicHJpdmFjeSI6InNlY3JldCIsInVybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3NyIsIm1lbWJlcnNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L21lbWJlcnN7L21lbWJlcn0iLCJyZXBvc2l0b3JpZXNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L3JlcG9zIiwicGVybWlzc2lvbiI6ImFkbWluIn0seyJuYW1lIjoianVzdC1mb3ItY3JhdGVzLTIiLCJpZCI6MTY5OTM3OSwic2x1ZyI6Imp1c3QtZm9yLWNyYXRlcy0yIiwiZGVzY3JpcHRpb24iOiJKdXN0IGZvciBDcmF0ZXMgMiIsInByaXZhY3kiOiJzZWNyZXQiLCJ1cmwiOiJodHRwczovL2FwaS5naXRodWIuY29tL3RlYW1zLzE2OTkzNzkiLCJtZW1iZXJzX3VybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OS9tZW1iZXJzey9tZW1iZXJ9IiwicmVwb3NpdG9yaWVzX3VybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OS9yZXBvcyIsInBlcm1pc3Npb24iOiJwdWxsIn0seyJuYW1lIjoianVzdC1mb3ItY3JhdGVzMSIsImlkIjoxNjk5Mzc4LCJzbHVnIjoianVzdC1mb3ItY3JhdGVzMSIsImRlc2NyaXB0aW9uIjoiIiwicHJpdmFjeSI6InNlY3JldCIsInVybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OCIsIm1lbWJlcnNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc4L21lbWJlcnN7L21lbWJlcn0iLCJyZXBvc2l0b3JpZXNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc4L3JlcG9zIiwicGVybWlzc2lvbiI6InB1bGwifV0="
+      "body": "ewogICJuYW1lIjogImNvcmUiLAogICJpZCI6IDE2OTkzNzcsCiAgInNsdWciOiAiY29yZSIsCiAgImRlc2NyaXB0aW9uIjogbnVsbCwKICAicHJpdmFjeSI6ICJzZWNyZXQiLAogICJ1cmwiOiAiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3IiwKICAibWVtYmVyc191cmwiOiAiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L21lbWJlcnN7L21lbWJlcn0iLAogICJyZXBvc2l0b3JpZXNfdXJsIjogImh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3Ny9yZXBvcyIsCiAgInBlcm1pc3Npb24iOiAiYWRtaW4iCn0K"
     }
   },
   {
diff --git a/src/tests/http-data/team_nonexistent_team b/src/tests/http-data/team_nonexistent_team
@@ -1,7 +1,7 @@
 [
   {
     "request": {
-      "uri": "http://api.github.com/orgs/crates-test-org/teams?per_page=100",
+      "uri": "http://api.github.com/orgs/crates-test-org/teams/this-does-not-exist",
       "method": "GET",
       "headers": [
         [
@@ -28,7 +28,7 @@
       "body": ""
     },
     "response": {
-      "status": 200,
+      "status": 404,
       "headers": [
         [
           "X-OAuth-Client-Id",
@@ -88,7 +88,7 @@
         ],
         [
           "content-length",
-          "905"
+          "111"
         ],
         [
           "Server",
@@ -120,14 +120,14 @@
         ],
         [
           "Status",
-          "200 OK"
+          "404 Not Found"
         ],
         [
           "Access-Control-Allow-Origin",
           "*"
         ]
       ],
-      "body": "W3sibmFtZSI6ImNvcmUiLCJpZCI6MTY5OTM3Nywic2x1ZyI6ImNvcmUiLCJkZXNjcmlwdGlvbiI6bnVsbCwicHJpdmFjeSI6InNlY3JldCIsInVybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3NyIsIm1lbWJlcnNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L21lbWJlcnN7L21lbWJlcn0iLCJyZXBvc2l0b3JpZXNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L3JlcG9zIiwicGVybWlzc2lvbiI6ImFkbWluIn0seyJuYW1lIjoianVzdC1mb3ItY3JhdGVzLTIiLCJpZCI6MTY5OTM3OSwic2x1ZyI6Imp1c3QtZm9yLWNyYXRlcy0yIiwiZGVzY3JpcHRpb24iOiJKdXN0IGZvciBDcmF0ZXMgMiIsInByaXZhY3kiOiJzZWNyZXQiLCJ1cmwiOiJodHRwczovL2FwaS5naXRodWIuY29tL3RlYW1zLzE2OTkzNzkiLCJtZW1iZXJzX3VybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OS9tZW1iZXJzey9tZW1iZXJ9IiwicmVwb3NpdG9yaWVzX3VybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OS9yZXBvcyIsInBlcm1pc3Npb24iOiJwdWxsIn0seyJuYW1lIjoianVzdC1mb3ItY3JhdGVzMSIsImlkIjoxNjk5Mzc4LCJzbHVnIjoianVzdC1mb3ItY3JhdGVzMSIsImRlc2NyaXB0aW9uIjoiIiwicHJpdmFjeSI6InNlY3JldCIsInVybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OCIsIm1lbWJlcnNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc4L21lbWJlcnN7L21lbWJlcn0iLCJyZXBvc2l0b3JpZXNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc4L3JlcG9zIiwicGVybWlzc2lvbiI6InB1bGwifV0="
+      "body": "ewogICJtZXNzYWdlIjogIk5vdCBGb3VuZCIsCiAgImRvY3VtZW50YXRpb25fdXJsIjogImh0dHBzOi8vZGV2ZWxvcGVyLmdpdGh1Yi5jb20vdjMvdGVhbXMvI2dldC10ZWFtLWJ5LW5hbWUiCn0K"
     }
   }
 ]
diff --git a/src/tests/http-data/team_publish_not_owned b/src/tests/http-data/team_publish_not_owned
@@ -1,7 +1,7 @@
 [
   {
     "request": {
-      "uri": "http://api.github.com/orgs/crates-test-org/teams?per_page=100",
+      "uri": "http://api.github.com/orgs/crates-test-org/teams/just-for-crates-2",
       "method": "GET",
       "headers": [
         [
@@ -84,7 +84,7 @@
         ],
         [
           "content-length",
-          "905"
+          "358"
         ],
         [
           "X-Runtime-rack",
@@ -127,7 +127,7 @@
           "private, max-age=60, s-maxage=60"
         ]
       ],
-      "body": "W3sibmFtZSI6ImNvcmUiLCJpZCI6MTY5OTM3Nywic2x1ZyI6ImNvcmUiLCJkZXNjcmlwdGlvbiI6bnVsbCwicHJpdmFjeSI6InNlY3JldCIsInVybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3NyIsIm1lbWJlcnNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L21lbWJlcnN7L21lbWJlcn0iLCJyZXBvc2l0b3JpZXNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L3JlcG9zIiwicGVybWlzc2lvbiI6ImFkbWluIn0seyJuYW1lIjoianVzdC1mb3ItY3JhdGVzLTIiLCJpZCI6MTY5OTM3OSwic2x1ZyI6Imp1c3QtZm9yLWNyYXRlcy0yIiwiZGVzY3JpcHRpb24iOiJKdXN0IGZvciBDcmF0ZXMgMiIsInByaXZhY3kiOiJzZWNyZXQiLCJ1cmwiOiJodHRwczovL2FwaS5naXRodWIuY29tL3RlYW1zLzE2OTkzNzkiLCJtZW1iZXJzX3VybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OS9tZW1iZXJzey9tZW1iZXJ9IiwicmVwb3NpdG9yaWVzX3VybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OS9yZXBvcyIsInBlcm1pc3Npb24iOiJwdWxsIn0seyJuYW1lIjoianVzdC1mb3ItY3JhdGVzMSIsImlkIjoxNjk5Mzc4LCJzbHVnIjoianVzdC1mb3ItY3JhdGVzMSIsImRlc2NyaXB0aW9uIjoiIiwicHJpdmFjeSI6InNlY3JldCIsInVybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OCIsIm1lbWJlcnNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc4L21lbWJlcnN7L21lbWJlcn0iLCJyZXBvc2l0b3JpZXNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc4L3JlcG9zIiwicGVybWlzc2lvbiI6InB1bGwifV0="
+      "body": "ewogICJuYW1lIjogImp1c3QtZm9yLWNyYXRlcy0yIiwKICAiaWQiOiAxNjk5Mzc5LAogICJzbHVnIjogImp1c3QtZm9yLWNyYXRlcy0yIiwKICAiZGVzY3JpcHRpb24iOiAiSnVzdCBmb3IgQ3JhdGVzIDIiLAogICJwcml2YWN5IjogInNlY3JldCIsCiAgInVybCI6ICJodHRwczovL2FwaS5naXRodWIuY29tL3RlYW1zLzE2OTkzNzkiLAogICJtZW1iZXJzX3VybCI6ICJodHRwczovL2FwaS5naXRodWIuY29tL3RlYW1zLzE2OTkzNzkvbWVtYmVyc3svbWVtYmVyfSIsCiAgInJlcG9zaXRvcmllc191cmwiOiAiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc5L3JlcG9zIiwKICAicGVybWlzc2lvbiI6ICJwdWxsIgp9Cg=="
     }
   },
   {
diff --git a/src/tests/http-data/team_publish_owned b/src/tests/http-data/team_publish_owned
@@ -1,7 +1,7 @@
 [
   {
     "request": {
-      "uri": "http://api.github.com/orgs/crates-test-org/teams?per_page=100",
+      "uri": "http://api.github.com/orgs/crates-test-org/teams/core",
       "method": "GET",
       "headers": [
         [
@@ -32,7 +32,7 @@
       "headers": [
         [
           "content-length",
-          "905"
+          "318"
         ],
         [
           "X-OAuth-Client-Id",
@@ -127,7 +127,7 @@
           "nosniff"
         ]
       ],
-      "body": "W3sibmFtZSI6ImNvcmUiLCJpZCI6MTY5OTM3Nywic2x1ZyI6ImNvcmUiLCJkZXNjcmlwdGlvbiI6bnVsbCwicHJpdmFjeSI6InNlY3JldCIsInVybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3NyIsIm1lbWJlcnNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L21lbWJlcnN7L21lbWJlcn0iLCJyZXBvc2l0b3JpZXNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L3JlcG9zIiwicGVybWlzc2lvbiI6ImFkbWluIn0seyJuYW1lIjoianVzdC1mb3ItY3JhdGVzLTIiLCJpZCI6MTY5OTM3OSwic2x1ZyI6Imp1c3QtZm9yLWNyYXRlcy0yIiwiZGVzY3JpcHRpb24iOiJKdXN0IGZvciBDcmF0ZXMgMiIsInByaXZhY3kiOiJzZWNyZXQiLCJ1cmwiOiJodHRwczovL2FwaS5naXRodWIuY29tL3RlYW1zLzE2OTkzNzkiLCJtZW1iZXJzX3VybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OS9tZW1iZXJzey9tZW1iZXJ9IiwicmVwb3NpdG9yaWVzX3VybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OS9yZXBvcyIsInBlcm1pc3Npb24iOiJwdWxsIn0seyJuYW1lIjoianVzdC1mb3ItY3JhdGVzMSIsImlkIjoxNjk5Mzc4LCJzbHVnIjoianVzdC1mb3ItY3JhdGVzMSIsImRlc2NyaXB0aW9uIjoiIiwicHJpdmFjeSI6InNlY3JldCIsInVybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OCIsIm1lbWJlcnNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc4L21lbWJlcnN7L21lbWJlcn0iLCJyZXBvc2l0b3JpZXNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc4L3JlcG9zIiwicGVybWlzc2lvbiI6InB1bGwifV0="
+      "body": "ewogICJuYW1lIjogImNvcmUiLAogICJpZCI6IDE2OTkzNzcsCiAgInNsdWciOiAiY29yZSIsCiAgImRlc2NyaXB0aW9uIjogbnVsbCwKICAicHJpdmFjeSI6ICJzZWNyZXQiLAogICJ1cmwiOiAiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3IiwKICAibWVtYmVyc191cmwiOiAiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L21lbWJlcnN7L21lbWJlcn0iLAogICJyZXBvc2l0b3JpZXNfdXJsIjogImh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3Ny9yZXBvcyIsCiAgInBlcm1pc3Npb24iOiAiYWRtaW4iCn0K"
     }
   },
   {
diff --git a/src/tests/http-data/team_remove_team_as_named_owner b/src/tests/http-data/team_remove_team_as_named_owner
diff --git a/src/tests/http-data/team_remove_team_as_team_owner b/src/tests/http-data/team_remove_team_as_team_owner

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"request": {`
`4`		`- "uri": "http://api.github.com/orgs/crates-test-org/teams?per_page=100",`
	`4`	`+ "uri": "http://api.github.com/orgs/crates-test-org/teams/core",`
`5`	`5`	`"method": "GET",`
`6`	`6`	`"headers": [`
`7`	`7`	`[`
`@@ -88,7 +88,7 @@`
`88`	`88`	`],`
`89`	`89`	`[`
`90`	`90`	`"content-length",`
`91`		`- "905"`
	`91`	`+ "318"`
`92`	`92`	`],`
`93`	`93`	`[`
`94`	`94`	`"content-type",`
`@@ -127,7 +127,7 @@`
`127`	`127`	`"CB3E:6F2D:2A3E4D:5FAD3B:59D4F801"`
`128`	`128`	`]`
`129`	`129`	`],`
`130`		- "body": "W3sibmFtZSI6ImNvcmUiLCJpZCI6MTY5OTM3Nywic2x1ZyI6ImNvcmUiLCJkZXNjcmlwdGlvbiI6bnVsbCwicHJpdmFjeSI6InNlY3JldCIsInVybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3NyIsIm1lbWJlcnNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L21lbWJlcnN7L21lbWJlcn0iLCJyZXBvc2l0b3JpZXNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L3JlcG9zIiwicGVybWlzc2lvbiI6ImFkbWluIn0seyJuYW1lIjoianVzdC1mb3ItY3JhdGVzLTIiLCJpZCI6MTY5OTM3OSwic2x1ZyI6Imp1c3QtZm9yLWNyYXRlcy0yIiwiZGVzY3JpcHRpb24iOiJKdXN0IGZvciBDcmF0ZXMgMiIsInByaXZhY3kiOiJzZWNyZXQiLCJ1cmwiOiJodHRwczovL2FwaS5naXRodWIuY29tL3RlYW1zLzE2OTkzNzkiLCJtZW1iZXJzX3VybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OS9tZW1iZXJzey9tZW1iZXJ9IiwicmVwb3NpdG9yaWVzX3VybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OS9yZXBvcyIsInBlcm1pc3Npb24iOiJwdWxsIn0seyJuYW1lIjoianVzdC1mb3ItY3JhdGVzMSIsImlkIjoxNjk5Mzc4LCJzbHVnIjoianVzdC1mb3ItY3JhdGVzMSIsImRlc2NyaXB0aW9uIjoiIiwicHJpdmFjeSI6InNlY3JldCIsInVybCI6Imh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3OCIsIm1lbWJlcnNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc4L21lbWJlcnN7L21lbWJlcn0iLCJyZXBvc2l0b3JpZXNfdXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc4L3JlcG9zIiwicGVybWlzc2lvbiI6InB1bGwifV0="
	`130`	`+ "body": "ewogICJuYW1lIjogImNvcmUiLAogICJpZCI6IDE2OTkzNzcsCiAgInNsdWciOiAiY29yZSIsCiAgImRlc2NyaXB0aW9uIjogbnVsbCwKICAicHJpdmFjeSI6ICJzZWNyZXQiLAogICJ1cmwiOiAiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3IiwKICAibWVtYmVyc191cmwiOiAiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS90ZWFtcy8xNjk5Mzc3L21lbWJlcnN7L21lbWJlcn0iLAogICJyZXBvc2l0b3JpZXNfdXJsIjogImh0dHBzOi8vYXBpLmdpdGh1Yi5jb20vdGVhbXMvMTY5OTM3Ny9yZXBvcyIsCiAgInBlcm1pc3Npb24iOiAiYWRtaW4iCn0K"`
`131`	`131`	`}`
`132`	`132`	`},`
`133`	`133`	`{`