Skip to content

Commit 6763913

Browse files
cabutlermitcabutlermit
committed
Update TIMDEX-related Outputs
Why these changes are being introduced: There are new shared workflows in the shared .github repository for handling the Fargate/Lambda deployment pipeline. How this addresses that need: * Update the TIMDEX-related outputs in dev to use the updated template for the dev-build caller workflow * Update the TIMDEX-related outputs in dev to use the update template for the Makefile * Update the TIMDEX-related outputs in stage to use the updated template for the stage-build caller workflow * Update the TIMDEX-related outputs in prod to use the updated template for the prod-promote caller workflow Side effects of this change: None.
1 parent 2fa85da commit 6763913

File tree

1 file changed

+36
-20
lines changed

1 file changed

+36
-20
lines changed

‎timdex_ecrs.tf‎

Lines changed: 36 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,42 +18,46 @@ module "ecr_mario" {
1818

1919
# Outputs in dev
2020
output "mario_dev_build_workflow" {
21-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/fargate-dev-build.tpl", {
21+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build.tpl", {
2222
region = var.aws_region
2323
role = module.ecr_mario.gha_role
2424
ecr = module.ecr_mario.repository_name
25+
function = ""
2526
}
2627
)
2728
description = "Full contents of the dev-build.yml for the mario repo"
2829
}
2930
output "mario_makefile" {
30-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/fargate-makefile.tpl", {
31+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile.tpl", {
3132
ecr_name = module.ecr_mario.repository_name
3233
ecr_url = module.ecr_mario.repository_url
34+
function = ""
3335
}
3436
)
3537
description = "Full contents of the Makefile for the mario repo (allows devs to push to Dev account only)"
3638
}
3739

3840
# Outputs in stage
3941
output "mario_stage_build_workflow" {
40-
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/fargate-stage-build.tpl", {
42+
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build.tpl", {
4143
region = var.aws_region
4244
role = module.ecr_mario.gha_role
4345
ecr = module.ecr_mario.repository_name
46+
function = ""
4447
}
4548
)
4649
description = "Full contents of the stage-build.yml for the mario repo"
4750
}
4851

4952
# Outputs after promotion to prod
5053
output "mario_prod_promote_workflow" {
51-
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/fargate-prod-promote.tpl", {
54+
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote.tpl", {
5255
region = var.aws_region
5356
role_stage = "${module.ecr_mario.repo_name}-gha-stage"
5457
role_prod = "${module.ecr_mario.repo_name}-gha-prod"
5558
ecr_stage = "${module.ecr_mario.repo_name}-stage"
5659
ecr_prod = "${module.ecr_mario.repo_name}-prod"
60+
function = ""
5761
}
5862
)
5963
description = "Full contents of the prod-promote.yml for the mario repo"
@@ -74,42 +78,46 @@ module "ecr_oaiharvester" {
7478
}
7579
# Outputs in dev
7680
output "oaiharvester_dev_build_workflow" {
77-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/fargate-dev-build.tpl", {
81+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build.tpl", {
7882
region = var.aws_region
7983
role = module.ecr_oaiharvester.gha_role
8084
ecr = module.ecr_oaiharvester.repository_name
85+
function = ""
8186
}
8287
)
8388
description = "Full contents of the dev-build.yml for the oaiharvester repo"
8489
}
8590
output "oaiharvester_makefile" {
86-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/fargate-makefile.tpl", {
91+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile.tpl", {
8792
ecr_name = module.ecr_oaiharvester.repository_name
8893
ecr_url = module.ecr_oaiharvester.repository_url
94+
function = ""
8995
}
9096
)
9197
description = "Full contents of the Makefile for the oaiharvester repo (allows devs to push to Dev account only)"
9298
}
9399

94100
# Outputs in stage
95101
output "oaiharvester_stage_build_workflow" {
96-
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/fargate-stage-build.tpl", {
102+
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build.tpl", {
97103
region = var.aws_region
98104
role = module.ecr_oaiharvester.gha_role
99105
ecr = module.ecr_oaiharvester.repository_name
106+
function = ""
100107
}
101108
)
102109
description = "Full contents of the stage-build.yml for the oaiharvester repo"
103110
}
104111

