fix: resolve Phase 14 merge conflicts across CI/CD, archive, and frontend sources

pkg/recon/sources/circleci_test.go

@@ -11,52 +11,6 @@ import (
 	"github.com/salvacybersec/keyhunter/pkg/recon"
 )
 
-<<<<<<< HEAD
-const circleFixtureJSON = `{
-  "items": [
-    {
-      "id": "pipeline-uuid-1",
-      "vcs": {"provider_name": "github", "target_repository_url": "https://github.com/alice/repo"}
-    },
-    {
-      "id": "pipeline-uuid-2",
-      "vcs": {"provider_name": "github", "target_repository_url": ""}
-    }
-  ]
-}`
-
-func TestCircleCI_Sweep_ExtractsFindings(t *testing.T) {
-	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.URL.Path != "/pipeline" {
-			t.Errorf("unexpected path: %s", r.URL.Path)
-		}
-		if r.Header.Get("Circle-Token") == "" {
-			t.Error("missing Circle-Token header")
-		}
-		w.Header().Set("Content-Type", "application/json")
-		_, _ = w.Write([]byte(circleFixtureJSON))
-	}))
-	defer srv.Close()
-
-	src := &CircleCISource{
-		Token:    "test-token",
-		BaseURL:  srv.URL,
-		Registry: providers.NewRegistryFromProviders([]providers.Provider{
-			{Name: "openai", Keywords: []string{"sk-proj-"}},
-		}),
-		Limiters: recon.NewLimiterRegistry(),
-		Client:   NewClient(),
-	}
-
-	out := make(chan recon.Finding, 16)
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-
-	if err := src.Sweep(ctx, "", out); err != nil {
-		t.Fatalf("Sweep err: %v", err)
-	}
-	close(out)
-=======
 func TestCircleCI_Name(t *testing.T) {
 	s := &CircleCISource{}
 	if s.Name() != "circleci" {
@@ -110,57 +64,15 @@ Tests completed successfully`))
 	if err != nil {
 		t.Fatalf("Sweep error: %v", err)
 	}
->>>>>>> worktree-agent-adad8c10
 
 	var findings []recon.Finding
 	for f := range out {
 		findings = append(findings, f)
 	}
-<<<<<<< HEAD
-	if len(findings) != 2 {
-		t.Fatalf("expected 2 findings, got %d", len(findings))
-	}
-	// First pipeline has VCS URL, second falls back to app URL.
-	if findings[0].Source != "https://github.com/alice/repo" {
-		t.Errorf("unexpected source[0]: %s", findings[0].Source)
-	}
-	if findings[1].Source != "https://app.circleci.com/pipelines/pipeline-uuid-2" {
-		t.Errorf("unexpected source[1]: %s", findings[1].Source)
-	}
-	for _, f := range findings {
-		if f.SourceType != "recon:circleci" {
-			t.Errorf("unexpected SourceType: %s", f.SourceType)
-		}
-	}
-}
-
-func TestCircleCI_EnabledOnlyWithToken(t *testing.T) {
-	s := &CircleCISource{}
-	if s.Enabled(recon.Config{}) {
-		t.Fatal("expected Enabled=false without token")
-	}
-	s.Token = "test"
-	if !s.Enabled(recon.Config{}) {
-		t.Fatal("expected Enabled=true with token")
-	}
-}
-
-func TestCircleCI_NameAndRate(t *testing.T) {
-	s := &CircleCISource{}
-	if s.Name() != "circleci" {
-		t.Errorf("unexpected name: %s", s.Name())
-	}
-	if s.Burst() != 2 {
-		t.Errorf("burst: %d", s.Burst())
-	}
-	if s.RespectsRobots() {
-		t.Error("expected RespectsRobots=false")
-=======
 	if len(findings) == 0 {
 		t.Fatal("expected at least one finding from CircleCI pipeline log")
 	}
 	if findings[0].SourceType != "recon:circleci" {
 		t.Fatalf("expected recon:circleci, got %s", findings[0].SourceType)
->>>>>>> worktree-agent-adad8c10
 	}
 }