Skip to content

Commit e9788a0

Browse files
antonbabenkoantonbabenko
committed
Fixes in arguments
1 parent ebf0ccd commit e9788a0

File tree

5 files changed

+24
-20
lines changed

5 files changed

+24
-20
lines changed

‎src/modulestf/convert.py

+17-15
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def convert_graph_to_modulestf_config(graph): # noqa: C901
152152
if sg_id:
153153
r.append_dependency(sg_id)
154154
r.update_dynamic_params("vpc_security_group_ids",
155-
"[dependency." + sg_id + ".outputs.this_security_group_id]")
155+
"[dependency." + sg_id + ".outputs.security_group_id]")
156156
r.update_params({"create_security_group": False})
157157

158158
if node.get("engine") == "aurora-mysql":
@@ -195,6 +195,7 @@ def convert_graph_to_modulestf_config(graph): # noqa: C901
195195
"family": "",
196196
"backup_retention_period": "0", # Disable backups to create DB faster
197197
"vpc_security_group_ids": [],
198+
"create_db_subnet_group": False,
198199
})
199200

200201
if vpc_id:
@@ -205,15 +206,15 @@ def convert_graph_to_modulestf_config(graph): # noqa: C901
205206
if sg_id:
206207
r.append_dependency(sg_id)
207208
r.update_dynamic_params("vpc_security_group_ids",
208-
"[dependency." + sg_id + ".outputs.this_security_group_id]")
209+
"[dependency." + sg_id + ".outputs.security_group_id]")
209210

