Merge branch 'main' into simonfaltum/doctor-command

Author: simonfaltum

.github/CODEOWNERS

@@ -1,11 +1,11 @@
 # Maintainers (can approve any PR)
-*                           @andrewnester @anton-107 @denik @pietern @shreyas-goenka @simonfaltum
+*                           @andrewnester @anton-107 @denik @pietern @shreyas-goenka @simonfaltum @renaudhartert-db
 
 # Bundles
-/bundle/                    @andrewnester @anton-107 @denik @pietern @shreyas-goenka @lennartkats-db
-/cmd/bundle/                @andrewnester @anton-107 @denik @pietern @shreyas-goenka @lennartkats-db
-/acceptance/bundle/         @andrewnester @anton-107 @denik @pietern @shreyas-goenka @lennartkats-db
-/libs/template/             @andrewnester @anton-107 @denik @pietern @shreyas-goenka @simonfaltum @lennartkats-db
+/bundle/                    team:bundle @lennartkats-db
+/cmd/bundle/                team:bundle @lennartkats-db
+/acceptance/bundle/         team:bundle @lennartkats-db
+/libs/template/             team:bundle @lennartkats-db
 
 # Pipelines
 /cmd/pipelines/             @jefferycheng1 @kanterov @lennartkats-db
@@ -16,10 +16,48 @@
 /acceptance/labs/           @alexott @nfx
 
 # Apps
-/cmd/apps/                  @databricks/eng-apps-devex
-/cmd/workspace/apps/        @databricks/eng-apps-devex
-/libs/apps/                 @databricks/eng-apps-devex
-/acceptance/apps/           @databricks/eng-apps-devex
+/cmd/apps/                  team:eng-apps-devex
+/cmd/workspace/apps/        team:eng-apps-devex
+/libs/apps/                 team:eng-apps-devex
+/acceptance/apps/           team:eng-apps-devex
+
+# Auth
+/cmd/auth/                  team:platform
+/libs/auth/                 team:platform
+/acceptance/auth/           team:platform
+
+# Filesystem & sync
+/cmd/fs/                    team:platform
+/cmd/sync/                  team:platform
+/libs/filer/                team:platform
+/libs/sync/                 team:platform
+
+# Core CLI infrastructure
+/cmd/root/                  team:platform
+/cmd/version/               team:platform
+/cmd/completion/            team:platform
+/cmd/configure/             team:platform
+/cmd/cache/                 team:platform
+/cmd/api/                   team:platform
+/cmd/selftest/              team:platform
+/cmd/psql/                  team:platform
+/libs/psql/                 team:platform
+
+# Libs (general)
+/libs/databrickscfg/        team:platform
+/libs/env/                  team:platform
+/libs/flags/                team:platform
+/libs/cmdio/                team:platform
+/libs/log/                  team:platform
+/libs/telemetry/            team:platform
+/libs/process/              team:platform
+/libs/git/                  team:platform
+
+# Integration tests
+/integration/               team:platform
+
+# Internal
+/internal/                  team:platform
 
 # Experimental
-/experimental/aitools/      @databricks/eng-apps-devex @lennartkats-db
+/experimental/aitools/      team:eng-apps-devex @lennartkats-db

.github/OWNERS

@@ -0,0 +1,16 @@
+# Team aliases for OWNERS file.
+# Use "team:<name>" in OWNERS to reference a team defined here.
+# Format: team:<name>  @member1 @member2 ...
+#
+# Keep these in sync with actual GitHub team rosters. GITHUB_TOKEN can't
+# resolve org team membership via the API, so this file is the source of
+# truth for the maintainer-approval workflow.
+#
+# GitHub team pages:
+#   bundle:          https://github.com/orgs/databricks/teams/cli-maintainers
+#   platform:        https://github.com/orgs/databricks/teams/cli-platform
+#   eng-apps-devex:  https://github.com/orgs/databricks/teams/eng-apps-devex
+
+team:bundle     @andrewnester @anton-107 @denik @janniklasrose @pietern @shreyas-goenka
+team:platform   @simonfaltum @renaudhartert-db @hectorcast-db @parthban-db @tanmay-db @Divyansh-db @tejaskochar-db @mihaimitrea-db @chrisst @rauchy
+team:eng-apps-devex @fjakobs @jamesbroadhead @Shridhad @atilafassina @keugenek @arsenyinfo @igrekun @pkosiec @MarioCadenas @pffigueiredo @ditadi @calvarjorge

