Skip to content

Commit 695e1ee

Browse files
Fix workflow bash variable interpolation: use env vars for secrets with special chars
1 parent 2696423 commit 695e1ee

File tree

2 files changed

+30
-18
lines changed

2 files changed

+30
-18
lines changed

.github/workflows/deploy-api.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,26 @@ jobs:
6161
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
6262

6363
- name: Configure App Service settings
64+
env:
65+
API_CONN: ${{ secrets.API_DB_CONNECTION_STRING }}
66+
IDS_URL: ${{ secrets.IDENTITY_SERVER_URL }}
67+
JWT_KEY: ${{ secrets.JWT_KEY }}
68+
ANGULAR_URL: ${{ secrets.ANGULAR_APP_URL }}
6469
run: |
6570
az webapp config appsettings set \
6671
--resource-group ${{ env.RESOURCE_GROUP }} \
6772
--name ${{ env.APP_SERVICE_NAME }} \
6873
--settings \
69-
"ConnectionStrings__DefaultConnection=${{ secrets.API_DB_CONNECTION_STRING }}" \
70-
"Sts__ServerUrl=${{ secrets.IDENTITY_SERVER_URL }}" \
71-
"Sts__ValidIssuer=${{ secrets.IDENTITY_SERVER_URL }}" \
74+
"ConnectionStrings__DefaultConnection=$API_CONN" \
75+
"Sts__ServerUrl=$IDS_URL" \
76+
"Sts__ValidIssuer=$IDS_URL" \
7277
"Sts__Audience=app.api.talentmanagement" \
73-
"JWTSettings__Key=${{ secrets.JWT_KEY }}" \
78+
"JWTSettings__Key=$JWT_KEY" \
7479
"JWTSettings__Issuer=CoreIdentity" \
7580
"JWTSettings__Audience=CoreIdentityUser" \
7681
"JWTSettings__DurationInMinutes=60" \
7782
"FeatureManagement__AuthEnabled=true" \
78-
"Cors__AllowedOrigins__0=${{ secrets.ANGULAR_APP_URL }}" \
83+
"Cors__AllowedOrigins__0=$ANGULAR_URL" \
7984
"ASPNETCORE_ENVIRONMENT=Production"
8085
8186
- name: Deploy to Azure App Service

.github/workflows/deploy-identityserver.yml

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -71,32 +71,39 @@ jobs:
7171
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
7272

7373
- name: Configure STS App Service settings
74+
env:
75+
IDS_CONN: ${{ secrets.IDS_DB_CONNECTION_STRING }}
76+
IDS_URL: ${{ secrets.IDENTITY_SERVER_URL }}
7477
run: |
7578
az webapp config appsettings set \
7679
--resource-group ${{ env.RESOURCE_GROUP }} \
7780
--name ${{ env.APP_SERVICE_NAME }} \
7881
--settings \
79-
"ConnectionStrings__ConfigurationDbConnection=${{ secrets.IDS_DB_CONNECTION_STRING }}" \
80-
"ConnectionStrings__PersistedGrantDbConnection=${{ secrets.IDS_DB_CONNECTION_STRING }}" \
81-
"ConnectionStrings__IdentityDbConnection=${{ secrets.IDS_DB_CONNECTION_STRING }}" \
82-
"ConnectionStrings__DataProtectionDbConnection=${{ secrets.IDS_DB_CONNECTION_STRING }}" \
83-
"AdminConfiguration__IdentityServerBaseUrl=${{ secrets.IDENTITY_SERVER_URL }}" \
82+
"ConnectionStrings__ConfigurationDbConnection=$IDS_CONN" \
83+
"ConnectionStrings__PersistedGrantDbConnection=$IDS_CONN" \
84+
"ConnectionStrings__IdentityDbConnection=$IDS_CONN" \
85+
"ConnectionStrings__DataProtectionDbConnection=$IDS_CONN" \
86+
"AdminConfiguration__IdentityServerBaseUrl=$IDS_URL" \
8487
"ASPNETCORE_ENVIRONMENT=Production"
8588
8689
- name: Configure Admin App Service settings
90+
env:
91+
IDS_CONN: ${{ secrets.IDS_DB_CONNECTION_STRING }}
92+
IDS_URL: ${{ secrets.IDENTITY_SERVER_URL }}
93+
ADMIN_URL: ${{ secrets.IDENTITY_ADMIN_URL }}
8794
run: |
8895
az webapp config appsettings set \
8996
--resource-group ${{ env.RESOURCE_GROUP }} \
9097
--name ${{ env.ADMIN_APP_SERVICE_NAME }} \
9198
--settings \
92-
"ConnectionStrings__ConfigurationDbConnection=${{ secrets.IDS_DB_CONNECTION_STRING }}" \
93-
"ConnectionStrings__PersistedGrantDbConnection=${{ secrets.IDS_DB_CONNECTION_STRING }}" \
94-
"ConnectionStrings__IdentityDbConnection=${{ secrets.IDS_DB_CONNECTION_STRING }}" \
95-
"ConnectionStrings__AdminLogDbConnection=${{ secrets.IDS_DB_CONNECTION_STRING }}" \
96-
"ConnectionStrings__AdminAuditLogDbConnection=${{ secrets.IDS_DB_CONNECTION_STRING }}" \
97-
"ConnectionStrings__DataProtectionDbConnection=${{ secrets.IDS_DB_CONNECTION_STRING }}" \
98-
"AdminConfiguration__IdentityServerBaseUrl=${{ secrets.IDENTITY_SERVER_URL }}" \
99-
"AdminConfiguration__IdentityAdminRedirectUri=${{ secrets.IDENTITY_ADMIN_URL }}/signin-oidc" \
99+
"ConnectionStrings__ConfigurationDbConnection=$IDS_CONN" \
100+
"ConnectionStrings__PersistedGrantDbConnection=$IDS_CONN" \
101+
"ConnectionStrings__IdentityDbConnection=$IDS_CONN" \
102+
"ConnectionStrings__AdminLogDbConnection=$IDS_CONN" \
103+
"ConnectionStrings__AdminAuditLogDbConnection=$IDS_CONN" \
104+
"ConnectionStrings__DataProtectionDbConnection=$IDS_CONN" \
105+
"AdminConfiguration__IdentityServerBaseUrl=$IDS_URL" \
106+
"AdminConfiguration__IdentityAdminRedirectUri=$ADMIN_URL/signin-oidc" \
100107
"SeedConfiguration__ApplySeed=false" \
101108
"DatabaseMigrationsConfiguration__ApplyDatabaseMigrations=false" \
102109
"ASPNETCORE_ENVIRONMENT=Production"

0 commit comments

Comments
 (0)