Skip to content

Commit 423a27f

Browse files
ttorblettorble
authored
Merge pull request #286258 from MicrosoftDocs/main
Publish to live, Friday 4 AM PST, 9/6
2 parents 99d45f3 + f931273 commit 423a27f

22 files changed

+86
-49
lines changed

‎articles/application-gateway/tcp-tls-proxy-overview.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: application-gateway
55
author: greg-lindsay
66
ms.service: azure-application-gateway
77
ms.topic: concept-article
8-
ms.date: 03/12/2024
8+
ms.date: 09/06/2024
99
ms.author: greglin
1010
---
1111

@@ -47,6 +47,7 @@ Process flow:
4747
- A WAF v2 SKU gateway allows the creation of TLS or TCP listeners and backends to support HTTP and non-HTTP traffic through the same resource. However, it does not inspect traffic on TLS and TCP listeners for exploits and vulnerabilities.
4848
- The default [draining timeout](configuration-http-settings.md#connection-draining) value for backend servers is 30 seconds. At present, a user-defined draining value is not supported.
4949
- Client IP preservation is currently not supported.
50+
- Application Gateway Ingress Controller (AGIC) is not supported and works only with L7 proxy through HTTP(S) listeners.
5051

5152
## Next steps
5253

‎articles/azure-functions/start-stop-vms/deploy.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ For each scenario, you can target the action against one or more subscriptions,
141141

142142
:::image type="content" source="media/deploy/schedule-recurrence-property.png" alt-text="Configure the recurrence frequency for logic app":::
143143

144-
> [!NOTE]
145-
> If you do not provide a start date and time for the first recurrence, a recurrence will immediately run when you save the logic app, which might cause the VMs to start or stop before the scheduled run.
144+
> [!NOTE]
145+
> If you do not provide a start date and time for the first recurrence, a recurrence will immediately run when you save the logic app, which might cause the VMs to start or stop before the scheduled run.
146146
147147
1. In the designer pane, select **Function-Try** to configure the target settings. In the request body, if you want to manage VMs across all resource groups in the subscription, modify the request body as shown in the following example.
148148

@@ -241,8 +241,8 @@ In an environment that includes two or more components on multiple Azure Resourc
241241

242242
:::image type="content" source="media/deploy/schedule-recurrence-property.png" alt-text="Configure the recurrence frequency for logic app":::
243243

244-
> [!NOTE]
245-
> If you do not provide a start date and time for the first recurrence, a recurrence will immediately run when you save the logic app, which might cause the VMs to start or stop before the scheduled run.
244+
> [!NOTE]
245+
> If you do not provide a start date and time for the first recurrence, a recurrence will immediately run when you save the logic app, which might cause the VMs to start or stop before the scheduled run.
246246

247247
1. In the designer pane, select **Function-Try** to configure the target settings and then select the **</> Code view** button in the top menu to edit the code for the **Function-Try** element. In the request body, if you want to manage VMs across all resource groups in the subscription, modify the request body as shown in the following example.
248248

‎articles/azure-functions/start-stop-vms/overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ This new version of Start/Stop VMs v2 provides a decentralized low-cost automati
1616

1717
## Important Start/Stop VMs v2 Updates
1818

19-
> + No further development, enhancements, or updates will be available for Start/Stop V2 except when required to remain on supported versions of components and Azure services.
19+
> + No further development, enhancements, or updates will be available for Start/Stop v2 except when required to remain on supported versions of components and Azure services.
2020
>
21-
> + The TriggerAutoUpdate and UpdateStartStopV2 functions are now deprecated and will be removed in future updates to Start/Stop,V2. To update Start/Stop V2, we recommend that you stop the site, install to the latest version from our [GitHub repository](https://github.com/microsoft/startstopv2-deployments), and the start the site. No built-in notification system is available for updates. After an update to Start/Stop V2 becomes available, we will update the [readme.md](https://github.com/microsoft/startstopv2-deployments/blob/main/README.md) in the GitHub repository. Third-party Github file watchers might be available to enable you to be notified of changes. To disable the automatic update functionality, set the Function App's **AzureClientOptions:EnableAutoUpdate** [application setting](../functions-how-to-use-azure-function-app-settings.md?tabs=azure-portal%2Cto-premium#get-started-in-the-azure-portal) to **false**.
21+
> + The TriggerAutoUpdate and UpdateStartStopV2 functions are now deprecated and will be removed in the future. To update Start/Stop v2, we recommend that you stop the site, install to the latest version from our [GitHub repository](https://github.com/microsoft/startstopv2-deployments), and then start the site. To disable the automatic update functionality, set the Function App's **AzureClientOptions:EnableAutoUpdate** [application setting](../functions-how-to-use-azure-function-app-settings.md?tabs=azure-portal%2Cto-premium#get-started-in-the-azure-portal) to **false**. No built-in notification system is available for updates. After an update to Start/Stop v2 becomes available, we will update the [readme.md](https://github.com/microsoft/startstopv2-deployments/blob/main/README.md) in the GitHub repository. Third-party GitHub file watchers might be available to notify you of changes.
2222
>
23-
> + As of August 19, 2024. Start/Stop v2 has been updated to the [.NET 8 isolated worker model](../functions-versions.md?tabs=isolated-process%2Cv4&pivots=programming-language-csharp#languages).
23+
> + As of August 19, 2024, Start/Stop v2 has been updated to the [.NET 8 isolated worker model](../functions-versions.md?tabs=isolated-process%2Cv4&pivots=programming-language-csharp#languages).
2424
2525

2626
## Overview

‎articles/communication-services/concepts/includes/identifiers/identifiers-android.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ if (communicationIdentifier instanceof CommunicationUserIdentifier) {
125125
else if (communicationIdentifier instanceof MicrosoftTeamsUserIdentifier) {
126126
Log.i(tag, "Teams user: " + ((MicrosoftTeamsUserIdentifier)communicationIdentifier).getUserId());
127127
}
128+
else if (communicationIdentifier instanceof MicrosoftTeamsAppIdentifier) {
129+
Log.i(tag, "Teams app: " + (( MicrosoftTeamsAppIdentifier)communicationIdentifier).getAppId());
130+
}
128131
else if (communicationIdentifier instanceof PhoneNumberIdentifier) {
129132
Log.i(tag, "Phone number: " + ((PhoneNumberIdentifier)communicationIdentifier).getPhoneNumber());
130133
}
131-
else if (communicationIdentifier instanceof MicrosoftBotIdentifier) {
132-
Log.i(tag, "Microsoft bot: " + ((MicrosoftBotIdentifier)communicationIdentifier).getBotId());
133-
}
134134
else if (communicationIdentifier instanceof UnknownIdentifier) {
135135
Log.i(tag, "Unkown user: " + ((UnknownIdentifier)communicationIdentifier).getId());
136136
}

‎articles/communication-services/concepts/includes/identifiers/identifiers-ios.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ switch (communicationIdentifier)
113113
print(#"Communication user: \(communicationUser.id)"#)
114114
case let teamsUser as MicrosoftTeamsUserIdentifier:
115115
print(#"Teams user: \(teamsUser.UserId)"#)
116+
case let teamsApp as MicrosoftTeamsAppIdentifier:
117+
print(#"Teams app: \(teamsApp.appId)"#)
116118
case let phoneNumber as PhoneNumberIdentifier:
117119
print(#"Phone number: \(phoneNumber.PhoneNumber)"#)
118-
case let bot as MicrosoftBotIdentifier:
119-
print(#"Microsoft bot: \(bot.botId)"#)
120120
case let unknown as UnknownIdentifier:
121121
print(#"Unknown: \(unknown.Id)"#)
122122
@unknown default:

‎articles/communication-services/concepts/includes/identifiers/identifiers-java.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ if (communicationIdentifier instanceof CommunicationUserIdentifier) {
125125
else if (communicationIdentifier instanceof MicrosoftTeamsUserIdentifier) {
126126
System.out.println("Teams user: " + ((MicrosoftTeamsUserIdentifier)communicationIdentifier).getUserId());
127127
}
128+
else if (communicationIdentifier instanceof MicrosoftTeamsAppIdentifier) {
129+
Log.i(tag, "Teams app: " + (( MicrosoftTeamsAppIdentifier)communicationIdentifier).getAppId());
130+
}
128131
else if (communicationIdentifier instanceof PhoneNumberIdentifier) {
129132
System.out.println("Phone number: " + ((PhoneNumberIdentifier)communicationIdentifier).getPhoneNumber());
130133
}
131-
else if (communicationIdentifier instanceof MicrosoftBotIdentifier) {
132-
Log.i(tag, "Microsoft bot: " + ((MicrosoftBotIdentifier)communicationIdentifier).getBotId());
133-
}
134134
else if (communicationIdentifier instanceof UnknownIdentifier) {
135135
System.out.println("Unkown user: " + ((UnknownIdentifier)communicationIdentifier).getId());
136136
}

‎articles/communication-services/concepts/includes/identifiers/identifiers-js.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@ switch (communicationIdentifier.kind)
124124
// narrowed to MicrosoftTeamsUserKind
125125
console.log(`Teams user: ${communicationIdentifier.microsoftTeamsUserId}`);
126126
break;
127+
case "microsoftTeamsApp":
128+
// narrowed to MicrosoftTeamsAppIdentifier
129+
console.log(`Teams app: ${communicationIdentifier.teamsAppId}`);
130+
break;
127131
case "phoneNumber":
128132
// narrowed to PhoneNumberKind
129133
console.log(`Phone number: ${communicationIdentifier.phoneNumber}`);
@@ -132,10 +136,6 @@ switch (communicationIdentifier.kind)
132136
// narrowed to UnknownIdentifierKind
133137
console.log(`Unknown: ${communicationIdentifier.id}`);
134138
break;
135-
case "microsoftBot":
136-
// narrowed to MicrosoftBotIdentifier
137-
console.log(`Microsoft bot: ${communicationIdentifier.botId}`);
138-
break;
139139
default:
140140
// be careful here whether you want to throw because a new SDK version
141141
// can introduce new identifier types

‎articles/communication-services/concepts/includes/identifiers/identifiers-net.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,12 @@ switch (communicationIdentifier)
127127
case MicrosoftTeamsUserIdentifier teamsUser:
128128
Console.WriteLine($"Teams user: {teamsUser.UserId}");
129129
break;
130+
case MicrosoftTeamsAppIdentifier teamsApp:
131+
Console.WriteLine($"Teams app: {teamsApp.AppId}");
132+
break;
130133
case PhoneNumberIdentifier phoneNumber:
131134
Console.WriteLine($"Phone number: {phoneNumber.PhoneNumber}");
132135
break;
133-
case MicrosoftBotIdentifier bot:
134-
Console.WriteLine($"Microsoft bot: {bot.BotId}");
135-
break;
136136
case UnknownIdentifier unknown:
137137
Console.WriteLine($"Unknown: {unknown.Id}");
138138
break;

‎articles/communication-services/concepts/includes/identifiers/identifiers-python.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ match communication_identifier.kind:
121121
print(f"Communication user: {communication_identifier.properties['id']}")
122122
case CommunicationIdentifierKind.MICROSOFT_TEAMS_USER:
123123
print(f"Teams user: {communication_identifier.properties['user_id']}")
124+
case CommunicationIdentifierKind.MICROSOFT_TEAMS_APP:
125+
print(f"Teams app: {communication_identifier.properties['app_id']}")
124126
case CommunicationIdentifierKind.PHONE_NUMBER:
125127
print(f"Phone number: {communication_identifier.properties['value']}")
126-
case CommunicationIdentifierKind.MICROSOFT_BOT:
127-
print(f"Microsoft bot: {communication_identifier.properties['bot_id']}")
128128
case CommunicationIdentifierKind.UNKNOWN:
129129
print(f"Unknown: {communication_identifier.raw_id}")
130130
case _:

‎articles/communication-services/concepts/includes/identifiers/identifiers-rest.md

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,9 @@ switch (communicationIdentifier.kind)
207207
case "microsoftTeamsUser":
208208
console.log(`Teams user: ${communicationIdentifier.microsoftTeamsUser.userId}`);
209209
break;
210+
case "microsoftTeamsApp":
211+
console.log(`Teams user: ${communicationIdentifier.microsoftTeamsApp.appId}`);
212+
break;
210213
case "phoneNumber":
211214
console.log(`Phone number: ${communicationIdentifier.phoneNumber.value}`);
212215
break;
@@ -227,6 +230,8 @@ if (communicationIdentifier.communicationUser) {
227230
console.log(`Communication user: ${communicationIdentifier.communicationUser.id}`);
228231
} else if (communicationIdentifier.microsoftTeamsUser) {
229232
console.log(`Teams user: ${communicationIdentifier.microsoftTeamsUser.userId}`);
233+
} else if (communicationIdentifier.microsoftTeamsApp) {
234+
console.log(`Teams app: ${communicationIdentifier.microsoftTeamsApp.appId}`);
230235
} else if (communicationIdentifier.phoneNumber) {
231236
console.log(`Phone number: ${communicationIdentifier.phoneNumber.value}`);
232237
} else {
@@ -264,28 +269,28 @@ The raw ID is the same as `communicationUser.id`.
264269
```json
265270
{
266271
"microsoftTeamsUser": {
267-
"userId": "[aadUserId]"
272+
"userId": "[entraUserId]"
268273
}
269274
}
270275
```
271276
*Raw ID:*
272277

273-
`8:orgid:[aadUserId]`
278+
`8:orgid:[entraUserId]`
274279

275280
The raw ID is the Microsoft Entra user object ID prefixed with `8:orgid:`.
276281

277282
*Identifier:*
278283
```json
279284
{
280285
"microsoftTeamsUser": {
281-
"userId": "[aadUserId]",
286+
"userId": "[entraUserId]",
282287
"cloud": "gcch"
283288
}
284289
}
285290
```
286291
*Raw ID:*
287292

288-
`8:gcch:[aadUserId]`
293+
`8:gcch:[entraUserId]`
289294

290295
The raw ID is the Microsoft Entra user object ID prefixed with `8:gcch:` or `8:dod:` depending on the cloud environment.
291296

@@ -320,6 +325,37 @@ The raw ID is the Teams visitor ID prefixed with `8:teamsvisitor:`. The Teams vi
320325

321326
The raw ID is the E.164 formatted phone number prefixed with `4:`.
322327

328+
### Microsoft Teams app
329+
330+
*Identifier:*
331+
```json
332+
{
333+
"microsoftTeamsApp": {
334+
"appId": "[entraUserId]"
335+
}
336+
}
337+
```
338+
*Raw ID:*
339+
340+
`28:orgid:[entraUserId]`
341+
342+
The raw ID is the application's Entra user object ID prefixed with `28:orgid:`.
343+
344+
*Identifier:*
345+
```json
346+
{
347+
"microsoftTeamsUser": {
348+
"userId": "[entraUserId]",
349+
"cloud": "gcch"
350+
}
351+
}
352+
```
353+
*Raw ID:*
354+
355+
`28:gcch:[entraUserId]`
356+
357+
The raw ID is the application's Entra user object ID prefixed with `28:gcch:` or `28:dod:` depending on the cloud environment.
358+
323359
### Unknown
324360

325361
*Identifier:*

0 commit comments

Comments
 (0)