Skip to content

Commit de1da9f

Browse files
cabutlermitcabutlermit
committed
Update Marimo-Launcher Outputs
Why these changes are being introduced: The marimo-launcher application will be the test application for migrating to the new workflows. How this addresses that need: * Update the TfCloud outputs for the marimo-launcher Makefile and caller workflows Side effects of this change: None. Relevant ticket(s): * https://mitlibraries.atlassian.net/browse/IN-1448
1 parent 0cdbf0a commit de1da9f

File tree

2 files changed

+20
-18
lines changed

2 files changed

+20
-18
lines changed

‎README.md‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ For each new ECR repository (or linked collection of ECR repositories), create a
6060
* a stage_build caller workflow
6161
* a prod_promote caller workflow
6262

63-
The [ppod_ecr.tf](./ppod_ecr.tf) is a good example of a single ECR repository for a Lambda function build around a containerized app. The [timdex_ecrs.tf](./timdex_ecrs.tf) is a good example of a collection of ECR repositories all linked to one project (and there are both Fargate-linked ECRs and Lambda-linked ECRs in that file).
63+
The [ppod_ecr.tf](./ppod_ecr.tf) is a good example of a single ECR repository for a Lambda function built around a containerized app. The [timdex_ecrs.tf](./timdex_ecrs.tf) is a good example of a collection of ECR repositories all linked to one project (and there are both Fargate-linked ECRs and Lambda-linked ECRs in that file).
6464

6565
**Note**: For Lambda function ECRs, it is imperative that the Infra engineer coordinates with the software engineer to determine the name of the Lambda function as part of the creation of the ECR by this repository.
6666

@@ -96,38 +96,40 @@ This is a core infrastructure repository that defines infrastructure related to
9696
* [Alma Hook](https://github.com/MITLibraries/mitlib-tf-workloads-almahook)
9797
* [Alma Webhook Lambdas](https://github.com/MITLibraries/alma-webhook-lambdas)
9898
* [Alma Patron Load](https://github.com/MITLibraries/mitlib-tf-workloads-patronload)
99-
* [Alma Patron Load Application Container](https://github.com/MITLibraries/alma-patronload)
99+
* [Alma Patron Load Application](https://github.com/MITLibraries/alma-patronload)
100100
* [Archival Packaging Tool](https://github.com/MITLibraries/mitlib-tf-workloads-apt)
101-
* [Archival Packaging Tool Application Container](https://github.com/MITLibraries/archival-packaging-tool)
101+
* [Archival Packaging Tool Application](https://github.com/MITLibraries/archival-packaging-tool)
102102
* [ASATI](https://github.com/MITLibraries/mitlib-tf-workloads-asati)
103-
* [ASATI Application Container](https://github.com/MITLibraries/asati)
103+
* [ASATI Application](https://github.com/MITLibraries/asati)
104104
* [Carbon](https://github.com/MITLibraries/mitlib-tf-workloads-carbon)
105105
* [CDPS](https://github.com/MITLibraries/mitlib-tf-workloads-cdps-storage)
106106
* [S3 BagIt Validator](https://github.com/MITLibraries/s3-bagit-validator)
107107
* [CDPS CURT](https://github.com/MITLibraries/cdps-curt)
108-
* [DSC](https://github.com/MITLibraries/mitlib-tf-workloads-dsc)
109-
* [DSC Application Container](https://github.com/MITLibraries/dspace-submission-composer)
110-
* [DSS](https://github.com/MITLibraries/mitlib-tf-workloads-dss)
111-
* [DSpace Submission Service Application Container](https://github.com/MITLibraries/dspace-submission-service)
112-
* [ETD](https://github.com/MITLibraries/mitlib-tf-workloads-etd)
108+
* [DSO Infrastructure](https://github.com/MITLibraries/mitlib-tf-workloads-dso)
109+
* [DSpace Submission Composer Application](https://github.com/MITLibraries/dspace-submission-composer)
110+
* [DSpace Submission Service Application](https://github.com/MITLibraries/dspace-submission-service)
111+
* **DEPRECATED**: [DSC](https://github.com/MITLibraries/mitlib-tf-workloads-dsc)
112+
* **DEPRECATED**: [DSS](https://github.com/MITLibraries/mitlib-tf-workloads-dss)
113+
* [ETD Infrastructure](https://github.com/MITLibraries/mitlib-tf-workloads-etd)
113114
* [HRQB](https://github.com/MITLibraries/mitlib-tf-workloads-hrqb-loader)
114115
* [HRQB Client](https://github.com/MITLibraries/hrqb-client)
115116
* [marimo notebooks](https://github.com/MITLibraries/mitlib-tf-workloads-notebooks)
116117
* [marimo-launcher](https://github.com/MITLibraries/marimo-launcher)
117118
* [marimo-helloworld](https://github.com/MITLibraries/marimo-helloworld)
118119
* [Matomo](https://github.com/MITLibraries/mitlib-tf-workloads-matomo)
119-
* [Matomo Application Container](https://github.com/MITLibraries/docker-matomo)
120+
* [Matomo Application](https://github.com/MITLibraries/docker-matomo)
120121
* [PPOD](https://github.com/MITLibraries/mitlib-tf-workloads-ppod)
121-
* [PPOD Application Container](https://github.com/MITLibraries/ppod)
122+
* [PPOD Application](https://github.com/MITLibraries/ppod)
122123
* [TACOS](https://github.com/MITLibraries/mitlib-tf-workloads-tacos)
123124
* [tacos-detectors-lambdas](https://github.com/MITLibraries/tacos-detectors-lambdas)
124125
* [TIMDEX](https://github.com/MITLibraries/mitlib-tf-workloads-timdex-infrastructure)
125-
* [TIMDEX Application Container](https://github.com/MITLibraries/timdex)
126+
* [TIMDEX Application](https://github.com/MITLibraries/timdex)
126127
* [TIMDEX Dataset API](https://github.com/MITLibraries/timdex-dataset-api)
127128
* [TIMDEX Index Manager](https://github.com/MITLibraries/timdex-index-manager)
128129
* [TIMDEX Pipeline Lambdas](https://github.com/MITLibraries/timdex-pipeline-lambdas)
129130
* [TIMDEX UI](https://github.com/MITLibraries/timdex-ui)
130131
* [TIMDEX Simulator](https://github.com/MITLibraries/timdex-simulator)
132+
* [TIMDEX Transmogrifier](https://github.com/MITLibraries/transmogrifier)
131133
* [WCD2Reshare](https://github.com/MITLibraries/mitlib-tf-workloads-wcd2reshare)
132134
* [WCD2Reshare Application Container](https://github.com/MITLibraries/wcd2reshare)
133135
* **DEPRECATED**: [Wiley](https://github.com/MITLibraries/mitlib-tf-workloads-wiley)
@@ -137,7 +139,7 @@ This is a core infrastructure repository that defines infrastructure related to
137139

138140
* Owner: See [CODEOWNERS](./.github/CODEOWNERS)
139141
* Team: See [CODEOWNERS](./.github/CODEOWNERS)
140-
* Last Maintenance: 2025-08
142+
* Last Maintenance: 2025-09
141143

142144
## TF markdown is automatically inserted at the bottom of this file, nothing should be written beyond this point
143145

@@ -146,7 +148,7 @@ This is a core infrastructure repository that defines infrastructure related to
146148

147149
| Name | Version |
148150
|------|---------|
149-
| terraform | ~> 1.12 |
151+
| terraform | ~> 1.13 |
150152
| aws | ~> 5.0 |
151153

152154
## Providers

‎marimo_ecr.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module "ecr_marimo" {
2121
## For marimo-launcher application repo and ECR repository
2222
# Outputs in dev
2323
output "marimo_fargate_dev_build_workflow" {
24-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build.tpl", {
24+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build-cpu-arch.tpl", {
2525
region = var.aws_region
2626
role = module.ecr_marimo.gha_role
2727
ecr = module.ecr_marimo.repository_name
@@ -31,7 +31,7 @@ output "marimo_fargate_dev_build_workflow" {
3131
description = "Full contents of the dev-build.yml for the marimo-launcher repo"
3232
}
3333
output "marimo_fargate_makefile" {
34-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile.tpl", {
34+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile-cpu-arch.tpl", {
3535
ecr_name = module.ecr_marimo.repository_name
3636
ecr_url = module.ecr_marimo.repository_url
3737
function = ""
@@ -42,7 +42,7 @@ output "marimo_fargate_makefile" {
4242

4343
# Outputs in stage
4444
output "marimo_fargate_stage_build_workflow" {
45-
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build.tpl", {
45+
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build-cpu-arch.tpl", {
4646
region = var.aws_region
4747
role = module.ecr_marimo.gha_role
4848
ecr = module.ecr_marimo.repository_name
@@ -54,7 +54,7 @@ output "marimo_fargate_stage_build_workflow" {
5454

5555
# Outputs after promotion to prod
5656
output "marimo_fargate_prod_promote_workflow" {
57-
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote.tpl", {
57+
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote-cpu-arch.tpl", {
5858
region = var.aws_region
5959
role_stage = "${module.ecr_marimo.repo_name}-gha-stage"
6060
role_prod = "${module.ecr_marimo.repo_name}-gha-prod"

0 commit comments

Comments
 (0)