Skip to content

Commit 2eb2bf6

Browse files
Avijit-MicrosoftAvijit-Microsoft
authored
refactor: dev to main - standardize environment variables & dependentbot changes
2 parents 7aa41bb + 442b6aa commit 2eb2bf6

42 files changed

Lines changed: 780 additions & 1516 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/deploy-orchestrator.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ on:
4242
required: false
4343
default: 'GoldenPath-Testing'
4444
type: string
45-
azure_env_log_analytics_workspace_id:
45+
azure_env_existing_log_analytics_workspace_rid:
4646
description: 'Log Analytics Workspace ID (Optional)'
4747
required: false
4848
default: ''
4949
type: string
50-
azure_existing_ai_project_resource_id:
50+
azure_existing_aiproject_resource_id:
5151
description: 'AI Project Resource ID (Optional)'
5252
required: false
5353
default: ''
@@ -57,7 +57,7 @@ on:
5757
required: false
5858
default: ''
5959
type: string
60-
azure_env_use_case:
60+
use_case:
6161
description: 'Azure Environment Use Case (telecom or IT_helpdesk)'
6262
required: false
6363
default: 'telecom'
@@ -91,9 +91,9 @@ jobs:
9191
exp: ${{ inputs.exp }}
9292
build_docker_image: ${{ inputs.build_docker_image }}
9393
existing_webapp_url: ${{ inputs.existing_webapp_url }}
94-
azure_env_log_analytics_workspace_id: ${{ inputs.azure_env_log_analytics_workspace_id }}
95-
azure_existing_ai_project_resource_id: ${{ inputs.azure_existing_ai_project_resource_id }}
96-
azure_env_use_case: ${{ inputs.azure_env_use_case }}
94+
azure_env_existing_log_analytics_workspace_rid: ${{ inputs.azure_env_existing_log_analytics_workspace_rid }}
95+
azure_existing_aiproject_resource_id: ${{ inputs.azure_existing_aiproject_resource_id }}
96+
use_case: ${{ inputs.use_case }}
9797
docker_image_tag: ${{ needs.docker-build.outputs.IMAGE_TAG }}
9898
run_e2e_tests: ${{ inputs.run_e2e_tests }}
9999
cleanup_resources: ${{ inputs.cleanup_resources }}
@@ -107,7 +107,7 @@ jobs:
107107
KMGENERIC_URL: ${{ needs.deploy.outputs.WEB_APP_URL || inputs.existing_webapp_url }}
108108
KMGENERIC_URL_API: ${{ needs.deploy.outputs.API_APP_URL || inputs.existing_webapp_url }}
109109
TEST_SUITE: ${{ inputs.trigger_type == 'workflow_dispatch' && inputs.run_e2e_tests || 'GoldenPath-Testing' }}
110-
AZURE_ENV_USE_CASE: ${{ inputs.azure_env_use_case }}
110+
USE_CASE: ${{ inputs.use_case }}
111111
secrets: inherit
112112

113113
cleanup-deployment:
@@ -121,7 +121,7 @@ jobs:
121121
existing_webapp_url: ${{ inputs.existing_webapp_url }}
122122
resource_group_name: ${{ needs.deploy.outputs.RESOURCE_GROUP_NAME }}
123123
azure_location: ${{ needs.deploy.outputs.AZURE_LOCATION }}
124-
azure_env_openai_location: ${{ needs.deploy.outputs.AZURE_ENV_OPENAI_LOCATION }}
124+
azure_env_ai_service_location: ${{ needs.deploy.outputs.AZURE_ENV_AI_SERVICE_LOCATION }}
125125
env_name: ${{ needs.deploy.outputs.ENV_NAME }}
126126
image_tag: ${{ needs.deploy.outputs.IMAGE_TAG }}
127127
secrets: inherit

‎.github/workflows/deploy-v2.yml‎

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ on:
7070
required: false
7171
default: false
7272
type: boolean
73-
AZURE_ENV_USE_CASE:
73+
USE_CASE:
7474
description: 'Specify Use case to deploy'
7575
type: 'choice'
7676
options:
@@ -87,12 +87,12 @@ on:
8787
- 'GoldenPath-Testing'
8888
- 'Smoke-Testing'
8989
- 'None'
90-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID:
90+
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
9191
description: 'Log Analytics Workspace ID (Optional)'
9292
required: false
9393
default: ''
9494
type: string
95-
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID:
95+
AZURE_EXISTING_AIPROJECT_RESOURCE_ID:
9696
description: 'AI Project Resource ID (Optional)'
9797
required: false
9898
default: ''
@@ -102,6 +102,8 @@ on:
102102
required: false
103103
default: ''
104104
type: string
105+
schedule:
106+
- cron: '0 9,21 * * *' # Runs at 9:00 AM and 9:00 PM GMT
105107

