Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d601573f
Commit
d601573f
authored
Jan 11, 2022
by
Alexander Turinske
Committed by
Natalia Tepluhina
Jan 11, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update vulnerabilities query to be agent-specific
- add clusterAgentID field - update tests
parent
18305dff
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
41 additions
and
11 deletions
+41
-11
app/assets/javascripts/clusters/agents/components/show.vue
app/assets/javascripts/clusters/agents/components/show.vue
+1
-1
ee/app/assets/javascripts/clusters/agents/components/show.vue
...pp/assets/javascripts/clusters/agents/components/show.vue
+2
-2
ee/app/assets/javascripts/security_dashboard/components/agent/agent_vulnerability_report.vue
...dashboard/components/agent/agent_vulnerability_report.vue
+10
-7
ee/app/assets/javascripts/security_dashboard/graphql/queries/project_vulnerabilities.query.graphql
...ard/graphql/queries/project_vulnerabilities.query.graphql
+2
-0
ee/spec/frontend/clusters/agents/components/show_spec.js
ee/spec/frontend/clusters/agents/components/show_spec.js
+23
-0
ee/spec/frontend/security_dashboard/components/agent/__snapshots__/agent_vulnerability_report_spec.js.snap
...ent/__snapshots__/agent_vulnerability_report_spec.js.snap
+1
-0
ee/spec/frontend/security_dashboard/components/agent/agent_vulnerability_report_spec.js
...board/components/agent/agent_vulnerability_report_spec.js
+2
-1
No files found.
app/assets/javascripts/clusters/agents/components/show.vue
View file @
d601573f
...
@@ -122,7 +122,7 @@ export default {
...
@@ -122,7 +122,7 @@ export default {
</p>
</p>
<gl-tabs
sync-active-tab-with-query-params
lazy
>
<gl-tabs
sync-active-tab-with-query-params
lazy
>
<slot
name=
"ee-security-tab"
></slot>
<slot
name=
"ee-security-tab"
:cluster-agent-id=
"clusterAgent.id"
></slot>
<gl-tab
:title=
"$options.i18n.activity"
query-param-value=
"activity"
>
<gl-tab
:title=
"$options.i18n.activity"
query-param-value=
"activity"
>
<activity-events
:agent-name=
"agentName"
:project-path=
"projectPath"
/>
<activity-events
:agent-name=
"agentName"
:project-path=
"projectPath"
/>
...
...
ee/app/assets/javascripts/clusters/agents/components/show.vue
View file @
d601573f
...
@@ -27,9 +27,9 @@ export default {
...
@@ -27,9 +27,9 @@ export default {
<
template
>
<
template
>
<agent-show-page>
<agent-show-page>
<template
v-if=
"showSecurityTab"
#ee-security-tab
>
<template
v-if=
"showSecurityTab"
#ee-security-tab
="
{ clusterAgentId }"
>
<gl-tab
:title=
"$options.i18n.securityTabTitle"
>
<gl-tab
:title=
"$options.i18n.securityTabTitle"
>
<agent-vulnerability-report
/>
<agent-vulnerability-report
:cluster-agent-id=
"clusterAgentId"
/>
</gl-tab>
</gl-tab>
</
template
>
</
template
>
</agent-show-page>
</agent-show-page>
...
...
ee/app/assets/javascripts/security_dashboard/components/agent/agent_vulnerability_report.vue
View file @
d601573f
...
@@ -34,23 +34,26 @@ export default {
...
@@ -34,23 +34,26 @@ export default {
};
};
},
},
inject
:
[
'
projectPath
'
],
inject
:
[
'
projectPath
'
],
props
:
{
clusterAgentId
:
{
type
:
String
,
required
:
true
,
},
},
data
()
{
data
()
{
return
{
return
{
graphqlFilters
:
undefined
,
graphqlFilters
:
{
clusterAgentId
:
[
this
.
clusterAgentId
]
}
,
};
};
},
},
computed
:
{
filtersToShow
()
{
return
FILTER_PRESETS
[
REPORT_TAB
.
OPERATIONAL
];
},
},
methods
:
{
methods
:
{
updateGraphqlFilters
(
graphqlFilters
)
{
updateGraphqlFilters
(
graphqlFilters
)
{
this
.
graphqlFilters
=
graphqlFilters
;
this
.
graphqlFilters
=
graphqlFilters
;
this
.
graphqlFilters
.
reportType
=
REPORT_TYPE_PRESETS
.
OPERATIONAL
;
this
.
graphqlFilters
.
reportType
=
REPORT_TYPE_PRESETS
.
OPERATIONAL
;
this
.
graphqlFilters
.
clusterAgentId
=
[
this
.
clusterAgentId
];
},
},
},
},
fieldsToShow
:
FIELD_PRESETS
[
REPORT_TAB
.
OPERATIONAL
],
fieldsToShow
:
FIELD_PRESETS
[
REPORT_TAB
.
OPERATIONAL
],
filtersToShow
:
FILTER_PRESETS
[
REPORT_TAB
.
OPERATIONAL
],
REPORT_TAB
,
REPORT_TAB
,
projectVulnerabilitiesQuery
,
projectVulnerabilitiesQuery
,
};
};
...
@@ -59,7 +62,7 @@ export default {
...
@@ -59,7 +62,7 @@ export default {
<
template
>
<
template
>
<div>
<div>
<vulnerability-filters
<vulnerability-filters
:filters=
"filtersToShow"
:filters=
"
$options.
filtersToShow"
class=
"security-dashboard-filters gl-mt-7"
class=
"security-dashboard-filters gl-mt-7"
@
filters-changed=
"updateGraphqlFilters"
@
filters-changed=
"updateGraphqlFilters"
/>
/>
...
...
ee/app/assets/javascripts/security_dashboard/graphql/queries/project_vulnerabilities.query.graphql
View file @
d601573f
...
@@ -14,6 +14,7 @@ query projectVulnerabilities(
...
@@ -14,6 +14,7 @@ query projectVulnerabilities(
$hasResolution
:
Boolean
$hasResolution
:
Boolean
$includeExternalIssueLinks
:
Boolean
=
false
$includeExternalIssueLinks
:
Boolean
=
false
$vetEnabled
:
Boolean
=
false
$vetEnabled
:
Boolean
=
false
$clusterAgentId
:
[
ClustersAgentID
!]
)
{
)
{
project
(
fullPath
:
$fullPath
)
{
project
(
fullPath
:
$fullPath
)
{
id
id
...
@@ -28,6 +29,7 @@ query projectVulnerabilities(
...
@@ -28,6 +29,7 @@ query projectVulnerabilities(
sort
:
$sort
sort
:
$sort
hasIssues
:
$hasIssues
hasIssues
:
$hasIssues
hasResolution
:
$hasResolution
hasResolution
:
$hasResolution
clusterAgentId
:
$clusterAgentId
)
{
)
{
nodes
{
nodes
{
...
VulnerabilityFragment
...
VulnerabilityFragment
...
...
ee/spec/frontend/clusters/agents/components/show_spec.js
View file @
d601573f
import
{
GlTab
}
from
'
@gitlab/ui
'
;
import
{
GlTab
}
from
'
@gitlab/ui
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
shallowMount
}
from
'
@vue/test-utils
'
;
import
{
nextTick
}
from
'
vue
'
;
import
{
nextTick
}
from
'
vue
'
;
import
{
stubComponent
}
from
'
helpers/stub_component
'
;
import
{
extendedWrapper
}
from
'
helpers/vue_test_utils_helper
'
;
import
{
extendedWrapper
}
from
'
helpers/vue_test_utils_helper
'
;
import
ClusterAgentShow
from
'
ee/clusters/agents/components/show.vue
'
;
import
ClusterAgentShow
from
'
ee/clusters/agents/components/show.vue
'
;
import
AgentShowPage
from
'
~/clusters/agents/components/show.vue
'
;
import
AgentVulnerabilityReport
from
'
ee/security_dashboard/components/agent/agent_vulnerability_report.vue
'
;
describe
(
'
ClusterAgentShow
'
,
()
=>
{
describe
(
'
ClusterAgentShow
'
,
()
=>
{
let
wrapper
;
let
wrapper
;
const
clusterAgentId
=
'
gid://gitlab/Clusters::Agent/1
'
;
const
AgentShowPageStub
=
stubComponent
(
AgentShowPage
,
{
provide
:
{
agentName
:
'
test
'
,
projectPath
:
'
test
'
},
template
:
`<div><slot name="ee-security-tab" clusterAgentId="
${
clusterAgentId
}
"></slot></div>`
,
});
const
createWrapper
=
({
glFeatures
=
{}
}
=
{})
=>
{
const
createWrapper
=
({
glFeatures
=
{}
}
=
{})
=>
{
wrapper
=
extendedWrapper
(
wrapper
=
extendedWrapper
(
shallowMount
(
ClusterAgentShow
,
{
shallowMount
(
ClusterAgentShow
,
{
provide
:
{
glFeatures
},
provide
:
{
glFeatures
},
stubs
:
{
AgentShowPage
:
AgentShowPageStub
,
},
}),
}),
);
);
};
};
const
findAgentVulnerabilityReport
=
()
=>
wrapper
.
findComponent
(
AgentVulnerabilityReport
);
const
findTab
=
()
=>
wrapper
.
findComponent
(
GlTab
);
const
findTab
=
()
=>
wrapper
.
findComponent
(
GlTab
);
afterEach
(()
=>
{
afterEach
(()
=>
{
...
@@ -34,4 +47,14 @@ describe('ClusterAgentShow', () => {
...
@@ -34,4 +47,14 @@ describe('ClusterAgentShow', () => {
expect
(
findTab
().
exists
()).
toBe
(
tabStatus
);
expect
(
findTab
().
exists
()).
toBe
(
tabStatus
);
});
});
});
});
describe
(
'
vulnerability report
'
,
()
=>
{
it
(
'
renders with cluster agent id
'
,
async
()
=>
{
createWrapper
({
glFeatures
:
{
clusterVulnerabilities
:
true
,
kubernetesClusterVulnerabilities
:
true
},
});
await
nextTick
();
expect
(
findAgentVulnerabilityReport
().
props
(
'
clusterAgentId
'
)).
toBe
(
clusterAgentId
);
});
});
});
});
ee/spec/frontend/security_dashboard/components/agent/__snapshots__/agent_vulnerability_report_spec.js.snap
View file @
d601573f
...
@@ -9,6 +9,7 @@ exports[`Agent vulnerability report component renders 1`] = `
...
@@ -9,6 +9,7 @@ exports[`Agent vulnerability report component renders 1`] = `
<vulnerability-list-graphql-stub
<vulnerability-list-graphql-stub
fields="[object Object],[object Object],[object Object],[object Object],,[object Object]"
fields="[object Object],[object Object],[object Object],[object Object],,[object Object]"
filters="[object Object]"
query="[object Object]"
query="[object Object]"
/>
/>
</div>
</div>
...
...
ee/spec/frontend/security_dashboard/components/agent/agent_vulnerability_report_spec.js
View file @
d601573f
...
@@ -4,10 +4,11 @@ import AgentVulnerabilityReport from 'ee/security_dashboard/components/agent/age
...
@@ -4,10 +4,11 @@ import AgentVulnerabilityReport from 'ee/security_dashboard/components/agent/age
describe
(
'
Agent vulnerability report component
'
,
()
=>
{
describe
(
'
Agent vulnerability report component
'
,
()
=>
{
let
wrapper
;
let
wrapper
;
const
propsData
=
{
clusterAgentId
:
'
gid://gitlab/Clusters::Agent/1
'
};
const
provide
=
{
agentName
:
'
primary-agent
'
,
projectPath
:
'
/path/to/project/
'
};
const
provide
=
{
agentName
:
'
primary-agent
'
,
projectPath
:
'
/path/to/project/
'
};
const
createWrapper
=
()
=>
{
const
createWrapper
=
()
=>
{
wrapper
=
shallowMount
(
AgentVulnerabilityReport
,
{
provide
});
wrapper
=
shallowMount
(
AgentVulnerabilityReport
,
{
pro
psData
,
pro
vide
});
};
};
afterEach
(()
=>
{
afterEach
(()
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment