Skip to content

feat: enable scanner version2 #80

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: enable scanner version2 #80

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
fb9c869
feat: enable scanner version2
penguinjournals Jun 23, 2022
8110739
fix: typo error
penguinjournals Jun 23, 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
33 changes: 22 additions & 11 deletions templates_apprunner/CloudConnector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,20 @@ Parameters:
- "No"
Default: "Yes"
Description: Whether to deploy ECS Image Scanning or not
UseScanningV2:
Type: String
AllowedValues:
- "Yes"
- "No"
Default: "No"
Description: Whether to deploy Image Scanner V2

Conditions:
VerifySSL: !Equals [ !Ref VerifySSL, "Yes" ]
DeployCloudScanning: !Equals [ !Ref DeployCloudScanning, "Yes"]
ECRImageScanningDeploy: !Equals [ !Ref ECRImageScanningDeploy, "Yes"]
ECSImageScanningDeploy: !Equals [ !Ref ECSImageScanningDeploy, "Yes"]
UseScanningV2: !Equals [ !Ref UseScanningV2, "Yes"]

Resources:

Expand Down Expand Up @@ -125,26 +133,29 @@ Resources:
- DeployCloudScanning
- !Sub
- |

${ECRCode}
${ECSCode}
- ECRCode:
'Fn::If':
- ECRImageScanningDeploy
- !Sub |

- aws-ecr:
codeBuildProject: ${BuildProject}
secureAPITokenSecretName: ${SysdigSecureAPITokenSsm}
- !If
- UseScanningV2
- "- aws-ecr-inline: {}"
- !Sub |
- aws-ecr:
codeBuildProject: ${BuildProject}
secureAPITokenSecretName: ${SysdigSecureAPITokenSsm}
- ""
ECSCode:
'Fn::If':
- ECSImageScanningDeploy
- !Sub |

- aws-ecs:
codeBuildProject: ${BuildProject}
secureAPITokenSecretName: ${SysdigSecureAPITokenSsm}
- !If
- UseScanningV2
- "- aws-ecs-inline: {}"
- !Sub |
- aws-ecs:
codeBuildProject: ${BuildProject}
secureAPITokenSecretName: ${SysdigSecureAPITokenSsm}
- ""
- "[]"

Expand Down
11 changes: 11 additions & 0 deletions templates_apprunner/SecureForCloudAppRunner.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,17 @@ Metadata:
default: "Do you want to deploy Fargate Image Scanning?"
ExistentCloudTrailSNSTopic:
default: "CloudTrail SNS Topic"
UseScanningV2:
default: "Do you want to use image scanner version 2?"

Parameters:
UseScanningV2:
Type: String
AllowedValues:
- "Yes"
- "No"
Default: "No"

ECRImageScanningDeploy:
Type: String
AllowedValues:
Expand Down Expand Up @@ -98,6 +107,7 @@ Conditions:
- !Equals [!Ref SysdigSecureEndpoint, "https://secure.sysdig.com"]
- !Equals [!Ref SysdigSecureEndpoint, "https://eu1.app.sysdig.com"]
- !Equals [!Ref SysdigSecureEndpoint, "https://us2.app.sysdig.com"]
UseScanningV2: !Equals [ !Ref UseScanningV2, "Yes" ]

Resources:
SysdigConfigLoggingBucket:
Expand Down Expand Up @@ -154,6 +164,7 @@ Resources:
DeployCloudScanning: !If [ DeployCloudScanning, "Yes", "No" ]
ECRImageScanningDeploy: !If [ ECRImageScanningDeploy, "Yes", "No"]
ECSImageScanningDeploy: !If [ ECSImageScanningDeploy, "Yes", "No"]
UseScanningV2: !If [ UseScanningV2, "Yes", "No"]

