From 43c02081ef7d4d46b0b78c831b653477092f3b64 Mon Sep 17 00:00:00 2001 From: Codex Assistant Date: Thu, 8 Jan 2026 09:08:49 +0200 Subject: [PATCH] fix conflicts --- .../SPRINT_20260104_002_SCANNER_secret_leak_detection_core.md | 4 ---- .../SPRINT_20260104_002_SCANNER_secret_leak_detection_core.md | 4 ---- .../SPRINT_20260104_006_BE_secret_detection_config_api.md | 3 --- .../SPRINT_20260104_008_FE_secret_detection_ui.md | 3 --- 4 files changed, 14 deletions(-) diff --git a/docs-archived/implplan/2026-01-04-completed-sprints/SPRINT_20260104_002_SCANNER_secret_leak_detection_core.md b/docs-archived/implplan/2026-01-04-completed-sprints/SPRINT_20260104_002_SCANNER_secret_leak_detection_core.md index 6055abe0e..8f075a180 100644 --- a/docs-archived/implplan/2026-01-04-completed-sprints/SPRINT_20260104_002_SCANNER_secret_leak_detection_core.md +++ b/docs-archived/implplan/2026-01-04-completed-sprints/SPRINT_20260104_002_SCANNER_secret_leak_detection_core.md @@ -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 diff --git a/docs-archived/implplan/2026-01-04-secret-detection/SPRINT_20260104_002_SCANNER_secret_leak_detection_core.md b/docs-archived/implplan/2026-01-04-secret-detection/SPRINT_20260104_002_SCANNER_secret_leak_detection_core.md index 6055abe0e..8f075a180 100644 --- a/docs-archived/implplan/2026-01-04-secret-detection/SPRINT_20260104_002_SCANNER_secret_leak_detection_core.md +++ b/docs-archived/implplan/2026-01-04-secret-detection/SPRINT_20260104_002_SCANNER_secret_leak_detection_core.md @@ -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 diff --git a/docs-archived/implplan/2026-01-04-secret-detection/SPRINT_20260104_006_BE_secret_detection_config_api.md b/docs-archived/implplan/2026-01-04-secret-detection/SPRINT_20260104_006_BE_secret_detection_config_api.md index 9be13ad7e..fd96797b7 100644 --- a/docs-archived/implplan/2026-01-04-secret-detection/SPRINT_20260104_006_BE_secret_detection_config_api.md +++ b/docs-archived/implplan/2026-01-04-secret-detection/SPRINT_20260104_006_BE_secret_detection_config_api.md @@ -30,11 +30,8 @@ Backend APIs and data models for configuring secret detection behavior per tenan | 1 | SDC-001 | DONE | None | Scanner Guild | Define SecretDetectionSettings domain model | | 2 | SDC-002 | DONE | SDC-001 | Scanner Guild | Create SecretRevelationPolicy enum and config | | 3 | SDC-003 | DONE | SDC-001 | Scanner Guild | Create SecretExceptionPattern model for allowlists | -<<<<<<<< HEAD:docs-archived/implplan/2026-01-04-completed-sprints/SPRINT_20260104_006_BE_secret_detection_config_api.md | 4 | SDC-004 | DONE | SDC-001 | Platform Guild | Add persistence (EF Core migrations) | -======== | 4 | SDC-004 | DONE | SDC-001 | Platform Guild | Add persistence (Dapper migrations) | ->>>>>>>> 2096cf49a629f8e20e0775958cf82718dab85884:docs-archived/implplan/2026-01-04-secret-detection/SPRINT_20260104_006_BE_secret_detection_config_api.md | 5 | SDC-005 | DONE | SDC-004 | Platform Guild | Create Settings CRUD API endpoints | | 6 | SDC-006 | DONE | SDC-005 | Platform Guild | Add OpenAPI spec for settings endpoints | | 7 | SDC-007 | DONE | SDC-003 | Scanner Guild | Integrate exception patterns into SecretsAnalyzerHost | diff --git a/docs-archived/implplan/2026-01-04-secret-detection/SPRINT_20260104_008_FE_secret_detection_ui.md b/docs-archived/implplan/2026-01-04-secret-detection/SPRINT_20260104_008_FE_secret_detection_ui.md index cc17e91d0..967967427 100644 --- a/docs-archived/implplan/2026-01-04-secret-detection/SPRINT_20260104_008_FE_secret_detection_ui.md +++ b/docs-archived/implplan/2026-01-04-secret-detection/SPRINT_20260104_008_FE_secret_detection_ui.md @@ -496,12 +496,9 @@ src/Web/StellaOps.Web/src/app/ | Date | Action | Notes | |------|--------|-------| | 2026-01-04 | Sprint created | UI components for secret detection | -<<<<<<< HEAD:docs/implplan/SPRINT_20260104_008_FE_secret_detection_ui.md | 2025-06-18 | SDU-001 through SDU-012 DONE | Full feature module implemented: 4 model files, 2 services with mock APIs, 10 standalone components (settings, findings-list, detail-drawer, exception-manager, exception-form, revelation-policy, rule-category, alert-destination, masked-value, channel-test), routes file, 2 test spec files. Angular v17 patterns with signals, InjectionToken DI. | -======= | 2026-01-05 | SDU-001 to SDU-010 completed | Feature module, settings page, revelation policy, rule toggles, findings list, masked display, exception manager, alert config all implemented | | 2026-01-05 | SDU-011 completed | Channel test functionality added to alert config | | 2026-01-05 | SDU-012 completed | E2E tests created in e2e/secret-detection.e2e.spec.ts | | 2026-01-05 | Sprint COMPLETE | All 12 tasks done | ->>>>>>> 2096cf49a629f8e20e0775958cf82718dab85884:docs-archived/implplan/2026-01-04-secret-detection/SPRINT_20260104_008_FE_secret_detection_ui.md