Skip to content

Commit fed0fc5

Browse files
committed
[pkg][terraform]remove template_file provider
1 parent a3c6b55 commit fed0fc5

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

chalice/package.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -798,11 +798,11 @@ def generate(self, resources):
798798
# type: (List[models.Model]) -> Dict[str, Any]
799799
template = {
800800
'resource': {},
801+
'locals': {},
801802
'terraform': {
802803
'required_version': '>= 0.12.26, < 1.2.0',
803804
'required_providers': {
804805
'aws': {'version': '>= 2, < 4'},
805-
'template': {'version': '~> 2'},
806806
'null': {'version': '>= 2, < 4'}
807807
}
808808
},
@@ -1087,14 +1087,12 @@ def _generate_restapi(self, resource, template):
10871087

10881088
# typechecker happiness
10891089
swagger_doc = cast(Dict, resource.swagger_doc)
1090-
template['data'].setdefault(
1091-
'template_file', {}).setdefault(
1092-
'chalice_api_swagger', {})['template'] = json.dumps(
1090+
template['locals']['chalice_api_swagger'] = json.dumps(
10931091
swagger_doc)
10941092

10951093
template['resource'].setdefault('aws_api_gateway_rest_api', {})[
10961094
resource.resource_name] = {
1097-
'body': '${data.template_file.chalice_api_swagger.rendered}',
1095+
'body': '${local.chalice_api_swagger}',
10981096
# Terraform will diff explicitly configured attributes
10991097
# to the current state of the resource. Attributes configured
11001098
# via swagger on the REST api need to be duplicated here, else
@@ -1124,7 +1122,7 @@ def _generate_restapi(self, resource, template):
11241122
# the swagger description for the api by using its checksum
11251123
# in the stage description.
11261124
'stage_description': (
1127-
"${md5(data.template_file.chalice_api_swagger.rendered)}"),
1125+
"${md5(local.chalice_api_swagger)}"),
11281126
'rest_api_id': '${aws_api_gateway_rest_api.%s.id}' % (
11291127
resource.resource_name),
11301128
'lifecycle': {'create_before_destroy': True}

tests/unit/test_package.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ def test_can_generate_rest_api(self, sample_app_with_auth):
550550
assert resources['aws_api_gateway_deployment']['rest_api'] == {
551551
'rest_api_id': '${aws_api_gateway_rest_api.rest_api.id}',
552552
'stage_description': (
553-
'${md5(data.template_file.chalice_api_swagger.rendered)}'),
553+
'${md5(local.chalice_api_swagger)}'),
554554
'stage_name': 'api',
555555
'lifecycle': {'create_before_destroy': True}
556556
}

0 commit comments

Comments
 (0)