|
12 | 12 | required: false |
13 | 13 | default: false |
14 | 14 | type: boolean |
| 15 | + AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: |
| 16 | + description: '[EXP Only] Azure Log Analytics Workspace ID (leave empty for default from secrets)' |
| 17 | + required: false |
| 18 | + default: '' |
| 19 | + type: string |
| 20 | + AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: |
| 21 | + description: '[EXP Only] Azure AI Project Resource ID (leave empty for default from secrets)' |
| 22 | + required: false |
| 23 | + default: '' |
| 24 | + type: string |
15 | 25 | run_e2e_tests: |
16 | 26 | description: 'Run end-to-end tests' |
17 | 27 | required: false |
|
30 | 40 | BRANCH_NAME: ${{ github.event.workflow_run.head_branch || github.head_ref || github.ref_name }} |
31 | 41 | WAF_ENABLED: ${{ github.event.inputs.waf_enabled || false }} |
32 | 42 | EXP: ${{ github.event.inputs.EXP || false }} |
| 43 | + AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID != '' && github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID || secrets.EXP_LOG_ANALYTICS_WORKSPACE_ID }} |
| 44 | + AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ github.event.inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID != '' && github.event.inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID || secrets.EXP_AI_PROJECT_RESOURCE_ID }} |
33 | 45 | CLEANUP_RESOURCES: ${{ github.event.inputs.cleanup_resources || true }} |
34 | 46 | RUN_E2E_TESTS: ${{ github.event.inputs.run_e2e_tests || true }} |
35 | 47 |
|
|
45 | 57 | env: |
46 | 58 | WAF_ENABLED: ${{ github.event.inputs.waf_enabled || true }} |
47 | 59 | EXP: ${{ github.event.inputs.EXP || false }} |
| 60 | + AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID != '' && github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID || secrets.EXP_LOG_ANALYTICS_WORKSPACE_ID }} |
| 61 | + AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ github.event.inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID != '' && github.event.inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID || secrets.EXP_AI_PROJECT_RESOURCE_ID }} |
48 | 62 | CLEANUP_RESOURCES: ${{ github.event.inputs.cleanup_resources || true }} |
49 | 63 |
|
50 | 64 | steps: |
@@ -267,10 +281,15 @@ jobs: |
267 | 281 |
|
268 | 282 | if [[ "${{ env.EXP }}" == "true" ]]; then |
269 | 283 | echo "✅ EXP ENABLED - Setting EXP parameters..." |
270 | | - azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID="${{ secrets.EXP_LOG_ANALYTICS_WORKSPACE_ID }}" |
271 | | - azd env set AZURE_EXISTING_AI_PROJECT_RESOURCE_ID="${{ secrets.EXP_AI_PROJECT_RESOURCE_ID }}" |
| 284 | + echo "AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ env.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}" |
| 285 | + echo "AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ env.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}" |
| 286 | + azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID="${{ env.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}" |
| 287 | + azd env set AZURE_EXISTING_AI_PROJECT_RESOURCE_ID="${{ env.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}" |
272 | 288 | else |
273 | 289 | echo "❌ EXP DISABLED - Skipping EXP parameters" |
| 290 | + if [[ -n "${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}" ]] || [[ -n "${{ github.event.inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}" ]]; then |
| 291 | + echo "⚠️ Warning: EXP parameter values provided but EXP is disabled. These values will be ignored." |
| 292 | + fi |
274 | 293 | fi |
275 | 294 |
|
276 | 295 | # Deploy using azd up |
|
0 commit comments