Skip to content

Commit 960978a

Browse files
Merge pull request #288 from microsoft/ve-networkchanges
fix: Optimize Network Module Deployment & Apply WAF Standardization fixes
2 parents e1d41bd + b274954 commit 960978a

File tree

10 files changed

+12644
-4282
lines changed

10 files changed

+12644
-4282
lines changed

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ jobs:
144144
--resource-group ${{ env.RESOURCE_GROUP_NAME }} \
145145
--template-file infra/main.json \
146146
--parameters \
147-
environmentName="${{ env.ENVIRONMENT_NAME }}" \
147+
solutionName="${{ env.ENVIRONMENT_NAME }}" \
148148
enablePrivateNetworking="false" \
149149
secondaryLocation="eastus2" \
150150
contentUnderstandingLocation="WestUS" \
151151
deploymentType="GlobalStandard" \
152152
gptModelName="gpt-4o" \
153153
gptModelVersion="2024-08-06" \
154154
gptDeploymentCapacity="30" \
155-
aiDeploymentsLocation="${{ env.AZURE_LOCATION }}" \
155+
aiServiceLocation="${{ env.AZURE_LOCATION }}" \
156156
tags="{'CreatedBy':'Pipeline', 'SecurityControl':'Ignore','Purpose':'Deploying and Cleaning Up Resources for Validation','CreatedDate':'$current_date'}" \
157157
--query "properties.outputs" -o json); then
158158
echo "❌ Deployment failed. See logs above."

docs/ConfigureAppAuthentication.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
1313

1414
1. Add Authentication Provider in Web Application
1515

16-
- Go to deployed Container App and select `ca-cps-<randomname>-web` and click **Add Identity Provider** button in Authentication.
16+
- Go to deployed Container App and select `ca-<randomname>-web` and click **Add Identity Provider** button in Authentication.
1717
![add_auth_provider_web_1](./images/add_auth_provider_web_1.png)
1818

1919
- Select **Microsoft** and set **Client secret expiration**, then click **Add** button.
@@ -29,7 +29,7 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
2929

3030
1. Add Authentication Provider in API Service
3131

32-
- Go to deployed Container App and select `ca-cps-<randomname>-api` and click **Add Identity Provider** button in Authentication.
32+
- Go to deployed Container App and select `ca-<randomname>-api` and click **Add Identity Provider** button in Authentication.
3333
![add_auth_provider_api_1](./images/add_auth_provider_api_1.png)
3434

3535
- Select **Microsoft** and set **Client secret expiration**.
@@ -42,7 +42,7 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
4242

4343
1. Set Redirect URI in Single Page Application Platform
4444

45-
- Go to deployed Container App `ca-cps-<randomname>-web` and select **Authentication** menu, then select created Application Registration.
45+
- Go to deployed Container App `ca-<randomname>-web` and select **Authentication** menu, then select created Application Registration.
4646
![configure_app_registration_web_1](./images/configure_app_registration_web_1.png)
4747

4848
- Select **Authentication**, then select **+ Add a platform** menu.
@@ -51,15 +51,15 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
5151
- Select **Single-page application**.
5252
![configure_app_registration_web_3](./images/configure_app_registration_web_3.png)
5353

54-
- Add Container App `ca-cps-<randomname>-web`'s URL.
54+
- Add Container App `ca-<randomname>-web`'s URL.
5555
![configure_app_registration_web_4](./images/configure_app_registration_web_4.png)
5656

5757
- You may get this URL from here in your Container App.
5858
![configure_app_registration_web_5](./images/configure_app_registration_web_5.png)
5959

6060
2. Add Permission and Grant Permission
6161

62-
- Add Permission for API application. Select **+ Add a permission** button, then search API application with name `ca-cps-<randomname>-api`.
62+
- Add Permission for API application. Select **+ Add a permission** button, then search API application with name `ca-<randomname>-api`.
6363
![configure_app_registration_web_6](./images/configure_app_registration_web_6.png)
6464
![configure_app_registration_web_7](./images/configure_app_registration_web_7.png)
6565

@@ -86,7 +86,7 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
8686

8787
1. Grab Scope Name for Impersonation
8888

89-
- Go to deployed Container App `ca-cps-<randomname>-api` and select **Authentication** menu, then select created Application Registration.
89+
- Go to deployed Container App `ca-<randomname>-api` and select **Authentication** menu, then select created Application Registration.
9090
![configure_app_registration_api_1](./images/configure_app_registration_api_1.png)
9191

9292
- Select **Expose an API** in the left menu. Copy the Scope name, then paste it in some temporary place.
@@ -95,7 +95,7 @@ We will add Microsoft Entra ID as an authentication provider to API and Web Appl
9595

9696
## Step 4: Add Web Application's Client Id to Allowed Client Applications List in API Application Registration
9797

98-
1. Go to the deployed Container App `ca-cps-<randomname>-api`, select **Authentication**, and then click **Edit**.
98+
1. Go to the deployed Container App `ca-<randomname>-api`, select **Authentication**, and then click **Edit**.
9999
![add_client_id_to_api_1](./images/add_client_id_to_api_1.png)
100100

101101
2. Select **Allow requests from specific client applications**, then click the **pencil** icon to add the Client Id.

0 commit comments

Comments
 (0)