Merge pull request #293293 from backwind1233/support-amr

Add Support for Azure Managed Redis

Author: denrea

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`.