Skip to content

Commit 0f7bba1

Browse files
authored
feat: add RESOURCE_TAGS to environment variables in workflows and main.tfvars.json (#296)
1 parent ccafe77 commit 0f7bba1

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

.github/workflows/azure-dev-down.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ jobs:
7070
RS_CONTAINER_NAME: ${{ vars.RS_CONTAINER_NAME }}
7171
RS_RESOURCE_GROUP: ${{ vars.RS_RESOURCE_GROUP }}
7272
RESOURCE_SHARE_USER: ${{ vars.RESOURCE_SHARE_USER }}
73+
RESOURCE_TAGS: ${{ vars.RESOURCE_TAGS }}
7374

7475
shell: bash
7576
run: |
@@ -79,6 +80,7 @@ jobs:
7980
azd env set RS_CONTAINER_NAME "$RS_CONTAINER_NAME"
8081
azd env set RS_RESOURCE_GROUP "$RS_RESOURCE_GROUP"
8182
azd env set RESOURCE_SHARE_USER "$RESOURCE_SHARE_USER"
83+
azd env set RESOURCE_TAGS "$RESOURCE_TAGS"
8284
8385
azd package # trigger prepackage hook to setup terraform provider
8486
azd provision --preview # https://github.com/Azure/azure-dev/issues/4317

.github/workflows/azure-dev.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ jobs:
133133
RS_RESOURCE_GROUP: ${{ vars.RS_RESOURCE_GROUP }}
134134

135135
RESOURCE_SHARE_USER: ${{ vars.RESOURCE_SHARE_USER }}
136+
RESOURCE_TAGS: ${{ vars.RESOURCE_TAGS }}
136137

137138
GITHUB_PAT: ${{ secrets.MCS_RUNNER }}
138139
GITHUB_REPO_OWNER: ${{ github.repository_owner }}
@@ -145,6 +146,7 @@ jobs:
145146
azd config set auth.useAzCliAuth "true"
146147
azd env new "$AZURE_ENV_NAME" --location "$AZURE_LOCATION" --no-prompt
147148
azd env set RESOURCE_SHARE_USER "$RESOURCE_SHARE_USER"
149+
azd env set RESOURCE_TAGS "$RESOURCE_TAGS"
148150
149151
azd env set RS_STORAGE_ACCOUNT "$RS_STORAGE_ACCOUNT"
150152
azd env set RS_CONTAINER_NAME "$RS_CONTAINER_NAME"
@@ -197,13 +199,15 @@ jobs:
197199
RS_CONTAINER_NAME: ${{ vars.RS_CONTAINER_NAME }}
198200
RS_RESOURCE_GROUP: ${{ vars.RS_RESOURCE_GROUP }}
199201
RESOURCE_SHARE_USER: ${{ vars.RESOURCE_SHARE_USER }}
202+
RESOURCE_TAGS: ${{ vars.RESOURCE_TAGS }}
200203

201204
shell: bash
202205
run: |
203206
azd env set RS_STORAGE_ACCOUNT "$RS_STORAGE_ACCOUNT"
204207
azd env set RS_CONTAINER_NAME "$RS_CONTAINER_NAME"
205208
azd env set RS_RESOURCE_GROUP "$RS_RESOURCE_GROUP"
206209
azd env set RESOURCE_SHARE_USER "$RESOURCE_SHARE_USER"
210+
azd env set RESOURCE_TAGS "$RESOURCE_TAGS"
207211
208212
azd env select "$AZURE_ENV_NAME"
209213
azd down --no-prompt --force --purge

infra/main.tfvars.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"use_billing_policy": "${USE_BILLING_POLICY:-false}",
55
"azd_environment_name": "${AZURE_ENV_NAME}",
66
"resource_share_user": ${RESOURCE_SHARE_USER},
7+
"tags": ${RESOURCE_TAGS},
78
"azure_ai_search_service_principal": {
89
"client_id": "${AZURE_AI_SEARCH_SERVICE_PRINCIPAL_CLIENT_ID}",
910
"enterprise_application_object_id": "${AZURE_AI_SEARCH_ENTERPRISE_APPLICATION_OBJECT_ID}",
@@ -32,4 +33,4 @@
3233
"pe_failover_subnet_id": "${PE_FAILOVER_SUBNET_ID}"
3334
}
3435
}
35-
}
36+
}

0 commit comments

Comments
 (0)