@@ -531,7 +531,10 @@ export class StacksCloud extends Stack {
531
531
effect : iam . Effect . ALLOW ,
532
532
principals : [ sesPrincipal ] ,
533
533
actions : [ 's3:PutObject' ] ,
534
- resources : [ this . storage . emailBucket . arnForObjects ( 'tmp/email_in/*' ) ] ,
534
+ resources : [
535
+ // this.storage.emailBucket.arnForObjects('tmp/email_in/*'),
536
+ this . storage . emailBucket . arnForObjects ( '*' ) ,
537
+ ] ,
535
538
conditions : {
536
539
StringEquals : {
537
540
'aws:Referer' : this . account ,
@@ -540,17 +543,6 @@ export class StacksCloud extends Stack {
540
543
} )
541
544
542
545
this . storage . emailBucket . addToResourcePolicy ( bucketPolicyStatement )
543
- // Grant SES permission to write to the S3 bucket
544
- this . storage . emailBucket . addToResourcePolicy ( new iam . PolicyStatement ( {
545
- principals : [ sesPrincipal ] ,
546
- actions : [ 's3:PutObject' ] ,
547
- resources : [ this . storage . emailBucket . arnForObjects ( '*' ) ] ,
548
- conditions : {
549
- StringEquals : {
550
- 'aws:Referer' : this . account ,
551
- } ,
552
- } ,
553
- } ) )
554
546
555
547
const iamGroup = new iam . Group ( this , 'IAMGroup' , {
556
548
groupName : `${ this . appName } -${ appEnv } -email-management-s3-group` ,
@@ -672,7 +664,7 @@ export class StacksCloud extends Stack {
672
664
} ,
673
665
} ,
674
666
] ,
675
- scanEnabled : config . email . server ?. scan ,
667
+ scanEnabled : config . email . server ?. scan || true ,
676
668
tlsPolicy : 'Require' ,
677
669
} ,
678
670
} )
@@ -919,7 +911,7 @@ export class StacksCloud extends Stack {
919
911
const existingBucketArn = `arn:aws:s3:::${ existingBucketName } `
920
912
921
913
if ( existingBucketName )
922
- return s3 . Bucket . fromBucketArn ( this , 'ExistingPublicBucket ' , existingBucketArn )
914
+ return s3 . Bucket . fromBucketArn ( this , 'PublicBucket ' , existingBucketArn )
923
915
924
916
return new s3 . Bucket ( this , 'PublicBucket' , {
925
917
bucketName : `${ bucketPrefix } ${ timestamp } ` ,
@@ -934,7 +926,7 @@ export class StacksCloud extends Stack {
934
926
const existingBucketArn = `arn:aws:s3:::${ existingBucketName } `
935
927
936
928
if ( existingBucketName )
937
- return s3 . Bucket . fromBucketArn ( this , 'ExistingPrivateBucket ' , existingBucketArn )
929
+ return s3 . Bucket . fromBucketArn ( this , 'PrivateBucket ' , existingBucketArn )
938
930
939
931
return new s3 . Bucket ( this , 'PrivateBucket' , {
940
932
bucketName : `${ bucketPrefix } ${ timestamp } ` ,
@@ -949,7 +941,7 @@ export class StacksCloud extends Stack {
949
941
const existingBucketArn = `arn:aws:s3:::${ existingBucketName } `
950
942
951
943
if ( existingBucketName )
952
- return s3 . Bucket . fromBucketArn ( this , 'ExistingEmailBucket ' , existingBucketArn )
944
+ return s3 . Bucket . fromBucketArn ( this , 'EmailBucket ' , existingBucketArn )
953
945
954
946
return new s3 . Bucket ( this , 'EmailServerBucket' , {
955
947
bucketName : `${ this . appName } -email-${ appEnv } -${ timestamp } ` ,
@@ -987,7 +979,6 @@ export async function getBucketWithPrefix(prefix: string): Promise<string | null
987
979
988
980
try {
989
981
const response = await s3 . send ( new ListBucketsCommand ( { } ) )
990
-
991
982
const bucket = response . Buckets ?. find ( bucket => bucket . Name ?. startsWith ( prefix ) )
992
983
993
984
return bucket ? bucket . Name : null
0 commit comments