From 37f5caac224d5f959a0950dc7a3dc73238f3fddd Mon Sep 17 00:00:00 2001
From: Vikas Bansal <43470111+vikasvb90@users.noreply.github.com>
Date: Tue, 5 Sep 2023 10:30:17 +0530
Subject: [PATCH] BWC compatibility fix for crypto settings in put repository
 request

Signed-off-by: Vikas Bansal <43470111+vikasvb90@users.noreply.github.com>
---
 .../main/java/org/opensearch/OpenSearchServerException.java   | 3 ++-
 .../admin/cluster/repositories/put/PutRepositoryRequest.java  | 4 ++--
 .../org/opensearch/cluster/metadata/RepositoryMetadata.java   | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/server/src/main/java/org/opensearch/OpenSearchServerException.java b/server/src/main/java/org/opensearch/OpenSearchServerException.java
index d8054e91c9b7a..39c22e60f038a 100644
--- a/server/src/main/java/org/opensearch/OpenSearchServerException.java
+++ b/server/src/main/java/org/opensearch/OpenSearchServerException.java
@@ -14,6 +14,7 @@
 import static org.opensearch.OpenSearchException.OpenSearchExceptionHandle;
 import static org.opensearch.OpenSearchException.OpenSearchExceptionHandleRegistry.registerExceptionHandle;
 import static org.opensearch.OpenSearchException.UNKNOWN_VERSION_ADDED;
+import static org.opensearch.Version.V_2_10_0;
 import static org.opensearch.Version.V_2_1_0;
 import static org.opensearch.Version.V_2_4_0;
 import static org.opensearch.Version.V_2_5_0;
@@ -1173,7 +1174,7 @@ public static void registerExceptions() {
                 V_2_7_0
             )
         );
-        registerExceptionHandle(new OpenSearchExceptionHandle(CryptoRegistryException.class, CryptoRegistryException::new, 171, V_3_0_0));
+        registerExceptionHandle(new OpenSearchExceptionHandle(CryptoRegistryException.class, CryptoRegistryException::new, 171, V_2_10_0));
         registerExceptionHandle(
             new OpenSearchExceptionHandle(
                 org.opensearch.cluster.block.IndexCreateBlockException.class,
diff --git a/server/src/main/java/org/opensearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java b/server/src/main/java/org/opensearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java
index 8fd74bc718bd4..582f73f335b49 100644
--- a/server/src/main/java/org/opensearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java
+++ b/server/src/main/java/org/opensearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java
@@ -78,7 +78,7 @@ public PutRepositoryRequest(StreamInput in) throws IOException {
         settings = readSettingsFromStream(in);
         verify = in.readBoolean();
 
-        if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_2_10_0)) {
             cryptoSettings = in.readOptionalWriteable(CryptoSettings::new);
         }
     }
@@ -275,7 +275,7 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeString(type);
         writeSettingsToStream(settings, out);
         out.writeBoolean(verify);
-        if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_2_10_0)) {
             out.writeOptionalWriteable(cryptoSettings);
         }
     }
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/RepositoryMetadata.java b/server/src/main/java/org/opensearch/cluster/metadata/RepositoryMetadata.java
index 181b8743fbfe6..580643b96e411 100644
--- a/server/src/main/java/org/opensearch/cluster/metadata/RepositoryMetadata.java
+++ b/server/src/main/java/org/opensearch/cluster/metadata/RepositoryMetadata.java
@@ -173,7 +173,7 @@ public RepositoryMetadata(StreamInput in) throws IOException {
         settings = Settings.readSettingsFromStream(in);
         generation = in.readLong();
         pendingGeneration = in.readLong();
-        if (in.getVersion().onOrAfter(Version.V_3_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_2_10_0)) {
             cryptoMetadata = in.readOptionalWriteable(CryptoMetadata::new);
         } else {
             cryptoMetadata = null;
@@ -192,7 +192,7 @@ public void writeTo(StreamOutput out) throws IOException {
         Settings.writeSettingsToStream(settings, out);
         out.writeLong(generation);
         out.writeLong(pendingGeneration);
-        if (out.getVersion().onOrAfter(Version.V_3_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_2_10_0)) {
             out.writeOptionalWriteable(cryptoMetadata);
         }
     }