feat: add git user.name to actor fallback chain (#994)
- Insert git config user.name in fallback chain before final $USER default - Consolidate duplicate actor resolution logic into single function - Add BEADS_ACTOR as env var alias for MCP compatibility - Add tests for actor resolution priority - Update CONFIG.md with Actor Identity Resolution section The new fallback order is: --actor flag > BD_ACTOR > BEADS_ACTOR > git user.name > $USER > "unknown" Co-authored-by: Ohffs <ohffsnotnow@gmail.com> Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
202
cmd/bd/actor_test.go
Normal file
202
cmd/bd/actor_test.go
Normal file
@@ -0,0 +1,202 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"os"
|
||||
"os/exec"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
// TestGetActorWithGit tests the actor resolution fallback chain.
|
||||
// Priority: --actor flag > BD_ACTOR env > BEADS_ACTOR env > git config user.name > $USER > "unknown"
|
||||
func TestGetActorWithGit(t *testing.T) {
|
||||
// Save original environment and actor variable
|
||||
origActor := actor
|
||||
origBdActor, bdActorSet := os.LookupEnv("BD_ACTOR")
|
||||
origBeadsActor, beadsActorSet := os.LookupEnv("BEADS_ACTOR")
|
||||
origUser, userSet := os.LookupEnv("USER")
|
||||
|
||||
// Cleanup after test
|
||||
defer func() {
|
||||
actor = origActor
|
||||
if bdActorSet {
|
||||
os.Setenv("BD_ACTOR", origBdActor)
|
||||
} else {
|
||||
os.Unsetenv("BD_ACTOR")
|
||||
}
|
||||
if beadsActorSet {
|
||||
os.Setenv("BEADS_ACTOR", origBeadsActor)
|
||||
} else {
|
||||
os.Unsetenv("BEADS_ACTOR")
|
||||
}
|
||||
if userSet {
|
||||
os.Setenv("USER", origUser)
|
||||
} else {
|
||||
os.Unsetenv("USER")
|
||||
}
|
||||
}()
|
||||
|
||||
// Helper to get current git user.name (may be empty if not configured)
|
||||
getGitUserName := func() string {
|
||||
out, err := exec.Command("git", "config", "user.name").Output()
|
||||
if err != nil {
|
||||
return ""
|
||||
}
|
||||
return strings.TrimSpace(string(out))
|
||||
}
|
||||
|
||||
gitUserName := getGitUserName()
|
||||
|
||||
tests := []struct {
|
||||
name string
|
||||
actorFlag string
|
||||
bdActor string
|
||||
beadsActor string
|
||||
user string
|
||||
expected string
|
||||
skipIfNoGit bool // Skip if git user.name is not configured
|
||||
}{
|
||||
{
|
||||
name: "actor flag takes priority",
|
||||
actorFlag: "flag-actor",
|
||||
bdActor: "bd-actor",
|
||||
beadsActor: "beads-actor",
|
||||
user: "system-user",
|
||||
expected: "flag-actor",
|
||||
},
|
||||
{
|
||||
name: "BD_ACTOR takes priority when no flag",
|
||||
actorFlag: "",
|
||||
bdActor: "bd-actor",
|
||||
beadsActor: "beads-actor",
|
||||
user: "system-user",
|
||||
expected: "bd-actor",
|
||||
},
|
||||
{
|
||||
name: "BEADS_ACTOR takes priority when no BD_ACTOR",
|
||||
actorFlag: "",
|
||||
bdActor: "",
|
||||
beadsActor: "beads-actor",
|
||||
user: "system-user",
|
||||
expected: "beads-actor",
|
||||
},
|
||||
{
|
||||
name: "git config user.name used when no env vars",
|
||||
actorFlag: "",
|
||||
bdActor: "",
|
||||
beadsActor: "",
|
||||
user: "system-user",
|
||||
expected: gitUserName, // Will be git user.name if configured
|
||||
skipIfNoGit: true,
|
||||
},
|
||||
{
|
||||
name: "USER fallback when no git config",
|
||||
actorFlag: "",
|
||||
bdActor: "",
|
||||
beadsActor: "",
|
||||
user: "fallback-user",
|
||||
expected: "fallback-user",
|
||||
// Note: This test may fail if git user.name is configured
|
||||
// We handle this by checking the actual git config in the test
|
||||
},
|
||||
{
|
||||
name: "unknown as final fallback",
|
||||
actorFlag: "",
|
||||
bdActor: "",
|
||||
beadsActor: "",
|
||||
user: "",
|
||||
expected: "unknown",
|
||||
// Note: This test may get git user.name instead if configured
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
// Skip tests that require git user.name to not be configured
|
||||
if tt.skipIfNoGit && gitUserName == "" {
|
||||
t.Skip("Skipping: git config user.name is not configured")
|
||||
}
|
||||
|
||||
// For tests expecting USER or unknown, skip if git user.name is configured
|
||||
// because git takes priority over USER
|
||||
if (tt.expected == tt.user || tt.expected == "unknown") && gitUserName != "" && tt.bdActor == "" && tt.beadsActor == "" && tt.actorFlag == "" {
|
||||
t.Skipf("Skipping: git config user.name (%s) takes priority over expected %s", gitUserName, tt.expected)
|
||||
}
|
||||
|
||||
// Set up test environment
|
||||
actor = tt.actorFlag
|
||||
|
||||
if tt.bdActor != "" {
|
||||
os.Setenv("BD_ACTOR", tt.bdActor)
|
||||
} else {
|
||||
os.Unsetenv("BD_ACTOR")
|
||||
}
|
||||
|
||||
if tt.beadsActor != "" {
|
||||
os.Setenv("BEADS_ACTOR", tt.beadsActor)
|
||||
} else {
|
||||
os.Unsetenv("BEADS_ACTOR")
|
||||
}
|
||||
|
||||
if tt.user != "" {
|
||||
os.Setenv("USER", tt.user)
|
||||
} else {
|
||||
os.Unsetenv("USER")
|
||||
}
|
||||
|
||||
// Call the function
|
||||
result := getActorWithGit()
|
||||
|
||||
// Check result
|
||||
if result != tt.expected {
|
||||
t.Errorf("getActorWithGit() = %q, want %q", result, tt.expected)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// TestGetActorWithGit_PriorityOrder tests that the priority order is respected
|
||||
func TestGetActorWithGit_PriorityOrder(t *testing.T) {
|
||||
// Save original state
|
||||
origActor := actor
|
||||
origBdActor, bdActorSet := os.LookupEnv("BD_ACTOR")
|
||||
origBeadsActor, beadsActorSet := os.LookupEnv("BEADS_ACTOR")
|
||||
|
||||
defer func() {
|
||||
actor = origActor
|
||||
if bdActorSet {
|
||||
os.Setenv("BD_ACTOR", origBdActor)
|
||||
} else {
|
||||
os.Unsetenv("BD_ACTOR")
|
||||
}
|
||||
if beadsActorSet {
|
||||
os.Setenv("BEADS_ACTOR", origBeadsActor)
|
||||
} else {
|
||||
os.Unsetenv("BEADS_ACTOR")
|
||||
}
|
||||
}()
|
||||
|
||||
// Test: flag > BD_ACTOR > BEADS_ACTOR
|
||||
actor = "from-flag"
|
||||
os.Setenv("BD_ACTOR", "from-bd-actor")
|
||||
os.Setenv("BEADS_ACTOR", "from-beads-actor")
|
||||
|
||||
result := getActorWithGit()
|
||||
if result != "from-flag" {
|
||||
t.Errorf("Expected flag to take priority, got %q", result)
|
||||
}
|
||||
|
||||
// Test: BD_ACTOR > BEADS_ACTOR (no flag)
|
||||
actor = ""
|
||||
result = getActorWithGit()
|
||||
if result != "from-bd-actor" {
|
||||
t.Errorf("Expected BD_ACTOR to take priority over BEADS_ACTOR, got %q", result)
|
||||
}
|
||||
|
||||
// Test: BEADS_ACTOR when BD_ACTOR is empty
|
||||
os.Unsetenv("BD_ACTOR")
|
||||
result = getActorWithGit()
|
||||
if result != "from-beads-actor" {
|
||||
t.Errorf("Expected BEADS_ACTOR to be used, got %q", result)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user