Merge branch 'better_vuln_issue_mr_creation_errors' into 'master'

Improve vulnerability issue/MR creation errors

See merge request gitlab-org/gitlab!46589

ee/app/services/issues/create_from_vulnerability_data_service.rb

@@ -3,7 +3,7 @@
 module Issues
   class CreateFromVulnerabilityDataService < ::BaseService
     def execute
-      return error("Can't create issue") unless can?(@current_user, :create_issue, @project)
+      return error("User is not permitted to create issue") unless can?(@current_user, :create_issue, @project)
 
       begin
         vulnerability = Gitlab::Vulnerabilities::Parser.fabricate(@params)

ee/app/services/issues/create_from_vulnerability_service.rb

@@ -2,7 +2,7 @@
 module Issues
   class CreateFromVulnerabilityService < ::BaseContainerService
     def execute
-      return error("Can't create issue") unless can?(@current_user, :create_issue, @container)
+      return error("User is not permitted to create issue") unless can?(@current_user, :create_issue, @container)
 
       vulnerability = params[:vulnerability].present
       link_type = params[:link_type]

ee/app/services/merge_requests/create_from_vulnerability_data_service.rb

@@ -16,8 +16,8 @@ module MergeRequests
       ]
       target_branch = vulnerability.target_branch || @project.default_branch
 
-      return error("Can't create merge_request") unless can_create_merge_request?(source_branch)
-      return error("Can't create merge request") if vulnerability.remediations.empty?
+      return error("User is not permitted to create merge request") unless can_create_merge_request?(source_branch)
+      return error("No remediations available for merge request") if vulnerability.remediations.empty?
 
       patch_result = create_patch(vulnerability, source_branch, target_branch)
 

ee/changelogs/unreleased/better_vuln_issue_mr_creation_errors.yml

+---
+title: Improve error messages for Vulnerability Issue/MR creation
+merge_request: 46589
+author:
+type: changed

ee/spec/services/ee/issues/create_from_vulnerability_data_service_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe Issues::CreateFromVulnerabilityDataService, '#execute' do
 
     it 'returns expected error' do
       expect(result[:status]).to eq(:error)
-      expect(result[:message]).to eq("Can't create issue")
+      expect(result[:message]).to eq("User is not permitted to create issue")
     end
   end
 
@@ -47,7 +47,7 @@ RSpec.describe Issues::CreateFromVulnerabilityDataService, '#execute' do
 
     it 'returns expected error' do
       expect(result[:status]).to eq(:error)
-      expect(result[:message]).to eq("Can't create issue")
+      expect(result[:message]).to eq("User is not permitted to create issue")
     end
   end
 

ee/spec/services/ee/issues/create_from_vulnerability_service_spec.rb

@@ -80,7 +80,7 @@ RSpec.describe Issues::CreateFromVulnerabilityService, '#execute' do
 
       it 'returns expected error' do
         expect(result[:status]).to eq(:error)
-        expect(result[:message]).to eq("Can't create issue")
+        expect(result[:message]).to eq("User is not permitted to create issue")
       end
     end
 
@@ -89,7 +89,7 @@ RSpec.describe Issues::CreateFromVulnerabilityService, '#execute' do
 
       it 'returns expected error' do
         expect(result[:status]).to eq(:error)
-        expect(result[:message]).to eq("Can't create issue")
+        expect(result[:message]).to eq("User is not permitted to create issue")
       end
     end
 

ee/spec/services/ee/merge_requests/create_from_vulnerability_data_service_spec.rb

@@ -43,7 +43,7 @@ RSpec.describe MergeRequests::CreateFromVulnerabilityDataService, '#execute' do
 
     it 'returns expected error' do
       expect(result[:status]).to eq(:error)
-      expect(result[:message]).to eq("Can't create merge_request")
+      expect(result[:message]).to eq("User is not permitted to create merge request")
     end
   end
 
@@ -53,7 +53,7 @@ RSpec.describe MergeRequests::CreateFromVulnerabilityDataService, '#execute' do
 
     it 'returns expected error' do
       expect(result[:status]).to eq(:error)
-      expect(result[:message]).to eq("Can't create merge_request")
+      expect(result[:message]).to eq("User is not permitted to create merge request")
     end
   end
 
@@ -213,7 +213,7 @@ RSpec.describe MergeRequests::CreateFromVulnerabilityDataService, '#execute' do
 
       it 'return expected error' do
         expect(result[:status]).to eq(:error)
-        expect(result[:message]).to eq("Can't create merge request")
+        expect(result[:message]).to eq("No remediations available for merge request")
       end
     end
   end