Skip to content

Commit b619cf2

Browse files
committed
[#323] Format code
1 parent 0aa0817 commit b619cf2

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ import {
1111
INFRA_CORE_MAIN_PATH,
1212
INFRA_CORE_OUTPUTS_PATH,
1313
INFRA_CORE_VARIABLES_PATH,
14-
MODULES_LOCALS_INDICATOR,
1514
} from '@/generators/terraform/constants';
16-
import { appendToFile, copy, injectToFile } from '@/helpers/file';
15+
import { appendToFile, copy } from '@/helpers/file';
1716

1817
import {
1918
AWS_SECURITY_GROUP_MAIN_PATH,
2019
AWS_SECURITY_GROUP_OUTPUTS_PATH,
2120
AWS_TEMPLATE_PATH,
2221
} from '../constants';
2322

24-
const albLocalesContent = dedent`
25-
###ALB Locals###
23+
const albLocalsContent = dedent`
24+
### Begin ALB ###
25+
locals {
2626
alb_s3_bucket_policy = {
2727
Version = "2012-10-17"
2828
Statement = [
@@ -58,11 +58,14 @@ const albLocalesContent = dedent`
5858
Resource = "arn:aws:s3:::\${module.s3_alb_access_log.aws_s3_bucket_name}"
5959
}
6060
]
61-
}`;
61+
}
62+
}
63+
### End ALB ###`;
6264

6365
const albDataContent = dedent`
64-
###ALB Locals###
65-
data "aws_elb_service_account" "elb_service_account" {}`;
66+
### Begin ALB ###
67+
data "aws_elb_service_account" "elb_service_account" {}
68+
### End ALB ###`;
6669

6770
const albVariablesContent = dedent`
6871
variable "health_check_path" {
@@ -99,7 +102,7 @@ const albModuleContent = dedent`
99102
module "s3_bucket_access_log_policy" {
100103
source = "../modules/s3/bucket_policy"
101104
102-
s3_bucket_name = module.s3_alb_access_log.aws_s3_bucket_name
105+
s3_bucket_name = module.s3_alb_access_log.aws_s3_bucket_name
103106
s3_bucket_policy = local.alb_s3_bucket_policy
104107
}`;
105108

@@ -166,9 +169,7 @@ const applyAwsAlb = async (options: AwsOptions) => {
166169
await requireAwsModules('alb', 'securityGroup', options);
167170

168171
copy(`${AWS_TEMPLATE_PATH}/modules/alb`, 'modules/alb', options.projectName);
169-
injectToFile(INFRA_CORE_LOCALS_PATH, albLocalesContent, options.projectName, {
170-
insertAfter: MODULES_LOCALS_INDICATOR,
171-
});
172+
appendToFile(INFRA_CORE_LOCALS_PATH, albLocalsContent, options.projectName);
172173
appendToFile(INFRA_CORE_DATA_PATH, albDataContent, options.projectName);
173174
appendToFile(INFRA_CORE_MAIN_PATH, albModuleContent, options.projectName);
174175
appendToFile(

src/generators/terraform/constants.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ const INFRA_SHARED_VARIABLES_PATH = `${INFRA_SHARED_PATH}/variables.tf`;
1212
const INFRA_SHARED_LOCALS_PATH = `${INFRA_SHARED_PATH}/locals.tf`;
1313
const INFRA_SHARED_DATA_PATH = `${INFRA_SHARED_PATH}/data.tf`;
1414

15-
const MODULES_LOCALS_INDICATOR = `### Modules Locals ###`;
16-
1715
export {
1816
INFRA_CORE_PATH,
1917
INFRA_CORE_MAIN_PATH,
@@ -27,5 +25,4 @@ export {
2725
INFRA_SHARED_VARIABLES_PATH,
2826
INFRA_SHARED_LOCALS_PATH,
2927
INFRA_SHARED_DATA_PATH,
30-
MODULES_LOCALS_INDICATOR,
3128
};

src/generators/terraform/index.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import {
55
INFRA_CORE_LOCALS_PATH,
66
INFRA_SHARED_LOCALS_PATH,
77
INFRA_CORE_DATA_PATH,
8-
MODULES_LOCALS_INDICATOR,
98
} from '@/generators/terraform/constants';
109
import { copy, rename, appendToFile } from '@/helpers/file';
1110

@@ -18,8 +17,6 @@ const applyTerraformCore = async (generalOptions: GeneralOptions) => {
1817
locals {
1918
project_name = "${projectName}"
2019
env_namespace = "\${local.project_name}-\${var.environment}"
21-
22-
${MODULES_LOCALS_INDICATOR}
2320
}`;
2421

2522
const coreDatContent = dedent`

0 commit comments

Comments
 (0)