106108
permissions:
107109
contents: read
@@ -120,10 +122,10 @@ jobs:
120122
build_docker_image: ${{ steps.validate.outputs.build_docker_image }}
121123
cleanup_resources: ${{ steps.validate.outputs.cleanup_resources }}
122124
run_e2e_tests: ${{ steps.validate.outputs.run_e2e_tests }}
123-
azure_env_log_analytics_workspace_id: ${{ steps.validate.outputs.azure_env_log_analytics_workspace_id }}
124-
azure_existing_ai_project_resource_id: ${{ steps.validate.outputs.azure_existing_ai_project_resource_id }}
125+
azure_env_existing_log_analytics_workspace_rid: ${{ steps.validate.outputs.azure_env_existing_log_analytics_workspace_rid }}
126+
azure_existing_aiproject_resource_id: ${{ steps.validate.outputs.azure_existing_aiproject_resource_id }}
125127
existing_webapp_url: ${{ steps.validate.outputs.existing_webapp_url }}
126-
azure_env_use_case: ${{ steps.validate.outputs.azure_env_use_case }}
128+
use_case: ${{ steps.validate.outputs.use_case }}
127129
runner_os: ${{ steps.validate.outputs.runner_os }}
128130

129131
steps:
@@ -138,10 +140,10 @@ jobs:
138140
INPUT_BUILD_DOCKER_IMAGE: ${{ github.event.inputs.build_docker_image }}
139141
INPUT_CLEANUP_RESOURCES: ${{ github.event.inputs.cleanup_resources }}
140142
INPUT_RUN_E2E_TESTS: ${{ github.event.inputs.run_e2e_tests }}
141-
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
142-
INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ github.event.inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
143+
INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ github.event.inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
144+
INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ github.event.inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
143145
INPUT_EXISTING_WEBAPP_URL: ${{ github.event.inputs.existing_webapp_url }}
144-
INPUT_AZURE_ENV_USE_CASE: ${{ github.event.inputs.AZURE_ENV_USE_CASE }}
146+
INPUT_USE_CASE: ${{ github.event.inputs.USE_CASE }}
145147
INPUT_RUNNER_OS: ${{ github.event.inputs.runner_os }}
146148