105112
# Outputs after promotion to prod
106113
output "oaiharvester_prod_promote_workflow" {
107-
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/fargate-prod-promote.tpl", {
114+
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote.tpl", {
108115
region = var.aws_region
109116
role_stage = "${module.ecr_oaiharvester.repo_name}-gha-stage"
110117
role_prod = "${module.ecr_oaiharvester.repo_name}-gha-prod"
111118
ecr_stage = "${module.ecr_oaiharvester.repo_name}-stage"
112119
ecr_prod = "${module.ecr_oaiharvester.repo_name}-prod"
120+
function = ""
113121
}
114122
)
115123
description = "Full contents of the prod-promote.yml for the oaiharvester repo"
@@ -131,40 +139,44 @@ module "ecr_timdex_transmogrifier" {
131139
}
132140
# Outputs in dev
133141
output "transmogrifier_dev_build_workflow" {
134-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/fargate-dev-build.tpl", {
142+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build.tpl", {
135143
region = var.aws_region
136144
role = module.ecr_timdex_transmogrifier.gha_role
137145
ecr = module.ecr_timdex_transmogrifier.repository_name
146+
function = ""
138147
}
139148
)
140149
description = "Full contents of the dev-build.yml for the transmogrifier repo"
141150
}
142151
output "transmogrifier_makefile" {
143-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/fargate-makefile.tpl", {
152+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile.tpl", {
144153
ecr_name = module.ecr_timdex_transmogrifier.repository_name
145154
ecr_url = module.ecr_timdex_transmogrifier.repository_url
155+
function = ""
146156
}
147157
)
148158
description = "Full contents of the Makefile for the transmogrifier repo (allows devs to push to Dev account only)"
149159
}
150160
# Outputs in stage
151161
output "transmogrifier_stage_build_workflow" {
152-
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/fargate-stage-build.tpl", {
162+
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build.tpl", {
153163
region = var.aws_region
154164
role = module.ecr_timdex_transmogrifier.gha_role
155165
ecr = module.ecr_timdex_transmogrifier.repository_name
166+
function = ""
156167
}
157168
)
158169
description = "Full contents of the stage-build.yml for the transmogrifier repo"
159170
}
160171
# Outputs after promotion to prod
161172
output "transmogrifier_prod_promote_workflow" {
162-
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/fargate-prod-promote.tpl", {
173+
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote.tpl", {
163174
region = var.aws_region
164175
role_stage = "${module.ecr_timdex_transmogrifier.repo_name}-gha-stage"
165176
role_prod = "${module.ecr_timdex_transmogrifier.repo_name}-gha-prod"
166177
ecr_stage = "${module.ecr_timdex_transmogrifier.repo_name}-stage"
167178
ecr_prod = "${module.ecr_timdex_transmogrifier.repo_name}-prod"
179+
function = ""
168180
}
169181
)
170182
description = "Full contents of the prod-promote.yml for the transmogrifier repo"
@@ -189,7 +201,7 @@ module "ecr_timdex_lambdas" {
189201
}
190202
# Outputs in dev
191203
output "timdex_lambdas_dev_build_workflow" {
192-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/lambda-dev-build.tpl", {
204+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build.tpl", {
193205
region = var.aws_region
194206
role = module.ecr_timdex_lambdas.gha_role
195207
ecr = module.ecr_timdex_lambdas.repository_name
@@ -199,7 +211,7 @@ output "timdex_lambdas_dev_build_workflow" {
199211
description = "Full contents of the dev-build.yml for the timdex-pipeline-lambdas repo"
200212
}
201213
output "timdex_lambdas_makefile" {
202-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/lambda-makefile.tpl", {
214+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile.tpl", {
203215
ecr_name = module.ecr_timdex_lambdas.repository_name
204216
ecr_url = module.ecr_timdex_lambdas.repository_url
205217
function = local.ecr_timdex_lambdas_function_name
@@ -210,7 +222,7 @@ output "timdex_lambdas_makefile" {
210222

211223
# Outputs in stage
212224
output "timdex_lambdas_stage_build_workflow" {
213-
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/lambda-stage-build.tpl", {
225+
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build.tpl", {
214226
region = var.aws_region
215227
role = module.ecr_timdex_lambdas.gha_role
216228
ecr = module.ecr_timdex_lambdas.repository_name
@@ -222,7 +234,7 @@ output "timdex_lambdas_stage_build_workflow" {
222234

223235
# Outputs after promotion to prod
224236
output "timdex_lambdas_prod_promote_workflow" {
225-
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/lambda-prod-promote.tpl", {
237+
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote.tpl", {
226238
region = var.aws_region
227239
role_stage = "${module.ecr_timdex_lambdas.repo_name}-gha-stage"
228240
role_prod = "${module.ecr_timdex_lambdas.repo_name}-gha-prod"
@@ -249,40 +261,44 @@ module "ecr_timdex_tim" {
249261
}
250262
# Outputs in dev
251263
output "tim_dev_build_workflow" {
252-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/fargate-dev-build.tpl", {
264+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build.tpl", {
253265
region = var.aws_region
254266
role = module.ecr_timdex_tim.gha_role
255267
ecr = module.ecr_timdex_tim.repository_name
268+
function = ""
256269
}
257270
)
258271
description = "Full contents of the dev-build.yml for the timdex-index-manager repo"
259272
}
260273
output "tim_makefile" {
261-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/fargate-makefile.tpl", {
274+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile.tpl", {
262275
ecr_name = module.ecr_timdex_tim.repository_name
263276
ecr_url = module.ecr_timdex_tim.repository_url
277+
function = ""
264278
}
265279
)
266280
description = "Full contents of the Makefile for the timdex-index-manager repo (allows devs to push to Dev account only)"
267281
}
268282
# Outputs in stage
269283
output "tim_stage_build_workflow" {
270-
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/fargate-stage-build.tpl", {
284+
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build.tpl", {
271285
region = var.aws_region
272286
role = module.ecr_timdex_tim.gha_role
273287
ecr = module.ecr_timdex_tim.repository_name
288+
function = ""
274289
}
275290
)
276291
description = "Full contents of the stage-build.yml for the timdex-index-manager repo"
277292
}
278293
# Outputs after promotion to prod
279294
output "tim_prod_promote_workflow" {
280-
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/fargate-prod-promote.tpl", {
295+
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote.tpl", {
281296
region = var.aws_region
282297
role_stage = "${module.ecr_timdex_tim.repo_name}-gha-stage"
283298
role_prod = "${module.ecr_timdex_tim.repo_name}-gha-prod"
284299
ecr_stage = "${module.ecr_timdex_tim.repo_name}-stage"
285300
ecr_prod = "${module.ecr_timdex_tim.repo_name}-prod"
301+
function = ""
286302
}
287303
)
288304
description = "Full contents of the prod-promote.yml for the timdex-index-manager repo"

0 commit comments

Comments
 (0)