CloudAgentlessRole:
Type: AWS::CloudFormation::Stack
Expand Down
45 changes: 26 additions & 19 deletions templates_ecs/CloudConnector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,29 @@ Parameters:
AllowedValues:
- "Yes"
- "No"
Default: "Yes"
Default: "No"
Description: Whether to deploy ECR Image Scanning or not
ECSImageScanningDeploy:
Type: String
AllowedValues:
- "Yes"
- "No"
Default: "Yes"
Default: "No"
Description: Whether to deploy ECS Image Scanning or not
UseScanningV2:
Type: String
AllowedValues:
- "Yes"
- "No"
Default: "No"
Description: Whether to deploy Image Scanner V2

Conditions:
VerifySSL: !Equals [ !Ref VerifySSL, "Yes" ]
DeployCloudScanning: !Equals [ !Ref DeployCloudScanning, "Yes"]
ECRImageScanningDeploy: !Equals [ !Ref ECRImageScanningDeploy, "Yes"]
ECSImageScanningDeploy: !Equals [ !Ref ECSImageScanningDeploy, "Yes"]
UseScanningV2: !Equals [ !Ref UseScanningV2, "Yes"]

Resources:

Expand Down Expand Up @@ -224,41 +232,40 @@ Resources:
"Fn::Base64":
!Sub
- |
rules:
- s3:
bucket: ${S3ConfigBucket}
path: rules
rules: []
ingestors:
- cloudtrail-sns-sqs:
queueURL: ${CloudTrailQueue}
scanners: ${Scanners}
- S3ConfigBucket: !Ref S3ConfigBucket
CloudTrailQueue: !Ref CloudTrailQueue
- CloudTrailQueue: !Ref CloudTrailQueue
Scanners:
'Fn::If':
- DeployCloudScanning
- !Sub
- |

${ECRCode}
${ECSCode}
- ECRCode:
'Fn::If':
- ECRImageScanningDeploy
- !Sub |

- aws-ecr:
codeBuildProject: ${BuildProject}
secureAPITokenSecretName: ${SysdigSecureAPITokenSsm}
- !If
- UseScanningV2
- "- aws-ecr-inline: {}"
- !Sub |
- aws-ecr:
codeBuildProject: ${BuildProject}
secureAPITokenSecretName: ${SysdigSecureAPITokenSsm}
- ""
ECSCode:
'Fn::If':
- ECSImageScanningDeploy
- !Sub |

- aws-ecs:
codeBuildProject: ${BuildProject}
secureAPITokenSecretName: ${SysdigSecureAPITokenSsm}
- !If
- UseScanningV2
- "- aws-ecs-inline: {}"
- !Sub |
- aws-ecs:
codeBuildProject: ${BuildProject}
secureAPITokenSecretName: ${SysdigSecureAPITokenSsm}
- ""
- "[]"

Expand Down
11 changes: 11 additions & 0 deletions templates_ecs/CloudVision.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,17 @@ Metadata:
default: "Private subnet Id's"
ExistentCloudTrailSNSTopic:
default: "CloudTrail SNS Topic"
UseScanningV2:
default: "Do you want to use image scanner version 2?"

Parameters:
UseScanningV2:
Type: String
AllowedValues:
- "Yes"
- "No"
Default: "No"

ECRImageScanningDeploy:
Type: String
AllowedValues:
Expand Down Expand Up @@ -133,6 +142,7 @@ Conditions:
- !Equals [!Ref SysdigSecureEndpoint, "https://secure.sysdig.com"]
- !Equals [!Ref SysdigSecureEndpoint, "https://eu1.app.sysdig.com"]
- !Equals [!Ref SysdigSecureEndpoint, "https://us2.app.sysdig.com"]
UseScanningV2: !Equals [ !Ref UseScanningV2, "Yes" ]

Resources:
S3ConfigBucket:
Expand Down Expand Up @@ -211,6 +221,7 @@ Resources:
DeployCloudScanning: !If [ DeployCloudScanning, "Yes", "No" ]
ECRImageScanningDeploy: !If [ ECRImageScanningDeploy, "Yes", "No"]
ECSImageScanningDeploy: !If [ ECSImageScanningDeploy, "Yes", "No"]
UseScanningV2: !If [ UseScanningV2, "Yes", "No"]

CloudAgentlessRole:
Type: AWS::CloudFormation::Stack
Expand Down