[#316] Update name, move s3BucketPolicy into s3 module

Author: tung-nimblehq

src/generators/addons/aws/modules/alb.ts

@@ -30,7 +30,7 @@ const albVariablesContent = dedent`
   }`;
 
 const albModuleContent = dedent`
-  module "s3_access_log" {
+  module "s3_alb_access_log" {
     source = "../modules/s3"
 
     env_namespace = local.env_namespace
@@ -47,13 +47,13 @@ const albModuleContent = dedent`
     subnet_ids             = module.vpc.public_subnet_ids
     security_group_ids     = module.security_group.alb_security_group_ids
     health_check_path      = var.health_check_path
-    bucket_access_log_name = module.s3_access_log.aws_s3_bucket_name
+    bucket_access_log_name = module.s3_alb_access_log.aws_s3_bucket_name
   }
 
   module "s3_bucket_access_log_policy" {
-    source = "../modules/s3BucketPolicy"
+    source = "../modules/s3/bucket_policy"
 
-    s3_bucket_name = module.s3_access_log.aws_s3_bucket_name
+    s3_bucket_name = module.s3_alb_access_log.aws_s3_bucket_name
     s3_bucket_policy = {
       Version = "2012-10-17"
       Statement = [
@@ -65,15 +65,15 @@ const albModuleContent = dedent`
             ]
           }
           Action   = "s3:PutObject"
-          Resource = "arn:aws:s3:::\${module.s3_access_log.aws_s3_bucket_name}/AWSLogs/*"
+          Resource = "arn:aws:s3:::\${module.s3_alb_access_log.aws_s3_bucket_name}/AWSLogs/*"
         },
         {
           Effect = "Allow",
           Principal = {
             Service = "delivery.logs.amazonaws.com"
           }
           Action   = "s3:PutObject"
-          Resource = "arn:aws:s3:::\${module.s3_access_log.aws_s3_bucket_name}/AWSLogs/*",
+          Resource = "arn:aws:s3:::\${module.s3_alb_access_log.aws_s3_bucket_name}/AWSLogs/*",
           Condition = {
             StringEquals = {
               "s3:x-amz-acl" = "bucket-owner-full-control"
@@ -86,7 +86,7 @@ const albModuleContent = dedent`
             Service = "delivery.logs.amazonaws.com"
           }
           Action   = "s3:GetBucketAcl"
-          Resource = "arn:aws:s3:::\${module.s3_access_log.aws_s3_bucket_name}"
+          Resource = "arn:aws:s3:::\${module.s3_alb_access_log.aws_s3_bucket_name}"
         }
       ]
     }

src/generators/addons/aws/modules/s3.test.ts

@@ -41,8 +41,8 @@ describe('S3 add-on', () => {
         'modules/s3/main.tf',
         'modules/s3/variables.tf',
         'modules/s3/outputs.tf',
-        'modules/s3BucketPolicy/main.tf',
-        'modules/s3BucketPolicy/variables.tf',
+        'modules/s3/bucket_policy/main.tf',
+        'modules/s3/bucket_policy/variables.tf',
       ];
 
       expect(projectDir).toHaveFiles(expectedFiles);

src/generators/addons/aws/modules/s3.ts

@@ -11,8 +11,8 @@ const applyAwsS3 = async (options: AwsOptions) => {
 
   copy(`${AWS_TEMPLATE_PATH}/modules/s3`, 'modules/s3', options.projectName);
   copy(
-    `${AWS_TEMPLATE_PATH}/modules/s3BucketPolicy`,
-    'modules/s3BucketPolicy',
+    `${AWS_TEMPLATE_PATH}/modules/s3/bucket_policy`,
+    'modules/s3/bucket_policy',
     options.projectName
   );
 };