Skip to content

Commit 50382ce

Browse files
committed
Update browsertrix-harvester Outputs
Why these changes are being introduced: See IN-1481 and IN-1500 for details. This is the migration to the new shared workflows. How this addresses that need: * Update the Terraform outputs for browsertrix-harvester to pull from the new template files for the new shared workflows Side effects of this change: None. Relevant ticket(s): * https://mitlibraries.atlassian.net/browse/IN-1500
1 parent cefdb2d commit 50382ce

File tree

1 file changed

+8
-29
lines changed

1 file changed

+8
-29
lines changed

timdex_ecrs.tf

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -258,14 +258,10 @@ module "ecr_timdex_browsertrix" {
258258
app-repo = "timdex-infrastructure-browsertrix"
259259
}
260260
}
261-
# NEED TO FIX THE MISSPELLING!!!
262-
moved {
263-
from = module.ecr_timdex_broswertrix
264-
to = module.ecr_timdex_browsertrix
265-
}
261+
266262
# Outputs in dev
267263
output "browsertrix_dev_build_workflow" {
268-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build.tpl", {
264+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build-cpu-arch.tpl", {
269265
region = var.aws_region
270266
role = module.ecr_timdex_browsertrix.gha_role
271267
ecr = module.ecr_timdex_browsertrix.repository_name
@@ -274,28 +270,20 @@ output "browsertrix_dev_build_workflow" {
274270
)
275271
description = "Full contents of the dev-build.yml for the browsertrix-harvester repo"
276272
}
277-
# NEED TO FIX THE MISSPELLING!!!
278-
moved {
279-
from = output.broswertrix_dev_build_workflow
280-
to = output.browsertrix_dev_build_workflow
281-
}
273+
282274
output "browsertrix_makefile" {
283-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile.tpl", {
275+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile-cpu-arch.tpl", {
284276
ecr_name = module.ecr_timdex_browsertrix.repository_name
285277
ecr_url = module.ecr_timdex_browsertrix.repository_url
286278
function = ""
287279
}
288280
)
289281
description = "Full contents of the Makefile for the browsertrix-harvester repo (allows devs to push to Dev account only)"
290282
}
291-
# NEED TO FIX THE MISSPELLING!!!
292-
moved {
293-
from = output.broswertrix_makefile
294-
to = output.browsertrix_makefile
295-
}
283+
296284
# Outputs in stage
297285
output "browsertrix_stage_build_workflow" {
298-
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build.tpl", {
286+
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build-cpu-arch.tpl", {
299287
region = var.aws_region
300288
role = module.ecr_timdex_browsertrix.gha_role
301289
ecr = module.ecr_timdex_browsertrix.repository_name
@@ -304,14 +292,10 @@ output "browsertrix_stage_build_workflow" {
304292
)
305293
description = "Full contents of the stage-build.yml for the browsertrix-harvester repo"
306294
}
307-
# NEED TO FIX THE MISSPELLING!!!
308-
moved {
309-
from = output.broswertrix_stage_build_workflow
310-
to = output.browsertrix_stage_build_workflow
311-
}
295+
312296
# Outputs after promotion to prod
313297
output "browsertrix_prod_promote_workflow" {
314-
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote.tpl", {
298+
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote-cpu-arch.tpl", {
315299
region = var.aws_region
316300
role_stage = "${module.ecr_timdex_browsertrix.repo_name}-gha-stage"
317301
role_prod = "${module.ecr_timdex_browsertrix.repo_name}-gha-prod"
@@ -322,11 +306,6 @@ output "browsertrix_prod_promote_workflow" {
322306
)
323307
description = "Full contents of the prod-promote.yml for the browsertrix-harvester repo"
324308
}
325-
# NEED TO FIX THE MISSPELLING!!!
326-
moved {
327-
from = output.broswertrix_prod_promote_workflow
328-
to = output.browsertrix_prod_promote_workflow
329-
}
330309

331310

332311
## geo-harvester

0 commit comments

Comments
 (0)