Skip to content

Commit 802561c

Browse files
chore: environments make more sense as objects instead of a list
1 parent 88c17f7 commit 802561c

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

.gitlab/datasources/environments.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
environments:
2-
- name: sandbox
2+
sandbox:
33
external_id: sandbox-publish-externalid
44
role_to_assume: sandbox-layer-deployer
55
account: 425362996713
66
add_layer_version_permissions: 0
77
automatically_bump_version: 1
8-
- name: prod
8+
prod:
99
external_id: prod-publish-externalid
1010
role_to_assume: dd-serverless-layer-deployer-role
1111
account: 464622532012

.gitlab/templates/pipeline.yaml.tpl

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ check layer size ({{ $flavor.name }}):
126126
script:
127127
- .gitlab/scripts/check_layer_size.sh
128128
129-
{{ range $environment := (ds "environments").environments }}
129+
{{ range $environment_name, $environment := (ds "environments").environments }}
130130
131-
{{ if eq $environment.name "prod" }}
131+
{{ if eq $environment_name "prod" }}
132132
133133
sign layer ({{ $flavor.name }}):
134134
stage: sign
@@ -151,30 +151,30 @@ sign layer ({{ $flavor.name }}):
151151
before_script:
152152
- EXTERNAL_ID_NAME={{ $environment.external_id }} ROLE_TO_ASSUME={{ $environment.role_to_assume }} AWS_ACCOUNT={{ $environment.account }} source .gitlab/scripts/get_secrets.sh
153153
script:
154-
- .gitlab/scripts/sign_layers.sh {{ $environment.name }}
154+
- .gitlab/scripts/sign_layers.sh {{ $environment_name }}
155155

156156
{{ end }} # if prod
157157

158-
publish layer {{ $environment.name }} ({{ $flavor.name }}):
158+
publish layer {{ $environment_name }} ({{ $flavor.name }}):
159159
stage: publish
160160
tags: ["arch:amd64"]
161161
image: ${CI_DOCKER_TARGET_IMAGE}:${CI_DOCKER_TARGET_VERSION}
162162
rules:
163-
- if: '"{{ $environment.name }}" == "sandbox"'
163+
- if: '"{{ $environment_name }}" == "sandbox"'
164164
when: manual
165165
allow_failure: true
166166
- if: '$CI_COMMIT_TAG =~ /^v.*/'
167167

168168
needs:
169-
{{ if eq $environment.name "prod" }}
169+
{{ if eq $environment_name "prod" }}
170170
- check layer size ({{ $flavor.name }})
171171
- sign layer ({{ $flavor.name }})
172172
{{ else }}
173173
- layer ({{ $flavor.name }})
174174
{{ end }} #end if prod
175175

176176
dependencies:
177-
{{ if or (eq $environment.name "prod") }}
177+
{{ if or (eq $environment_name "prod") }}
178178
- sign layer ({{ $flavor.name }})
179179
{{ else }}
180180
- layer ({{ $flavor.name }})
@@ -196,7 +196,7 @@ publish layer {{ $environment.name }} ({{ $flavor.name }}):
196196
script:
197197
- .gitlab/scripts/publish_layer.sh
198198

199-
{{ if eq $environment.name "sandbox" }}
199+
{{ if eq $environment_name "sandbox" }}
200200

201201
publish layer sandbox [us-east-1] ({{ $flavor.name }}):
202202
stage: self-monitoring
@@ -234,9 +234,9 @@ publish layer sandbox [us-east-1] ({{ $flavor.name }}):
234234

235235
{{ range $multi_arch_image_flavor := (ds "flavors").multi_arch_image_flavors }}
236236

237-
{{ range $environment := (ds "environments").environments }}
237+
{{ range $environment_name, $environment := (ds "environments").environments }}
238238

239-
{{ if eq $environment.name "sandbox" }}
239+
{{ if eq $environment_name "sandbox" }}
240240

241241
publish private images ({{ $multi_arch_image_flavor.name }}):
242242
stage: self-monitoring
@@ -304,35 +304,35 @@ publish image ({{ $multi_arch_image_flavor.name }}):
304304

305305
{{ end }} # end multi_arch_image_flavors
306306

307-
{{ range $environment := (ds "environments").environments }}
307+
{{ range $environment_name, $environment := (ds "environments").environments }}
308308

309-
{{ if eq $environment.name "prod" }}signed {{ end }}layer bundle:
310-
stage: {{ if eq $environment.name "prod" }}sign{{ else }}build{{ end }}
309+
{{ if eq $environment_name "prod" }}signed {{ end }}layer bundle:
310+
stage: {{ if eq $environment_name "prod" }}sign{{ else }}build{{ end }}
311311
image: registry.ddbuild.io/images/docker:20.10
312312
tags: ["arch:amd64"]
313313
rules:
314-
- if: '"{{ $environment.name }}" == "sandbox"'
314+
- if: '"{{ $environment_name }}" == "sandbox"'
315315
- if: '$CI_COMMIT_TAG =~ /^v.*/'
316316
needs:
317317
{{ range (ds "flavors").flavors }}
318318
{{ if .needs_layer_publish }}
319-
- {{ if eq $environment.name "prod" }}sign {{ end }}layer ({{ .name }})
319+
- {{ if eq $environment_name "prod" }}sign {{ end }}layer ({{ .name }})
320320
{{ end }} # end needs_layer_publish
321321
{{ end }} # end flavors
322322
dependencies:
323323
{{ range (ds "flavors").flavors }}
324324
{{ if .needs_layer_publish }}
325-
- {{ if eq $environment.name "prod" }}sign {{ end }}layer ({{ .name }})
325+
- {{ if eq $environment_name "prod" }}sign {{ end }}layer ({{ .name }})
326326
{{ end }} # end needs_layer_publish
327327
{{ end }} # end flavors
328328
artifacts:
329-
expire_in: {{ if eq $environment.name "prod" }}1 day{{ else }}1 hr{{ end }}
329+
expire_in: {{ if eq $environment_name "prod" }}1 day{{ else }}1 hr{{ end }}
330330
paths:
331-
- datadog_extension-{{ if eq $environment.name "prod"}}signed-{{ end }}bundle-${CI_JOB_ID}/
332-
name: datadog_extension-{{ if eq $environment.name "prod"}}signed-{{ end }}bundle-${CI_JOB_ID}
331+
- datadog_extension-{{ if eq $environment_name "prod"}}signed-{{ end }}bundle-${CI_JOB_ID}/
332+
name: datadog_extension-{{ if eq $environment_name "prod"}}signed-{{ end }}bundle-${CI_JOB_ID}
333333
script:
334-
- rm -rf datadog_extension-{{ if eq $environment.name "prod"}}signed-{{ end }}bundle-${CI_JOB_ID}
335-
- mkdir -p datadog_extension-{{ if eq $environment.name "prod"}}signed-{{ end }}bundle-${CI_JOB_ID}
336-
- cp .layers/datadog_extension-*.zip datadog_extension-{{ if eq $environment.name "prod"}}signed-{{ end }}bundle-${CI_JOB_ID}
334+
- rm -rf datadog_extension-{{ if eq $environment_name "prod"}}signed-{{ end }}bundle-${CI_JOB_ID}
335+
- mkdir -p datadog_extension-{{ if eq $environment_name "prod"}}signed-{{ end }}bundle-${CI_JOB_ID}
336+
- cp .layers/datadog_extension-*.zip datadog_extension-{{ if eq $environment_name "prod"}}signed-{{ end }}bundle-${CI_JOB_ID}
337337

338338
{{ end }} # end environments

0 commit comments

Comments
 (0)