Skip to content

Commit 788b675

Browse files
committed
Remove deployment resource because of auto-deploy
1 parent 43df895 commit 788b675

File tree

4 files changed

+15
-72
lines changed

4 files changed

+15
-72
lines changed

src/mach/templates/partials/endpoints/aws_api_gateway.tf

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,11 @@ resource "aws_apigatewayv2_route" "{{ endpoint.key|slugify }}_application" {
2222
route_key = "$default"
2323
}
2424

25-
resource "aws_apigatewayv2_deployment" "{{ endpoint.key|slugify }}_default" {
26-
api_id = aws_apigatewayv2_api.{{ endpoint.key|slugify }}_gateway.id
27-
description = "Stage for default release"
28-
29-
lifecycle {
30-
create_before_destroy = true
31-
}
25+
resource "aws_apigatewayv2_stage" "{{ endpoint.key|slugify }}_default" {
26+
name = "$default"
27+
description = "Stage for default release"
28+
api_id = aws_apigatewayv2_api.{{ endpoint.key|slugify }}_gateway.id
29+
auto_deploy = true
3230

3331
depends_on = [
3432
{% for component in endpoint.components %}
@@ -37,14 +35,6 @@ resource "aws_apigatewayv2_deployment" "{{ endpoint.key|slugify }}_default" {
3735
]
3836
}
3937

40-
resource "aws_apigatewayv2_stage" "{{ endpoint.key|slugify }}_default" {
41-
name = "$default"
42-
description = "Stage for default release"
43-
api_id = aws_apigatewayv2_api.{{ endpoint.key|slugify }}_gateway.id
44-
deployment_id = aws_apigatewayv2_deployment.{{ endpoint.key|slugify }}_default.id
45-
auto_deploy = true
46-
}
47-
4838
# Route53 mappings
4939
resource "aws_apigatewayv2_domain_name" "{{ endpoint.key|slugify }}" {
5040
domain_name = "{{ endpoint.url }}"

tests/files/aws_config1_expected_mach-site-eu.json

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -214,30 +214,6 @@
214214
}
215215
}
216216
},
217-
{
218-
"aws_apigatewayv2_deployment": {
219-
"main_default": {
220-
"api_id": [
221-
"${aws_apigatewayv2_api.main_gateway.id}"
222-
],
223-
"description": [
224-
"Stage for default release"
225-
],
226-
"lifecycle": [
227-
{
228-
"create_before_destroy": [
229-
true
230-
]
231-
}
232-
],
233-
"depends_on": [
234-
[
235-
"${module.payment}"
236-
]
237-
]
238-
}
239-
}
240-
},
241217
{
242218
"aws_apigatewayv2_stage": {
243219
"main_default": {
@@ -250,11 +226,13 @@
250226
"api_id": [
251227
"${aws_apigatewayv2_api.main_gateway.id}"
252228
],
253-
"deployment_id": [
254-
"${aws_apigatewayv2_deployment.main_default.id}"
255-
],
256229
"auto_deploy": [
257230
true
231+
],
232+
"depends_on": [
233+
[
234+
"${module.payment}"
235+
]
258236
]
259237
}
260238
}

tests/files/aws_config1_expected_mach-site-us.json

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -211,30 +211,6 @@
211211
}
212212
}
213213
},
214-
{
215-
"aws_apigatewayv2_deployment": {
216-
"main_default": {
217-
"api_id": [
218-
"${aws_apigatewayv2_api.main_gateway.id}"
219-
],
220-
"description": [
221-
"Stage for default release"
222-
],
223-
"lifecycle": [
224-
{
225-
"create_before_destroy": [
226-
true
227-
]
228-
}
229-
],
230-
"depends_on": [
231-
[
232-
"${module.payment}"
233-
]
234-
]
235-
}
236-
}
237-
},
238214
{
239215
"aws_apigatewayv2_stage": {
240216
"main_default": {
@@ -247,11 +223,13 @@
247223
"api_id": [
248224
"${aws_apigatewayv2_api.main_gateway.id}"
249225
],
250-
"deployment_id": [
251-
"${aws_apigatewayv2_deployment.main_default.id}"
252-
],
253226
"auto_deploy": [
254227
true
228+
],
229+
"depends_on": [
230+
[
231+
"${module.payment}"
232+
]
255233
]
256234
}
257235
}

tests/unittests/test_terraform.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ def test_generate_w_endpoints(config: types.MachConfig, tf_mock):
109109
"aws_acm_certificate.public",
110110
"aws_apigatewayv2_api.public_gateway",
111111
"aws_apigatewayv2_api_mapping.public",
112-
"aws_apigatewayv2_deployment.public_default",
113112
"aws_apigatewayv2_domain_name.public",
114113
"aws_apigatewayv2_route.public_application",
115114
"aws_apigatewayv2_stage.public_default",
@@ -148,8 +147,6 @@ def test_generate_w_endpoints(config: types.MachConfig, tf_mock):
148147
"aws_apigatewayv2_api.public_gateway",
149148
"aws_apigatewayv2_api_mapping.private",
150149
"aws_apigatewayv2_api_mapping.public",
151-
"aws_apigatewayv2_deployment.private_default",
152-
"aws_apigatewayv2_deployment.public_default",
153150
"aws_apigatewayv2_domain_name.private",
154151
"aws_apigatewayv2_domain_name.public",
155152
"aws_apigatewayv2_route.private_application",

0 commit comments

Comments
 (0)