From 344130536007f32cf1290ae53914e0179aaf0451 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Sat, 13 Jan 2024 17:13:05 -0800
Subject: [PATCH 1/2] Add launching-pad team.

---
 src/validate.rs                 | 9 ---------
 teams/community.toml            | 1 +
 teams/docker.toml               | 1 +
 teams/launching-pad.toml        | 7 +++++++
 teams/twir.toml                 | 1 +
 teams/web-presence.toml         | 1 +
 teams/wg-async.toml             | 1 +
 teams/wg-cli.toml               | 1 +
 teams/wg-embedded.toml          | 1 +
 teams/wg-gamedev.toml           | 1 +
 teams/wg-rust-by-example.toml   | 1 +
 teams/wg-secure-code.toml       | 1 +
 teams/wg-security-response.toml | 1 +
 teams/wg-wasm.toml              | 1 +
 14 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 teams/launching-pad.toml

diff --git a/src/validate.rs b/src/validate.rs
index b63b19d22..3a7cc9f7b 100644
--- a/src/validate.rs
+++ b/src/validate.rs
@@ -185,15 +185,6 @@ fn validate_subteam_of(data: &Data, errors: &mut Vec<String>) {
                 );
             };
 
-            if !matches!(team.kind(), TeamKind::Team) && parent.subteam_of().is_some() {
-                bail!(
-                    "{} `{}` can't be a subteam of a subteam (`{}`)",
-                    team.kind(),
-                    team.name(),
-                    parent.name(),
-                );
-            }
-
             team = parent;
         }
         Ok(())
diff --git a/teams/community.toml b/teams/community.toml
index 63796370d..6b3d1685c 100644
--- a/teams/community.toml
+++ b/teams/community.toml
@@ -1,4 +1,5 @@
 name = "community"
+subteam-of = "launching-pad"
 
 [people]
 leads = []
diff --git a/teams/docker.toml b/teams/docker.toml
index 9dec587b2..0de70631e 100644
--- a/teams/docker.toml
+++ b/teams/docker.toml
@@ -1,4 +1,5 @@
 name = "docker"
+subteam-of = "launching-pad"
 
 [people]
 leads = []
diff --git a/teams/launching-pad.toml b/teams/launching-pad.toml
new file mode 100644
index 000000000..bb486a6bb
--- /dev/null
+++ b/teams/launching-pad.toml
@@ -0,0 +1,7 @@
+name = "launching-pad"
+
+[people]
+# This is an "umbrella" team, and thus does not have any members.
+leads = []
+members = []
+alumni = []
diff --git a/teams/twir.toml b/teams/twir.toml
index 0b59073a3..e190f9a93 100644
--- a/teams/twir.toml
+++ b/teams/twir.toml
@@ -1,4 +1,5 @@
 name = "twir"
+subteam-of = "launching-pad"
 
 [people]
 leads = ["nellshamrell"]
diff --git a/teams/web-presence.toml b/teams/web-presence.toml
index df453f258..05da4c895 100644
--- a/teams/web-presence.toml
+++ b/teams/web-presence.toml
@@ -1,4 +1,5 @@
 name = "web-presence"
+subteam-of = "launching-pad"
 
 [people]
 leads = []
diff --git a/teams/wg-async.toml b/teams/wg-async.toml
index 5f009ec24..cf38d3106 100644
--- a/teams/wg-async.toml
+++ b/teams/wg-async.toml
@@ -1,4 +1,5 @@
 name = "wg-async"
+subteam-of = "launching-pad"
 kind = "working-group"
 
 [people]
diff --git a/teams/wg-cli.toml b/teams/wg-cli.toml
index b3c602d93..d387d5f86 100644
--- a/teams/wg-cli.toml
+++ b/teams/wg-cli.toml
@@ -1,4 +1,5 @@
 name = "wg-cli"
+subteam-of = "launching-pad"
 kind = "working-group"
 
 [people]
diff --git a/teams/wg-embedded.toml b/teams/wg-embedded.toml
index 0bbc1479d..44468aa00 100644
--- a/teams/wg-embedded.toml
+++ b/teams/wg-embedded.toml
@@ -1,4 +1,5 @@
 name = "wg-embedded"
+subteam-of = "launching-pad"
 kind = "working-group"
 
 [people]
diff --git a/teams/wg-gamedev.toml b/teams/wg-gamedev.toml
index 5c4f31ed0..407f3cd34 100644
--- a/teams/wg-gamedev.toml
+++ b/teams/wg-gamedev.toml
@@ -1,4 +1,5 @@
 name = "wg-gamedev"
+subteam-of = "launching-pad"
 kind = "working-group"
 
 [people]
diff --git a/teams/wg-rust-by-example.toml b/teams/wg-rust-by-example.toml
index d999035cb..e40cb831c 100644
--- a/teams/wg-rust-by-example.toml
+++ b/teams/wg-rust-by-example.toml
@@ -1,4 +1,5 @@
 name = "wg-rust-by-example"
+subteam-of = "launching-pad"
 kind = "working-group"
 
 [people]
diff --git a/teams/wg-secure-code.toml b/teams/wg-secure-code.toml
index 1e98471b0..dc1154f18 100644
--- a/teams/wg-secure-code.toml
+++ b/teams/wg-secure-code.toml
@@ -1,4 +1,5 @@
 name = "wg-secure-code"
+subteam-of = "launching-pad"
 kind = "working-group"
 
 [people]
diff --git a/teams/wg-security-response.toml b/teams/wg-security-response.toml
index 34e082f10..cf46568b1 100644
--- a/teams/wg-security-response.toml
+++ b/teams/wg-security-response.toml
@@ -1,4 +1,5 @@
 name = "wg-security-response"
+subteam-of = "launching-pad"
 kind = "working-group"
 
 [people]
diff --git a/teams/wg-wasm.toml b/teams/wg-wasm.toml
index 6bee88916..58b350998 100644
--- a/teams/wg-wasm.toml
+++ b/teams/wg-wasm.toml
@@ -1,4 +1,5 @@
 name = "wg-wasm"
+subteam-of = "launching-pad"
 kind = "working-group"
 
 [people]

From 805a2722381e2faab5581725f3fd84909dbd3379 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Thu, 18 Jan 2024 17:04:00 -0800
Subject: [PATCH 2/2] Set parent team for wg-triage.

---
 teams/wg-triage.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/teams/wg-triage.toml b/teams/wg-triage.toml
index b0445043f..c5a3ada68 100644
--- a/teams/wg-triage.toml
+++ b/teams/wg-triage.toml
@@ -1,5 +1,6 @@
 name = "wg-triage"
 kind = "working-group"
+subteam-of = "launching-pad"
 
 [people]
 leads = ["Dylan-DPC"]