73d4d5ecb2
When creating issues with explicit IDs like `bd create --id hq-cv-test`,
the prefix validation was failing even when `hq-cv` was in `allowed_prefixes`.
Root cause: `ExtractIssuePrefix("hq-cv-test")` returns `"hq"` (not `"hq-cv"`)
because "test" looks like an English word, causing the algorithm to fall back
to the first hyphen. The validation then checked if `"hq"` was in the allowed
list containing `"hq-cv"` - which failed.
The fix adds `ValidateIDPrefixAllowed()` which validates the full ID using
"starts with" matching (the same approach the importer uses successfully).
This correctly handles multi-hyphen prefixes like `hq-cv-` regardless of
what the suffix looks like.
Fixes #1135
Co-authored-by: Steven Syrek <steven.syrek@deepl.com>
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
504 lines
16 KiB
Go
504 lines
16 KiB
Go
package validation
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/steveyegge/beads/internal/types"
|
|
)
|
|
|
|
func TestParsePriority(t *testing.T) {
|
|
tests := []struct {
|
|
input string
|
|
expected int
|
|
}{
|
|
// Numeric format
|
|
{"0", 0},
|
|
{"1", 1},
|
|
{"2", 2},
|
|
{"3", 3},
|
|
{"4", 4},
|
|
|
|
// P-prefix format (uppercase)
|
|
{"P0", 0},
|
|
{"P1", 1},
|
|
{"P2", 2},
|
|
{"P3", 3},
|
|
{"P4", 4},
|
|
|
|
// P-prefix format (lowercase)
|
|
{"p0", 0},
|
|
{"p1", 1},
|
|
{"p2", 2},
|
|
|
|
// With whitespace
|
|
{" 1 ", 1},
|
|
{" P1 ", 1},
|
|
|
|
// Invalid cases (returns -1)
|
|
{"5", -1}, // Out of range
|
|
{"-1", -1}, // Negative
|
|
{"P5", -1}, // Out of range with prefix
|
|
{"abc", -1}, // Not a number
|
|
{"P", -1}, // Just the prefix
|
|
{"PP1", -1}, // Double prefix
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.input, func(t *testing.T) {
|
|
got := ParsePriority(tt.input)
|
|
if got != tt.expected {
|
|
t.Errorf("ParsePriority(%q) = %d, want %d", tt.input, got, tt.expected)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestValidatePriority(t *testing.T) {
|
|
tests := []struct {
|
|
input string
|
|
wantValue int
|
|
wantError bool
|
|
}{
|
|
{"0", 0, false},
|
|
{"2", 2, false},
|
|
{"P1", 1, false},
|
|
{"5", -1, true},
|
|
{"abc", -1, true},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.input, func(t *testing.T) {
|
|
got, err := ValidatePriority(tt.input)
|
|
if (err != nil) != tt.wantError {
|
|
t.Errorf("ValidatePriority(%q) error = %v, wantError %v", tt.input, err, tt.wantError)
|
|
return
|
|
}
|
|
if got != tt.wantValue {
|
|
t.Errorf("ValidatePriority(%q) = %d, want %d", tt.input, got, tt.wantValue)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestValidateIDFormat(t *testing.T) {
|
|
tests := []struct {
|
|
input string
|
|
wantPrefix string
|
|
wantError bool
|
|
}{
|
|
{"", "", false},
|
|
{"bd-a3f8e9", "bd", false},
|
|
{"bd-42", "bd", false},
|
|
{"bd-a3f8e9.1", "bd", false},
|
|
{"foo-bar", "foo", false},
|
|
{"nohyphen", "", true},
|
|
|
|
// Hyphenated prefix support
|
|
// These test cases verify that ValidateIDFormat correctly extracts
|
|
// prefixes containing hyphens (e.g., "bead-me-up" not just "bead")
|
|
{"bead-me-up-3e9", "bead-me-up", false}, // 3-char hash suffix
|
|
{"bead-me-up-3e9.1", "bead-me-up", false}, // hierarchical child
|
|
{"bead-me-up-3e9.1.2", "bead-me-up", false}, // deeply nested child
|
|
{"web-app-a3f8e9", "web-app", false}, // 6-char hash suffix
|
|
{"my-cool-project-1a2b", "my-cool-project", false}, // 4-char hash suffix
|
|
{"document-intelligence-0sa", "document-intelligence", false}, // 3-char hash
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.input, func(t *testing.T) {
|
|
got, err := ValidateIDFormat(tt.input)
|
|
if (err != nil) != tt.wantError {
|
|
t.Errorf("ValidateIDFormat(%q) error = %v, wantError %v", tt.input, err, tt.wantError)
|
|
return
|
|
}
|
|
if got != tt.wantPrefix {
|
|
t.Errorf("ValidateIDFormat(%q) = %q, want %q", tt.input, got, tt.wantPrefix)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestValidateIDFormat_ParentChildFlow tests the exact scenario that fails with --parent flag:
|
|
// When creating a child of a parent with a hyphenated prefix, the generated child ID
|
|
// (e.g., "bead-me-up-3e9.1") should have its prefix correctly extracted as "bead-me-up",
|
|
// not "bead". This test simulates the create.go flow at lines 352-391.
|
|
func TestValidateIDFormat_ParentChildFlow(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
parentID string
|
|
childSuffix string
|
|
dbPrefix string
|
|
wantPrefix string
|
|
shouldMatch bool
|
|
}{
|
|
{
|
|
name: "simple prefix - child creation works",
|
|
parentID: "bd-a3f8e9",
|
|
childSuffix: ".1",
|
|
dbPrefix: "bd",
|
|
wantPrefix: "bd",
|
|
shouldMatch: true,
|
|
},
|
|
{
|
|
name: "hyphenated prefix - child creation FAILS with current impl",
|
|
parentID: "bead-me-up-3e9",
|
|
childSuffix: ".1",
|
|
dbPrefix: "bead-me-up",
|
|
wantPrefix: "bead-me-up", // Current impl returns "bead" - THIS IS THE BUG
|
|
shouldMatch: true,
|
|
},
|
|
{
|
|
name: "hyphenated prefix - deeply nested child",
|
|
parentID: "bead-me-up-3e9.1",
|
|
childSuffix: ".2",
|
|
dbPrefix: "bead-me-up",
|
|
wantPrefix: "bead-me-up",
|
|
shouldMatch: true,
|
|
},
|
|
{
|
|
name: "multi-hyphen prefix - web-app style",
|
|
parentID: "web-app-abc123",
|
|
childSuffix: ".1",
|
|
dbPrefix: "web-app",
|
|
wantPrefix: "web-app",
|
|
shouldMatch: true,
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
// Simulate the child ID generation that happens in create.go:352
|
|
childID := tt.parentID + tt.childSuffix
|
|
|
|
// Simulate the validation flow from create.go:361
|
|
extractedPrefix, err := ValidateIDFormat(childID)
|
|
if err != nil {
|
|
t.Fatalf("ValidateIDFormat(%q) unexpected error: %v", childID, err)
|
|
}
|
|
|
|
// Check that extracted prefix matches expected
|
|
if extractedPrefix != tt.wantPrefix {
|
|
t.Errorf("ValidateIDFormat(%q) extracted prefix = %q, want %q",
|
|
childID, extractedPrefix, tt.wantPrefix)
|
|
}
|
|
|
|
// Simulate the prefix validation from create.go:389
|
|
// This is where the "prefix mismatch" error occurs
|
|
err = ValidatePrefix(extractedPrefix, tt.dbPrefix, false)
|
|
prefixMatches := (err == nil)
|
|
|
|
if prefixMatches != tt.shouldMatch {
|
|
if tt.shouldMatch {
|
|
t.Errorf("--parent %s flow: prefix validation failed unexpectedly: %v\n"+
|
|
" Child ID: %s\n"+
|
|
" Extracted prefix: %q\n"+
|
|
" Database prefix: %q",
|
|
tt.parentID, err, childID, extractedPrefix, tt.dbPrefix)
|
|
} else {
|
|
t.Errorf("--parent %s flow: expected prefix mismatch but validation passed", tt.parentID)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestParseIssueType(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
input string
|
|
wantType types.IssueType
|
|
wantError bool
|
|
errorContains string
|
|
}{
|
|
// Core work types (always valid)
|
|
{"bug type", "bug", types.TypeBug, false, ""},
|
|
{"feature type", "feature", types.TypeFeature, false, ""},
|
|
{"task type", "task", types.TypeTask, false, ""},
|
|
{"epic type", "epic", types.TypeEpic, false, ""},
|
|
{"chore type", "chore", types.TypeChore, false, ""},
|
|
// Gas Town types require types.custom configuration (invalid without config)
|
|
{"merge-request type", "merge-request", types.TypeTask, true, "invalid issue type"},
|
|
{"molecule type", "molecule", types.TypeTask, true, "invalid issue type"},
|
|
{"gate type", "gate", types.TypeTask, true, "invalid issue type"},
|
|
{"event type", "event", types.TypeTask, true, "invalid issue type"},
|
|
{"message type", "message", types.TypeTask, true, "invalid issue type"},
|
|
|
|
// Case sensitivity (function is case-sensitive)
|
|
{"uppercase bug", "BUG", types.TypeTask, true, "invalid issue type"},
|
|
{"mixed case feature", "FeAtUrE", types.TypeTask, true, "invalid issue type"},
|
|
|
|
// With whitespace
|
|
{"bug with spaces", " bug ", types.TypeBug, false, ""},
|
|
{"feature with tabs", "\tfeature\t", types.TypeFeature, false, ""},
|
|
|
|
// Invalid issue types
|
|
{"invalid type", "invalid", types.TypeTask, true, "invalid issue type"},
|
|
{"empty string", "", types.TypeTask, true, "invalid issue type"},
|
|
{"whitespace only", " ", types.TypeTask, true, "invalid issue type"},
|
|
{"numeric type", "123", types.TypeTask, true, "invalid issue type"},
|
|
{"special chars", "bug!", types.TypeTask, true, "invalid issue type"},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
got, err := ParseIssueType(tt.input)
|
|
|
|
// Check error conditions
|
|
if (err != nil) != tt.wantError {
|
|
t.Errorf("ParseIssueType(%q) error = %v, wantError %v", tt.input, err, tt.wantError)
|
|
return
|
|
}
|
|
|
|
if err != nil && tt.errorContains != "" {
|
|
if !strings.Contains(err.Error(), tt.errorContains) {
|
|
t.Errorf("ParseIssueType(%q) error message = %q, should contain %q", tt.input, err.Error(), tt.errorContains)
|
|
}
|
|
return
|
|
}
|
|
|
|
// Check return value
|
|
if got != tt.wantType {
|
|
t.Errorf("ParseIssueType(%q) = %v, want %v", tt.input, got, tt.wantType)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestValidatePrefix(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
requestedPrefix string
|
|
dbPrefix string
|
|
force bool
|
|
wantError bool
|
|
}{
|
|
{"matching prefixes", "bd", "bd", false, false},
|
|
{"empty db prefix", "bd", "", false, false},
|
|
{"mismatched with force", "foo", "bd", true, false},
|
|
{"mismatched without force", "foo", "bd", false, true},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
err := ValidatePrefix(tt.requestedPrefix, tt.dbPrefix, tt.force)
|
|
if (err != nil) != tt.wantError {
|
|
t.Errorf("ValidatePrefix() error = %v, wantError %v", err, tt.wantError)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestValidatePrefixWithAllowed(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
requestedPrefix string
|
|
dbPrefix string
|
|
allowedPrefixes string
|
|
force bool
|
|
wantError bool
|
|
}{
|
|
// Basic cases (same as ValidatePrefix)
|
|
{"matching prefixes", "bd", "bd", "", false, false},
|
|
{"empty db prefix", "bd", "", "", false, false},
|
|
{"mismatched with force", "foo", "bd", "", true, false},
|
|
{"mismatched without force", "foo", "bd", "", false, true},
|
|
|
|
// Multi-prefix cases (Gas Town use case)
|
|
{"allowed prefix gt", "gt", "hq", "gt,hmc", false, false},
|
|
{"allowed prefix hmc", "hmc", "hq", "gt,hmc", false, false},
|
|
{"primary prefix still works", "hq", "hq", "gt,hmc", false, false},
|
|
{"prefix not in allowed list", "foo", "hq", "gt,hmc", false, true},
|
|
|
|
// Edge cases
|
|
{"allowed with spaces", "gt", "hq", "gt, hmc, foo", false, false},
|
|
{"empty allowed list", "gt", "hq", "", false, true},
|
|
{"single allowed prefix", "gt", "hq", "gt", false, false},
|
|
|
|
// GH#1135: prefix-of-allowed cases
|
|
// When ExtractIssuePrefix returns "hq" from "hq-cv-test", but "hq-cv" is allowed
|
|
{"GH#1135 prefix-of-allowed hq->hq-cv", "hq", "djdefi-ops", "djdefi-ops,hq-cv", false, false},
|
|
{"GH#1135 prefix-of-allowed with multiple", "hq", "djdefi-ops", "hq-cv,hq-other,foo", false, false},
|
|
{"GH#1135 exact match still works", "hq-cv", "djdefi-ops", "hq-cv", false, false},
|
|
{"GH#1135 no false positive for unrelated prefix", "bar", "djdefi-ops", "hq-cv", false, true},
|
|
{"GH#1135 no false positive for partial overlap", "hq", "djdefi-ops", "hqx-cv", false, true},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
err := ValidatePrefixWithAllowed(tt.requestedPrefix, tt.dbPrefix, tt.allowedPrefixes, tt.force)
|
|
if (err != nil) != tt.wantError {
|
|
t.Errorf("ValidatePrefixWithAllowed() error = %v, wantError %v", err, tt.wantError)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
// TestValidateIDPrefixAllowed tests the new function that validates IDs using
|
|
// "starts with" matching to handle multi-hyphen prefixes correctly (GH#1135).
|
|
func TestValidateIDPrefixAllowed(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
id string
|
|
dbPrefix string
|
|
allowedPrefixes string
|
|
force bool
|
|
wantError bool
|
|
}{
|
|
// Basic cases
|
|
{"matching prefix", "bd-abc123", "bd", "", false, false},
|
|
{"empty db prefix", "bd-abc123", "", "", false, false},
|
|
{"mismatched with force", "foo-abc123", "bd", "", true, false},
|
|
{"mismatched without force", "foo-abc123", "bd", "", false, true},
|
|
|
|
// Multi-hyphen prefix cases (GH#1135 - the main bug)
|
|
{"hq-cv prefix with word suffix", "hq-cv-test", "djdefi-ops", "hq,hq-cv", false, false},
|
|
{"hq-cv prefix with hash suffix", "hq-cv-abc123", "djdefi-ops", "hq,hq-cv", false, false},
|
|
{"djdefi-ops with word suffix", "djdefi-ops-test", "djdefi-ops", "", false, false},
|
|
|
|
// Allowed prefixes list
|
|
{"allowed prefix gt", "gt-abc123", "hq", "gt,hmc", false, false},
|
|
{"allowed prefix hmc", "hmc-abc123", "hq", "gt,hmc", false, false},
|
|
{"primary prefix still works", "hq-abc123", "hq", "gt,hmc", false, false},
|
|
{"prefix not in allowed list", "foo-abc123", "hq", "gt,hmc", false, true},
|
|
|
|
// Edge cases
|
|
{"allowed with spaces", "gt-abc123", "hq", "gt, hmc, foo", false, false},
|
|
{"allowed with trailing dash", "gt-abc123", "hq", "gt-, hmc-", false, false},
|
|
{"empty allowed list", "gt-abc123", "hq", "", false, true},
|
|
{"single allowed prefix", "gt-abc123", "hq", "gt", false, false},
|
|
|
|
// Multi-hyphen allowed prefixes
|
|
{"multi-hyphen in allowed list", "my-cool-prefix-abc123", "hq", "my-cool-prefix,other", false, false},
|
|
{"partial match should fail", "hq-cv-extra-test", "hq", "hq-cv-extra", false, false},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
err := ValidateIDPrefixAllowed(tt.id, tt.dbPrefix, tt.allowedPrefixes, tt.force)
|
|
if (err != nil) != tt.wantError {
|
|
t.Errorf("ValidateIDPrefixAllowed(%q, %q, %q) error = %v, wantError %v",
|
|
tt.id, tt.dbPrefix, tt.allowedPrefixes, err, tt.wantError)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestValidateAgentID(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
id string
|
|
wantError bool
|
|
errorContains string
|
|
}{
|
|
// Town-level agents (no rig)
|
|
{"valid mayor", "gt-mayor", false, ""},
|
|
{"valid deacon", "gt-deacon", false, ""},
|
|
|
|
// Per-rig agents (canonical format: gt-<rig>-<role>)
|
|
{"valid witness gastown", "gt-gastown-witness", false, ""},
|
|
{"valid refinery beads", "gt-beads-refinery", false, ""},
|
|
|
|
// Named agents (canonical format: gt-<rig>-<role>-<name>)
|
|
{"valid polecat", "gt-gastown-polecat-nux", false, ""},
|
|
{"valid crew", "gt-beads-crew-dave", false, ""},
|
|
{"valid polecat with complex name", "gt-gastown-polecat-war-boy-1", false, ""},
|
|
|
|
// Valid: alternative prefixes (beads uses bd-)
|
|
{"valid bd-mayor", "bd-mayor", false, ""},
|
|
{"valid bd-beads-polecat-pearl", "bd-beads-polecat-pearl", false, ""},
|
|
{"valid bd-beads-witness", "bd-beads-witness", false, ""},
|
|
|
|
// Valid: hyphenated rig names (GH#854)
|
|
{"hyphenated rig witness", "ob-my-project-witness", false, ""},
|
|
{"hyphenated rig refinery", "gt-foo-bar-refinery", false, ""},
|
|
{"hyphenated rig crew", "bd-my-cool-project-crew-fang", false, ""},
|
|
{"hyphenated rig polecat", "gt-some-long-rig-name-polecat-nux", false, ""},
|
|
{"hyphenated rig and name", "gt-my-rig-polecat-war-boy", false, ""},
|
|
{"multi-hyphen rig crew", "ob-a-b-c-d-crew-dave", false, ""},
|
|
|
|
// Invalid: no prefix (missing hyphen)
|
|
{"no prefix", "mayor", true, "must have a prefix followed by '-'"},
|
|
|
|
// Invalid: empty
|
|
{"empty id", "", true, "agent ID is required"},
|
|
|
|
// Invalid: unknown role in position 2
|
|
{"unknown role", "gt-gastown-admin", true, "invalid agent format"},
|
|
|
|
// Invalid: town-level with rig (put role first)
|
|
{"mayor with rig suffix", "gt-gastown-mayor", true, "cannot have rig/name suffixes"},
|
|
{"deacon with rig suffix", "gt-beads-deacon", true, "cannot have rig/name suffixes"},
|
|
|
|
// Invalid: per-rig role without rig
|
|
{"witness alone", "gt-witness", true, "requires rig"},
|
|
{"refinery alone", "gt-refinery", true, "requires rig"},
|
|
|
|
// Invalid: named agent without name
|
|
{"crew no name", "gt-beads-crew", true, "requires name"},
|
|
{"polecat no name", "gt-gastown-polecat", true, "requires name"},
|
|
|
|
// Invalid: witness/refinery with extra parts
|
|
{"witness with name", "gt-gastown-witness-extra", true, "cannot have name suffix"},
|
|
{"refinery with name", "gt-beads-refinery-extra", true, "cannot have name suffix"},
|
|
|
|
// Invalid: empty components
|
|
{"empty after prefix", "gt-", true, "must include content after prefix"},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
err := ValidateAgentID(tt.id)
|
|
if (err != nil) != tt.wantError {
|
|
t.Errorf("ValidateAgentID(%q) error = %v, wantError %v", tt.id, err, tt.wantError)
|
|
return
|
|
}
|
|
if err != nil && tt.errorContains != "" {
|
|
if !strings.Contains(err.Error(), tt.errorContains) {
|
|
t.Errorf("ValidateAgentID(%q) error = %q, should contain %q", tt.id, err.Error(), tt.errorContains)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestExtractAgentPrefix(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
id string
|
|
wantPrefix string
|
|
}{
|
|
// Town-level agents
|
|
{"mayor", "gt-mayor", "gt"},
|
|
{"deacon", "gt-deacon", "gt"},
|
|
{"bd mayor", "bd-mayor", "bd"},
|
|
|
|
// Per-rig agents
|
|
{"witness", "gt-gastown-witness", "gt"},
|
|
{"refinery", "bd-beads-refinery", "bd"},
|
|
|
|
// Named agents - the bug case
|
|
{"polecat 3-char name", "nx-nexus-polecat-nux", "nx"},
|
|
{"polecat regular", "gt-gastown-polecat-phoenix", "gt"},
|
|
{"crew", "gt-beads-crew-dave", "gt"},
|
|
|
|
// Hyphenated rig names
|
|
{"hyphenated rig", "gt-my-project-witness", "gt"},
|
|
{"multi-hyphen rig polecat", "bd-my-cool-app-polecat-bob", "bd"},
|
|
|
|
// Edge cases
|
|
{"no hyphen", "nohyphen", ""},
|
|
{"empty", "", ""},
|
|
{"just prefix", "gt-", "gt"},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
got := ExtractAgentPrefix(tt.id)
|
|
if got != tt.wantPrefix {
|
|
t.Errorf("ExtractAgentPrefix(%q) = %q, want %q", tt.id, got, tt.wantPrefix)
|
|
}
|
|
})
|
|
}
|
|
}
|