Skip to content

Distinguish queries with same opname in compliance integration tests#3627

Merged
pedrottimark merged 2 commits intomasterfrom
cypress-compliance-distinguish-opname
Oct 31, 2022
Merged

Distinguish queries with same opname in compliance integration tests#3627
pedrottimark merged 2 commits intomasterfrom
cypress-compliance-distinguish-opname

Conversation

@pedrottimark
Copy link
Contributor

@pedrottimark pedrottimark commented Oct 30, 2022

Description

Prerequisite to simplify integration test configuration to intercept requests and wait for responses:

  • replace requestConfig: { opnameAliasesMap, routeMatcherMap }
  • with routeMatcherMap

getAggregatedResults

Before changes, same opname requires payload predicate:

  • "variables": { "groupBy": ["STANDARD", "CLUSTER"], "unit": "CHECK" }
  • "variables": { "groupBy": ["STANDARD", "NAMESPACE"], "unit": "CHECK" }
  • "variables": { "groupBy": ["STANDARD", "CLUSTER"], "unit": "CHECK" }
  • "variables": { "groupBy": ["STANDARD", "NODE"], "unit": "CHECK" }

After changes, distinct opnames include prepositional phrase and entity type:

  • getAggregateResultsAcrossEntity_CLUSTER
  • getAggregateResultsByEntity_CLUSTER
  • getAggregateResultsAcrossEntity_NAMESPACE
  • getAggregateResultsAcrossEntity_NODE

complianceStandards

Before changes, same opname requires payload predicate:

  • where: "Standard:CIS Docker v1.2.0"
  • where: "Standard:"CIS Kubernetes v1.5"
  • where: "Standard:"HIPAA 164"
  • where: "Standard:"NIST SP 800-190"
  • where: "Standard:"NIST SP 800-53"
  • where: "Standard:"PCI DSS 3.2.1"

After changes, distinct opnames include standard id:

  • 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

Checklist

  • Investigated and inspected CI test results
  • Edited integration tests

Testing Performed

@ghost
Copy link

ghost commented Oct 30, 2022

Images are ready for the commit at cde853b.

To use with deploy scripts, first export MAIN_IMAGE_TAG=3.72.x-447-gcde853bd97.

@pedrottimark pedrottimark requested a review from vjwilson October 31, 2022 16:33
Copy link
Contributor

@vjwilson vjwilson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants