Make team website entries required

Author: ehuss

docs/toml-schema.md

@@ -119,7 +119,7 @@ ping = "rust-lang/cargo"
 # Team members to be excluded from FCPs
 exclude-members = ["some-team-member"]
 
-# Information about the team to display on the www.rust-lang.org website.
+# Information about the team to display on the www.rust-lang.org website (required except marker teams).
 [website]
 # The name of the team to display on the website (required).
 name = "Language team"

src/validate.rs

@@ -51,6 +51,7 @@ static CHECKS: &[Check<fn(&Data, &mut Vec<String>)>] = checks![
     validate_repos,
     validate_branch_protections,
     validate_member_roles,
+    validate_website,
 ];
 
 #[allow(clippy::type_complexity)]
@@ -1040,3 +1041,16 @@ where
         }
     }
 }
+
+fn validate_website(data: &Data, errors: &mut Vec<String>) {
+    wrapper(data.teams(), errors, |team, _| {
+        match team.kind() {
+            TeamKind::MarkerTeam => return Ok(()),
+            TeamKind::Team | TeamKind::WorkingGroup | TeamKind::ProjectGroup => {}
+        };
+        if team.website_data().is_none() {
+            bail!("team `{}` should have a `[website]` table", team.name());
+        }
+        Ok(())
+    })
+}

teams/mentors.toml

@@ -21,5 +21,5 @@ alumni = []
 name = "gsoc-mentors"
 
 [website]
-name = "Mentorship Programs"
-description = "Organizes involvement in internship programs such as Google Summer of Code"
+name = "Mentors team"
+description = "Mentors for the mentorship and internship programs"

tests/static-api/_expected/v1/teams.json

@@ -90,7 +90,17 @@
     ],
     "alumni": [],
     "github": null,
-    "website_data": null,
+    "website_data": {
+      "name": "Leaderless",
+      "description": "Test",
+      "page": "leaderless",
+      "email": null,
+      "repo": null,
+      "discord": null,
+      "zulip_stream": null,
+      "matrix_room": null,
+      "weight": 0
+    },
     "roles": [],
     "discord": []
   },
@@ -101,7 +111,17 @@
     "members": [],
     "alumni": [],
     "github": null,
-    "website_data": null,
+    "website_data": {
+      "name": "Leadership council",
+      "description": "test",
+      "page": "leadership-council",
+      "email": null,
+      "repo": null,
+      "discord": null,
+      "zulip_stream": null,
+      "matrix_room": null,
+      "weight": 0
+    },
     "roles": [],
     "discord": []
   },
@@ -132,7 +152,17 @@
     ],
     "alumni": [],
     "github": null,
-    "website_data": null,
+    "website_data": {
+      "name": "Leads permissions",
+      "description": "Test",
+      "page": "leads-permissions",
+      "email": null,
+      "repo": null,
+      "discord": null,
+      "zulip_stream": null,
+      "matrix_room": null,
+      "weight": 0
+    },
     "roles": [],
     "discord": []
   },
@@ -166,7 +196,17 @@
       }
     ],
     "github": null,
-    "website_data": null,
+    "website_data": {
+      "name": "WG Test",
+      "description": "test",
+      "page": "wg-test",
+      "email": null,
+      "repo": null,
+      "discord": null,
+      "zulip_stream": null,
+      "matrix_room": null,
+      "weight": 0
+    },
     "roles": [
       {
         "id": "convener",

tests/static-api/_expected/v1/teams/leaderless.json

@@ -13,7 +13,17 @@
   ],
   "alumni": [],
   "github": null,
-  "website_data": null,
+  "website_data": {
+    "name": "Leaderless",
+    "description": "Test",
+    "page": "leaderless",
+    "email": null,
+    "repo": null,
+    "discord": null,
+    "zulip_stream": null,
+    "matrix_room": null,
+    "weight": 0
+  },
   "roles": [],
   "discord": []
 }

tests/static-api/_expected/v1/teams/leadership-council.json

@@ -5,7 +5,17 @@
   "members": [],
   "alumni": [],
   "github": null,
-  "website_data": null,
+  "website_data": {
+    "name": "Leadership council",
+    "description": "test",
+    "page": "leadership-council",
+    "email": null,
+    "repo": null,
+    "discord": null,
+    "zulip_stream": null,
+    "matrix_room": null,
+    "weight": 0
+  },
   "roles": [],
   "discord": []
 }

tests/static-api/_expected/v1/teams/leads-permissions.json

@@ -25,7 +25,17 @@
   ],
   "alumni": [],
   "github": null,
-  "website_data": null,
+  "website_data": {
+    "name": "Leads permissions",
+    "description": "Test",
+    "page": "leads-permissions",
+    "email": null,
+    "repo": null,
+    "discord": null,
+    "zulip_stream": null,
+    "matrix_room": null,
+    "weight": 0
+  },
   "roles": [],
   "discord": []
 }

tests/static-api/_expected/v1/teams/wg-test.json

@@ -28,7 +28,17 @@
     }
   ],
   "github": null,
-  "website_data": null,
+  "website_data": {
+    "name": "WG Test",
+    "description": "test",
+    "page": "wg-test",
+    "email": null,
+    "repo": null,
+    "discord": null,
+    "zulip_stream": null,
+    "matrix_room": null,
+    "weight": 0
+  },
   "roles": [
     {
       "id": "convener",

tests/static-api/teams/leaderless.toml

@@ -5,3 +5,7 @@ top-level = true
 leads = []
 members = ["user-0"]
 alumni = []
+
+[website]
+name = "Leaderless"
+description = "Test"

tests/static-api/teams/leadership-council.toml

@@ -4,3 +4,7 @@ name = "leadership-council"
 leads = []
 members = []
 alumni = []
+
+[website]
+name = "Leadership council"
+description = "test"

tests/static-api/teams/leads-permissions.toml

@@ -8,3 +8,7 @@ alumni = []
 
 [leads-permissions]
 bors.crates-io.review = true
+
+[website]
+name = "Leads permissions"
+description = "Test"

tests/static-api/teams/wg-test.toml

@@ -12,3 +12,7 @@ alumni = ["user-0", "user-5"]
 [[roles]]
 id = "convener"
 description = "Convener"
+
+[website]
+name = "WG Test"
+description = "test"