Skip to content

Distinguish queries with same opname in compliance integration tests #3627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pedrottimark merged 2 commits into from
Oct 31, 2022
Merged

Distinguish queries with same opname in compliance integration tests #3627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c2795b
Distinguish queries with same opname in compliance integration tests
Oct 30, 2022
cde853b
Fix typo
Oct 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 11 additions & 45 deletions ui/apps/platform/cypress/helpers/compliance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,59 +11,25 @@ const routeMatcherMap = {};
'nodesCount',
'deploymentsCount',
'runStatuses',
'getAggregatedResults', // 4 requests
'getAggregatedResultsAcrossEntity_CLUSTER',
'getAggregatedResultsByEntity_CLUSTER',
'getAggregatedResultsAcrossEntity_NAMESPACE',
'getAggregatedResultsAcrossEntity_NODE',
'getComplianceStandards',
'complianceStandards', // 6 requests
'complianceStandards_CIS_Docker_v1_2_0',
'complianceStandards_CIS_Kubernetes_v1_5',
'complianceStandards_HIPAA_164',
'complianceStandards_NIST_800_190',
'complianceStandards_NIST_SP_800_53_Rev_4',
'complianceStandards_PCI_DSS_3_2',
].forEach((opname) => {
routeMatcherMap[opname] = {
method: 'POST',
url: api.graphql(opname),
};
});

/*
* getAggregatedResults opname has 4 requests with 2 duplicates for CLUSTER.
* Each entity alias has a predicate to match the payload of the corresponding request.
*/
const getAggregatedResults = {};
['CLUSTER', 'NAMESPACE', 'NODE'].forEach((entity) => {
getAggregatedResults[entity] = (req) => {
const { groupBy, unit } = req.body.variables;
// "variables": { "groupBy": ["STANDARD", "CLUSTER"], "unit": "CHECK" }
return (
Array.isArray(groupBy) &&
groupBy[0] === 'STANDARD' &&
groupBy[1] === entity &&
unit === 'CHECK'
);
};
});

/*
* complianceStandards opname has 6 requests.
* Each standard name alias has a predicate to match the payload of the corresponding request.
*/
const complianceStandards = {};
[
'CIS Docker v1.2.0',
'CIS Kubernetes v1.5',
'HIPAA 164',
'NIST SP 800-190',
'NIST SP 800-53',
'PCI DSS 3.2.1',
].forEach((standardName) => {
complianceStandards[standardName] = (req) => {
const { where } = req.body.variables;
return where === `Standard:${standardName}`;
};
});

const opnameAliasesMap = {
getAggregatedResults,
complianceStandards,
};

const requestConfig = { routeMatcherMap, opnameAliasesMap };
const requestConfig = { routeMatcherMap };

export function visitComplianceDashboard() {
visit(url.dashboard, requestConfig);
Expand Down
4 changes: 2 additions & 2 deletions ui/apps/platform/src/Containers/Compliance/widgets/ComplianceByStandard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Widget from 'Components/Widget';
import Sunburst from 'Components/visuals/Sunburst';
import Query from 'Components/CacheFirstQuery';
import Loader from 'Components/Loader';
import { COMPLIANCE_STANDARDS as QUERY } from 'queries/standard';
import { COMPLIANCE_STANDARDS } from 'queries/standard';
import queryService from 'utils/queryService';
import searchContext from 'Containers/searchContext';
import isGQLLoading from 'utils/gqlLoading';
Expand Down Expand Up @@ -196,7 +196,7 @@ const ComplianceByStandard = ({
};

return (
<Query query={QUERY} variables={variables}>
<Query query={COMPLIANCE_STANDARDS(standardId)} variables={variables}>
{({ loading, data }) => {
let contents = null;
let viewStandardLink = null;
Expand Down
2 changes: 1 addition & 1 deletion ui/apps/platform/src/Containers/Compliance/widgets/StandardsAcrossEntity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const StandardsAcrossEntity = ({ match, location, entityType, bodyClassName, cla
groupBy: [entityTypes.STANDARD, entityType],
unit: entityTypes.CHECK,
};
const { loading, error, data } = useQuery(AGGREGATED_RESULTS_ACROSS_ENTITY, {
const { loading, error, data } = useQuery(AGGREGATED_RESULTS_ACROSS_ENTITY(entityType), {
variables,
});

Expand Down
2 changes: 1 addition & 1 deletion ui/apps/platform/src/Containers/Compliance/widgets/StandardsByEntity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ const StandardsByEntity = ({ match, location, entityType, bodyClassName, classNa
groupBy: [entityTypes.STANDARD, entityType],
unit: entityTypes.CHECK,
};
const { loading, error, data } = useQuery(AGGREGATED_RESULTS_STANDARDS_BY_ENTITY, {
const { loading, error, data } = useQuery(AGGREGATED_RESULTS_STANDARDS_BY_ENTITY(entityType), {
variables,
});

Expand Down
8 changes: 4 additions & 4 deletions ui/apps/platform/src/queries/controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { gql } from '@apollo/client';

export const AGGREGATED_RESULTS_ACROSS_ENTITY = gql`
query getAggregatedResults(
export const AGGREGATED_RESULTS_ACROSS_ENTITY = (entityType) => gql`
query getAggregatedResultsAcrossEntity_${entityType}(
$groupBy: [ComplianceAggregation_Scope!]
$unit: ComplianceAggregation_Scope!
$where: String
Expand Down Expand Up @@ -115,8 +115,8 @@ export const AGGREGATED_RESULTS_ACROSS_ENTITIES = gql`
}
`;

export const AGGREGATED_RESULTS_STANDARDS_BY_ENTITY = gql`
query getAggregatedResults(
export const AGGREGATED_RESULTS_STANDARDS_BY_ENTITY = (entityType) => gql`
query getAggregatedResultsByEntity_${entityType}(
$groupBy: [ComplianceAggregation_Scope!]
$unit: ComplianceAggregation_Scope!
$where: String
Expand Down
4 changes: 2 additions & 2 deletions ui/apps/platform/src/queries/standard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ export const LIST_STANDARD_NO_NODES = gql`
}
`;

export const COMPLIANCE_STANDARDS = gql`
query complianceStandards($groupBy: [ComplianceAggregation_Scope!], $where: String) {
export const COMPLIANCE_STANDARDS = (standardId) => gql`
query complianceStandards_${standardId}($groupBy: [ComplianceAggregation_Scope!], $where: String) {
complianceStandards {
id
name
Expand Down