diff --git a/ee/app/services/security/ingestion/tasks/ingest_vulnerabilities/mark_resolved_as_detected.rb b/ee/app/services/security/ingestion/tasks/ingest_vulnerabilities/mark_resolved_as_detected.rb index 1ee46e81b16eae44f1367862c76f0177356246a1..83efe0fe610e144d4665d65d07572766f73c7241 100644 --- a/ee/app/services/security/ingestion/tasks/ingest_vulnerabilities/mark_resolved_as_detected.rb +++ b/ee/app/services/security/ingestion/tasks/ingest_vulnerabilities/mark_resolved_as_detected.rb @@ -23,7 +23,7 @@ def mark_as_resolved ::Vulnerability .resolved .where(id: resolved_vulnerabilities_ids) - .update_all(state: ::Vulnerability.states[:detected]) + .update_all(state: :detected) end end @@ -43,8 +43,8 @@ def create_state_transitions(vulnerability_ids) def create_state_transition_for(vulnerability_id) ::Vulnerabilities::StateTransition.create!( vulnerability: vulnerability_id, - from_state: ::Vulnerability.states[:resolved], - to_state: ::Vulnerability.states[:detected] + from_state: :resolved, + to_state: :detected ) end end diff --git a/ee/lib/ee/gitlab/background_migration/migrate_vulnerabilities_feedback_to_vulnerabilities_state_transition.rb b/ee/lib/ee/gitlab/background_migration/migrate_vulnerabilities_feedback_to_vulnerabilities_state_transition.rb index 446270e563b386bff6b896d286d5f3c07fd976a9..45640a7830dc50789d3a3e6e97a18ff11ca5ff78 100644 --- a/ee/lib/ee/gitlab/background_migration/migrate_vulnerabilities_feedback_to_vulnerabilities_state_transition.rb +++ b/ee/lib/ee/gitlab/background_migration/migrate_vulnerabilities_feedback_to_vulnerabilities_state_transition.rb @@ -245,7 +245,6 @@ def save_state_transition(feedback:, vulnerability:) def build_state_transition(feedback:, vulnerability:) from_state = Vulnerability.states[:detected] to_state = Vulnerability.states[:dismissed] - max_length_comment = strip_or_truncate_comment(feedback: feedback) attrs = { diff --git a/ee/spec/factories/vulnerabilities.rb b/ee/spec/factories/vulnerabilities.rb index 8d8a1c12387ab207288e0ee9542d62101acd8894..df6dd937a281d807f295203e689fd839663cc5bc 100644 --- a/ee/spec/factories/vulnerabilities.rb +++ b/ee/spec/factories/vulnerabilities.rb @@ -13,21 +13,21 @@ present_on_default_branch { true } trait :detected do - state { Vulnerability.states[:detected] } + state { :detected } end trait :resolved do - state { Vulnerability.states[:resolved] } + state { :resolved } resolved_at { Time.current } end trait :dismissed do - state { Vulnerability.states[:dismissed] } + state { :dismissed } dismissed_at { Time.current } end trait :confirmed do - state { Vulnerability.states[:confirmed] } + state { :confirmed } confirmed_at { Time.current } end diff --git a/ee/spec/factories/vulnerabilities/read.rb b/ee/spec/factories/vulnerabilities/read.rb index 08911a1e7d27e470cdd0885e75f03484a7d35a21..20b04f9985220acdafec8129dcbe25751ff79209 100644 --- a/ee/spec/factories/vulnerabilities/read.rb +++ b/ee/spec/factories/vulnerabilities/read.rb @@ -7,7 +7,7 @@ scanner factory: :vulnerabilities_scanner report_type { :sast } severity { :high } - state { Vulnerability.states[:detected] } + state { :detected } uuid { SecureRandom.uuid } end end