Skip to content

Commit 0e13309

Browse files
committed
Merge branch 'release-ignite-event-hubs-app-groups-ga' of https://github.com/MicrosoftDocs/azure-docs-pr into egriddr0923
2 parents ab948ce + 69fd1dd commit 0e13309

File tree

51 files changed

+2775
-505
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+2775
-505
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/iot-hub/iot-hub-rm-template.md",
5+
"redirect_url": "articles/iot-hub/iot-hub-rm-rest",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/visual-studio/vs-storage-cloud-services-getting-started-blobs.md",
510
"redirect_url": "/previous-versions/azure/visual-studio/vs-storage-cloud-services-getting-started-blobs",

articles/active-directory/devices/howto-vm-sign-in-azure-ad-linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ To improve the security of Linux virtual machines (VMs) in Azure, you can integr
2222
This article shows you how to create and configure a Linux VM and log in with Azure AD by using OpenSSH certificate-based authentication.
2323

2424
> [!IMPORTANT]
25-
> This capability is now generally available. The previous version that made use of device code flow was [deprecated on August 15, 2021](../../virtual-machines/linux/login-using-aad.md). To migrate from the old version to this version, see the section [Migrate from the previous (preview) version](#migrate-from-the-previous-preview-version).
25+
> This capability is now generally available. The previous version that made use of device code flow was [deprecated on August 15, 2021](/azure-docs-archive-pr/virtual-machines/linux/login-using-aad). To migrate from the old version to this version, see the section [Migrate from the previous (preview) version](#migrate-from-the-previous-preview-version).
2626
2727
There are many security benefits of using Azure AD with OpenSSH certificate-based authentication to log in to Linux VMs in Azure. They include:
2828

articles/active-directory/devices/howto-vm-sign-in-azure-ad-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ To configure role assignments for your Azure AD-enabled Windows Server 2019 Data
200200

201201
The following example uses [az role assignment create](/cli/azure/role/assignment#az-role-assignment-create) to assign the Virtual Machine Administrator Login role to the VM for your current Azure user. You obtain the username of your current Azure account by using [az account show](/cli/azure/account#az-account-show), and you set the scope to the VM created in a previous step by using [az vm show](/cli/azure/vm#az-vm-show).
202202

203-
You can also assign the scope at a resource group or subscription level. Normal Azure RBAC inheritance permissions apply. For more information, see [Log in to a Linux virtual machine in Azure by using Azure Active Directory authentication](../../virtual-machines/linux/login-using-aad.md).
203+
You can also assign the scope at a resource group or subscription level. Normal Azure RBAC inheritance permissions apply. For more information, see [Log in to a Linux virtual machine in Azure by using Azure Active Directory authentication](/azure-docs-archive-pr/virtual-machines/linux/login-using-aad).
204204

205205
```AzureCLI
206206
$username=$(az account show --query user.name --output tsv)

articles/active-directory/fundamentals/secure-with-azure-ad-resource-management.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,14 +310,14 @@ When a requirement exists to deploy IaaS workloads to Azure that require identit
310310

311311
![Diagram that shows Azure AD authentication to Azure VMs.](media/secure-with-azure-ad-resource-management/sign-into-vm.png)
312312

313-
**Supported operating systems**: Signing into virtual machines in Azure using Azure AD authentication is currently supported in Windows and Linux. For more specifics on supported operating systems, refer to the documentation for [Windows](../devices/howto-vm-sign-in-azure-ad-windows.md) and [Linux](../../virtual-machines/linux/login-using-aad.md).
313+
**Supported operating systems**: Signing into virtual machines in Azure using Azure AD authentication is currently supported in Windows and Linux. For more specifics on supported operating systems, refer to the documentation for [Windows](../devices/howto-vm-sign-in-azure-ad-windows.md) and [Linux](/azure-docs-archive-pr/virtual-machines/linux/login-using-aad).
314314

315315
**Credentials**: One of the key benefits of signing into virtual machines in Azure using Azure AD authentication is the ability to use the same federated or managed Azure AD credentials that you normally use for access to Azure AD services for sign-in to the virtual machine.
316316

317317
>[!NOTE]
318318
>The Azure AD tenant that is used for sign-in in this scenario is the Azure AD tenant that is associated with the subscription that the virtual machine has been provisioned into. This Azure AD tenant can be one that has identities synchronized from on-premises AD DS. Organizations should make an informed choice that aligns with their isolation principals when choosing which subscription and Azure AD tenant they wish to use for sign-in to these servers.
319319
320-
**Network Requirements**: These virtual machines will need to access Azure AD for authentication so you must ensure that the virtual machines network configuration permits outbound access to Azure AD endpoints on 443. See the documentation for [Windows](../devices/howto-vm-sign-in-azure-ad-windows.md) and [Linux](../../virtual-machines/linux/login-using-aad.md) for more information.
320+
**Network Requirements**: These virtual machines will need to access Azure AD for authentication so you must ensure that the virtual machines network configuration permits outbound access to Azure AD endpoints on 443. See the documentation for [Windows](../devices/howto-vm-sign-in-azure-ad-windows.md) and [Linux](/azure-docs-archive-pr/virtual-machines/linux/login-using-aad) for more information.
321321

322322
**Role-based Access Control (RBAC)**: Two RBAC roles are available to provide the appropriate level of access to these virtual machines. These RBAC roles can be configured via the Azure AD Portal or via the Azure Cloud Shell Experience. For more information, see [Configure role assignments for the VM](../devices/howto-vm-sign-in-azure-ad-windows.md).
323323

articles/azure-arc/data/preview-testing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ To install a pre-release version, follow these pre-requisite instructions:
5858
If you use the Azure CLI extension:
5959

6060
- Uninstall the Azure CLI extension (`az extension remove -n arcdata`).
61-
- Download the latest pre-release Azure CLI extension `.whl` file from [https://aka.ms/az-cli-arcdata-ext](https://aka.ms/az-cli-arcdata-ext).
61+
- Download the latest pre-release Azure CLI extension `.whl` file from the link in the [Current preview release information](#Current preview release information)
6262
- Install the latest pre-release Azure CLI extension (`az extension add -s <location of downloaded .whl file>`).
6363

6464
If you use the Azure Data Studio extension to install:
6565

6666
- Uninstall the Azure Data Studio extension. Select the Extensions panel and select on the **Azure Arc** extension, select **Uninstall**.
67-
- Download the latest pre-release Azure Data Studio extension .vsix files from [https://aka.ms/ads-arcdata-ext](https://aka.ms/ads-arcdata-ext) and [https://aka.ms/ads-azcli-ext](https://aka.ms/ads-azcli-ext).
67+
- Download the latest pre-release Azure Data Studio extension .vsix files from the links in the [Current preview release information](#Current preview release information)
6868
- Install the extensions by choosing File -> Install Extension from VSIX package and then browsing to the download location of the .vsix files. Install the `azcli` extension first and then `arc`.
6969

7070
### Install using Azure CLI

articles/azure-maps/quick-android-map.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Microsoft Azure Maps
44
description: 'Quickstart: Learn how to create an Android app using the Azure Maps Android SDK.'
55
author: stevemunk
66
ms.author: v-munksteve
7-
ms.date: 02/09/2022
7+
ms.date: 09/22/2022
88
ms.topic: quickstart
99
ms.service: azure-maps
1010
services: azure-maps
@@ -120,7 +120,17 @@ The next step in building your application is to install the Azure Maps Android
120120
121121
:::image type="content" source="./media/quick-android-map/project-settings-file.png" alt-text="A screenshot of the project settings file in Android Studio.":::
122122
123-
3. Open the application **build.gradle** file and do the following:
123+
3. Open the project's **gradle.properties** file, verify that `android.useAndroidX` and `android.enableJetifier` are both set to `true`.
124+
125+
If the **gradle.properties** file does not include `android.useAndroidX` and `android.enableJetifier`, add the next two lines to the end of the file:
126+
127+
```gradle
128+
android.useAndroidX=true
129+
android.enableJetifier=true
130+
```
131+
132+
133+
4. Open the application **build.gradle** file and do the following:
124134

125135
1. Verify your project's **minSdk** is **21** or higher.
126136

@@ -143,7 +153,7 @@ The next step in building your application is to install the Azure Maps Android
143153
144154
:::image type="content" source="./media/quick-android-map/build-gradle-file.png" alt-text="A screenshot showing the application build dot gradle file in Android Studio.":::
145155
146-
4. Add a map fragment to the main activity:
156+
5. Add a map fragment to the main activity:
147157
148158
```xml
149159
<com.azure.android.maps.control.MapControl
@@ -159,7 +169,7 @@ The next step in building your application is to install the Azure Maps Android
159169
160170
::: zone pivot="programming-language-java-android"
161171
162-
5. In the **MainActivity.java** file you'll need to:
172+
6. In the **MainActivity.java** file you'll need to:
163173
164174
* Add imports for the Azure Maps SDK.
165175
* Set your Azure Maps authentication information.
@@ -267,7 +277,7 @@ The next step in building your application is to install the Azure Maps Android
267277
268278
::: zone pivot="programming-language-kotlin"
269279
270-
5. In the **MainActivity.kt** file you'll need to:
280+
7. In the **MainActivity.kt** file you'll need to:
271281
272282
* add imports for the Azure Maps SDK
273283
* set your Azure Maps authentication information
@@ -373,7 +383,7 @@ The next step in building your application is to install the Azure Maps Android
373383
374384
::: zone-end
375385
376-
6. Select the run button from the toolbar, as shown in the following image (or press `Control` + `R` on a Mac), to build your application.
386+
8. Select the run button from the toolbar, as shown in the following image (or press `Control` + `R` on a Mac), to build your application.
377387
378388
:::image type="content" source="media/quick-android-map/run-app.png" alt-text="A screenshot showing the run button in Android Studio.":::
379389

articles/azure-resource-manager/bicep/bicep-config-linter.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Linter settings for Bicep config
33
description: Describes how to customize configuration values for the Bicep linter
44
ms.topic: conceptual
5-
ms.date: 09/21/2022
5+
ms.date: 09/23/2022
66
---
77

88
# Add linter settings in the Bicep config file
@@ -89,6 +89,9 @@ The following example shows the rules that are available for configuration.
8989
"use-protectedsettings-for-commandtoexecute-secrets": {
9090
"level": "warning"
9191
},
92+
"use-resource-id-functions": {
93+
"level": "warning"
94+
},
9295
"use-stable-resource-identifiers": {
9396
"level": "warning"
9497
},

articles/azure-resource-manager/bicep/linter-rule-no-hardcoded-location.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
title: Linter rule - no hard-coded locations
3-
description: Linter rule - no hard-coded locations
2+
title: Linter rule - no hardcoded locations
3+
description: Linter rule - no hardcoded locations
44
ms.topic: conceptual
55
ms.date: 1/6/2022
66
---
77

8-
# Linter rule - no hard-coded locations
8+
# Linter rule - no hardcoded locations
99

1010
This rule finds uses of Azure location values that aren't parameterized.
1111

@@ -17,9 +17,9 @@ Use the following value in the [Bicep configuration file](bicep-config-linter.md
1717

1818
## Solution
1919

20-
Template users may have limited access to regions where they can create resources. A hard-coded resource location might block users from creating a resource, thus preventing them from using the template. By providing a location parameter that defaults to the resource group location, users can use the default value when convenient but also specify a different location.
20+
Template users may have limited access to regions where they can create resources. A hardcoded resource location might block users from creating a resource, thus preventing them from using the template. By providing a location parameter that defaults to the resource group location, users can use the default value when convenient but also specify a different location.
2121

22-
Rather than using a hard-coded string or variable value, use a parameter, the string 'global', or an expression (but not `resourceGroup().location` or `deployment().location`, see [no-loc-expr-outside-params](./linter-rule-no-loc-expr-outside-params.md)). Best practice suggests that to set your resources' locations, your template should have a string parameter named `location`. This parameter may default to the resource group or deployment location (`resourceGroup().location` or `deployment().location`).
22+
Rather than using a hardcoded string or variable value, use a parameter, the string 'global', or an expression (but not `resourceGroup().location` or `deployment().location`, see [no-loc-expr-outside-params](./linter-rule-no-loc-expr-outside-params.md)). Best practice suggests that to set your resources' locations, your template should have a string parameter named `location`. This parameter may default to the resource group or deployment location (`resourceGroup().location` or `deployment().location`).
2323

2424
The following example fails this test because the resource's `location` property uses a string literal:
2525

@@ -61,7 +61,7 @@ The following example fails this test because a string literal is being passed i
6161
module m1 'module1.bicep' = {
6262
name: 'module1'
6363
params: {
64-
location: 'westus'
64+
location: 'westus'
6565
}
6666
}
6767
```
Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
---
2+
title: Linter rule - use resource ID functions
3+
description: Linter rule - use resource ID functions
4+
ms.topic: conceptual
5+
ms.date: 09/23/2022
6+
---
7+
8+
# Linter rule - use resource ID functions
9+
10+
Ensures that the ID of a symbolic resource name or a suitable function is used rather than a manually created ID, such as a concatenating string, for all properties representing a resource ID. Use resource symbolic names whenever it's possible.
11+
12+
The allowed functions include:
13+
14+
- [`extensionResourceId`](./bicep-functions-resource.md#extensionresourceid)
15+
- [`resourceId`](./bicep-functions-resource.md#resourceid)
16+
- [`subscriptionResourceId`](./bicep-functions-resource.md#subscriptionresourceid)
17+
- [`tenantResourceId`](./bicep-functions-resource.md#tenantresourceid)
18+
- [`reference`](./bicep-functions-resource.md#reference)
19+
- [`subscription`](./bicep-functions-scope.md#subscription)
20+
- [`guid`](./bicep-functions-string.md#guid)
21+
22+
## Linter rule code
23+
24+
Use the following value in the [Bicep configuration file](bicep-config-linter.md) to customize rule settings:
25+
26+
`use-resource-id-functions`
27+
28+
## Solution
29+
30+
The following example fails this test because the resource's `api/id` property uses a manually created string:
31+
32+
```bicep
33+
@description('description')
34+
param connections_azuremonitorlogs_name string
35+
36+
@description('description')
37+
param location string
38+
39+
@description('description')
40+
param resourceTags object
41+
param tenantId string
42+
43+
resource connections_azuremonitorlogs_name_resource 'Microsoft.Web/connections@2016-06-01' = {
44+
name: connections_azuremonitorlogs_name
45+
location: location
46+
tags: resourceTags
47+
properties: {
48+
displayName: 'azuremonitorlogs'
49+
statuses: [
50+
{
51+
status: 'Connected'
52+
}
53+
]
54+
nonSecretParameterValues: {
55+
'token:TenantId': tenantId
56+
'token:grantType': 'code'
57+
}
58+
api: {
59+
name: connections_azuremonitorlogs_name
60+
displayName: 'Azure Monitor Logs'
61+
description: 'Use this connector to query your Azure Monitor Logs across Log Analytics workspace and Application Insights component, to list or visualize results.'
62+
iconUri: 'https://connectoricons-prod.azureedge.net/releases/v1.0.1501/1.0.1501.2507/${connections_azuremonitorlogs_name}/icon.png'
63+
brandColor: '#0072C6'
64+
id: '/subscriptions/<subscription_id_here>/providers/Microsoft.Web/locations/<region_here>/managedApis/${connections_azuremonitorlogs_name}'
65+
type: 'Microsoft.Web/locations/managedApis'
66+
}
67+
}
68+
}
69+
```
70+
71+
You can fix it by using the `subscriptionResourceId()` function:
72+
73+
```bicep
74+
@description('description')
75+
param connections_azuremonitorlogs_name string
76+
77+
@description('description')
78+
param location string
79+
80+
@description('description')
81+
param resourceTags object
82+
param tenantId string
83+
84+
resource connections_azuremonitorlogs_name_resource 'Microsoft.Web/connections@2016-06-01' = {
85+
name: connections_azuremonitorlogs_name
86+
location: location
87+
tags: resourceTags
88+
properties: {
89+
displayName: 'azuremonitorlogs'
90+
statuses: [
91+
{
92+
status: 'Connected'
93+
}
94+
]
95+
nonSecretParameterValues: {
96+
'token:TenantId': tenantId
97+
'token:grantType': 'code'
98+
}
99+
api: {
100+
name: connections_azuremonitorlogs_name
101+
displayName: 'Azure Monitor Logs'
102+
description: 'Use this connector to query your Azure Monitor Logs across Log Analytics workspace and Application Insights component, to list or visualize results.'
103+
iconUri: 'https://connectoricons-prod.azureedge.net/releases/v1.0.1501/1.0.1501.2507/${connections_azuremonitorlogs_name}/icon.png'
104+
brandColor: '#0072C6'
105+
id: subscriptionResourceId('Microsoft.Web/locations/managedApis', location, connections_azuremonitorlogs_name)
106+
type: 'Microsoft.Web/locations/managedApis'
107+
}
108+
}
109+
}
110+
```
111+
112+
## Next steps
113+
114+
For more information about the linter, see [Use Bicep linter](./linter.md).

articles/azure-resource-manager/bicep/linter.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Use Bicep linter
33
description: Learn how to use Bicep linter.
44
ms.topic: conceptual
5-
ms.date: 09/21/2022
5+
ms.date: 9/23/2022
66
---
77

88
# Use Bicep linter
@@ -39,6 +39,7 @@ The default set of linter rules is minimal and taken from [arm-ttk test cases](.
3939
- [secure-secrets-in-params](./linter-rule-secure-secrets-in-parameters.md)
4040
- [simplify-interpolation](./linter-rule-simplify-interpolation.md)
4141
- [use-protectedsettings-for-commandtoexecute-secrets](./linter-rule-use-protectedsettings-for-commandtoexecute-secrets.md)
42+
- [use-resource-id-functions](./linter-rule-use-resource-id-functions.md)
4243
- [use-stable-resource-identifiers](./linter-rule-use-stable-resource-identifier.md)
4344
- [use-stable-vm-image](./linter-rule-use-stable-vm-image.md)
4445

0 commit comments

Comments
 (0)