210211
if node.get("engine") == "mysql":
211212
r.update_params({
212213
"engine": "mysql",
213214
"port": "3306",
214-
"engine_version": "5.7.19",
215-
"major_engine_version": "5.7",
216-
"family": "mysql5.7",
215+
"engine_version": "8.0.20",
216+
"major_engine_version": "8.0",
217+
"family": "mysql8.0",
217218
})
218219
elif node.get("engine") == "mariadb":
219220
r.update_params({
@@ -225,11 +226,11 @@ def convert_graph_to_modulestf_config(graph): # noqa: C901
225226
})
226227
elif node.get("engine") == "postgres":
227228
r.update_params({
228-
"engine": "mariadb",
229+
"engine": "postgres",
229230
"port": "5432",
230-
"engine_version": "9.6.9",
231-
"major_engine_version": "9.6",
232-
"family": "postgres9.6",
231+
"engine_version": "11.10",
232+
"major_engine_version": "11",
233+
"family": "postgres11",
233234
})
234235
else:
235236
r.update_params({
@@ -272,6 +273,8 @@ def convert_graph_to_modulestf_config(graph): # noqa: C901
272273
"max_size": 1,
273274
"desired_capacity": 1,
274275
"health_check_type": "EC2",
276+
"use_lt": True,
277+
"create_lt": True,
275278
"image_id": "HCL:dependency.aws-data.outputs.amazon_linux2_aws_ami_id",
276279
"vpc_zone_identifier": [],
277280
"security_groups": [],
@@ -285,7 +288,7 @@ def convert_graph_to_modulestf_config(graph): # noqa: C901
285288

286289
if sg_id:
287290
r.append_dependency(sg_id)
288-
r.update_dynamic_params("security_groups", "[dependency." + sg_id + ".outputs.this_security_group_id]")
291+
r.update_dynamic_params("security_groups", "[dependency." + sg_id + ".outputs.security_group_id]")
289292

290293
if elb_id and elb_type == "application":
291294
r.update_params({
@@ -340,7 +343,7 @@ def convert_graph_to_modulestf_config(graph): # noqa: C901
340343

341344
if sg_id:
342345
r.append_dependency(sg_id)
343-
r.update_dynamic_params("security_groups", "[dependency." + sg_id + ".outputs.this_security_group_id]")
346+
r.update_dynamic_params("security_groups", "[dependency." + sg_id + ".outputs.security_group_id]")
344347

345348
elif node.get("elbType") == "network":
346349
r = Resource(key, "nlb", node_text)
@@ -380,7 +383,7 @@ def convert_graph_to_modulestf_config(graph): # noqa: C901
380383

381384
if sg_id:
382385
r.append_dependency(sg_id)
383-
r.update_dynamic_params("security_groups", "[dependency." + sg_id + ".outputs.this_security_group_id]")
386+
r.update_dynamic_params("security_groups", "[dependency." + sg_id + ".outputs.security_group_id]")
384387

385388
resources.append(r.content())
386389

@@ -407,7 +410,7 @@ def convert_graph_to_modulestf_config(graph): # noqa: C901
407410

408411
if sg_id:
409412
r.append_dependency(sg_id)
410-
r.update_dynamic_params("vpc_security_group_ids", "[dependency." + sg_id + ".outputs.this_security_group_id]")
413+
r.update_dynamic_params("vpc_security_group_ids", "[dependency." + sg_id + ".outputs.security_group_id]")
411414

412415
resources.append(r.content())
413416

@@ -525,7 +528,7 @@ def convert_graph_to_modulestf_config(graph): # noqa: C901
525528
rules_with_cidr_blocks.append(tmp_rule)
526529
else:
527530
dependency_sg_id = rule.get("target")
528-
tmp_rule.update({"source_security_group_id": "HCL:dependency." + dependency_sg_id + ".outputs.this_security_group_id"})
531+
tmp_rule.update({"source_security_group_id": "HCL:dependency." + dependency_sg_id + ".outputs.security_group_id"})
529532
rules_with_source_security_group_id.append(tmp_rule)
530533

531534
r.append_dependency(dependency_sg_id)
@@ -570,7 +573,6 @@ def convert_graph_to_modulestf_config(graph): # noqa: C901
570573
"database_subnets":
571574
"HCL:[for k,v in dependency.aws-data.outputs.available_aws_availability_zones_names: cidrsubnet(\"" +
572575
selected_vpc_cidr + "\", 8, k+20)]",
573-
# "redshift_subnets": [],
574576
})
575577

576578
r.append_dependency("aws-data")

‎src/modulestf/modules.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ def update_template_variables(var):
166166

167167
# Data sources for aws_region and aws_availability_zones
168168
"aws-data": {
169-
"source": "${get_parent_terragrunt_dir()}/../../../modules/aws-data",
169+
"source": "${get_parent_terragrunt_dir()}/../../modules/aws-data",
170170
"registry_url": "",
171171
"variables": {},
172172
},

‎src/modulestf/render.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def make_dir_name(type, text, appendix=""):
159159
# Should start with "dependency."
160160
#
161161
# Examples:
162-
# dependency.a3bfbba6-ff09-4efc-a56b-39b647f203f6.outputs.this_security_group_id => dependency.sg_2.outputs.this_security_group_id
162+
# dependency.a3bfbba6-ff09-4efc-a56b-39b647f203f6.outputs.security_group_id => dependency.sg_2.outputs.security_group_id
163163
# Source: https://stackoverflow.com/a/38970181/550451
164164
def recursive_replace_dependency(input, dirs):
165165
if isinstance(input, dict):

‎src/templates/root/template/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Local .terraform directories
22
**/.terraform/*
3+
.terraform
4+
.terragrunt-cache
35

46
# Terraform lockfile
57
.terraform.lock.hcl

‎tests/test_dynamic_params.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
from pprint import pprint
33

44
dynamic_params = {
5-
'key': 'dependency.a3bfbbf.outputs.this_security_group_id',
5+
'key': 'dependency.a3bfbbf.outputs.security_group_id',
66
'egress_with_source_security_group_id': [],
77
'ingress_with_source_security_group_id': [
88
{
99
'description': 'All TCP from sg2',
1010
'from_port': '0',
1111
'protocol': 6,
12-
'source_security_group_id': 'dependency.a3bfbb.outputs.this_security_group_id',
12+
'source_security_group_id': 'dependency.a3bfbb.outputs.security_group_id',
1313
'to_port': '65535'
1414
},
1515
{
1616
'description': 'All TCP from sg3',
1717
'from_port': '0',
1818
'protocol': 6,
19-
'source_security_group_id': '[dependency.a3bfbb.outputs.this_security_group_id] + dependency.abcdef.outputs.this_security_group_id',
19+
'source_security_group_id': '[dependency.a3bfbb.outputs.security_group_id] + dependency.abcdef.outputs.security_group_id',
2020
'to_port': '65535'
2121
}
2222
]

0 commit comments

Comments
 (0)