Merge pull request #293449 from MicrosoftDocs/main

1/23/2025 11:00 AM IST Publish

Author: PhilKang0704

articles/app-service/provision-resource-terraform.md

@@ -85,7 +85,7 @@ resource "azurerm_linux_web_app" "webapp" {
 resource "azurerm_app_service_source_control" "sourcecontrol" {
   app_id             = azurerm_linux_web_app.webapp.id
   repo_url           = "https://github.com/Azure-Samples/nodejs-docs-hello-world"
-  branch             = "master"
+  branch             = "main"
   use_manual_integration = true
   use_mercurial      = false
 }

articles/azure-cache-for-redis/cache-java-get-started.md

@@ -7,6 +7,7 @@ ms.date: 01/04/2022
 ms.topic: quickstart
 ms.devlang: java
 ms.custom: devx-track-java, devx-track-javaee, mode-api, mvc, devx-track-extended-java, ignite-2024
+zone_pivot_groups: redis-type
 ---
 
 # Quickstart: Use Azure Cache for Redis in Java with Jedis Redis client
@@ -22,10 +23,24 @@ Clone the repo [Java quickstart](https://github.com/Azure-Samples/azure-cache-re
 - Azure subscription - [create one for free](https://azure.microsoft.com/free/)
 - [Apache Maven](https://maven.apache.org/download.cgi)
 
-## Create an Azure Cache for Redis
+::: zone pivot="azure-managed-redis"
+
+## Create an Azure Managed Redis (preview) instance
+
+[!INCLUDE [managed-redis-create](includes/managed-redis-create.md)]
+
+::: zone-end
+
+::: zone pivot="azure-cache-redis"
+
+## Create an Azure Cache for Redis instance
 
 [!INCLUDE [redis-cache-create](~/reusable-content/ce-skilling/azure/includes/azure-cache-for-redis/includes/redis-cache-create.md)]
 
+[!INCLUDE [redis-cache-access-keys](includes/redis-cache-access-keys.md)]
+
+::: zone-end
+
 ## Set up the working environment
 
 [!INCLUDE [redis-setup-working-environment](includes/redis-setup-working-environment.md)]
@@ -54,13 +69,13 @@ Clone the repo [Java quickstart](https://github.com/Azure-Samples/azure-cache-re
     <dependency>
         <groupId>com.azure</groupId>
         <artifactId>azure-identity</artifactId>
-        <version>1.11.2</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+        <version>1.15.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
     </dependency>
 
     <dependency>
         <groupId>redis.clients</groupId>
         <artifactId>jedis</artifactId>
-        <version>5.1.0</version>  <!-- {x-version-update;redis.clients:jedis;external_dependency} -->
+        <version>5.2.0</version> <!-- {x-version-update;redis.clients:jedis;external_dependency} -->
     </dependency>
     ```
 
@@ -72,7 +87,7 @@ Clone the repo [Java quickstart](https://github.com/Azure-Samples/azure-cache-re
     <dependency>
         <groupId>redis.clients</groupId>
         <artifactId>jedis</artifactId>
-        <version>5.1.0</version>  <!-- {x-version-update;redis.clients:jedis;external_dependency} -->
+        <version>5.2.0</version> <!-- {x-version-update;redis.clients:jedis;external_dependency} -->
     </dependency>
     ```
 
@@ -112,9 +127,10 @@ Clone the repo [Java quickstart](https://github.com/Azure-Samples/azure-cache-re
 
             String cacheHostname = System.getenv("REDIS_CACHE_HOSTNAME");
             String username = System.getenv("USER_NAME");
+            int port = Integer.parseInt(System.getenv().getOrDefault("REDIS_CACHE_PORT", "6380"));
 
             // Connect to the Azure Cache for Redis over the TLS/SSL port using the key.
-            Jedis jedis = new Jedis(cacheHostname, 6380, DefaultJedisClientConfig.builder()
+            Jedis jedis = new Jedis(cacheHostname, port, DefaultJedisClientConfig.builder()
                     .password(token) // Microsoft Entra access token as password is required.
                     .user(username) // Username is Required
                     .ssl(useSsl) // SSL Connection is Required
@@ -165,9 +181,10 @@ Clone the repo [Java quickstart](https://github.com/Azure-Samples/azure-cache-re
             boolean useSsl = true;
             String cacheHostname = System.getenv("REDIS_CACHE_HOSTNAME");
             String cachekey = System.getenv("REDIS_CACHE_KEY");
+            int port = Integer.parseInt(System.getenv().getOrDefault("REDIS_CACHE_PORT", "6380"));
 
             // Connect to the Azure Cache for Redis over the TLS/SSL port using the key.
-            Jedis jedis = new Jedis(cacheHostname, 6380, DefaultJedisClientConfig.builder()
+            Jedis jedis = new Jedis(cacheHostname, port, DefaultJedisClientConfig.builder()
                 .password(cachekey)
                 .ssl(useSsl)
                 .build());

articles/azure-cache-for-redis/cache-java-redisson-get-started.md

@@ -8,6 +8,7 @@ ms.topic: quickstart
 ms.devlang: java
 ms.custom: mvc, seo-java-january2024, seo-java-february2024, mode-api, devx-track-java, devx-track-extended-java, devx-track-javaee, ignite-2024
 #Customer intent: As a Java developer, new to Azure Cache for Redis, I want to create a new Java app that uses Azure Cache for Redis and Redisson as Redis client.
+zone_pivot_groups: redis-type
 ---
 
 # Quickstart: Use Azure Cache for Redis in Java with Redisson Redis client
@@ -24,10 +25,24 @@ This quickstart uses the Maven archetype feature to generate the scaffolding for
 - [Use Microsoft Entra ID for cache authentication](cache-azure-active-directory-for-authentication.md)
 - [Apache Maven](https://maven.apache.org/download.cgi)
 
-## Create an Azure Cache for Redis
+::: zone pivot="azure-managed-redis"
+
+## Create an Azure Managed Redis (preview) instance
+
+[!INCLUDE [managed-redis-create](includes/managed-redis-create.md)]
+
+::: zone-end
+
+::: zone pivot="azure-cache-redis"
+
+## Create an Azure Cache for Redis instance
 
 [!INCLUDE [redis-cache-create](~/reusable-content/ce-skilling/azure/includes/azure-cache-for-redis/includes/redis-cache-create.md)]
 
+[!INCLUDE [redis-cache-access-keys](includes/redis-cache-access-keys.md)]
+
+::: zone-end
+
 ## Set up the working environment
 
 [!INCLUDE [redis-setup-working-environment](includes/redis-setup-working-environment.md)]
@@ -57,13 +72,13 @@ This quickstart uses the Maven archetype feature to generate the scaffolding for
    <dependency>
        <groupId>com.azure</groupId>
        <artifactId>azure-identity</artifactId>
-       <version>1.11.2</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
+       <version>1.15.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
    </dependency>
 
    <dependency>
        <groupId>org.redisson</groupId>
        <artifactId>redisson</artifactId>
-       <version>3.27.0</version> <!-- {x-version-update;org.redisson:redisson;external_dependency} -->
+       <version>3.36.0</version> <!-- {x-version-update;org.redisson:redisson;external_dependency} -->
    </dependency>
    ```
 
@@ -75,7 +90,7 @@ This quickstart uses the Maven archetype feature to generate the scaffolding for
    <dependency>
        <groupId>org.redisson</groupId>
        <artifactId>redisson</artifactId>
-       <version>3.27.0</version> <!-- {x-version-update;org.redisson:redisson;external_dependency} -->
+       <version>3.36.0</version> <!-- {x-version-update;org.redisson:redisson;external_dependency} -->
    </dependency>
    ```
 
@@ -149,7 +164,7 @@ This quickstart uses the Maven archetype feature to generate the scaffolding for
            // Connect to the Azure Cache for Redis over the TLS/SSL port using the key
            Config redissonconfig = new Config();
            redissonconfig.useSingleServer()
-                   .setAddress(String.format("rediss://%s:6380", System.getenv("REDIS_CACHE_HOSTNAME")))
+                   .setAddress(String.format("rediss://%s:%s", System.getenv("REDIS_CACHE_HOSTNAME"),  System.getenv("REDIS_CACHE_PORT")))
                    .setUsername(System.getenv("USER_NAME")) // (Required) Username is Object ID of your managed identity or service principal
                    .setPassword(token); // Microsoft Entra access token as password is required.
            return redissonconfig;
@@ -213,7 +228,7 @@ This quickstart uses the Maven archetype feature to generate the scaffolding for
            // Connect to the Azure Cache for Redis over the TLS/SSL port using the key
            Config redissonconfig = new Config();
            redissonconfig.useSingleServer().setPassword(System.getenv("REDIS_CACHE_KEY"))
-                   .setAddress(String.format("rediss://%s:6380", System.getenv("REDIS_CACHE_HOSTNAME")));
+                   .setAddress(String.format("rediss://%s:%s", System.getenv("REDIS_CACHE_HOSTNAME"), System.getenv("REDIS_CACHE_PORT")));
            return redissonconfig;
        }
    }

articles/azure-cache-for-redis/includes/redis-setup-working-environment.md

@@ -8,11 +8,28 @@ The following steps show you how to set up the working environment for the Java
 
 ### [Microsoft Entra ID authentication (recommended)](#tab/entraid)
 
+::: zone pivot="azure-managed-redis"
+
+```bash
+export REDIS_CACHE_HOSTNAME=<your-host-name>.redis.cache.windows.net
+export USER_NAME=<user-name>
+export REDIS_CACHE_PORT=10000
+```
+
+::: zone-end
+
+::: zone pivot="azure-cache-redis"
+
+
 ```bash
 export REDIS_CACHE_HOSTNAME=<your-host-name>.redis.cache.windows.net
 export USER_NAME=<user-name>
+export REDIS_CACHE_PORT=6380
 ```
 
+::: zone-end
+
+
 Replace the placeholders with the following values:
 
 - `<your-host-name>`: The DNS host name. To get the host name and ports for your cache, select **Overview** from the **Resource** menu. The host name is of the form `<DNS name>.redis.cache.windows.net`.
@@ -31,11 +48,26 @@ Replace the placeholders with the following values:
 
 ### [Access key authentication](#tab/accesskey)
 
+::: zone pivot="azure-managed-redis"
+
+```bash
+export REDIS_CACHE_HOSTNAME=<your-host-name>.redis.cache.windows.net
+export REDIS_CACHE_KEY=<your-primary-access-key>
+export REDIS_CACHE_PORT=10000
+```
+
+::: zone-end
+
+::: zone pivot="azure-cache-redis"
+
 ```bash
 export REDIS_CACHE_HOSTNAME=<your-host-name>.redis.cache.windows.net
 export REDIS_CACHE_KEY=<your-primary-access-key>
+export REDIS_CACHE_PORT=6380
 ```
 
+::: zone-end
+
 Replace the placeholders with the following values:
 
 - `<your-host-name>`: The DNS host name.  To get the host name and ports for your cache, select **Overview** from the **Resource** menu. The host name is of the form `<DNS name>.redis.cache.windows.net`.

articles/azure-resource-manager/management/async-operations.md

@@ -2,12 +2,12 @@
 title: Status of asynchronous operations
 description: Describes how to track asynchronous operations in Azure. It shows the values you use to get the status of a long-running operation.
 ms.topic: conceptual
-ms.date: 09/26/2024
+ms.date: 01/22/2025
 ---
 
 # Track asynchronous Azure operations
 
-Some Azure REST operations run asynchronously because the operation can't be completed quickly. This article describes how to track the status of asynchronous operations through values returned in the response.  
+Some Azure REST operations run asynchronously because the operation can't be completed quickly. This article describes how to track the status of asynchronous operations through values returned in the response.
 
 ## Status codes for asynchronous operations
 
@@ -46,7 +46,7 @@ When the `Retry-after` header isn't returned, [implement your own retry logic](/
 
 ## Permission for tracking async status
 
-To track the status of an asynchronous operation, you need sufficient permission at the level of the resource group. If you only have permission at the level of the resource, you can start the operation but you can't track its status. Permission at the level of the resource group is required because the URL for tracking status isn't scoped to the resource.
+To track the status of an asynchronous operation, you need sufficient permission at the resource group level. If you only have permission at the resource level, you can start the operation but you can't track its status. Resource group-level permission is required because the URL for tracking status isn't scoped to the resource.
 
 For example, to start a virtual machine, you need the Virtual Machine Contributor role for the resource group that contains the virtual machine. The URL for tracking a start request doesn't include the virtual machine in its path.
 
@@ -87,11 +87,11 @@ The following example shows other values that might be returned from the operati
 }
 ```
 
-The error object is returned when the status is Failed or Canceled. All other values are optional. The response you receive may look different than the example.
+The error object is returned when the status is Failed or Canceled. All other values are optional. The response you receive might look different than the example.
 
 ## provisioningState values
 
-Operations that create, update, or delete (PUT, PATCH, DELETE) a resource typically return a `provisioningState` value. When an operation completes, one of following three values is returned:
+Operations that create, update, or delete (PUT, PATCH, DELETE) a resource typically return a `provisioningState` value. When an operation completes, one of the following three values is returned:
 
 * Succeeded
 * Failed
@@ -154,7 +154,7 @@ Among the header values, you see:
 Azure-AsyncOperation: https://management.azure.com/subscriptions/{subscription-id}/resourcegroups/{resource-group}/providers/Microsoft.Resources/deployments/{deployment-name}/operationStatuses/{operation-id}?api-version=2020-06-01
 ```
 
-To check the status of the asynchronous operation, sending another request to that URL.
+To check the status of the asynchronous operation, send another request to the operation URL.
 
 ```HTTP
 GET 
@@ -186,7 +186,7 @@ PUT
 https://management.azure.com/subscriptions/{subscription-id}/resourceGroups/{resource-group}/providers/Microsoft.Storage/storageAccounts/{storage-name}?api-version=2019-06-01
 ```
 
-And the request body contains properties for the storage account:
+The request body contains properties for the storage account:
 
 ```json
 {
@@ -206,7 +206,7 @@ Location: https://management.azure.com/subscriptions/{subscription-id}/providers
 Retry-After: 17
 ```
 
-After waiting for number of seconds specified in Retry-After, check the status of the asynchronous operation by sending another request to that URL.
+After waiting for number of seconds specified in `Retry-After`, check the status of the asynchronous operation by sending another request to that URL.
 
 ```HTTP
 GET 

articles/azure-resource-manager/management/authenticate-multi-tenant.md

@@ -3,12 +3,12 @@ title: Authenticate across tenants
 description: Describes how Azure Resource Manager handles authentication requests across tenants.
 ms.topic: conceptual
 ms.custom: devx-track-arm-template
-ms.date: 09/26/2024
+ms.date: 01/22/2025
 ---
 
 # Authenticate requests across tenants
 
-When creating a multi-tenant application, you may need to handle authentication requests for resources that are in different tenants. A common scenario is when a virtual machine in one tenant must join a virtual network in another tenant. Azure Resource Manager provides a header value for storing auxiliary tokens to authenticate the requests to different tenants.
+When creating a multitenant application, you might need to handle authentication requests for resources in different tenants. A common scenario is when a virtual machine in one tenant must join a virtual network in another tenant. Azure Resource Manager provides a header value for storing auxiliary tokens to authenticate the requests to different tenants.
 
 ## Header values for authentication
 
@@ -21,15 +21,15 @@ The request has the following authentication header values:
 
 The auxiliary header can hold up to three auxiliary tokens.
 
-In the code of your multi-tenant app, get the authentication token for other tenants and store them in the auxiliary headers. The user or application must have been invited as a guest to the other tenants.
+In the code of your multitenant app, get the authentication token for other tenants and store them in the auxiliary headers. The user or application must be invited as a guest to the other tenants.
 
 ## Processing the request
 
-When your app sends a request to Resource Manager, the request is run under the identity from the primary token. The primary token must be valid and unexpired. This token must be from a tenant that can manage the subscription.
+When your app sends a request to Resource Manager, the request runs under the identity from the primary token. The primary token must be valid and unexpired. This token must be from a tenant that can manage the subscription.
 
-When the request references a resource from different tenant, Resource Manager checks the auxiliary tokens to determine if the request can be processed. All auxiliary tokens in the header must be valid and unexpired. If any token is expired, Resource Manager returns a 401 response code. The response includes the client ID and tenant ID from the token that isn't valid. If the auxiliary header contains a valid token for the tenant, the cross tenant request is processed.
+When the request references a resource from different tenant, Resource Manager checks the auxiliary tokens to determine if it can process the request. All auxiliary tokens in the header must be valid and unexpired. If any token is expired, Resource Manager returns a 401 response code. The response includes the client ID and tenant ID from the token that isn't valid. If the auxiliary header contains a valid token for the tenant, the cross-tenant request is processed.
 
 ## Next steps
 
 * To learn about authentication requests, see [Authentication flows and application scenarios](../../active-directory/develop/authentication-flows-app-scenarios.md).
-* For more information about tokens, see [Microsoft Entra access tokens](../../active-directory/develop/access-tokens.md).
+* For more information about tokens, see [Microsoft Entra access tokens](../../active-directory/develop/access-tokens.md).