.github/OWNERTEAMS

@@ -20,7 +20,7 @@ runs:
       shell: bash
 
     - name: Setup Go
-      uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
+      uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
       with:
         go-version-file: go.mod
         cache-dependency-path: |

.github/actions/setup-build-environment/action.yml

@@ -1,9 +1,56 @@
 const fs = require("fs");
+const path = require("path");
+
+/**
+ * Read a file and return non-empty, non-comment lines split by whitespace.
+ * Returns [] if the file does not exist.
+ *
+ * @param {string} filePath
+ * @returns {string[][]} array of whitespace-split tokens per line
+ */
+function readDataLines(filePath) {
+  let content;
+  try {
+    content = fs.readFileSync(filePath, "utf-8");
+  } catch (e) {
+    if (e.code === "ENOENT") return [];
+    throw e;
+  }
+  const result = [];
+  for (const raw of content.split("\n")) {
+    const line = raw.trim();
+    if (!line || line.startsWith("#")) continue;
+    const parts = line.split(/\s+/);
+    if (parts.length >= 2) result.push(parts);
+  }
+  return result;
+}
+
+/**
+ * Parse an OWNERTEAMS file into a map of team aliases.
+ * Format: "team:<name>  @member1 @member2 ..."
+ * Returns Map<string, string[]> where key is "team:<name>" and value is member logins.
+ *
+ * @param {string} filePath - absolute path to the OWNERTEAMS file
+ * @returns {Map<string, string[]>}
+ */
+function parseOwnerTeams(filePath) {
+  const teams = new Map();
+  for (const parts of readDataLines(filePath)) {
+    if (!parts[0].startsWith("team:")) continue;
+    const members = parts.slice(1).filter((p) => p.startsWith("@")).map((p) => p.slice(1));
+    teams.set(parts[0], members);
+  }
+  return teams;
+}
 
 /**
  * Parse an OWNERS file (same format as CODEOWNERS).
  * Returns array of { pattern, owners } rules.
  *
+ * If an OWNERTEAMS file exists alongside the OWNERS file, "team:<name>"
+ * tokens are expanded to their member lists.
+ *
  * By default, team refs (org/team) are filtered out and @ is stripped.
  * Pass { includeTeams: true } to keep team refs (with @ stripped).
  *
@@ -13,18 +60,19 @@ const fs = require("fs");
  */
 function parseOwnersFile(filePath, opts) {
   const includeTeams = opts && opts.includeTeams;
-  const lines = fs.readFileSync(filePath, "utf-8").split("\n");
+  const teamsPath = path.join(path.dirname(filePath), "OWNERTEAMS");
+  const teams = parseOwnerTeams(teamsPath);
   const rules = [];
-  for (const raw of lines) {
-    const line = raw.trim();
-    if (!line || line.startsWith("#")) continue;
-    const parts = line.split(/\s+/);
-    if (parts.length < 2) continue;
+  for (const parts of readDataLines(filePath)) {
     const pattern = parts[0];
-    const owners = parts
-      .slice(1)
-      .filter((p) => p.startsWith("@") && (includeTeams || !p.includes("/")))
-      .map((p) => p.slice(1));
+    const owners = [];
+    for (const p of parts.slice(1)) {
+      if (p.startsWith("team:") && teams.has(p)) {
+        owners.push(...teams.get(p));
+      } else if (p.startsWith("@") && (includeTeams || !p.includes("/"))) {
+        owners.push(p.slice(1));
+      }
+    }
     rules.push({ pattern, owners });
   }
   return rules;
@@ -89,4 +137,4 @@ function getOwnershipGroups(filenames, rules) {
   return groups;
 }
 
-module.exports = { parseOwnersFile, ownersMatch, findOwners, getMaintainers, getOwnershipGroups };
+module.exports = { parseOwnerTeams, parseOwnersFile, ownersMatch, findOwners, getMaintainers, getOwnershipGroups };

.github/scripts/owners.js

@@ -5,6 +5,7 @@ const os = require("os");
 const path = require("path");
 
 const {
+  parseOwnerTeams,
   ownersMatch,
   parseOwnersFile,
   findOwners,
@@ -125,6 +126,99 @@ describe("parseOwnersFile", () => {
   });
 });
 
+// --- parseOwnerTeams ---
+
+describe("parseOwnerTeams", () => {
+  let tmpDir;
+
+  before(() => {
+    tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "ownerteams-test-"));
+  });
+
+  after(() => {
+    fs.rmSync(tmpDir, { recursive: true });
+  });
+
+  it("parses team definitions", () => {
+    const teamsPath = path.join(tmpDir, "OWNERTEAMS");
+    fs.writeFileSync(teamsPath, "team:platform @alice @bob @carol\n");
+    const teams = parseOwnerTeams(teamsPath);
+    assert.equal(teams.size, 1);
+    assert.deepEqual(teams.get("team:platform"), ["alice", "bob", "carol"]);
+  });
+
+  it("parses multiple teams", () => {
+    const teamsPath = path.join(tmpDir, "OWNERTEAMS");
+    fs.writeFileSync(teamsPath, "team:platform @alice @bob\nteam:bundle @carol @dave\n");
+    const teams = parseOwnerTeams(teamsPath);
+    assert.equal(teams.size, 2);
+    assert.deepEqual(teams.get("team:platform"), ["alice", "bob"]);
+    assert.deepEqual(teams.get("team:bundle"), ["carol", "dave"]);
+  });
+
+  it("skips comments and blank lines", () => {
+    const teamsPath = path.join(tmpDir, "OWNERTEAMS");
+    fs.writeFileSync(teamsPath, "# comment\n\nteam:platform @alice\n");
+    const teams = parseOwnerTeams(teamsPath);
+    assert.equal(teams.size, 1);
+  });
+
+  it("returns empty map if file does not exist", () => {
+    const teams = parseOwnerTeams(path.join(tmpDir, "NONEXISTENT"));
+    assert.equal(teams.size, 0);
+  });
+});
+
+// --- parseOwnersFile with team aliases ---
+
+describe("parseOwnersFile with OWNERTEAMS", () => {
+  let tmpDir;
+  let ownersPath;
+  let teamsPath;
+
+  before(() => {
+    tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "owners-teams-test-"));
+    ownersPath = path.join(tmpDir, "OWNERS");
+    teamsPath = path.join(tmpDir, "OWNERTEAMS");
+  });
+
+  after(() => {
+    fs.rmSync(tmpDir, { recursive: true });
+  });
+
+  it("expands team aliases to members", () => {
+    fs.writeFileSync(teamsPath, "team:platform @alice @bob\n");
+    fs.writeFileSync(ownersPath, "/cmd/auth/ team:platform\n");
+    const rules = parseOwnersFile(ownersPath);
+    assert.equal(rules.length, 1);
+    assert.deepEqual(rules[0].owners, ["alice", "bob"]);
+  });
+
+  it("mixes team aliases with individual owners", () => {
+    fs.writeFileSync(teamsPath, "team:platform @alice @bob\n");
+    fs.writeFileSync(ownersPath, "/cmd/auth/ team:platform @carol\n");
+    const rules = parseOwnersFile(ownersPath);
+    assert.equal(rules.length, 1);
+    assert.deepEqual(rules[0].owners, ["alice", "bob", "carol"]);
+  });
+
+  it("unknown team alias is ignored", () => {
+    fs.writeFileSync(teamsPath, "team:platform @alice\n");
+    fs.writeFileSync(ownersPath, "/cmd/auth/ team:unknown @bob\n");
+    const rules = parseOwnersFile(ownersPath);
+    assert.deepEqual(rules[0].owners, ["bob"]);
+  });
+
+  it("works without OWNERTEAMS file", () => {
+    const tmpDir2 = fs.mkdtempSync(path.join(os.tmpdir(), "owners-noteams-"));
+    const ownersPath2 = path.join(tmpDir2, "OWNERS");
+    fs.writeFileSync(ownersPath2, "* @alice\n");
+    const rules = parseOwnersFile(ownersPath2);
+    assert.deepEqual(rules[0].owners, ["alice"]);
+    fs.rmSync(tmpDir2, { recursive: true });
+  });
+});
+
 // --- findOwners ---
 
 describe("findOwners", () => {

.github/scripts/owners.test.js

@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
-      - uses: actions/setup-go@4b73464bb391d4059bd26b0524d20df3927bd417 # v6.3.0
+      - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
         with:
           go-version-file: go.mod
           # Use different schema from regular job, to avoid overwriting the same key