Skip to content
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.

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

[SEC-16683] Decouple Agentless Scanning from CSPM #153

Merged
merged 5 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
8 changes: 4 additions & 4 deletions aws_quickstart/datadog_agentless_scanning.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Parameters:
- true
- false
Description: >-
Enable Agentless Scanning of host vulnerabilities. "CloudSecurityPostureManagement" must be set to 'true'.
Enable Agentless Scanning of host vulnerabilities.
Default: false

AgentlessContainerScanning:
Expand All @@ -31,7 +31,7 @@ Parameters:
- true
- false
Description: >-
Enable Agentless Scanning of container vulnerabilities. "CloudSecurityPostureManagement" must be set to 'true'.
Enable Agentless Scanning of container vulnerabilities.
Default: false

AgentlessLambdaScanning:
Expand All @@ -40,7 +40,7 @@ Parameters:
- true
- false
Description: >-
Enable Agentless Scanning of Lambda vulnerabilities. "CloudSecurityPostureManagement" must be set to 'true'.
Enable Agentless Scanning of Lambda vulnerabilities.
Default: false

AgentlessSensitiveDataScanning:
Expand All @@ -49,7 +49,7 @@ Parameters:
- true
- false
Description: >-
Enable Agentless Scanning of datastores (S3 buckets). "CloudSecurityPostureManagement" must be set to 'true'.
Enable Agentless Scanning of datastores (S3 buckets).
Default: false

DatadogAPIKeySecretArn:
Expand Down
35 changes: 27 additions & 8 deletions aws_quickstart/main_extended.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,34 +92,34 @@ Parameters:
- true
- false
Description: >-
Enable Agentless Scanning of host vulnerabilities. "CloudSecurityPostureManagement" must be set to 'true'.
Enable Agentless Scanning of host vulnerabilities.
Default: false
AgentlessContainerScanning:
Type: String
AllowedValues:
- true
- false
Description: >-
Enable Agentless Scanning of container vulnerabilities. "CloudSecurityPostureManagement" must be set to 'true'.
Enable Agentless Scanning of container vulnerabilities.
Default: false
AgentlessLambdaScanning:
Type: String
AllowedValues:
- true
- false
Description: >-
Enable Agentless Scanning of Lambda vulnerabilities. "CloudSecurityPostureManagement" must be set to 'true'.
Enable Agentless Scanning of Lambda vulnerabilities.
Default: false
AgentlessSensitiveDataScanning:
Type: String
AllowedValues:
- true
- false
Description: >-
Enable Agentless Scanning of datastores (S3 buckets). "CloudSecurityPostureManagement" must be set to 'true'.
Enable Agentless Scanning of datastores (S3 buckets).
Default: false
Rules:
ResourceCollectionValidState:
CSPMResourceCollectionValidState:
Assertions:
- Assert:
Fn::Not:
Expand All @@ -131,6 +131,28 @@ Rules:
- Ref: CloudSecurityPostureManagement
- 'true'
AssertDescription: CloudSecurityPostureManagement requires ResourceCollection, must enable ResourceCollection
AgentlessResourceCollectionValidState:
Assertions:
- Assert:
Fn::Not:
- Fn::And:
- Fn::Equals:
- Ref: DisableResourceCollection
- 'true'
- Fn::Or:
- Fn::Equals:
- !Ref AgentlessHostScanning
- true
- Fn::Equals:
- !Ref AgentlessContainerScanning
- true
- Fn::Equals:
- !Ref AgentlessLambdaScanning
- true
- Fn::Equals:
- !Ref AgentlessSensitiveDataScanning
- true
AssertDescription: Agentless Scanning options require ResourceCollection, must enable ResourceCollection
Conditions:
InstallForwarder:
Fn::Equals:
Expand All @@ -146,9 +168,6 @@ Conditions:
- Fn::Equals:
- !Ref DatadogSite
- ddog-gov.com
- Fn::Equals:
- !Ref CloudSecurityPostureManagement
- true
- Fn::Or:
- Fn::Equals:
- !Ref AgentlessHostScanning
Expand Down
Loading