fix conflicts

This commit is contained in:
Codex Assistant
2026-01-08 09:08:49 +02:00
parent 8f0320edd5
commit 43c02081ef
4 changed files with 0 additions and 14 deletions

View File

@@ -537,13 +537,9 @@ Initial rules to include in default bundle:
| Date | Action | Notes |
|------|--------|-------|
| 2026-01-04 | Sprint created | Based on gap analysis of secrets scanning support |
<<<<<<<< HEAD:docs-archived/implplan/2026-01-04-completed-sprints/SPRINT_20260104_002_SCANNER_secret_leak_detection_core.md
| 2026-01-07 | All tasks marked DONE | Implementation verified: project structure, detectors (Regex, Entropy, Composite), models (SecretRule, SecretRuleset, SecretLeakEvidence), RulesetLoader, SecretsAnalyzer, SecretsAnalyzerHost, ServiceCollectionExtensions, unit tests all exist |
| 2026-01-07 | Gap analysis | Found missing tests: SecretsAnalyzerTests.cs, SecretsAnalyzerHostTests.cs, Fixtures/, integration tests |
| 2026-01-07 | Tests completed | Added SecretsAnalyzerTests.cs (20 tests), SecretsAnalyzerHostTests.cs (9 tests), SecretsAnalyzerIntegrationTests.cs (11 tests), Fixtures/ with aws-access-key.txt, github-token.txt, private-key.pem, test-ruleset.jsonl |
| 2026-01-07 | Sprint complete | All tasks verified and ready for archive |
========
| 2026-01-04 | SLD-001 to SLD-014, SLD-016 completed | Full implementation: project structure, rule models, RegexDetector, EntropyDetector, PayloadMasker, SecretLeakEvidence, RulesetLoader, SecretsAnalyzerOptions, CompositeSecretDetector, SecretsAnalyzer, SecretsAnalyzerHost, ServiceCollectionExtensions, unit tests (EntropyCalculatorTests, PayloadMaskerTests, RegexDetectorTests, RulesetLoaderTests, SecretRuleTests, SecretRulesetTests), AGENTS.md. All builds verified. |
| 2026-01-04 | SLD-015 completed | Created integration test project with test fixtures (aws-access-key.txt, github-token.txt, private-key.pem, test-ruleset.jsonl) and SecretsAnalyzerIntegrationTests.cs covering full scan detection, feature flags, circuit breaker, masking, evidence fields, and determinism. All builds verified. **Sprint complete.** |
>>>>>>>> 2096cf49a629f8e20e0775958cf82718dab85884:docs-archived/implplan/2026-01-04-secret-detection/SPRINT_20260104_002_SCANNER_secret_leak_detection_core.md