Skip to content

Commit 66bf269

Browse files
authored
Merge pull request #1697 from UK-Export-Finance/fix/deployment
fix(deployment): removed frivolous variables
2 parents 2df606c + 2fff33b commit 66bf269

File tree

2 files changed

+58
-56
lines changed

2 files changed

+58
-56
lines changed

.github/workflows/deployment.yml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
# https://learn.microsoft.com/en-us/azure/cloud-adoption-framework/ready/azure-best-practices/resource-naming
66
#
77
#
8+
# Following Azure services are consumed:
9+
# 1. Azure resource group - https://learn.microsoft.com/en-us/cli/azure/group?view=azure-cli-latest#az-group-create
10+
# 2. Azure container registry - https://learn.microsoft.com/en-us/cli/azure/acr?view=azure-cli-latest#az-acr-create
11+
# 3. Azure WebApp - https://learn.microsoft.com/en-us/azure/app-service/overview
12+
#
13+
#
814
# Execution
915
# *********
1016
# GHA is only invoked when following conditions are satisfied:
@@ -67,21 +73,21 @@ jobs:
6773
creds: ${{ secrets.AZURE_CREDENTIALS }}
6874

6975
- name: Defaults ✨
70-
uses: Azure/cli@v1.0.8
76+
uses: azure/cli@v1.0.9
7177
with:
7278
inlineScript: |
7379
# Basic
7480
az configure --defaults location=${{ vars.REGION }}
7581
az configure --defaults group=rg-${{ env.PRODUCT }}-${{ github.ref_name }}-${{ vars.VERSION }}
7682
7783
- name: Extension ➕
78-
uses: Azure/cli@v1.0.8
84+
uses: azure/cli@v1.0.9
7985
with:
8086
inlineScript: |
8187
az config set extension.use_dynamic_install=yes_without_prompt
8288
8389
- name: Import ⬇
84-
uses: Azure/cli@v1.0.8
90+
uses: azure/cli@v1.0.9
8591
with:
8692
inlineScript: |
8793
az mysql flexible-server execute \
@@ -109,7 +115,7 @@ jobs:
109115
creds: ${{ secrets.AZURE_CREDENTIALS }}
110116

111117
- name: Defaults ✨
112-
uses: Azure/cli@v1.0.8
118+
uses: azure/cli@v1.0.9
113119
with:
114120
inlineScript: |
115121
# Basic
@@ -146,7 +152,7 @@ jobs:
146152
docker push ${{ env.ACR }}/${{ env.NAME }}:${{ env.FROM }}
147153
148154
- name: Environment 🧱
149-
uses: azure/cli@v1.0.8
155+
uses: azure/cli@v1.0.9
150156
with:
151157
inlineScript: |
152158
az webapp config appsettings set \
@@ -156,12 +162,10 @@ jobs:
156162
NODE_ENV='${{ vars.NODE_ENV }}' \
157163
PORT='${{ vars.API_PORT }}' \
158164
WEBSITES_PORT='${{ vars.API_PORT }}' \
159-
TLS_CERTIFICATE='${{ secrets.TLS_CERTIFICATE }}' \
160-
TLS_KEY='${{ secrets.TLS_KEY }}' \
161-
API_KEY='${{ secrets.API_KEY }}' \
162165
APIM_MDM_URL='${{ secrets.APIM_MDM_URL }}' \
163166
APIM_MDM_KEY='${{ secrets.APIM_MDM_KEY }}' \
164167
APIM_MDM_VALUE='${{ secrets.APIM_MDM_VALUE }}' \
168+
API_KEY='${{ secrets.API_KEY }}' \
165169
SESSION_SECRET='${{ secrets.SESSION_SECRET }}' \
166170
GOV_NOTIFY_API_KEY='${{ secrets.GOV_NOTIFY_API_KEY }}' \
167171
COMPANIES_HOUSE_API_URL='${{ secrets.COMPANIES_HOUSE_API_URL }}' \
@@ -171,7 +175,7 @@ jobs:
171175
FEEDBACK_EMAIL_RECIPIENT='${{ secrets.FEEDBACK_EMAIL_RECIPIENT }}'
172176
173177
- name: Slot 🔀
174-
uses: azure/cli@v1.0.8
178+
uses: azure/cli@v1.0.9
175179
with:
176180
inlineScript: |
177181
# Create new temporary slot
@@ -193,7 +197,7 @@ jobs:
193197
--name ${{ env.WEBAPP }}
194198
195199
- name: Reboot ♻️
196-
uses: azure/cli@v1.0.8
200+
uses: azure/cli@v1.0.9
197201
with:
198202
inlineScript: |
199203
az webapp restart \
@@ -217,7 +221,7 @@ jobs:
217221
creds: ${{ secrets.AZURE_CREDENTIALS }}
218222

219223
- name: Defaults ✨
220-
uses: Azure/cli@v1.0.8
224+
uses: azure/cli@v1.0.9
221225
with:
222226
inlineScript: |
223227
# Basic
@@ -252,7 +256,7 @@ jobs:
252256
docker push ${{ env.ACR }}/${{ env.NAME }}:${{ env.FROM }}
253257
254258
- name: Environment 🧱
255-
uses: azure/cli@v1.0.8
259+
uses: azure/cli@v1.0.9
256260
with:
257261
inlineScript: |
258262
az webapp config appsettings set \
@@ -262,18 +266,16 @@ jobs:
262266
NODE_ENV='${{ vars.NODE_ENV }}' \
263267
PORT='${{ vars.UI_PORT }}' \
264268
WEBSITES_PORT='${{ vars.UI_PORT }}' \
265-
TLS_CERTIFICATE='${{ secrets.TLS_CERTIFICATE }}' \
266-
TLS_KEY='${{ secrets.TLS_KEY }}' \
267269
SESSION_SECRET='${{ secrets.SESSION_SECRET }}' \
268270
GOOGLE_ANALYTICS_ID='${{ secrets.GOOGLE_ANALYTICS_ID }}' \
269271
GOOGLE_TAG_MANAGER_ID='${{ secrets.GOOGLE_TAG_MANAGER_ID }}' \
270-
API_KEY='${{ secrets.API_KEY }}' \
271272
APIM_MDM_URL='${{ secrets.APIM_MDM_URL }}' \
272273
APIM_MDM_KEY='${{ secrets.APIM_MDM_KEY }}' \
273-
APIM_MDM_VALUE='${{ secrets.APIM_MDM_VALUE }}'
274+
APIM_MDM_VALUE='${{ secrets.APIM_MDM_VALUE }}' \
275+
API_KEY='${{ secrets.API_KEY }}'
274276
275277
- name: Slot 🔀
276-
uses: azure/cli@v1.0.8
278+
uses: azure/cli@v1.0.9
277279
with:
278280
inlineScript: |
279281
# Create new temporary slot
@@ -295,7 +297,7 @@ jobs:
295297
--name ${{ env.WEBAPP }}
296298
297299
- name: Reboot ♻️
298-
uses: azure/cli@v1.0.8
300+
uses: azure/cli@v1.0.9
299301
with:
300302
inlineScript: |
301303
az webapp restart \

0 commit comments

Comments
 (0)