Skip to content

Commit ac9a704

Browse files
Merge remote-tracking branch 'origin/main' into PSL-US-27016
2 parents 08c1f91 + 7761130 commit ac9a704

File tree

15 files changed

+131
-134
lines changed

15 files changed

+131
-134
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Each line is a file pattern followed by one or more owners.
33

44
# These owners will be the default owners for everything in the repo.
5-
* @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft @aniaroramsft @brittneek @Vinay-Microsoft @toherman-msft @nchandhi
5+
* @Avijit-Microsoft @Roopan-Microsoft @Prajwal-Microsoft @aniaroramsft @brittneek @Vinay-Microsoft @toherman-msft @nchandhi @dgp10801

documents/DeploymentGuide.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,24 @@ You can run this solution in VS Code Dev Containers, which will open the project
115115

116116
### VS Code Web
117117

118-
[![Open in Visual Studio Code Web](https://img.shields.io/static/v1?style=for-the-badge&label=Visual%20Studio%20Code%20(Web)&message=Open&color=blue&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/azure/?vscode-azure-exp=foundry&agentPayload=eyJiYXNlVXJsIjogImh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS9taWNyb3NvZnQvQ29udmVyc2F0aW9uLUtub3dsZWRnZS1NaW5pbmctU29sdXRpb24tQWNjZWxlcmF0b3IvcmVmcy9oZWFkcy9tYWluL2luZnJhL3ZzY29kZV93ZWIiLCAiaW5kZXhVcmwiOiAiL2luZGV4Lmpzb24iLCAidmFyaWFibGVzIjogeyJhZ2VudElkIjogIiIsICJjb25uZWN0aW9uU3RyaW5nIjogIiIsICJ0aHJlYWRJZCI6ICIiLCAidXNlck1lc3NhZ2UiOiAiIiwgInBsYXlncm91bmROYW1lIjogIiIsICJsb2NhdGlvbiI6ICIiLCAic3Vic2NyaXB0aW9uSWQiOiAiIiwgInJlc291cmNlSWQiOiAiIiwgInByb2plY3RSZXNvdXJjZUlkIjogIiIsICJlbmRwb2ludCI6ICIifSwgImNvZGVSb3V0ZSI6IFsiYWktcHJvamVjdHMtc2RrIiwgInB5dGhvbiIsICJkZWZhdWx0LWF6dXJlLWF1dGgiLCAiZW5kcG9pbnQiXX0=):
118+
[![Open in Visual Studio Code Web](https://img.shields.io/static/v1?style=for-the-badge&label=Visual%20Studio%20Code%20(Web)&message=Open&color=blue&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/azure/?vscode-azure-exp=foundry&agentPayload=eyJiYXNlVXJsIjogImh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS9taWNyb3NvZnQvQ29udmVyc2F0aW9uLUtub3dsZWRnZS1NaW5pbmctU29sdXRpb24tQWNjZWxlcmF0b3IvcmVmcy9oZWFkcy9tYWluL2luZnJhL3ZzY29kZV93ZWIiLCAiaW5kZXhVcmwiOiAiL2luZGV4Lmpzb24iLCAidmFyaWFibGVzIjogeyJhZ2VudElkIjogIiIsICJjb25uZWN0aW9uU3RyaW5nIjogIiIsICJ0aHJlYWRJZCI6ICIiLCAidXNlck1lc3NhZ2UiOiAiIiwgInBsYXlncm91bmROYW1lIjogIiIsICJsb2NhdGlvbiI6ICIiLCAic3Vic2NyaXB0aW9uSWQiOiAiIiwgInJlc291cmNlSWQiOiAiIiwgInByb2plY3RSZXNvdXJjZUlkIjogIiIsICJlbmRwb2ludCI6ICIifSwgImNvZGVSb3V0ZSI6IFsiYWktcHJvamVjdHMtc2RrIiwgInB5dGhvbiIsICJkZWZhdWx0LWF6dXJlLWF1dGgiLCAiZW5kcG9pbnQiXX0=)
119119

120120
1. Click the badge above (may take a few minutes to load)
121121
2. Sign in with your Azure account when prompted
122122
3. Select the subscription where you want to deploy the solution
123123
4. Wait for the environment to initialize (includes all deployment tools)
124-
5. When prompted in the VS Code Web terminal, choose one of the available options shown below:
124+
5. Once the solution opens, the **AI Foundry terminal** will automatically start running the following command to install the required dependencies:
125125

126-
![VS Code Initial Prompt](./Images/vscodeweb_intialize.png)
126+
```shell
127+
sh install.sh
128+
```
129+
During this process, you’ll be prompted with the message:
130+
```
131+
What would you like to do with these files?
132+
- Overwrite with versions from template
133+
- Keep my existing files unchanged
134+
```
135+
Choose “**Overwrite with versions from template**” and provide a unique environment name when prompted.
127136
6. Continue with the [deploying steps](#deploying-with-azd).
128137

129138
</details>
-34.8 KB
Binary file not shown.

documents/QuotaCheck.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ Before deploying the accelerator, **ensure sufficient quota availability** for t
55
66
### Login if you have not done so already
77
```
8-
azd auth login
8+
az login
9+
```
10+
If using VS Code Web:
11+
```
12+
az login --use-device-code
913
```
1014

1115
### 📌 Default Models & Capacities:
@@ -74,7 +78,7 @@ The final table lists regions with available quota. You can select any of these
7478

7579
### **If using VS Code or Codespaces**
7680
1. Open the terminal in VS Code or Codespaces.
77-
2. If you're using VS Code, click the dropdown on the right side of the terminal window, and select `Git Bash`.
81+
2. If you're using VS Code, click the dropdown on the right side of the terminal window, and select `Git Bash` / `bash`.
7882
![git_bash](Images/git_bash.png)
7983
3. Navigate to the `scripts` folder where the script files are located and make the script as executable:
8084
```sh
@@ -96,4 +100,5 @@ The final table lists regions with available quota. You can select any of these
96100
curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
97101
az login
98102
```
103+
> Note: Use `az login --use-device-code` in VS Code Web.
99104
6. Rerun the script after installing Azure CLI.

infra/main.bicep

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -460,12 +460,6 @@ var dnsZoneIndex = {
460460
sqlServer: 9
461461
search: 10
462462
}
463-
// List of DNS zone indices that correspond to AI-related services.
464-
var aiRelatedDnsZoneIndices = [
465-
dnsZoneIndex.cognitiveServices
466-
dnsZoneIndex.openAI
467-
dnsZoneIndex.aiServices
468-
]
469463

470464
// ===================================================
471465
// DEPLOY PRIVATE DNS ZONES
@@ -1575,6 +1569,9 @@ module webSiteBackend 'modules/web-sites.bicep' = {
15751569
SOLUTION_NAME: solutionSuffix
15761570
APP_ENV: 'Prod'
15771571
AZURE_CLIENT_ID: backendUserAssignedIdentity.outputs.clientId
1572+
AZURE_BASIC_LOGGING_LEVEL: 'INFO'
1573+
AZURE_PACKAGE_LOGGING_LEVEL: 'WARNING'
1574+
AZURE_LOGGING_PACKAGES: ''
15781575
}
15791576
// WAF aligned configuration for Monitoring
15801577
applicationInsightResourceId: enableMonitoring ? applicationInsights!.outputs.resourceId : null

0 commit comments

Comments
 (0)