Skip to content

Commit 047f8ed

Browse files
authored
Merge pull request #262133 from MicrosoftDocs/main
1/2/2023 AM Publish
2 parents 1d17b4e + 62f0990 commit 047f8ed

File tree

103 files changed

+487
-393
lines changed

Some content is hidden

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

103 files changed

+487
-393
lines changed

articles/azure-cache-for-redis/cache-how-to-import-export-data.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ This section contains frequently asked questions about the Import/Export feature
131131
- [I got an error when exporting my data to Azure Blob Storage. What happened?](#i-got-an-error-when-exporting-my-data-to-azure-blob-storage-what-happened)
132132
- [How to export if I have firewall enabled on my storage account?](#how-to-export-if-i-have-firewall-enabled-on-my-storage-account)
133133
- [Can I import or export data from a storage account in a different subscription than my cache?](#can-i-import-or-export-data-from-a-storage-account-in-a-different-subscription-than-my-cache)
134+
- [Which permissions need to be granted to the storage account container shared access signature (SAS) token to allow export?](#which-permissions-need-to-be-granted-to-the-storage-account-container-shared-access-signature-sas-token-to-allow-export)
134135

135136
### Which tiers support Import/Export?
136137

@@ -222,6 +223,16 @@ More information here - [Managed identity for storage accounts - Azure Cache for
222223

223224
In the _Premium_ tier, you can import and export data from a storage account in a different subscription than your cache, but you must use [managed identity](cache-managed-identity.md) as the authentication method. You will need to select the chosen subscription holding the storage account when configuring the import or export.
224225

226+
### Which permissions need to be granted to the storage account container shared access signature (SAS) token to allow export?
227+
In order for export to an Azure storage account to work sucessfully, the [shared access signature (SAS) token](../storage/common/storage-sas-overview.md) must have the following permissions:
228+
- `read`
229+
- `add`
230+
- `create`
231+
- `write`
232+
- `delete`
233+
- `tag`
234+
- `move`
235+
225236
## Next steps
226237

227238
Learn more about Azure Cache for Redis features.

articles/azure-functions/storage-considerations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ You can mount existing Azure Files shares to your Linux function apps. By mounti
182182

183183
In this command, `share-name` is the name of the existing Azure Files share, and `custom-id` can be any string that uniquely defines the share when mounted to the function app. Also, `mount-path` is the path from which the share is accessed in your function app. `mount-path` must be in the format `/dir-name`, and it can't start with `/home`.
184184

185-
For a complete example, see the scripts in [Create a Python function app and mount a Azure Files share](scripts/functions-cli-mount-files-storage-linux.md).
185+
For a complete example, see the scripts in [Create a Python function app and mount an Azure Files share](scripts/functions-cli-mount-files-storage-linux.md).
186186

187187
# [Azure PowerShell](#tab/azure-powershell)
188188

articles/azure-monitor/app/worker-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ You must have a valid Application Insights connection string. This string is req
3333

3434
```xml
3535
<ItemGroup>
36-
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.13.1" />
36+
<PackageReference Include="Microsoft.ApplicationInsights.WorkerService" Version="2.22.0" />
3737
</ItemGroup>
3838
```
3939

articles/azure-resource-manager/bicep/deployment-script-bicep.md

Lines changed: 88 additions & 82 deletions
Large diffs are not rendered by default.

articles/azure-resource-manager/bicep/deployment-script-develop.md

Lines changed: 124 additions & 118 deletions
Large diffs are not rendered by default.

articles/azure-resource-manager/bicep/deployment-script-vnet.md

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
11
---
2-
title: Access private virtual network | Microsoft Docs
3-
description: Access private virtual network from Bicep deployment script.
2+
title: Access a private virtual network from a Bicep deployment script
3+
description: Learn how to run and test Bicep deployment scripts in private networks.
44
ms.custom: devx-track-bicep
55
ms.topic: conceptual
66
ms.date: 12/13/2023
77
---
88

9-
# Access private virtual network
9+
# Access a private virtual network from a Bicep deployment script
1010

11-
With Microsoft.Resources/deploymentScripts version `2023-08-01`, you can run deployment scripts in private networks with some additional configurations.
11+
With `Microsoft.Resources/deploymentScripts` version `2023-08-01`, you can run deployment scripts in private networks with some additional configurations:
1212

1313
- Create a user-assigned managed identity, and specify it in the `identity` property. To assign the identity, see [Identity](./deployment-script-develop.md#identity).
14-
- Create a storage account in the private network, and specify the deployment script to use the existing storage account. To specify an existing storage account, see [Use existing storage account](./deployment-script-develop.md#use-existing-storage-account). Some additional configuration is required for the storage account.
14+
- Create a storage account in the private network, and specify the deployment script to use the existing storage account. For more information, see [Use an existing storage account](./deployment-script-develop.md#use-an-existing-storage-account). Some additional configuration is required for the storage account:
1515

1616
1. Open the storage account in the [Azure portal](https://portal.azure.com).
17-
1. From the left menu, select **Access Control (IAM)**, and then select the **Role assignments** tab.
18-
1. Add the `Storage File Data Privileged Contributor` role to the user-assignment managed identity.
19-
1. From the left menu, under **Security + networking**, select **Networking**, and then select **Firewalls and virtual networks**.
17+
1. On the left menu, select **Access Control (IAM)**, and then select the **Role assignments** tab.
18+
1. Add the **Storage File Data Privileged Contributor** role to the user-assigned managed identity.
19+
1. On the left menu, under **Security + networking**, select **Networking**, and then select **Firewalls and virtual networks**.
2020
1. Select **Enabled from selected virtual networks and IP addresses**.
21-
22-
:::image type="content" source="./media/deployment-script-vnet/bicep-deployment-script-access-vnet-config-storage.png" alt-text="Screenshot of configuring storage account for accessing private network.":::
23-
24-
1. Under **Virtual networks**, add a subnet. On the screenshot, the subnet is called *dspvnVnet*.
21+
1. Under **Virtual networks**, add a subnet. In the following screenshot, the subnet is called *dspvnVnet*.
2522
1. Under **Exceptions**, select **Allow Azure services on the trusted services list to access this storage account**.
2623

24+
:::image type="content" source="./media/deployment-script-vnet/bicep-deployment-script-access-vnet-config-storage.png" alt-text="Screenshot of selections for configuring a storage account for accessing a private network.":::
25+
2726
The following Bicep file shows how to configure the environment for running a deployment script:
2827

2928
```bicep
30-
@maxLength(10) // required max length since the storage account has a max of 26 chars
29+
@maxLength(10) // Required maximum length, because the storage account has a maximum of 26 characters
3130
param prefix string
3231
param location string = resourceGroup().location
3332
param userAssignedIdentityName string = '${prefix}Identity'
@@ -101,7 +100,7 @@ resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@
101100
}
102101
103102
resource storageFileDataPrivilegedContributor 'Microsoft.Authorization/roleDefinitions@2022-04-01' existing = {
104-
name: '69566ab7-960f-475b-8e7c-b3118f30c6bd' // Storage File Data Priveleged Contributor
103+
name: '69566ab7-960f-475b-8e7c-b3118f30c6bd' // Storage File Data Privileged Contributor
105104
scope: tenant()
106105
}
107106
@@ -174,7 +173,7 @@ resource dsTest 'Microsoft.Resources/deploymentScripts@2023-08-01' = {
174173

175174
## Next steps
176175

177-
In this article, you learned how to access private virtual network. To learn more:
176+
In this article, you learned how to access a private virtual network. To learn more:
178177

179178
> [!div class="nextstepaction"]
180179
> [Use deployment scripts in Bicep](./deployment-script-bicep.md)

articles/azure-resource-manager/bicep/user-defined-data-types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ param serviceConfig ServiceConfig = { type: 'bar', value: true }
256256
output config object = serviceConfig
257257
```
258258

259-
The parameter value is validated based on the discriminated property value. In the preceeding example, if the *serviceConfig* parameter value is of type *foo*, it undergoes validation using the *FooConfig*type. Likewise, if the parameter value is of type *bar*, validation is performed using the *BarConfig* type, and this pattern continues for other types as well.
259+
The parameter value is validated based on the discriminated property value. In the preceding example, if the *serviceConfig* parameter value is of type *foo*, it undergoes validation using the *FooConfig*type. Likewise, if the parameter value is of type *bar*, validation is performed using the *BarConfig* type, and this pattern continues for other types as well.
260260

261261
## Import types between Bicep files (Preview)
262262

articles/azure-resource-manager/management/resource-name-rules.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -537,9 +537,9 @@ In the following tables, the term alphanumeric refers to:
537537
> [!div class="mx-tableFixed"]
538538
> | Entity | Scope | Length | Valid Characters |
539539
> | --- | --- | --- | --- |
540-
> | workspaces | resource group | 3-33 | Alphanumerics and hyphens |
540+
> | workspaces | resource group | 3-33 | Alphanumerics, hyphens, and underscores. |
541541
> | workspaces / computes | workspace | 3-24 for compute instance<br>3-32 for AML compute<br>2-16 for other compute types | Alphanumerics and hyphens. |
542-
> | workspaces / datastores | workspace | Maximum 255 characters for datastore name| Datastore name consists only of lowercase letters, digits, and underscores |
542+
> | workspaces / datastores | workspace | Maximum 255 characters for datastore name| Datastore name consists only of lowercase letters, digits, and underscores. |
543543
544544
## Microsoft.ManagedIdentity
545545

articles/container-apps/dapr-component-resiliency.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ resource myPolicyDoc 'Microsoft.App/managedEnvironments/daprComponents/resilienc
5959
maxIntervalInMilliseconds: 10000
6060
}
6161
}
62-
},
62+
}
6363
inboundPolicy: {
6464
timeoutPolicy: {
6565
responseTimeoutInSeconds: 15
@@ -208,7 +208,7 @@ properties: {
208208
timeoutPolicy: {
209209
responseTimeoutInSeconds: 15
210210
}
211-
},
211+
}
212212
inbound: {
213213
timeoutPolicy: {
214214
responseTimeoutInSeconds: 15
@@ -236,7 +236,7 @@ properties: {
236236
maxIntervalInMilliseconds: 10000
237237
}
238238
}
239-
},
239+
}
240240
inbound: {
241241
httpRetryPolicy: {
242242
maxRetries: 5

articles/container-instances/container-instances-egress-ip-address.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ View the container logs to confirm the IP address is the same as the public IP a
163163

164164
```azurecli
165165
az container logs \
166-
--sed 's/$RESOURCE_GROUP_NAME/$resourceGroup/g'
166+
--resource-group $resourceGroup \
167167
--name testegress
168168
```
169169

0 commit comments

Comments
 (0)