Skip to content

Commit

Permalink
change bucket resource name
Browse files Browse the repository at this point in the history
cleans up auto-generated bucket name
  • Loading branch information
MrSecure committed Oct 12, 2019
1 parent d0af7f4 commit b5ccdad
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions util/Audit_Pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ Parameters:
Default: 30
Type: Number
Description: Timeout for running prowler across the fleet
MinValue: 5
MaxValue: 480
pAuditRolePathName:
Default: '/audit/prowler/XA_AuditRole_Prowler'
Type: String
Expand Down Expand Up @@ -120,7 +122,7 @@ Parameters:
Resources:

# S3 Bucket for Results, Config
ProwlerResultsBucket:
ProwlerResults:
Type: "AWS::S3::Bucket"
Properties:
# BucketName: !Sub "audit-results-${AWS::AccountId}"
Expand Down Expand Up @@ -178,23 +180,23 @@ Resources:
- s3:GetObject
- s3:GetObjectVersion
Resource:
- !Sub "${ProwlerResultsBucket.Arn}/*"
- !Sub "${ProwlerResults.Arn}/*"
- Effect: Allow
Action:
- s3:ListBucket
- s3:HeadBucket
- s3:GetBucketLocation
- s3:GetBucketAcl
Resource:
- !Sub "${ProwlerResultsBucket.Arn}"
- !Sub "${ProwlerResults.Arn}"
- Effect: Allow
Action:
- logs:CreateLogGroup
- logs:CreateLogStream
- logs:PutLogEvents
Resource:
- !Sub "arn:aws:logs:${AWS::Region}:${AWS::AccountId}:log-group:*"
- !Sub "${ProwlerResultsBucket.Arn}"
- !Sub "${ProwlerResults.Arn}"
- Effect: Allow
Action:
- ssm:GetParameters
Expand Down Expand Up @@ -227,7 +229,7 @@ Resources:
Artifacts:
Name: "ProwlerResults"
Type: "S3"
Location: !Ref ProwlerResultsBucket
Location: !Ref ProwlerResults
Path: "prowler"
NamespaceType: NONE
Packaging: NONE
Expand All @@ -240,7 +242,7 @@ Resources:
StreamName: "codebuild_runs"
S3Logs:
Status: DISABLED
# Location: !Sub "${ProwlerResultsBucket.Arn}/codebuild_run_logs"
# Location: !Sub "${ProwlerResults.Arn}/codebuild_run_logs"
EncryptionDisabled: False
BadgeEnabled: False
Tags:
Expand Down Expand Up @@ -409,4 +411,4 @@ Resources:
Outputs:
ResultsBucket:
Description: S3 Bucket with Prowler Results, Logs, Configs
Value: !Ref ProwlerResultsBucket
Value: !Ref ProwlerResults

0 comments on commit b5ccdad

Please sign in to comment.