Skip to content

Commit 18b423a

Browse files
Merge pull request #230 from microsoft/dev
refactor: merge dev into main
2 parents d6c6b73 + b869018 commit 18b423a

File tree

6 files changed

+15
-4
lines changed

6 files changed

+15
-4
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ jobs:
2020
# Step 2: Validate the Azure template using microsoft/template-validation-action
2121
- name: Validate Azure Template
2222
uses: microsoft/template-validation-action@Latest
23+
with:
24+
validateAzd: true
25+
useDevContainer: false
2326
id: validation
2427
env:
2528
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
@@ -28,7 +31,9 @@ jobs:
2831
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
2932
AZURE_ENV_NAME: ${{ secrets.AZURE_ENV_NAME }}
3033
AZURE_LOCATION: ${{ secrets.AZURE_LOCATION }}
31-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34+
AZURE_AI_DEPLOYMENT_LOCATION : ${{ secrets.AZURE_AI_DEPLOYMENT_LOCATION }}
35+
AZURE_ENV_MODEL_CAPACITY : 1
36+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3237
# Step 3: Print the result of the validation
3338
- name: Print result
3439
run: cat ${{ steps.validation.outputs.resultFile }}

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ Quick deploy
7575
### How to install or deploy
7676
Follow the quick deploy steps on the deployment guide to deploy this solution to your own Azure subscription.
7777

78+
> **Note:** This solution accelerator requires **Azure Developer CLI (azd) version 1.18.0 or higher**. Please ensure you have the latest version installed before proceeding with deployment. [Download azd here](https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/install-azd).
79+
7880
[Click here to launch the deployment guide](./docs/DeploymentGuide.md)
7981
<br/><br/>
8082

azure.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ metadata:
33
template: modernize-your-code-solution-accelerator@1.0
44

55
requiredVersions:
6-
azd: '>1.17.1'
6+
azd: '>= 1.18.0'
77

88
parameters:
99
AzureAiServiceLocation:

docs/DeploymentGuide.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ If you're not using one of the above options for opening the project, then you'l
9898

9999
1. Make sure the following tools are installed:
100100

101-
* [Azure Developer CLI (azd)](https://aka.ms/install-azd) <small>(v1.17.1+)</small> - version
101+
* [Azure Developer CLI (azd)](https://aka.ms/install-azd) <small>(v1.18.0+)</small> - version
102102
* [Python 3.9+](https://www.python.org/downloads/)
103103
* [Docker Desktop](https://www.docker.com/products/docker-desktop/)
104104
* [Git](https://git-scm.com/downloads)
@@ -195,6 +195,7 @@ To change the azd parameters from the default values, follow the steps [here](..
195195
```shell
196196
azd up
197197
```
198+
> **Note:** This solution accelerator requires **Azure Developer CLI (azd) version 1.18.0 or higher**. Please ensure you have the latest version installed before proceeding with deployment. [Download azd here](https://learn.microsoft.com/en-us/azure/developer/azure-developer-cli/install-azd).
198199
199200
4. Select a subscription from your Azure account, and select a location which has quota for all the resources.
200201
* This deployment will take *6-9 minutes* to provision the resources in your account and set up the solution with sample data.

infra/main.parameters.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
"capacity": {
1818
"value": "${AZURE_ENV_MODEL_CAPACITY}"
1919
},
20+
"aiDeploymentsLocation": {
21+
"value": "${AZURE_AI_DEPLOYMENT_LOCATION}"
22+
},
2023
"gptModelVersion": {
2124
"value": "${AZURE_ENV_MODEL_VERSION}"
2225
},

infra/modules/cosmosDb.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ module cosmosAccount 'br/public:avm/res/document-db/database-account:0.15.0' = {
9090
backupPolicyType: !empty(secondaryLocation) ? 'Periodic' : 'Continuous'
9191
backupStorageRedundancy: zoneRedundant ? 'Zone' : 'Local'
9292
disableKeyBasedMetadataWriteAccess: false
93-
disableLocalAuthentication: privateNetworking != null
93+
disableLocalAuthentication: true
9494
diagnosticSettings: !empty(logAnalyticsWorkspaceResourceId)
9595
? [{ workspaceResourceId: logAnalyticsWorkspaceResourceId }]
9696
: []

0 commit comments

Comments
 (0)