style: format code with gofmt
This commit is contained in:
parent
e38364b08a
commit
47533a00cd
3 changed files with 11 additions and 11 deletions
|
|
@ -161,8 +161,8 @@ func NewAgentLoop(cfg *config.Config, msgBus *bus.MessageBus, provider providers
|
||||||
contextBuilder: contextBuilder,
|
contextBuilder: contextBuilder,
|
||||||
tools: toolsRegistry,
|
tools: toolsRegistry,
|
||||||
mcpManager: mcpManager,
|
mcpManager: mcpManager,
|
||||||
mcpConfig: cfg.Tools.MCP, // Store only MCP config (minimal dependency)
|
mcpConfig: cfg.Tools.MCP, // Store only MCP config (minimal dependency)
|
||||||
workspacePath: workspace, // Store workspace path for envFile resolution
|
workspacePath: workspace, // Store workspace path for envFile resolution
|
||||||
subagentManager: subagentManager,
|
subagentManager: subagentManager,
|
||||||
summarizing: sync.Map{},
|
summarizing: sync.Map{},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -134,32 +134,32 @@ func TestEnvFilePriority(t *testing.T) {
|
||||||
// Create a temporary .env file
|
// Create a temporary .env file
|
||||||
tmpDir := t.TempDir()
|
tmpDir := t.TempDir()
|
||||||
envFile := filepath.Join(tmpDir, ".env")
|
envFile := filepath.Join(tmpDir, ".env")
|
||||||
|
|
||||||
envContent := `API_KEY=from_file
|
envContent := `API_KEY=from_file
|
||||||
DATABASE_URL=from_file
|
DATABASE_URL=from_file
|
||||||
SHARED_VAR=from_file`
|
SHARED_VAR=from_file`
|
||||||
|
|
||||||
if err := os.WriteFile(envFile, []byte(envContent), 0644); err != nil {
|
if err := os.WriteFile(envFile, []byte(envContent), 0644); err != nil {
|
||||||
t.Fatalf("Failed to create .env file: %v", err)
|
t.Fatalf("Failed to create .env file: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Load envFile
|
// Load envFile
|
||||||
envVars, err := loadEnvFile(envFile)
|
envVars, err := loadEnvFile(envFile)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("Failed to load env file: %v", err)
|
t.Fatalf("Failed to load env file: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Verify envFile variables
|
// Verify envFile variables
|
||||||
if envVars["API_KEY"] != "from_file" {
|
if envVars["API_KEY"] != "from_file" {
|
||||||
t.Errorf("Expected API_KEY=from_file, got %s", envVars["API_KEY"])
|
t.Errorf("Expected API_KEY=from_file, got %s", envVars["API_KEY"])
|
||||||
}
|
}
|
||||||
|
|
||||||
// Simulate config.Env overriding envFile
|
// Simulate config.Env overriding envFile
|
||||||
configEnv := map[string]string{
|
configEnv := map[string]string{
|
||||||
"SHARED_VAR": "from_config",
|
"SHARED_VAR": "from_config",
|
||||||
"NEW_VAR": "from_config",
|
"NEW_VAR": "from_config",
|
||||||
}
|
}
|
||||||
|
|
||||||
// Merge: envFile first, then config overrides
|
// Merge: envFile first, then config overrides
|
||||||
merged := make(map[string]string)
|
merged := make(map[string]string)
|
||||||
for k, v := range envVars {
|
for k, v := range envVars {
|
||||||
|
|
@ -168,7 +168,7 @@ SHARED_VAR=from_file`
|
||||||
for k, v := range configEnv {
|
for k, v := range configEnv {
|
||||||
merged[k] = v
|
merged[k] = v
|
||||||
}
|
}
|
||||||
|
|
||||||
// Verify priority: config.Env should override envFile
|
// Verify priority: config.Env should override envFile
|
||||||
if merged["SHARED_VAR"] != "from_config" {
|
if merged["SHARED_VAR"] != "from_config" {
|
||||||
t.Errorf("Expected SHARED_VAR=from_config (config should override file), got %s", merged["SHARED_VAR"])
|
t.Errorf("Expected SHARED_VAR=from_config (config should override file), got %s", merged["SHARED_VAR"])
|
||||||
|
|
|
||||||
|
|
@ -39,9 +39,9 @@ func TestNewMCPTool(t *testing.T) {
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"description": "Test input",
|
"description": "Test input",
|
||||||
},
|
},
|
||||||
},
|
|
||||||
},
|
},
|
||||||
}
|
},
|
||||||
|
}
|
||||||
|
|
||||||
mcpTool := NewMCPTool(manager, "test_server", tool)
|
mcpTool := NewMCPTool(manager, "test_server", tool)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue