Commit f433772f authored by Jacques Erasmus's avatar Jacques Erasmus

Merge branch 'aqualls-fix-api-misspelling' into 'master'

Fix misspelling of 'vulnerabilities' in API

See merge request gitlab-org/gitlab!52380
parents a45862f8 796f6eb1
...@@ -11261,7 +11261,7 @@ type Group { ...@@ -11261,7 +11261,7 @@ type Group {
): [VulnerableProjectsByGrade!]! ): [VulnerableProjectsByGrade!]!
""" """
Vulnerability scanners reported on the project vulnerabilties of the group and its subgroups Vulnerability scanners reported on the project vulnerabilities of the group and its subgroups
""" """
vulnerabilityScanners( vulnerabilityScanners(
""" """
...@@ -11966,7 +11966,7 @@ type InstanceSecurityDashboard { ...@@ -11966,7 +11966,7 @@ type InstanceSecurityDashboard {
vulnerabilityGrades: [VulnerableProjectsByGrade!]! vulnerabilityGrades: [VulnerableProjectsByGrade!]!
""" """
Vulnerability scanners reported on the vulnerabilties from projects selected in Instance Security Dashboard Vulnerability scanners reported on the vulnerabilities from projects selected in Instance Security Dashboard
""" """
vulnerabilityScanners( vulnerabilityScanners(
""" """
...@@ -19650,7 +19650,7 @@ type Project { ...@@ -19650,7 +19650,7 @@ type Project {
): VulnerabilitiesCountByDayConnection ): VulnerabilitiesCountByDayConnection
""" """
Vulnerability scanners reported on the project vulnerabilties Vulnerability scanners reported on the project vulnerabilities
""" """
vulnerabilityScanners( vulnerabilityScanners(
""" """
......
...@@ -30680,7 +30680,7 @@ ...@@ -30680,7 +30680,7 @@
}, },
{ {
"name": "vulnerabilityScanners", "name": "vulnerabilityScanners",
"description": "Vulnerability scanners reported on the project vulnerabilties of the group and its subgroups", "description": "Vulnerability scanners reported on the project vulnerabilities of the group and its subgroups",
"args": [ "args": [
{ {
"name": "after", "name": "after",
...@@ -32690,7 +32690,7 @@ ...@@ -32690,7 +32690,7 @@
}, },
{ {
"name": "vulnerabilityScanners", "name": "vulnerabilityScanners",
"description": "Vulnerability scanners reported on the vulnerabilties from projects selected in Instance Security Dashboard", "description": "Vulnerability scanners reported on the vulnerabilities from projects selected in Instance Security Dashboard",
"args": [ "args": [
{ {
"name": "after", "name": "after",
...@@ -57062,7 +57062,7 @@ ...@@ -57062,7 +57062,7 @@
}, },
{ {
"name": "vulnerabilityScanners", "name": "vulnerabilityScanners",
"description": "Vulnerability scanners reported on the project vulnerabilties", "description": "Vulnerability scanners reported on the project vulnerabilities",
"args": [ "args": [
{ {
"name": "after", "name": "after",
...@@ -1693,7 +1693,7 @@ Autogenerated return type of GitlabSubscriptionActivate. ...@@ -1693,7 +1693,7 @@ Autogenerated return type of GitlabSubscriptionActivate.
| `vulnerabilitiesCountByDay` | VulnerabilitiesCountByDayConnection | Number of vulnerabilities per day for the projects in the group and its subgroups | | `vulnerabilitiesCountByDay` | VulnerabilitiesCountByDayConnection | Number of vulnerabilities per day for the projects in the group and its subgroups |
| `vulnerabilitiesCountByDayAndSeverity` **{warning-solid}** | VulnerabilitiesCountByDayAndSeverityConnection | **Deprecated:** Use `vulnerabilitiesCountByDay`. Deprecated in 13.3. | | `vulnerabilitiesCountByDayAndSeverity` **{warning-solid}** | VulnerabilitiesCountByDayAndSeverityConnection | **Deprecated:** Use `vulnerabilitiesCountByDay`. Deprecated in 13.3. |
| `vulnerabilityGrades` | VulnerableProjectsByGrade! => Array | Represents vulnerable project counts for each grade | | `vulnerabilityGrades` | VulnerableProjectsByGrade! => Array | Represents vulnerable project counts for each grade |
| `vulnerabilityScanners` | VulnerabilityScannerConnection | Vulnerability scanners reported on the project vulnerabilties of the group and its subgroups | | `vulnerabilityScanners` | VulnerabilityScannerConnection | Vulnerability scanners reported on the project vulnerabilities of the group and its subgroups |
| `vulnerabilitySeveritiesCount` | VulnerabilitySeveritiesCount | Counts for each vulnerability severity in the group and its subgroups | | `vulnerabilitySeveritiesCount` | VulnerabilitySeveritiesCount | Counts for each vulnerability severity in the group and its subgroups |
| `webUrl` | String! | Web URL of the group. | | `webUrl` | String! | Web URL of the group. |
...@@ -1818,7 +1818,7 @@ A block of time for which a participant is on-call.. ...@@ -1818,7 +1818,7 @@ A block of time for which a participant is on-call..
| ----- | ---- | ----------- | | ----- | ---- | ----------- |
| `projects` | ProjectConnection! | Projects selected in Instance Security Dashboard | | `projects` | ProjectConnection! | Projects selected in Instance Security Dashboard |
| `vulnerabilityGrades` | VulnerableProjectsByGrade! => Array | Represents vulnerable project counts for each grade | | `vulnerabilityGrades` | VulnerableProjectsByGrade! => Array | Represents vulnerable project counts for each grade |
| `vulnerabilityScanners` | VulnerabilityScannerConnection | Vulnerability scanners reported on the vulnerabilties from projects selected in Instance Security Dashboard | | `vulnerabilityScanners` | VulnerabilityScannerConnection | Vulnerability scanners reported on the vulnerabilities from projects selected in Instance Security Dashboard |
| `vulnerabilitySeveritiesCount` | VulnerabilitySeveritiesCount | Counts for each vulnerability severity from projects selected in Instance Security Dashboard | | `vulnerabilitySeveritiesCount` | VulnerabilitySeveritiesCount | Counts for each vulnerability severity from projects selected in Instance Security Dashboard |
### InstanceStatisticsMeasurement ### InstanceStatisticsMeasurement
...@@ -2824,7 +2824,7 @@ Autogenerated return type of PipelineRetry. ...@@ -2824,7 +2824,7 @@ Autogenerated return type of PipelineRetry.
| `visibility` | String | Visibility of the project | | `visibility` | String | Visibility of the project |
| `vulnerabilities` | VulnerabilityConnection | Vulnerabilities reported on the project | | `vulnerabilities` | VulnerabilityConnection | Vulnerabilities reported on the project |
| `vulnerabilitiesCountByDay` | VulnerabilitiesCountByDayConnection | Number of vulnerabilities per day for the project | | `vulnerabilitiesCountByDay` | VulnerabilitiesCountByDayConnection | Number of vulnerabilities per day for the project |
| `vulnerabilityScanners` | VulnerabilityScannerConnection | Vulnerability scanners reported on the project vulnerabilties | | `vulnerabilityScanners` | VulnerabilityScannerConnection | Vulnerability scanners reported on the project vulnerabilities |
| `vulnerabilitySeveritiesCount` | VulnerabilitySeveritiesCount | Counts for each vulnerability severity in the project | | `vulnerabilitySeveritiesCount` | VulnerabilitySeveritiesCount | Counts for each vulnerability severity in the project |
| `webUrl` | String | Web URL of the project | | `webUrl` | String | Web URL of the project |
| `wikiEnabled` | Boolean | Indicates if Wikis are enabled for the current user | | `wikiEnabled` | Boolean | Indicates if Wikis are enabled for the current user |
......
...@@ -54,7 +54,7 @@ module EE ...@@ -54,7 +54,7 @@ module EE
field :vulnerability_scanners, field :vulnerability_scanners,
::Types::VulnerabilityScannerType.connection_type, ::Types::VulnerabilityScannerType.connection_type,
null: true, null: true,
description: 'Vulnerability scanners reported on the project vulnerabilties of the group and its subgroups', description: 'Vulnerability scanners reported on the project vulnerabilities of the group and its subgroups',
resolver: ::Resolvers::Vulnerabilities::ScannersResolver resolver: ::Resolvers::Vulnerabilities::ScannersResolver
field :vulnerability_severities_count, ::Types::VulnerabilitySeveritiesCountType, null: true, field :vulnerability_severities_count, ::Types::VulnerabilitySeveritiesCountType, null: true,
......
...@@ -24,7 +24,7 @@ module EE ...@@ -24,7 +24,7 @@ module EE
field :vulnerability_scanners, field :vulnerability_scanners,
::Types::VulnerabilityScannerType.connection_type, ::Types::VulnerabilityScannerType.connection_type,
null: true, null: true,
description: 'Vulnerability scanners reported on the project vulnerabilties', description: 'Vulnerability scanners reported on the project vulnerabilities',
resolver: ::Resolvers::Vulnerabilities::ScannersResolver resolver: ::Resolvers::Vulnerabilities::ScannersResolver
field :vulnerabilities_count_by_day, field :vulnerabilities_count_by_day,
......
...@@ -14,7 +14,7 @@ module Types ...@@ -14,7 +14,7 @@ module Types
field :vulnerability_scanners, field :vulnerability_scanners,
::Types::VulnerabilityScannerType.connection_type, ::Types::VulnerabilityScannerType.connection_type,
null: true, null: true,
description: 'Vulnerability scanners reported on the vulnerabilties from projects selected in Instance Security Dashboard', description: 'Vulnerability scanners reported on the vulnerabilities from projects selected in Instance Security Dashboard',
resolver: ::Resolvers::Vulnerabilities::ScannersResolver resolver: ::Resolvers::Vulnerabilities::ScannersResolver
field :vulnerability_severities_count, ::Types::VulnerabilitySeveritiesCountType, null: true, field :vulnerability_severities_count, ::Types::VulnerabilitySeveritiesCountType, null: true,
......
...@@ -85,7 +85,7 @@ describe('Security Dashboard Table', () => { ...@@ -85,7 +85,7 @@ describe('Security Dashboard Table', () => {
}); });
}); });
describe('with no vulnerabilties', () => { describe('with no vulnerabilities', () => {
beforeEach(() => { beforeEach(() => {
store.commit(`vulnerabilities/${RECEIVE_VULNERABILITIES_SUCCESS}`, { store.commit(`vulnerabilities/${RECEIVE_VULNERABILITIES_SUCCESS}`, {
vulnerabilities: [], vulnerabilities: [],
......
...@@ -62,7 +62,7 @@ RSpec.describe Security::StoreReportService, '#execute' do ...@@ -62,7 +62,7 @@ RSpec.describe Security::StoreReportService, '#execute' do
expect { subject }.to change { project.vulnerability_remediations.count }.by(remediations) expect { subject }.to change { project.vulnerability_remediations.count }.by(remediations)
end end
it 'inserts all vulnerabilties' do it 'inserts all vulnerabilities' do
expect { subject }.to change { Vulnerability.count }.by(findings) expect { subject }.to change { Vulnerability.count }.by(findings)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment