Skip to content

Commit 2c551c6

Browse files
cabutlermitcabutlermit
committed
Update GIS-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 GIS-related output in dev to use the updated template for the dev-build caller workflow * Update the GIS-related output in dev to use the update template for the Makefile * Update the GIS-related output in stage to use the updated template for the stage-build caller workflow * Update the GIS-related output in prod to use the updated template for the prod-promote caller workflow Side effects of this change: None.
1 parent 1fa9f58 commit 2c551c6

File tree

1 file changed

+32
-16
lines changed

1 file changed

+32
-16
lines changed

‎gis_ecrs.tf‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,42 +64,46 @@ module "ecr_slingshot" {
6464
## For geoweb application repo and ECR repository
6565
# Outputs in dev
6666
output "geoweb_fargate_dev_build_workflow" {
67-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/fargate-dev-build.tpl", {
67+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build.tpl", {
6868
region = var.aws_region
6969
role = module.ecr_geoweb.gha_role
7070
ecr = module.ecr_geoweb.repository_name
71+
function = ""
7172
}
7273
)
7374
description = "Full contents of the dev-build.yml for the geoweb-deposits repo"
7475
}
7576
output "geoweb_fargate_makefile" {
76-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/fargate-makefile.tpl", {
77+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile.tpl", {
7778
ecr_name = module.ecr_geoweb.repository_name
7879
ecr_url = module.ecr_geoweb.repository_url
80+
function = ""
7981
}
8082
)
8183
description = "Full contents of the Makefile for the geoweb-deposits repo (allows devs to push to Dev account only)"
8284
}
8385

8486
# Outputs in stage
8587
output "geoweb_fargate_stage_build_workflow" {
86-
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/fargate-stage-build.tpl", {
88+
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build.tpl", {
8789
region = var.aws_region
8890
role = module.ecr_geoweb.gha_role
8991
ecr = module.ecr_geoweb.repository_name
92+
function = ""
9093
}
9194
)
9295
description = "Full contents of the stage-build.yml for the geoweb-deposits repo"
9396
}
9497

9598
# Outputs after promotion to prod
9699
output "geoweb_fargate_prod_promote_workflow" {
97-
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/fargate-prod-promote.tpl", {
100+
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote.tpl", {
98101
region = var.aws_region
99102
role_stage = "${module.ecr_geoweb.repo_name}-gha-stage"
100103
role_prod = "${module.ecr_geoweb.repo_name}-gha-prod"
101104
ecr_stage = "${module.ecr_geoweb.repo_name}-stage"
102105
ecr_prod = "${module.ecr_geoweb.repo_name}-prod"
106+
function = ""
103107
}
104108
)
105109
description = "Full contents of the prod-promote.yml for the geoweb-deposits repo"
@@ -108,42 +112,46 @@ output "geoweb_fargate_prod_promote_workflow" {
108112
## For geoserver application repo and ECR repository
109113
# Outputs in dev
110114
output "geoserver_fargate_dev_build_workflow" {
111-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/fargate-dev-build.tpl", {
115+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build.tpl", {
112116
region = var.aws_region
113117
role = module.ecr_geoserver.gha_role
114118
ecr = module.ecr_geoserver.repository_name
119+
function = ""
115120
}
116121
)
117122
description = "Full contents of the dev-build.yml for the geoserver-deposits repo"
118123
}
119124
output "geoserver_fargate_makefile" {
120-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/fargate-makefile.tpl", {
125+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile.tpl", {
121126
ecr_name = module.ecr_geoserver.repository_name
122127
ecr_url = module.ecr_geoserver.repository_url
128+
function = ""
123129
}
124130
)
125131
description = "Full contents of the Makefile for the geoserver-deposits repo (allows devs to push to Dev account only)"
126132
}
127133

128134
# Outputs in stage
129135
output "geoserver_fargate_stage_build_workflow" {
130-
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/fargate-stage-build.tpl", {
136+
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build.tpl", {
131137
region = var.aws_region
132138
role = module.ecr_geoserver.gha_role
133139
ecr = module.ecr_geoserver.repository_name
140+
function = ""
134141
}
135142
)
136143
description = "Full contents of the stage-build.yml for the geoserver-deposits repo"
137144
}
138145

139146
# Outputs after promotion to prod
140147
output "geoserver_fargate_prod_promote_workflow" {
141-
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/fargate-prod-promote.tpl", {
148+
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote.tpl", {
142149
region = var.aws_region
143150
role_stage = "${module.ecr_geoserver.repo_name}-gha-stage"
144151
role_prod = "${module.ecr_geoserver.repo_name}-gha-prod"
145152
ecr_stage = "${module.ecr_geoserver.repo_name}-stage"
146153
ecr_prod = "${module.ecr_geoserver.repo_name}-prod"
154+
function = ""
147155
}
148156
)
149157
description = "Full contents of the prod-promote.yml for the geoserver-deposits repo"
@@ -152,42 +160,46 @@ output "geoserver_fargate_prod_promote_workflow" {
152160
## For geosolr application repo and ECR repository
153161
# Outputs in dev
154162
output "geosolr_fargate_dev_build_workflow" {
155-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/fargate-dev-build.tpl", {
163+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build.tpl", {
156164
region = var.aws_region
157165
role = module.ecr_geosolr.gha_role
158166
ecr = module.ecr_geosolr.repository_name
167+
function = ""
159168
}
160169
)
161170
description = "Full contents of the dev-build.yml for the geosolr-deposits repo"
162171
}
163172
output "geosolr_fargate_makefile" {
164-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/fargate-makefile.tpl", {
173+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile.tpl", {
165174
ecr_name = module.ecr_geosolr.repository_name
166175
ecr_url = module.ecr_geosolr.repository_url
176+
function = ""
167177
}
168178
)
169179
description = "Full contents of the Makefile for the geosolr-deposits repo (allows devs to push to Dev account only)"
170180
}
171181

172182
# Outputs in stage
173183
output "geosolr_fargate_stage_build_workflow" {
174-
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/fargate-stage-build.tpl", {
184+
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build.tpl", {
175185
region = var.aws_region
176186
role = module.ecr_geosolr.gha_role
177187
ecr = module.ecr_geosolr.repository_name
188+
function = ""
178189
}
179190
)
180191
description = "Full contents of the stage-build.yml for the geosolr-deposits repo"
181192
}
182193

183194
# Outputs after promotion to prod
184195
output "geosolr_fargate_prod_promote_workflow" {
185-
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/fargate-prod-promote.tpl", {
196+
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote.tpl", {
186197
region = var.aws_region
187198
role_stage = "${module.ecr_geosolr.repo_name}-gha-stage"
188199
role_prod = "${module.ecr_geosolr.repo_name}-gha-prod"
189200
ecr_stage = "${module.ecr_geosolr.repo_name}-stage"
190201
ecr_prod = "${module.ecr_geosolr.repo_name}-prod"
202+
function = ""
191203
}
192204
)
193205
description = "Full contents of the prod-promote.yml for the geosolr-deposits repo"
@@ -196,42 +208,46 @@ output "geosolr_fargate_prod_promote_workflow" {
196208
## For slingshot application repo and ECR repository
197209
# Outputs in dev
198210
output "slingshot_fargate_dev_build_workflow" {
199-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/fargate-dev-build.tpl", {
211+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build.tpl", {
200212
region = var.aws_region
201213
role = module.ecr_slingshot.gha_role
202214
ecr = module.ecr_slingshot.repository_name
215+
function = ""
203216
}
204217
)
205218
description = "Full contents of the dev-build.yml for the slingshot-deposits repo"
206219
}
207220
output "slingshot_fargate_makefile" {
208-
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/fargate-makefile.tpl", {
221+
value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile.tpl", {
209222
ecr_name = module.ecr_slingshot.repository_name
210223
ecr_url = module.ecr_slingshot.repository_url
224+
function = ""
211225
}
212226
)
213227
description = "Full contents of the Makefile for the slingshot-deposits repo (allows devs to push to Dev account only)"
214228
}
215229

216230
# Outputs in stage
217231
output "slingshot_fargate_stage_build_workflow" {
218-
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/fargate-stage-build.tpl", {
232+
value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build.tpl", {
219233
region = var.aws_region
220234
role = module.ecr_slingshot.gha_role
221235
ecr = module.ecr_slingshot.repository_name
236+
function = ""
222237
}
223238
)
224239
description = "Full contents of the stage-build.yml for the slingshot-deposits repo"
225240
}
226241

227242
# Outputs after promotion to prod
228243
output "slingshot_fargate_prod_promote_workflow" {
229-
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/fargate-prod-promote.tpl", {
244+
value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote.tpl", {
230245
region = var.aws_region
231246
role_stage = "${module.ecr_slingshot.repo_name}-gha-stage"
232247
role_prod = "${module.ecr_slingshot.repo_name}-gha-prod"
233248
ecr_stage = "${module.ecr_slingshot.repo_name}-stage"
234249
ecr_prod = "${module.ecr_slingshot.repo_name}-prod"
250+
function = ""
235251
}
236252
)
237253
description = "Full contents of the prod-promote.yml for the slingshot-deposits repo"

0 commit comments

Comments
 (0)