-
Notifications
You must be signed in to change notification settings - Fork 17
fix: Standardization of parameters and update workflows and documentation #145
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
Prachig-Microsoft
wants to merge
5
commits into
dev
Choose a base branch
from
psl-prachi-params
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
5a74666
Update parameters for AI services and remove secondary location refer…
Prachig-Microsoft 2b56470
Remove aiDeploymentLocation parameter from workflows and documentation
Prachig-Microsoft 784f5dd
Revert environment variable naming to original format
Prachig-Microsoft cef5227
Fix Log Analytics workspace variable naming consistency
Prachig-Microsoft 1fbaf05
Rename Log Analytics Workspace ID to Resource ID and update validatio…
Vamshi-Microsoft File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,7 +28,7 @@ on: | |
| required: false | ||
| type: string | ||
| default: 'false' | ||
| AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: | ||
| AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: | ||
| required: false | ||
| type: string | ||
| AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: | ||
|
|
@@ -59,7 +59,7 @@ jobs: | |
| INPUT_BUILD_DOCKER_IMAGE: ${{ inputs.BUILD_DOCKER_IMAGE }} | ||
| INPUT_EXP: ${{ inputs.EXP }} | ||
| INPUT_WAF_ENABLED: ${{ inputs.WAF_ENABLED }} | ||
| INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }} | ||
| INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }} | ||
| INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }} | ||
|
Comment on lines
59
to
63
|
||
| run: | | ||
| echo "🔍 Validating workflow input parameters..." | ||
|
|
@@ -223,7 +223,7 @@ jobs: | |
| IMAGE_TAG: ${{ inputs.IMAGE_TAG }} | ||
| BUILD_DOCKER_IMAGE: ${{ inputs.BUILD_DOCKER_IMAGE }} | ||
| EXP: ${{ inputs.EXP }} | ||
| AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID_INPUT: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }} | ||
| AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID_INPUT: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }} | ||
| AZURE_EXISTING_AI_PROJECT_RESOURCE_ID_INPUT: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }} | ||
| run: | | ||
| set -e | ||
|
|
@@ -237,9 +237,7 @@ jobs: | |
|
|
||
| # Set additional parameters | ||
| azd env set AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}" | ||
| azd env set AZURE_AI_SERVICE_LOCATION="$AZURE_ENV_OPENAI_LOCATION" | ||
| azd env set AZURE_AI_DEPLOYMENT_LOCATION="$AZURE_ENV_OPENAI_LOCATION" | ||
| azd env set AZURE_AI_SERVICE_LOCATION="$AZURE_ENV_OPENAI_LOCATION" | ||
| azd env set AZURE_ENV_AI_SERVICE_LOCATION="$AZURE_ENV_OPENAI_LOCATION" | ||
| azd env set AZURE_LOCATION="$AZURE_LOCATION" | ||
| azd env set AZURE_RESOURCE_GROUP="$RESOURCE_GROUP_NAME" | ||
| azd env set AZURE_ENV_IMAGETAG="$IMAGE_TAG" | ||
|
|
@@ -249,34 +247,34 @@ jobs: | |
| # Extract ACR name from login server and set as environment variable | ||
| ACR_NAME=$(echo "${{ secrets.ACR_TEST_LOGIN_SERVER }}") | ||
| azd env set AZURE_CONTAINER_REGISTRY_HOST="$ACR_NAME" | ||
| echo "Set ACR name to: $ACR_NAME" | ||
| echo "Set ACR host to: $ACR_NAME" | ||
| else | ||
| echo "Skipping ACR name configuration (using existing image)" | ||
| echo "Skipping ACR endpoint configuration (using existing image)" | ||
| fi | ||
|
|
||
| if [[ "$EXP" == "true" ]]; then | ||
| echo "✅ EXP ENABLED - Setting EXP parameters..." | ||
|
|
||
| # Set EXP variables dynamically | ||
| if [[ -n "$AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID_INPUT" ]]; then | ||
| EXP_LOG_ANALYTICS_ID="$AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID_INPUT" | ||
| if [[ -n "$AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID_INPUT" ]]; then | ||
| EXP_LOG_ANALYTICS_ID="$AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID_INPUT" | ||
| else | ||
| EXP_LOG_ANALYTICS_ID="${{ secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}" | ||
| EXP_LOG_ANALYTICS_ID="${{ secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}" | ||
| fi | ||
|
|
||
| if [[ -n "$AZURE_EXISTING_AI_PROJECT_RESOURCE_ID_INPUT" ]]; then | ||
| EXP_AI_PROJECT_ID="$AZURE_EXISTING_AI_PROJECT_RESOURCE_ID_INPUT" | ||
| else | ||
| EXP_AI_PROJECT_ID="${{ secrets.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}" | ||
| EXP_AI_PROJECT_ID="${{ secrets.AZURE_ENV_FOUNDRY_PROJECT_RID }}" | ||
| fi | ||
|
|
||
| echo "AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: $EXP_LOG_ANALYTICS_ID" | ||
| echo "AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: $EXP_AI_PROJECT_ID" | ||
| azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID="$EXP_LOG_ANALYTICS_ID" | ||
| azd env set AZURE_EXISTING_AI_PROJECT_RESOURCE_ID="$EXP_AI_PROJECT_ID" | ||
| echo "AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: $EXP_LOG_ANALYTICS_ID" | ||
| echo "AZURE_ENV_FOUNDRY_PROJECT_RID: $EXP_AI_PROJECT_ID" | ||
| azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID="$EXP_LOG_ANALYTICS_ID" | ||
| azd env set AZURE_ENV_FOUNDRY_PROJECT_RID="$EXP_AI_PROJECT_ID" | ||
| else | ||
| echo "❌ EXP DISABLED - Skipping EXP parameters" | ||
| if [[ -n "$AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID_INPUT" ]] || [[ -n "$AZURE_EXISTING_AI_PROJECT_RESOURCE_ID_INPUT" ]]; then | ||
| if [[ -n "$AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID_INPUT" ]] || [[ -n "$AZURE_EXISTING_AI_PROJECT_RESOURCE_ID_INPUT" ]]; then | ||
| echo "⚠️ Warning: EXP parameter values provided but EXP is disabled. These values will be ignored." | ||
| fi | ||
| fi | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -28,7 +28,7 @@ on: | |||||||
| required: false | ||||||||
| type: string | ||||||||
| default: 'false' | ||||||||
| AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: | ||||||||
| AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: | ||||||||
| required: false | ||||||||
| type: string | ||||||||
| AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: | ||||||||
|
|
@@ -59,7 +59,7 @@ jobs: | |||||||
| INPUT_BUILD_DOCKER_IMAGE: ${{ inputs.BUILD_DOCKER_IMAGE }} | ||||||||
| INPUT_EXP: ${{ inputs.EXP }} | ||||||||
| INPUT_WAF_ENABLED: ${{ inputs.WAF_ENABLED }} | ||||||||
| INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }} | ||||||||
| INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }} | ||||||||
|
||||||||
| INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }} | |
| INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }} | |
| INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -46,7 +46,7 @@ on: | |
| required: false | ||
| default: '' | ||
| type: string | ||
| AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: | ||
| AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: | ||
| description: 'Log Analytics Workspace ID (Optional)' | ||
| required: false | ||
| default: '' | ||
|
|
@@ -119,7 +119,7 @@ jobs: | |
| INPUT_WAF_ENABLED: ${{ inputs.waf_enabled }} | ||
| INPUT_EXP: ${{ inputs.EXP }} | ||
| INPUT_CLEANUP_RESOURCES: ${{ inputs.cleanup_resources }} | ||
| INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }} | ||
| INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }} | ||
| INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }} | ||
| INPUT_EXISTING_WEBAPP_URL: ${{ inputs.existing_webapp_url }} | ||
| INPUT_DOCKER_IMAGE_TAG: ${{ inputs.docker_image_tag }} | ||
|
|
@@ -205,15 +205,15 @@ jobs: | |
| echo "✅ cleanup_resources: '$INPUT_CLEANUP_RESOURCES' is valid" | ||
| fi | ||
|
|
||
| # Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID (Azure Resource ID format) | ||
| if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" ]]; then | ||
| 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 | ||
| echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID is invalid. Must be a valid Azure Resource ID format:" | ||
| # Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID (Azure Resource ID format) | ||
| if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" ]]; then | ||
| if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then | ||
| echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID is invalid. Must be a valid Azure Resource ID format:" | ||
| echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}" | ||
| echo " Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID'" | ||
| echo " Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID'" | ||
| VALIDATION_FAILED=true | ||
| else | ||
| echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Valid Resource ID format" | ||
| echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: Valid Resource ID format" | ||
| fi | ||
| fi | ||
|
|
||
|
|
@@ -269,7 +269,7 @@ jobs: | |
| shell: bash | ||
| env: | ||
| INPUT_EXP: ${{ inputs.EXP }} | ||
| INPUT_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }} | ||
| INPUT_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }} | ||
| INPUT_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }} | ||
| run: | | ||
|
Comment on lines
271
to
275
|
||
| echo "🔍 Validating EXP configuration..." | ||
|
|
@@ -510,7 +510,7 @@ jobs: | |
| BUILD_DOCKER_IMAGE: ${{ inputs.build_docker_image || 'false' }} | ||
| EXP: ${{ needs.azure-setup.outputs.EXP_ENABLED }} | ||
| WAF_ENABLED: ${{ inputs.waf_enabled == true && 'true' || 'false' }} | ||
| AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }} | ||
| AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }} | ||
| AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }} | ||
| secrets: inherit | ||
|
|
||
|
|
@@ -528,6 +528,6 @@ jobs: | |
| BUILD_DOCKER_IMAGE: ${{ inputs.build_docker_image || 'false' }} | ||
| EXP: ${{ needs.azure-setup.outputs.EXP_ENABLED }} | ||
| WAF_ENABLED: ${{ inputs.waf_enabled == true && 'true' || 'false' }} | ||
| AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }} | ||
| AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }} | ||
| AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }} | ||
| secrets: inherit | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
deploy-v2.ymlstill defines the workflow_dispatch input asAZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID, but the validation step reads${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}and later outputsazure_env_log_analytics_workspace_rid. As-is, the value will always be empty and the validation block below also referencesINPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_IDwhich is never set. Rename the workflow_dispatch input toAZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID(or update the references back to_ID) and make the variable names consistent throughout the validation/output logic.