Skip to content

Commit 87efbba

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into afd-tls
2 parents 5997944 + a9aad67 commit 87efbba

13 files changed

+147
-19
lines changed

articles/api-management/upgrade-and-scale.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ You can choose between the following dedicated tiers: **Developer**, **Basic**,
4040

4141
* The **Developer** tier should be used to evaluate the service; it shouldn't be used for production. The **Developer** tier doesn't have SLA and you can't scale this tier (add/remove units).
4242

43-
* **Basic**, **Basic v2**, **Standard**, **Standard v2**, **Premium**, and **Premium v2** are production tiers that have SLA and can be scaled. For pricing details and scale limits, see [API Management pricing](https://azure.microsoft.com/pricing/details/api-management/#pricing).
43+
* **Basic**, **Basic v2**, **Standard**, **Standard v2**, **Premium**, and **Premium v2** (limited preview) are tiers that have SLA and can be scaled. For pricing details and scale limits, see [API Management pricing](https://azure.microsoft.com/pricing/details/api-management/#pricing).
4444

4545
* The **Premium** tier enables you to distribute a single Azure API Management instance across any number of desired Azure regions. When you initially create an Azure API Management service, the instance contains only one unit and resides in a single Azure region (the **primary** region).
4646

@@ -49,7 +49,7 @@ You can choose between the following dedicated tiers: **Developer**, **Basic**,
4949
* You can upgrade and downgrade to and from certain dedicated services tiers:
5050
* You can upgrade and downgrade to and from classic tiers (**Developer**, **Basic**, **Standard**, and **Premium**).
5151

52-
* You can upgrade and downgrade to and from v2 tiers (**Basic v2**, **Standard v2**, and **Premium v2**).
52+
* You can upgrade and downgrade to and from the **Basic v2** and **Standard v2** tiers.
5353

5454
Downgrading can remove some features. For example, downgrading to **Standard** or **Basic** from the **Premium** tier can remove virtual networks or multi-region deployment.
5555

@@ -108,4 +108,4 @@ If your security requirements include [compute isolation](../azure-government/az
108108
- [How to deploy an Azure API Management service instance to multiple Azure regions](api-management-howto-deploy-multi-region.md)
109109
- [How to automatically scale an Azure API Management service instance](api-management-howto-autoscale.md)
110110
- [Plan and manage costs for API Management](plan-manage-costs.md)
111-
- [API Management limits](../azure-resource-manager/management/azure-subscription-service-limits.md#azure-api-management-limits)
111+
- [API Management limits](../azure-resource-manager/management/azure-subscription-service-limits.md#azure-api-management-limits)

articles/expressroute/expressroute-howto-linkvnet-arm.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: expressroute
55
author: duongau
66
ms.service: azure-expressroute
77
ms.topic: how-to
8-
ms.date: 09/30/2024
8+
ms.date: 03/26/2025
99
ms.author: duau
1010
ms.custom: devx-track-azurepowershell
1111
---
@@ -250,11 +250,11 @@ Set-AzVirtualNetworkGatewayConnection -VirtualNetworkGatewayConnection $connecti
250250
```
251251
### FastPath Virtual Network Peering, User-Defined-Routes (UDRs) and Private Link support for ExpressRoute Direct Connections
252252

253-
With Virtual Network Peering and UDR support, FastPath will send traffic directly to VMs deployed in "spoke" Virtual Networks (connected via Virtual Network Peering) and honor any UDRs configured on the GatewaySubnet. This capability is now generally available (GA).
253+
With Virtual Network Peering and UDR support, FastPath will send traffic directly to VMs deployed in "spoke" Virtual Networks (connected via Virtual Network Peering) and honor any UDRs configured on the GatewaySubnet. This capability is now generally available (GA). For customers that wish to enable these GA features on an existing connection, please disable and then re-enable FastPath on the connection.
254254

255255
With FastPath and Private Link, Private Link traffic sent over ExpressRoute bypasses the ExpressRoute virtual network gateway in the data path. With both of these features enabled, FastPath will directly send traffic to a Private Endpoint deployed in a "spoke" Virtual Network.
256256

257-
These scenarios are Generally Available for limited scenarios with connections associated to 10 Gbps and 100 Gbps ExpressRoute Direct circuits. To enable, follow the below guidance:
257+
This scenarios is Generally Available for limited scenarios with connections associated to 10 Gbps and 100 Gbps ExpressRoute Direct circuits. To enable, follow the below guidance:
258258
1. Complete this [Microsoft Form](https://aka.ms/fplimitedga) to request to enroll your subscription. Requests may take up to 4 weeks to complete, so plan deployments accordingly.
259259
2. Once you receive a confirmation from Step 1, run the following Azure PowerShell command in the target Azure subscription.
260260
```azurepowershell-interactive

articles/logic-apps/connectors/sap.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: daviburg
77
ms.author: daviburg
88
ms.reviewer: estfan, azla
99
ms.topic: how-to
10-
ms.date: 01/16/2025
10+
ms.date: 03/24/2025
1111
---
1212

1313
# Connect to SAP from workflows in Azure Logic Apps
@@ -167,7 +167,15 @@ SAP upgraded their .NET connector (NCo) to version 3.1, which changed the way th
167167

168168
* For a Standard workflow in single-tenant Azure Logic Apps, see [Single-tenant prerequisites](#single-tenant-prerequisites).
169169

170-
* By default, the SAP built-in connector operations are *stateless*. To run these operations in stateful mode, see [Enable stateful mode for stateless built-in connectors](../../connectors/enable-stateful-affinity-built-in-connectors.md).
170+
* By default, the SAP built-in connector operations are *stateless*. To run these operations in stateful mode, see [Enable stateful mode for stateless built-in connectors](/azure/connectors/enable-stateful-affinity-built-in-connectors).
171+
172+
Stateful communications must stay with the same workflow instance during processing. A Standard logic app can use [scale out](/azure/connectors/enable-stateful-affinity-built-in-connectors#prevent-context-loss-during-resource-scale-in-events) to distribute the workload over multiple workflow instances when needed. This requirement applies to the following kinds of operations:
173+
174+
* All actions that specify a **Session ID** value, such as **[BAPI] Commit transaction**.
175+
176+
* All actions that specify a **Transaction ID** value, except for the following actions: **[IDOC - RFC] Confirm transaction Id** and **[IDoc] Get IDoc list for transaction**.
177+
178+
* **Respond to SAP server**
171179

172180
* To use either the SAP managed or built-in connector trigger named **When a message is received**, complete the following tasks:
173181

@@ -199,7 +207,9 @@ SAP upgraded their .NET connector (NCo) to version 3.1, which changed the way th
199207

200208
In Standard workflows, the SAP built-in trigger named **When a message is received** uses the Azure Functions trigger instead, and shows only the actual callbacks from SAP.
201209

202-
* For the SAP built-in connector trigger named **When a message is received**, you have to enable virtual network integration and private ports by following the article at [Enabling Service Bus and SAP built-in connectors for stateful Logic Apps in Standard](https://techcommunity.microsoft.com/t5/azure-integration-services-blog/enabling-service-bus-and-sap-built-in-connectors-for-stateful/ba-p/3820381). You can also run the workflow in Visual Studio Code to fire the trigger locally. For Visual Studio Code setup requirements and more information, see [Create a Standard logic app workflow in single-tenant Azure Logic Apps using Visual Studio Code](../create-single-tenant-workflows-visual-studio-code.md). You must also set up the following environment variables on the computer where you install Visual Studio Code:
210+
* For the SAP built-in connector trigger named **When a message is received**, you have to enable virtual network integration and private ports by following the steps in [Enable stateful mode for stateless built-in connectors in Azure Logic Apps](/azure/connectors/enable-stateful-affinity-built-in-connectors). Otherwise, without these requirements, the action named **Respond to SAP server** might lack the necessary state to properly work.
211+
212+
To locally fire the trigger, you can run the workflow in Visual Studio Code. For Visual Studio Code setup requirements and more information, see [Create Standard workflows in Azure Logic Apps with Visual Studio Code](/azure/logic-apps/create-standard-workflows-visual-studio-code). You must also set up the following environment variables on the computer where you install Visual Studio Code:
203213

204214
- **WEBSITE_PRIVATE_IP**: Set this environment variable value to **127.0.0.1** as the localhost address.
205215
- **WEBSITE_PRIVATE_PORTS**: Set this environment variable value to two free and usable ports on your local computer, separating the values with a comma (**,**), for example, **8080,8088**.

articles/storage-actions/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ items:
1010
items:
1111
- name: Create, assign, and run a storage task
1212
href: storage-tasks/storage-task-quickstart-portal.md
13+
- name: Create a storage task - Terraform
14+
href: storage-tasks/storage-task-quickstart-terraform.md
1315
expanded: true
1416
- name: Concepts
1517
items:
Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
---
2+
title: 'Quickstart: Create a storage task using Terraform'
3+
titleSuffix: Azure Storage Actions Preview
4+
description: Learn how to create a storage task using Terraform. A storage task can perform on blobs in one or more Azure Storage accounts.
5+
author: normesta
6+
ms.service: azure-storage-actions
7+
ms.custom: devx-track-terraform;build-2023-metadata-update
8+
ms.topic: quickstart
9+
ms.author: normesta
10+
ms.date: 03/25/2025
11+
#customer intent: As a Terraform user, I want to see how to create a storage task using Terraform.
12+
content_well_notification:
13+
- AI-contribution
14+
---
15+
16+
# Quickstart: Create a storage task using Terraform
17+
18+
A storage task can perform operations on blobs in an Azure Storage account. As you create a task, you can define the conditions that must be met by each object (container or blob), and the operations to perform on the object. You can also identify one or more Azure Storage account targets. See [What are Azure Storage Actions?](../overview.md).
19+
20+
In this how-to article, you'll learn how to create a storage task using Terraform.
21+
22+
> [!IMPORTANT]
23+
> Azure Storage Actions is currently in PREVIEW and is available in these [regions](../overview.md#supported-regions).
24+
> See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
25+
26+
[!INCLUDE [About Terraform](~/azure-dev-docs-pr/articles/terraform/includes/abstract.md)]
27+
28+
> [!div class="checklist"]
29+
> * Retrieve the current Azure client configuration.
30+
> * Generate a random name for the resource group.
31+
> * Create a new Azure resource group with the generated name.
32+
> * Generate a random string to be used as the storage task name.
33+
> * Calculate a future date by offsetting the current date by a certain number of days.
34+
> * Create a new Azure API resource of type "Microsoft.StorageActions/storageTasks".
35+
> * Specify the required providers for Terraform, including their sources and versions.
36+
> * Configure the Azure provider with specific features.
37+
> * Define several variables, including the location of the resource group, the prefix for the resource group name, the number of offset days, and the description of the storage task.
38+
39+
## Prerequisites
40+
41+
- Create an Azure account with an active subscription. You can [create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
42+
43+
- [Install and configure Terraform](/azure/developer/terraform/quickstart-configure)
44+
45+
## Implement the Terraform code
46+
47+
The sample code for this article is located in the [Azure Terraform GitHub repo](https://github.com/Azure/terraform/tree/master/quickstart/101-azure-storage-actions-create-storage-task). You can view the log file containing the [test results from current and previous versions of Terraform](https://github.com/Azure/terraform/tree/master/quickstart/101-azure-storage-actions-create-storage-task/TestRecord.md). See more [articles and sample code showing how to use Terraform to manage Azure resources](/azure/terraform)
48+
49+
1. Create a directory in which to test and run the sample Terraform code, and make it the current directory.
50+
51+
1. Create a file named `providers.tf` and insert the following code.
52+
:::code language="Terraform" source="~/terraform_samples/quickstart/101-azure-storage-actions-create-storage-task/providers.tf":::
53+
54+
1. Create a file named `main.tf` and insert the following code.
55+
:::code language="Terraform" source="~/terraform_samples/quickstart/101-azure-storage-actions-create-storage-task/main.tf":::
56+
57+
1. Create a file named `variables.tf` and insert the following code.
58+
:::code language="Terraform" source="~/terraform_samples/quickstart/101-azure-storage-actions-create-storage-task/variables.tf":::
59+
60+
1. Create a file named `outputs.tf` and insert the following code.
61+
:::code language="Terraform" source="~/terraform_samples/quickstart/101-azure-storage-actions-create-storage-task/outputs.tf":::
62+
63+
> [!IMPORTANT]
64+
> If you are using the 4.x azurerm provider, you must [explicitly specify the Azure subscription ID](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/guides/4.0-upgrade-guide#specifying-subscription-id-is-now-mandatory) to authenticate to Azure before running the Terraform commands.
65+
>
66+
> One way to specify the Azure subscription ID without putting it in the `providers` block is to specify the subscription ID in an environment variable named `ARM_SUBSCRIPTION_ID`.
67+
>
68+
> For more information, see the [Azure provider reference documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#argument-reference).
69+
70+
## Initialize Terraform
71+
72+
[!INCLUDE [terraform-init.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-init.md)]
73+
74+
## Create a Terraform execution plan
75+
76+
[!INCLUDE [terraform-plan.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-plan.md)]
77+
78+
## Apply a Terraform execution plan
79+
80+
[!INCLUDE [terraform-apply-plan.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-apply-plan.md)]
81+
82+
## Verify the results
83+
84+
#### [Azure PowerShell](#tab/azure-powershell)
85+
86+
1. Get the Azure resource group name.
87+
88+
```console
89+
$resource_group_name=$(terraform output -raw resource_group_name)
90+
```
91+
92+
1. Get the storage task name.
93+
94+
```console
95+
$storage_task_name=$(terraform output -raw storage_task_name)
96+
```
97+
98+
1. Run [Get-AzStorageActionTask](/powershell/module/az.storageaction/get-azstorageactiontask) to get the storage task properties.
99+
100+
```azurepowershell
101+
Get-AzStorageActionTask -Name $storage_task_name -ResourceGroupName $resource_group_name
102+
```
103+
104+
---
105+
106+
## Clean up resources
107+
108+
[!INCLUDE [terraform-plan-destroy.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-plan-destroy.md)]
109+
110+
## Troubleshoot Terraform on Azure
111+
112+
[Troubleshoot common problems when using Terraform on Azure](/azure/developer/terraform/troubleshoot).
113+
114+
## Next steps
115+
116+
[Create a storage task](storage-task-create.md)

articles/virtual-wan/scenario-365-expressroute-private.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: floklaffenbach
77

88
ms.service: azure-virtual-wan
99
ms.topic: concept-article
10-
ms.date: 10/25/2024
10+
ms.date: 03/26/2025
1111
ms.author: flofox
1212

1313
---

articles/virtual-wan/scenario-any-to-any.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: cherylmc
77

88
ms.service: azure-virtual-wan
99
ms.topic: concept-article
10-
ms.date: 10/25/2024
10+
ms.date: 03/26/2025
1111
ms.author: cherylmc
1212
ms.custom: fasttrack-edit
1313

articles/virtual-wan/scenario-isolate-virtual-networks-branches.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: cherylmc
77

88
ms.service: azure-virtual-wan
99
ms.topic: concept-article
10-
ms.date: 10/17/2024
10+
ms.date: 03/26/2025
1111
ms.author: cherylmc
1212

1313
---

articles/virtual-wan/scenario-isolate-vnets-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: cherylmc
77

88
ms.service: azure-virtual-wan
99
ms.topic: concept-article
10-
ms.date: 10/25/2024
10+
ms.date: 03/26/2025
1111
ms.author: cherylmc
1212

1313
---

articles/virtual-wan/scenario-isolate-vnets.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: cherylmc
77

88
ms.service: azure-virtual-wan
99
ms.topic: concept-article
10-
ms.date: 10/25/2024
10+
ms.date: 03/26/2025
1111
ms.author: cherylmc
1212
ms.custom: fasttrack-edit
1313

0 commit comments

Comments
 (0)