-
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 3 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
Some comments aren't visible on the classic Files Changed page.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -238,9 +238,7 @@ jobs: | |
|
|
||
| # Set additional parameters | ||
| azd env set AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}" | ||
| azd env set AZURE_AI_SERVICE_LOCATION="$env:AZURE_ENV_OPENAI_LOCATION" | ||
| azd env set AZURE_AI_DEPLOYMENT_LOCATION="$env:AZURE_ENV_OPENAI_LOCATION" | ||
| azd env set AZURE_AI_SERVICE_LOCATION="$env:AZURE_ENV_OPENAI_LOCATION" | ||
| azd env set AZURE_ENV_AI_SERVICE_LOCATION="$env:AZURE_ENV_OPENAI_LOCATION" | ||
| azd env set AZURE_LOCATION="$env:AZURE_LOCATION" | ||
| azd env set AZURE_RESOURCE_GROUP="$env:RESOURCE_GROUP_NAME" | ||
| azd env set AZURE_ENV_IMAGETAG="$env:IMAGE_TAG" | ||
|
|
@@ -249,9 +247,9 @@ jobs: | |
| if ($env:BUILD_DOCKER_IMAGE -eq "true") { | ||
| $ACR_NAME = "${{ secrets.ACR_TEST_LOGIN_SERVER }}" | ||
| azd env set AZURE_CONTAINER_REGISTRY_HOST="$ACR_NAME" | ||
| Write-Host "Set ACR name to: $ACR_NAME" | ||
| Write-Host "Set ACR host to: $ACR_NAME" | ||
| } else { | ||
| Write-Host "Skipping ACR name configuration (using existing image)" | ||
| Write-Host "Skipping ACR endpoint configuration (using existing image)" | ||
| } | ||
|
|
||
| if ($env:EXP -eq "true") { | ||
|
|
@@ -261,19 +259,19 @@ jobs: | |
| if ($env:AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID -ne "") { | ||
| $EXP_LOG_ANALYTICS_ID = $env:AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID | ||
| } else { | ||
| $EXP_LOG_ANALYTICS_ID = "${{ secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}" | ||
| $EXP_LOG_ANALYTICS_ID = "${{ secrets.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID }}" | ||
| } | ||
|
|
||
| if ($env:AZURE_EXISTING_AI_PROJECT_RESOURCE_ID -ne "") { | ||
| $EXP_AI_PROJECT_ID = $env:AZURE_EXISTING_AI_PROJECT_RESOURCE_ID | ||
| } else { | ||
| $EXP_AI_PROJECT_ID = "${{ secrets.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}" | ||
| $EXP_AI_PROJECT_ID = "${{ secrets.AZURE_ENV_FOUNDRY_PROJECT_RID }}" | ||
|
||
| } | ||
|
|
||
| Write-Host "AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: $EXP_LOG_ANALYTICS_ID" | ||
| Write-Host "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" | ||
| Write-Host "AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID: $EXP_LOG_ANALYTICS_ID" | ||
| Write-Host "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 { | ||
| Write-Host "❌ EXP DISABLED - Skipping EXP parameters" | ||
| } | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -10,13 +10,14 @@ By default this template will use the environment name as the prefix to prevent | |
| | ------------------------------- | ------- | ----------------------- | ------------------------------------------------------------------------------------- | | ||
| | `AZURE_ENV_NAME` | string | `conmig` | Sets the environment name prefix for all Azure resources. | | ||
| | `AZURE_LOCATION` | string | `westus` | Sets the location/region for all Azure resources. | | ||
| | `AZURE_SECONDARY_LOCATION` | string | `eastus2` | Specifies a secondary Azure region. | | ||
| | `AZURE_CONTAINER_REGISTRY_HOST` | string | `myregistry.azurecr.io` | Specifies the container registry from which to pull app container images. | | ||
| | `AZURE_AI_DEPLOYMENT_LOCATION` | string | `eastus2` | Specifies alternative location for AI model resources. | | ||
| | `AZURE_CONTAINER_REGISTRY_HOST` | string | `myregistry.azurecr.io` | Specifies the container registry host from which to pull app container images. | | ||
| | `AZURE_ENV_AI_SERVICE_LOCATION` | string | `eastus2` | Specifies the Azure region for AI services (OpenAI/AI Foundry). | | ||
| | `AZURE_AI_DEPLOYMENT_TYPE` | string | `GlobalStandard` | Defines the model deployment type (allowed values: `Standard`, `GlobalStandard`). | | ||
| | `AZURE_AI_MODEL_NAME` | string | `o3` | Specifies the `o` model name. | | ||
| | `AZURE_AI_MODEL_VERSION` | string | `2025-04-16` | Specifies the `o` model version. | | ||
| | `AZURE_AI_MODEL_CAPACITY` | integer | `200` | Sets the model capacity (choose based on your subscription's available `o` capacity). | | ||
| | `AZURE_AI_MODEL_NAME` | string | `o3` | Specifies the AI model name. | | ||
| | `AZURE_AI_MODEL_VERSION` | string | `2025-04-16` | Specifies the AI model version. | | ||
| | `AZURE_AI_MODEL_CAPACITY` | integer | `200` | Sets the model capacity (choose based on your subscription's available capacity). | | ||
| | `AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID` | string | `` | Optional. Resource ID of an existing Log Analytics workspace to use. | | ||
| | `AZURE_ENV_FOUNDRY_PROJECT_RID` | string | `` | Optional. Resource ID of an existing AI Foundry project to use. | | ||
|
Comment on lines
+13
to
+20
|
||
| | `AZURE_ENV_VM_ADMIN_USERNAME` | string | `` | The administrator username for the virtual machine. | | ||
| | `AZURE_ENV_VM_ADMIN_PASSWORD` | string | `` | The administrator password for the virtual machine. | | ||
| | `AZURE_ENV_IMAGETAG` | string | `latest` | Specifies the container image tag to use for deployment. | | ||
|
|
||
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 |
|---|---|---|
|
|
@@ -23,7 +23,7 @@ Copy Resource ID that is your Workspace ID | |
| ### 4. Set the Workspace ID in Your Environment | ||
| Run the following command in your terminal | ||
| ```bash | ||
| azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID '<Existing Log Analytics Workspace Id>' | ||
| azd env set AZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID '<Existing Log Analytics Workspace Id>' | ||
|
||
| ``` | ||
| Replace `<Existing Log Analytics Workspace Id>` with the value obtained from Step 3. | ||
|
|
||
|
|
||
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
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.
The EXP parameter selection still reads from the old input/env names (
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID_INPUTandAZURE_EXISTING_AI_PROJECT_RESOURCE_ID_INPUT) while the workflow now setsAZURE_ENV_LOG_ANALYTICS_WORKSPACE_RID/AZURE_ENV_FOUNDRY_PROJECT_RIDinto the azd environment. This undermines the parameter-name standardization and can break callers that switch to the new names. Consider renaming the workflow_call inputs and the intermediate variables to the new*_RIDnames and updating the validation/warning logic accordingly (keeping backwards-compat mapping only if needed).