147149
run: |
@@ -232,32 +234,32 @@ jobs:
232234
echo "✅ run_e2e_tests: '$TEST_OPTION' is valid"
233235
fi
234236
235-
# Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID (optional, Azure Resource ID format)
236-
if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" ]]; then
237-
if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
238-
echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID is invalid. Must be a valid Azure Resource ID format:"
237+
# Validate AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID (optional, Azure Resource ID format)
238+
if [[ -n "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" ]]; then
239+
if [[ ! "$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
240+
echo "❌ ERROR: AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:"
239241
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}"
240-
echo " Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID'"
242+
echo " Got: '$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID'"
241243
VALIDATION_FAILED=true
242244
else
243-
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Valid Resource ID format"
245+
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format"
244246
fi
245247
else
246-
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Not provided (optional)"
248+
echo "✅ AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: Not provided (optional)"
247249
fi
248250
249-
# Validate AZURE_EXISTING_AI_PROJECT_RESOURCE_ID (optional, Azure Resource ID format)
250-
if [[ -n "$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" ]]; then
251-
if [[ ! "$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
252-
echo "❌ ERROR: AZURE_EXISTING_AI_PROJECT_RESOURCE_ID is invalid. Must be a valid Azure Resource ID format:"
251+
# Validate AZURE_EXISTING_AIPROJECT_RESOURCE_ID (optional, Azure Resource ID format)
252+
if [[ -n "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" ]]; then
253+
if [[ ! "$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
254+
echo "❌ ERROR: AZURE_EXISTING_AIPROJECT_RESOURCE_ID is invalid. Must be a valid Azure Resource ID format:"
253255
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}"
254-
echo " Got: '$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID'"
256+
echo " Got: '$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID'"
255257
VALIDATION_FAILED=true
256258
else
257-
echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: Valid Resource ID format"
259+
echo "✅ AZURE_EXISTING_AIPROJECT_RESOURCE_ID: Valid Resource ID format"
258260
fi
259261
else
260-
echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: Not provided (optional)"
262+
echo "✅ AZURE_EXISTING_AIPROJECT_RESOURCE_ID: Not provided (optional)"
261263
fi
262264
263265
# Validate existing_webapp_url (optional, must start with https)
@@ -272,13 +274,13 @@ jobs:
272274
echo "✅ existing_webapp_url: Not provided (will perform deployment)"
273275
fi
274276
275-
# Validate AZURE_ENV_USE_CASE (specific allowed values)
276-
USE_CASE="${INPUT_AZURE_ENV_USE_CASE:-telecom}"
277+
# Validate USE_CASE (specific allowed values)
278+
USE_CASE="${INPUT_USE_CASE:-telecom}"
277279
if [[ "$USE_CASE" != "telecom" && "$USE_CASE" != "IT_helpdesk" ]]; then
278-
echo "❌ ERROR: AZURE_ENV_USE_CASE must be one of: telecom, IT_helpdesk, got: '$USE_CASE'"
280+
echo "❌ ERROR: USE_CASE must be one of: telecom, IT_helpdesk, got: '$USE_CASE'"
279281
VALIDATION_FAILED=true
280282
else
281-
echo "✅ AZURE_ENV_USE_CASE: '$USE_CASE' is valid"
283+
echo "✅ USE_CASE: '$USE_CASE' is valid"
282284
fi
283285
284286
# Fail workflow if any validation failed
@@ -300,10 +302,10 @@ jobs:
300302
echo "build_docker_image=$BUILD_DOCKER" >> $GITHUB_OUTPUT
301303
echo "cleanup_resources=$CLEANUP_RESOURCES" >> $GITHUB_OUTPUT
302304
echo "run_e2e_tests=$TEST_OPTION" >> $GITHUB_OUTPUT
303-
echo "azure_env_log_analytics_workspace_id=$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" >> $GITHUB_OUTPUT
304-
echo "azure_existing_ai_project_resource_id=$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" >> $GITHUB_OUTPUT
305+
echo "azure_env_existing_log_analytics_workspace_rid=$INPUT_AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID" >> $GITHUB_OUTPUT
306+
echo "azure_existing_aiproject_resource_id=$INPUT_AZURE_EXISTING_AIPROJECT_RESOURCE_ID" >> $GITHUB_OUTPUT
305307
echo "existing_webapp_url=$INPUT_EXISTING_WEBAPP_URL" >> $GITHUB_OUTPUT
306-
echo "azure_env_use_case=$USE_CASE" >> $GITHUB_OUTPUT
308+
echo "use_case=$USE_CASE" >> $GITHUB_OUTPUT
307309
echo "runner_os=$RUNNER_OS" >> $GITHUB_OUTPUT
308310
309311
@@ -320,10 +322,10 @@ jobs:
320322
build_docker_image: ${{ needs.validate-inputs.outputs.build_docker_image == 'true' }}
321323
cleanup_resources: ${{ needs.validate-inputs.outputs.cleanup_resources == 'true' }}
322324
run_e2e_tests: ${{ needs.validate-inputs.outputs.run_e2e_tests || 'GoldenPath-Testing' }}
323-
azure_env_log_analytics_workspace_id: ${{ needs.validate-inputs.outputs.azure_env_log_analytics_workspace_id || '' }}
324-
azure_existing_ai_project_resource_id: ${{ needs.validate-inputs.outputs.azure_existing_ai_project_resource_id || '' }}
325+
azure_env_existing_log_analytics_workspace_rid: ${{ needs.validate-inputs.outputs.azure_env_existing_log_analytics_workspace_rid || '' }}
326+
azure_existing_aiproject_resource_id: ${{ needs.validate-inputs.outputs.azure_existing_aiproject_resource_id || '' }}
325327
existing_webapp_url: ${{ needs.validate-inputs.outputs.existing_webapp_url || '' }}
326-
azure_env_use_case: ${{ needs.validate-inputs.outputs.azure_env_use_case || 'telecom' }}
328+
use_case: ${{ needs.validate-inputs.outputs.use_case || 'telecom' }}
327329
trigger_type: ${{ github.event_name }}
328330
secrets: inherit
329331

0 commit comments

Comments
 (0)