Skip to content

Commit e240625

Browse files
authored
Merge pull request #243001 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents f2b3306 + edcbf99 commit e240625

37 files changed

+232
-109
lines changed

articles/active-directory/conditional-access/concept-continuous-access-evaluation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Token expiration and refresh are a standard mechanism in the industry. When a cl
2121

2222
Customers have expressed concerns about the lag between when conditions change for a user, and when policy changes are enforced. Azure AD has experimented with the "blunt object" approach of reduced token lifetimes but found they can degrade user experiences and reliability without eliminating risks.
2323

24-
Timely response to policy violations or security issues really requires a "conversation" between the token issuer (Azure AD), and the relying party (enlightened app). This two-way conversation gives us two important capabilities. The relying party can see when properties change, like network location, and tell the token issuer. It also gives the token issuer a way to tell the relying party to stop respecting tokens for a given user because of account compromise, disablement, or other concerns. The mechanism for this conversation is continuous access evaluation (CAE). The goal for critical event evaluation is for response to be near real time, but latency of up to 15 minutes may be observed because of event propagation time; however, IP locations policy enforcement is instant.
24+
Timely response to policy violations or security issues really requires a "conversation" between the token issuer (Azure AD), and the relying party (enlightened app). This two-way conversation gives us two important capabilities. The relying party can see when properties change, like network location, and tell the token issuer. It also gives the token issuer a way to tell the relying party to stop respecting tokens for a given user because of account compromise, disablement, or other concerns. The mechanism for this conversation is continuous access evaluation (CAE), an industry standard based on [Open ID Continuous Access Evaluation Profile (CAEP)](https://openid.net/specs/openid-caep-specification-1_0-01.html). The goal for critical event evaluation is for response to be near real time, but latency of up to 15 minutes may be observed because of event propagation time; however, IP locations policy enforcement is instant.
2525

2626
The initial implementation of continuous access evaluation focuses on Exchange, Teams, and SharePoint Online.
2727

articles/active-directory/conditional-access/concept-filter-for-applications.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Follow the instructions in the article, [Add or deactivate custom security attri
5757
:::image type="content" source="media/concept-filter-for-applications/custom-attributes.png" alt-text="A screenshot showing custom security attribute and predefined values in Azure AD." lightbox="media/concept-filter-for-applications/custom-attributes.png":::
5858

5959
> [!NOTE]
60-
> Conditional Access filters for devices only works with custom security attributes of type "string".
60+
> Conditional Access filters for devices only works with custom security attributes of type "string". Custom Security Attributes support creation of Boolean data type but Conditional Access Policy only supports "string".
6161
6262
## Create a Conditional Access policy
6363

articles/active-directory/devices/faq.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ sections:
6060
- User disables the device from the My Apps portal.
6161
- An administrator (or user) deletes or disables the device in the Azure portal or by using PowerShell
6262
- Hybrid Azure AD joined only: An administrator removes the devices OU out of sync scope resulting in the devices being deleted from Azure AD
63+
- Hybrid Azure AD joined only: An administrator disables the computer account on premises, resulting in the device being disabled in Azure AD
6364
- Upgrading Azure AD connect to the version 1.4.xx.x. [Understanding Azure AD Connect 1.4.xx.x and device disappearance](/troubleshoot/azure/active-directory/reference-connect-device-disappearance).
6465
6566

articles/aks/csi-migrate-in-tree-volumes.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,10 +279,11 @@ Before proceeding, verify the following:
279279
DISK_URI="$(kubectl get pv $PV -n $NAMESPACE -o jsonpath='{.spec.azureDisk.diskURI}')"
280280
TARGET_RESOURCE_GROUP="$(cut -d'/' -f5 <<<"$DISK_URI")"
281281
echo $DISK_URI
282+
SUBSCRIPTION_ID="$(echo $DISK_URI | grep -o 'subscriptions/[^/]*' | sed 's#subscriptions/##g')"
282283
echo $TARGET_RESOURCE_GROUP
283284
PERSISTENT_VOLUME_RECLAIM_POLICY="$(kubectl get pv $PV -n $NAMESPACE -o jsonpath='{.spec.persistentVolumeReclaimPolicy}')"
284-
az snapshot create --resource-group $TARGET_RESOURCE_GROUP --name $PVC-$FILENAME --source "$DISK_URI"
285-
SNAPSHOT_PATH=$(az snapshot list --resource-group $TARGET_RESOURCE_GROUP --query "[?name == '$PVC-$FILENAME'].id | [0]")
285+
az snapshot create --resource-group $TARGET_RESOURCE_GROUP --name $PVC-$FILENAME --source "$DISK_URI" --subscription ${SUBSCRIPTION_ID}
286+
SNAPSHOT_PATH=$(az snapshot list --resource-group $TARGET_RESOURCE_GROUP --query "[?name == '$PVC-$FILENAME'].id | [0]" --subscription ${SUBSCRIPTION_ID})
286287
SNAPSHOT_HANDLE=$(echo "$SNAPSHOT_PATH" | tr -d '"')
287288
echo $SNAPSHOT_HANDLE
288289
sleep 10

articles/aks/dapr-settings.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,10 +199,10 @@ az k8s-extension upgrade --cluster-type managedClusters \
199199
--resource-group myResourceGroup \
200200
--name dapr \
201201
--extension-type Microsoft.Dapr \
202-
--set global.tag=1.10.0-AzureLinux
202+
--set global.tag=1.10.0-mariner
203203
```
204204

205-
- [Learn more about using AzureLinux-based images with Dapr][dapr-azurelinux].
205+
- [Learn more about using Mariner-based images with Dapr][dapr-mariner].
206206
- [Learn more about deploying AzureLinux on AKS][aks-azurelinux].
207207

208208

@@ -262,4 +262,4 @@ Once you have successfully provisioned Dapr in your AKS cluster, try deploying a
262262
[dapr-supported-version]: https://docs.dapr.io/operations/support/support-release-policy/#supported-versions
263263
[dapr-troubleshooting]: https://docs.dapr.io/operations/troubleshooting/common_issues/
264264
[supported-cloud-regions]: https://azure.microsoft.com/global-infrastructure/services/?products=azure-arc
265-
[dapr-azurelinux]: https://docs.dapr.io/operations/hosting/kubernetes/kubernetes-deploy/#using-azurelinux-based-images
265+
[dapr-mariner]: https://docs.dapr.io/operations/hosting/kubernetes/kubernetes-deploy/#using-mariner-based-images

articles/app-service/configure-authentication-provider-openid-connect.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ You can configure your app to use one or more OIDC providers. Each must be given
1919
Your provider will require you to register the details of your application with it. One of these steps involves specifying a redirect URI. This redirect URI will be of the form `<app-url>/.auth/login/<provider-name>/callback`. Each identity provider should provide more instructions on how to complete these steps. `<provider-name>` will refer to the friendly name you give to the OpenID provider name in Azure.
2020

2121
> [!NOTE]
22-
> Some providers may require additional steps for their configuration and how to use the values they provide. For example, Apple provides a private key which is not itself used as the OIDC client secret, and you instead must use it craft a JWT which is treated as the secret you provide in your app config (see the "Creating the Client Secret" section of the [Sign in with Apple documentation](https://developer.apple.com/documentation/sign_in_with_apple/generate_and_validate_tokens))
22+
> Some providers may require additional steps for their configuration and how to use the values they provide. For example, Apple provides a private key which is not itself used as the OIDC client secret, and you instead must use it to craft a JWT which is treated as the secret you provide in your app config (see the "Creating the Client Secret" section of the [Sign in with Apple documentation](https://developer.apple.com/documentation/sign_in_with_apple/generate_and_validate_tokens))
2323
>
2424
2525
You will need to collect a **client ID** and **client secret** for your application.

articles/azure-maps/how-to-use-services-module.md

Lines changed: 82 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
---
2-
title: Use the Azure Maps Services module | Microsoft Azure Maps
2+
title: Use the Azure Maps Services module
3+
titleSuffix: Microsoft Azure Maps
34
description: Learn about the Azure Maps services module. See how to load and use this helper library to access Azure Maps REST services in web or Node.js applications.
4-
author: eriklindeman
5-
ms.author: eriklind
6-
ms.date: 03/25/2019
5+
author: dubiety
6+
ms.author: yuchungchen
7+
ms.date: 06/26/2023
78
ms.topic: how-to
89
ms.service: azure-maps
910
services: azure-maps
@@ -34,7 +35,7 @@ The Azure Maps Web SDK provides a *services module*. This module is a helper lib
3435
import * as service from "azure-maps-rest";
3536
```
3637

37-
1. Create an authentication pipeline. The pipeline must be created before you can initialize a service URL client endpoint. Use your own Azure Maps account key or Azure Active Directory (Azure AD) credentials to authenticate an Azure Maps Search service client. In this example, the Search service URL client will be created.
38+
1. Create an authentication pipeline. The pipeline must be created before you can initialize a service URL client endpoint. Use your own Azure Maps account key or Azure Active Directory (Azure AD) credentials to authenticate an Azure Maps Search service client. In this example, the Search service URL client will be created.
3839

3940
If you use a subscription key for authentication:
4041

@@ -150,16 +151,85 @@ The Azure Maps Web SDK provides a *services module*. This module is a helper lib
150151
});
151152
```
152153

153-
Here's the full, running code sample:
154+
Here's the full, running code sample:
154155
155-
<br/>
156+
```javascript
157+
<html>
158+
<head>
159+
160+
<script src="https://atlas.microsoft.com/sdk/javascript/service/2/atlas-service.min.js"></script>
161+
162+
<script type="text/javascript">
163+
164+
// Get an Azure Maps key at https://azure.com/maps.
165+
var subscriptionKey = '{Your-Azure-Maps-Subscription-key}';
166+
167+
// Use SubscriptionKeyCredential with a subscription key.
168+
var subscriptionKeyCredential = new atlas.service.SubscriptionKeyCredential(subscriptionKey);
169+
170+
// Use subscriptionKeyCredential to create a pipeline.
171+
var pipeline = atlas.service.MapsURL.newPipeline(subscriptionKeyCredential, {
172+
retryOptions: { maxTries: 4 } // Retry options
173+
});
156174
175+
// Create an instance of the SearchURL client.
176+
var searchURL = new atlas.service.SearchURL(pipeline);
177+
178+
// Search for "1 microsoft way, redmond, wa".
179+
searchURL.searchAddress(atlas.service.Aborter.timeout(10000), '1 microsoft way, redmond, wa')
180+
.then(response => {
181+
var html = [];
182+
183+
// Display the total results.
184+
html.push('Total results: ', response.summary.numResults, '<br/><br/>');
185+
186+
// Create a table of the results.
187+
html.push('<table><tr><td></td><td>Result</td><td>Latitude</td><td>Longitude</td></tr>');
188+
189+
for(var i=0;i<response.results.length;i++){
190+
html.push('<tr><td>', (i+1), '.</td><td>',
191+
response.results[i].address.freeformAddress,
192+
'</td><td>',
193+
response.results[i].position.lat,
194+
'</td><td>',
195+
response.results[i].position.lon,
196+
'</td></tr>');
197+
}
198+
199+
html.push('</table>');
200+
201+
// Add the resulting HTML to the body of the page.
202+
document.body.innerHTML = html.join('');
203+
});
204+
205+
</script>
206+
</head>
207+
208+
<style>
209+
table {
210+
border: 1px solid black;
211+
border-collapse: collapse;
212+
}
213+
td, th {
214+
border: 1px solid black;
215+
padding: 5px;
216+
}
217+
</style>
218+
219+
<body> </body>
220+
221+
</html>
222+
```
223+
224+
The following image is a screenshot showing the results of this sample code, a table with the address searched for, along with the resulting coordinates.
225+
226+
:::image type="content" source="./media/how-to-use-services-module/services-module-in-webpage.png"alt-text="A screenshot of an HTML table showing the address searched and the resulting coordinates.":::
227+
228+
<!-------------------------------------------------------
157229
<iframe height="500" scrolling="no" title="Using the Services Module" src="//codepen.io/azuremaps/embed/zbXGMR/?height=500&theme-id=0&default-tab=js,result&editable=true" frameborder='no' loading="lazy" allowtransparency="true" allowfullscreen="true">
158230
See the Pen <a href='https://codepen.io/azuremaps/pen/zbXGMR/'>Using the Services Module</a> by Azure Maps
159-
(<a href='https://codepen.io/azuremaps'>@azuremaps</a>) on <a href='https://codepen.io'>CodePen</a>.
160-
</iframe>
161-
162-
<br/>
231+
(<a href='https://codepen.io/azuremaps'>@azuremaps</a>) on <a href='https://codepen.io'>CodePen</a>.</iframe>
232+
--------------------------------------------------------->
163233

164234
## Azure Government cloud support
165235

@@ -209,4 +279,4 @@ For more code samples that use the services module, see these articles:
209279
> [Get information from a coordinate](./map-get-information-from-coordinate.md)
210280
211281
> [!div class="nextstepaction"]
212-
> [Show directions from A to B](./map-route.md)
282+
> [Show directions from A to B](./map-route.md)

articles/azure-maps/map-accessibility.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ Any additional information that is placed on the base map should have correspond
118118

119119
A marker or symbol is often used to represent a location on the map. Additional information about the location is typically displayed in a popup when the user interacts with the marker. In most applications, popups appear when a user selects a marker. However, clicking and tapping require the user to use a mouse and a touch screen, respectively. A good practice is to make popups accessible when using a keyboard. This functionality can be achieved by creating a popup for each data point and adding it to the map.
120120

121-
The [Accessible popups] example loads points of interests on the map using a symbol layer and adds a popup to the map for each point of interest. A reference to each popup is stored in the properties of each data point. It can also be retrieved for a marker, such as when a marker is selected. When focused on the map, pressing the tab key allows the user to step through each popup on the map.
121+
The [Accessible popups] example loads points of interests on the map using a symbol layer and adds a popup to the map for each point of interest. A reference to each popup is stored in the properties of each data point. It can also be retrieved for a marker, such as when a marker is selected. When focused on the map, pressing the tab key allows the user to step through each popup on the map. For the source code for this sample, see [Accessible popups source code].
122122

123123
:::image type="content" source="./media/map-accessibility/accessible-popups.png" alt-text="A screenshot showing a maps with accessible popups.":::
124124

@@ -179,5 +179,6 @@ Take a look at these useful accessibility tools:
179179
> [No Coffee Vision Simulator](https://uxpro.cc/toolbox/nocoffee/)
180180
181181
[Accessible popups]: https://samples.azuremaps.com/popups/accessible-popups
182+
[Accessible popups source code]: https://github.com/Azure-Samples/AzureMapsCodeSamples/blob/main/Samples/Popups/Accessible%20popups/Accessible%20popups.html
182183
[Accessibility Conformance Reports]: https://cloudblogs.microsoft.com/industry-blog/government/2018/09/11/accessibility-conformance-reports/
183184
[Accessible Rich Internet Applications (ARIA)]: https://www.w3.org/WAI/standards-guidelines/aria/

articles/azure-maps/map-add-bubble-layer.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ This code shows you how to use a bubble layer to render a point on the map and a
120120

121121
## Customize a bubble layer
122122

123-
The Bubble layer only has a few styling options. Use the [Bubble Layer Options] sample to try them out.
123+
The Bubble layer only has a few styling options. Use the [Bubble Layer Options] sample to try them out. For the source code for this sample, see [Bubble Layer Options source code].
124124

125125
:::image type="content" source="./media/map-add-bubble-layer/bubble-layer-options.png" alt-text="Screenshot showing a the Bubble Layer Options sample that shows a map with bubbles and selectable bubble layer options to the left of the map.":::
126126

@@ -156,4 +156,5 @@ See the following articles for more code samples to add to your maps:
156156
> [Code samples](/samples/browse/?products=azure-maps)
157157
158158
[Bubble Layer Options]: https://samples.azuremaps.com/bubble-layer/bubble-layer-options
159+
[Bubble Layer Options source code]: https://github.com/Azure-Samples/AzureMapsCodeSamples/blob/main/Samples/Bubble%20Layer/Bubble%20Layer%20Options/Bubble%20Layer%20Options.html
159160
[bubble layer]: /javascript/api/azure-maps-control/atlas.layer.bubblelayer

articles/azure-maps/map-add-controls.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ The style picker control is defined by the [StyleControl] class. For more inform
9393

9494
## Customize controls
9595

96-
The [Navigation Control Options] sample is a tool to test out the various options for customizing the controls.
96+
The [Navigation Control Options] sample is a tool to test out the various options for customizing the controls. For the source code for this sample, see [Navigation Control Options source code].
9797

9898
:::image type="content" source="./media/map-add-controls/map-navigation-control-options.png" alt-text="Screenshot showing the Map Navigation Control Options sample, which contains a map displaying zoom, compass, pitch and style controls and options on the left side of the screen that enable you to change the Control Position, Control Style, Zoom Delta, Pitch Delta, Compass Rotation Delta, Picker Styles, and Style Picker Layout properties.":::
9999

@@ -146,6 +146,7 @@ See the following articles for full code:
146146
[CompassControl]: /javascript/api/azure-maps-control/atlas.control.compasscontrol
147147
[StyleControl]: /javascript/api/azure-maps-control/atlas.control.stylecontrol
148148
[Navigation Control Options]: https://samples.azuremaps.com/controls/map-navigation-control-options
149+
[Navigation Control Options source code]: https://github.com/Azure-Samples/AzureMapsCodeSamples/blob/main/Samples/Controls/Map%20Navigation%20Control%20Options/Map%20Navigation%20Control%20Options.html
149150
[choose a map style]: choose-map-style.md
150151
[Add a pin]: map-add-pin.md
151152
[Add a popup]: map-add-popup.md

0 commit comments

Comments
 (0)