diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml
index 5f90ff11fd3fc9419b339f995f2de8bf4507233d..25e222a65dc089b083142060527261f7cf45d5f4 100644
--- a/.rubocop_todo/layout/argument_alignment.yml
+++ b/.rubocop_todo/layout/argument_alignment.yml
@@ -496,11 +496,6 @@ Layout/ArgumentAlignment:
- 'app/services/quick_actions/interpret_service.rb'
- 'app/services/search/global_service.rb'
- 'app/services/search/project_service.rb'
- - 'app/services/security/ci_configuration/base_create_service.rb'
- - 'app/services/security/ci_configuration/container_scanning_create_service.rb'
- - 'app/services/security/ci_configuration/dependency_scanning_create_service.rb'
- - 'app/services/security/ci_configuration/sast_iac_create_service.rb'
- - 'app/services/security/ci_configuration/secret_detection_create_service.rb'
- 'app/validators/feature_flag_user_xids_validator.rb'
- 'config/application.rb'
- 'config/initializers/hashie_mash_permitted_patch.rb'
@@ -815,9 +810,6 @@ Layout/ArgumentAlignment:
- 'ee/app/services/iterations/create_service.rb'
- 'ee/app/services/merge_trains/create_pipeline_service.rb'
- 'ee/app/services/registrations/standard_namespace_create_service.rb'
- - 'ee/app/services/security/findings/dismiss_service.rb'
- - 'ee/app/services/security/ingestion/tasks/ingest_vulnerability_flags.rb'
- - 'ee/app/services/security/track_scan_service.rb'
- 'ee/app/services/vulnerabilities/confirm_service.rb'
- 'ee/app/services/vulnerabilities/findings/find_or_create_from_security_finding_service.rb'
- 'ee/app/services/vulnerabilities/security_finding/create_merge_request_service.rb'
diff --git a/app/services/security/ci_configuration/base_create_service.rb b/app/services/security/ci_configuration/base_create_service.rb
index a205a68532bcfd4f301042816f7cae7da0e1cfc4..2c855da0b1e8e86651e145ec5418f0924e66a352 100644
--- a/app/services/security/ci_configuration/base_create_service.rb
+++ b/app/services/security/ci_configuration/base_create_service.rb
@@ -15,11 +15,14 @@ def initialize(project, current_user)
def execute
if project.repository.empty? && !(@params && @params[:initialize_with_sast])
- docs_link = ActionController::Base.helpers.link_to _('add at least one file to the repository'),
- Rails.application.routes.url_helpers.help_page_url('user/project/repository/index.md',
- anchor: 'add-files-to-a-repository'),
- target: '_blank',
- rel: 'noopener noreferrer'
+ docs_link = ActionController::Base.helpers.link_to(
+ _('add at least one file to the repository'),
+ Rails.application.routes.url_helpers.help_page_url(
+ 'user/project/repository/index.md', anchor: 'add-files-to-a-repository'
+ ),
+ target: '_blank',
+ rel: 'noopener noreferrer'
+ )
return ServiceResponse.error(
message: _(format('You must %s before using Security features.', docs_link)).html_safe
diff --git a/app/services/security/ci_configuration/container_scanning_create_service.rb b/app/services/security/ci_configuration/container_scanning_create_service.rb
index 4dfd05451ad6a0732c293d4c66c319926e534d50..b1dd9d9c750a8324375a3b558c729236a7f52d60 100644
--- a/app/services/security/ci_configuration/container_scanning_create_service.rb
+++ b/app/services/security/ci_configuration/container_scanning_create_service.rb
@@ -6,8 +6,11 @@ class ContainerScanningCreateService < ::Security::CiConfiguration::BaseCreateSe
private
def action
- Security::CiConfiguration::ContainerScanningBuildAction.new(project.auto_devops_enabled?, existing_gitlab_ci_content,
- project.ci_config_path).generate
+ Security::CiConfiguration::ContainerScanningBuildAction.new(
+ project.auto_devops_enabled?,
+ existing_gitlab_ci_content,
+ project.ci_config_path
+ ).generate
end
def next_branch
diff --git a/app/services/security/ci_configuration/dependency_scanning_create_service.rb b/app/services/security/ci_configuration/dependency_scanning_create_service.rb
index 66dd76c4b5dfcbfd7ebef1a3e09379f16729ccdf..c10d57974b75548b220e109cd1077a09e535610b 100644
--- a/app/services/security/ci_configuration/dependency_scanning_create_service.rb
+++ b/app/services/security/ci_configuration/dependency_scanning_create_service.rb
@@ -6,8 +6,11 @@ class DependencyScanningCreateService < ::Security::CiConfiguration::BaseCreateS
private
def action
- Security::CiConfiguration::DependencyScanningBuildAction.new(project.auto_devops_enabled?, existing_gitlab_ci_content,
- project.ci_config_path).generate
+ Security::CiConfiguration::DependencyScanningBuildAction.new(
+ project.auto_devops_enabled?,
+ existing_gitlab_ci_content,
+ project.ci_config_path
+ ).generate
end
def next_branch
diff --git a/app/services/security/ci_configuration/sast_iac_create_service.rb b/app/services/security/ci_configuration/sast_iac_create_service.rb
index 61bbebd77d07a891aa6720dd8a3d88ae270ea35a..ab667581d81d8147d8636d3152f0f2699e28cd78 100644
--- a/app/services/security/ci_configuration/sast_iac_create_service.rb
+++ b/app/services/security/ci_configuration/sast_iac_create_service.rb
@@ -6,8 +6,11 @@ class SastIacCreateService < ::Security::CiConfiguration::BaseCreateService
private
def action
- Security::CiConfiguration::SastIacBuildAction.new(project.auto_devops_enabled?, existing_gitlab_ci_content,
- project.ci_config_path).generate
+ Security::CiConfiguration::SastIacBuildAction.new(
+ project.auto_devops_enabled?,
+ existing_gitlab_ci_content,
+ project.ci_config_path
+ ).generate
end
def next_branch
diff --git a/app/services/security/ci_configuration/secret_detection_create_service.rb b/app/services/security/ci_configuration/secret_detection_create_service.rb
index 792fe4986e92bc62db6f19787f22add1aad49ead..10400dbc165708c4259c9f4235bd14448a5b64d1 100644
--- a/app/services/security/ci_configuration/secret_detection_create_service.rb
+++ b/app/services/security/ci_configuration/secret_detection_create_service.rb
@@ -6,8 +6,11 @@ class SecretDetectionCreateService < ::Security::CiConfiguration::BaseCreateServ
private
def action
- Security::CiConfiguration::SecretDetectionBuildAction.new(project.auto_devops_enabled?, existing_gitlab_ci_content,
- project.ci_config_path).generate
+ Security::CiConfiguration::SecretDetectionBuildAction.new(
+ project.auto_devops_enabled?,
+ existing_gitlab_ci_content,
+ project.ci_config_path
+ ).generate
end
def next_branch
diff --git a/ee/app/services/security/findings/dismiss_service.rb b/ee/app/services/security/findings/dismiss_service.rb
index fe46c5d69ac7c64858aa00ed4a973acb5d2e0472..9d4c87fe591fe56d368eb617cbde21ad91512b7c 100644
--- a/ee/app/services/security/findings/dismiss_service.rb
+++ b/ee/app/services/security/findings/dismiss_service.rb
@@ -72,11 +72,13 @@ def create_and_dismiss_vulnerability
dismissal_reason: @dismissal_reason
}
- ::Vulnerabilities::FindOrCreateFromSecurityFindingService.new(project: @project,
- current_user: @current_user,
- params: security_finding_params,
- state: :dismissed,
- present_on_default_branch: false).execute
+ ::Vulnerabilities::FindOrCreateFromSecurityFindingService.new(
+ project: @project,
+ current_user: @current_user,
+ params: security_finding_params,
+ state: :dismissed,
+ present_on_default_branch: false
+ ).execute
end
def feedback_params
diff --git a/ee/app/services/security/ingestion/tasks/ingest_vulnerability_flags.rb b/ee/app/services/security/ingestion/tasks/ingest_vulnerability_flags.rb
index e455eed46ca4005c6de72829848caed4ce08850e..cdf0d8d6495d29b81afc1ba34da6b06ef2a0152f 100644
--- a/ee/app/services/security/ingestion/tasks/ingest_vulnerability_flags.rb
+++ b/ee/app/services/security/ingestion/tasks/ingest_vulnerability_flags.rb
@@ -29,8 +29,10 @@ def finding_ids
def flag_attributes_for(finding_map)
finding_map.report_finding.flags.map do |vulnerability_flag|
- vulnerability_flag.to_h.merge!(vulnerability_occurrence_id: finding_map.finding_id,
- description: description_for(vulnerability_flag))
+ vulnerability_flag.to_h.merge!(
+ vulnerability_occurrence_id: finding_map.finding_id,
+ description: description_for(vulnerability_flag)
+ )
end
end
diff --git a/ee/app/services/security/track_scan_service.rb b/ee/app/services/security/track_scan_service.rb
index 286d0adbcaad0223b53f10c31befa1fb3ce8519c..62e869b9360547b66d9e70d3fcce65672b47910c 100644
--- a/ee/app/services/security/track_scan_service.rb
+++ b/ee/app/services/security/track_scan_service.rb
@@ -26,14 +26,16 @@ def track_scan_event(report_type, report)
idempotency_key = [build.project_id, build.id, scan_type(report, report_type), report&.scan&.start_time || ""].join("::")
- ::Gitlab::Tracking.event('secure::scan',
- 'scan',
- context: [context],
- idempotency_key: Digest::SHA256.hexdigest(idempotency_key),
- user: build.user,
- project: build.project_id,
- label: analyzer_id(report),
- property: scan_type(report, report_type))
+ ::Gitlab::Tracking.event(
+ 'secure::scan',
+ 'scan',
+ context: [context],
+ idempotency_key: Digest::SHA256.hexdigest(idempotency_key),
+ user: build.user,
+ project: build.project_id,
+ label: analyzer_id(report),
+ property: scan_type(report, report_type)
+ )
end
def data_to_track(report_type, report)