[GRPC] Adapt transport-grpc to use opensearch-protobufs 0.13.0

CHANGELOG.md

@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Add temporal routing processors for time-based document routing ([#18920](https://github.com/opensearch-project/OpenSearch/issues/18920))
 - The dynamic mapping parameter supports false_allow_templates ([#19065](https://github.com/opensearch-project/OpenSearch/pull/19065))
 - Add a toBuilder method in EngineConfig to support easy modification of configs([#19054](https://github.com/opensearch-project/OpenSearch/pull/19054))
+- Upgrade opensearch-protobufs dependency to 0.10.0 and update transport-grpc module compatibility ([#19007](https://github.com/opensearch-project/OpenSearch/issues/19007))
 
 ### Changed
 - Add CompletionStage variants to methods in the Client Interface and default to ActionListener impl ([#18998](https://github.com/opensearch-project/OpenSearch/pull/18998))

modules/transport-grpc/build.gradle

@@ -34,7 +34,7 @@ dependencies {
   implementation "io.grpc:grpc-stub:${versions.grpc}"
   implementation "io.grpc:grpc-util:${versions.grpc}"
   implementation "io.perfmark:perfmark-api:0.27.0"
-  implementation "org.opensearch:protobufs:0.6.0"
+  implementation "org.opensearch:protobufs:0.10.0"
   testImplementation project(':test:framework')
 }
 

modules/transport-grpc/licenses/protobufs-0.10.0.jar.sha1

@@ -0,0 +1 @@
+10b3dba8b0973fd6ed4ab530228a764bd624af40

modules/transport-grpc/src/internalClusterTest/java/org/opensearch/transport/grpc/DocumentServiceIT.java

@@ -37,11 +37,11 @@ public void testDocumentServiceBulk() throws Exception {
             DocumentServiceGrpc.DocumentServiceBlockingStub documentStub = DocumentServiceGrpc.newBlockingStub(channel);
 
             // Create a bulk request with an index operation
-            IndexOperation indexOp = IndexOperation.newBuilder().setIndex(indexName).setId("1").build();
+            IndexOperation indexOp = IndexOperation.newBuilder().setXIndex(indexName).setXId("1").build();
 
             BulkRequestBody requestBody = BulkRequestBody.newBuilder()
-                .setIndex(indexOp)
-                .setDoc(com.google.protobuf.ByteString.copyFromUtf8(DEFAULT_DOCUMENT_SOURCE))
+                .setOperationContainer(org.opensearch.protobufs.OperationContainer.newBuilder().setIndex(indexOp).build())
+                .setObject(com.google.protobuf.ByteString.copyFromUtf8(DEFAULT_DOCUMENT_SOURCE))
                 .build();
 
             BulkRequest bulkRequest = BulkRequest.newBuilder().addRequestBody(requestBody).build();

modules/transport-grpc/src/internalClusterTest/java/org/opensearch/transport/grpc/SearchServiceIT.java

@@ -57,7 +57,7 @@ public void testSearchServiceSearch() throws Exception {
                 searchResponse.getResponseBody().getHits().getTotal().getTotalHits().getValue() > 0
             );
             assertEquals("Search response should have one hit", 1, searchResponse.getResponseBody().getHits().getHitsCount());
-            assertEquals("Hit should have correct ID", "1", searchResponse.getResponseBody().getHits().getHits(0).getId());
+            assertEquals("Hit should have correct ID", "1", searchResponse.getResponseBody().getHits().getHits(0).getXId());
         }
     }
 }

modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/common/FetchSourceContextProtoUtils.java

@@ -43,25 +43,25 @@ public static FetchSourceContext parseFromProtoRequest(org.opensearch.protobufs.
         String[] sourceIncludes = null;
 
         // Set up source context if source parameters are provided
-        if (request.hasSource()) {
-            switch (request.getSource().getSourceConfigParamCase()) {
-                case SourceConfigParam.SourceConfigParamCase.BOOL_VALUE:
-                    fetchSource = request.getSource().getBoolValue();
+        if (request.hasXSource()) {
+            switch (request.getXSource().getSourceConfigParamCase()) {
+                case BOOL_VALUE:
+                    fetchSource = request.getXSource().getBoolValue();
                     break;
-                case SourceConfigParam.SourceConfigParamCase.STRING_ARRAY:
-                    sourceIncludes = request.getSource().getStringArray().getStringArrayList().toArray(new String[0]);
+                case STRING_ARRAY:
+                    sourceIncludes = request.getXSource().getStringArray().getStringArrayList().toArray(new String[0]);
                     break;
                 default:
                     throw new UnsupportedOperationException("Invalid sourceConfig provided.");
             }
         }
 
-        if (request.getSourceIncludesList().size() > 0) {
-            sourceIncludes = request.getSourceIncludesList().toArray(new String[0]);
+        if (request.getXSourceIncludesCount() > 0) {
+            sourceIncludes = request.getXSourceIncludesList().toArray(new String[0]);
         }
 
-        if (request.getSourceExcludesList().size() > 0) {
-            sourceExcludes = request.getSourceExcludesList().toArray(new String[0]);
+        if (request.getXSourceExcludesCount() > 0) {
+            sourceExcludes = request.getXSourceExcludesList().toArray(new String[0]);
         }
         if (fetchSource != null || sourceIncludes != null || sourceExcludes != null) {
             return new FetchSourceContext(fetchSource == null ? true : fetchSource, sourceIncludes, sourceExcludes);
@@ -81,8 +81,8 @@ public static FetchSourceContext parseFromProtoRequest(org.opensearch.protobufs.
         String[] sourceExcludes = null;
         String[] sourceIncludes = null;
 
-        if (request.hasSource()) {
-            SourceConfigParam source = request.getSource();
+        if (request.hasXSource()) {
+            SourceConfigParam source = request.getXSource();
 
             if (source.hasBoolValue()) {
                 fetchSource = source.getBoolValue();
@@ -91,12 +91,12 @@ public static FetchSourceContext parseFromProtoRequest(org.opensearch.protobufs.
             }
         }
 
-        if (request.getSourceIncludesCount() > 0) {
-            sourceIncludes = request.getSourceIncludesList().toArray(new String[0]);
+        if (request.getXSourceIncludesCount() > 0) {
+            sourceIncludes = request.getXSourceIncludesList().toArray(new String[0]);
         }
 
-        if (request.getSourceExcludesCount() > 0) {
-            sourceExcludes = request.getSourceExcludesList().toArray(new String[0]);
+        if (request.getXSourceExcludesCount() > 0) {
+            sourceExcludes = request.getXSourceExcludesList().toArray(new String[0]);
         }
 
         if (fetchSource != null || sourceIncludes != null || sourceExcludes != null) {
@@ -118,22 +118,16 @@ public static FetchSourceContext fromProto(SourceConfig sourceConfig) {
         String[] excludes = Strings.EMPTY_ARRAY;
         if (sourceConfig.getSourceConfigCase() == SourceConfig.SourceConfigCase.FETCH) {
             fetchSource = sourceConfig.getFetch();
-        } else if (sourceConfig.hasIncludes()) {
-            ArrayList<String> list = new ArrayList<>();
-            for (String string : sourceConfig.getIncludes().getStringArrayList()) {
-                list.add(string);
-            }
-            includes = list.toArray(new String[0]);
         } else if (sourceConfig.hasFilter()) {
             SourceFilter sourceFilter = sourceConfig.getFilter();
-            if (!sourceFilter.getIncludesList().isEmpty()) {
+            if (sourceFilter.getIncludesCount() > 0) {
                 List<String> includesList = new ArrayList<>();
                 for (String s : sourceFilter.getIncludesList()) {
                     includesList.add(s);
                 }
                 includes = includesList.toArray(new String[0]);
             }
-            if (!sourceFilter.getExcludesList().isEmpty()) {
+            if (sourceFilter.getExcludesCount() > 0) {
                 List<String> excludesList = new ArrayList<>();
                 for (String s : sourceFilter.getExcludesList()) {
                     excludesList.add(s);

modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/common/OpTypeProtoUtils.java

@@ -37,6 +37,7 @@ public static DocWriteRequest.OpType fromProto(OpType opType) {
                 return DocWriteRequest.OpType.CREATE;
             case OP_TYPE_INDEX:
                 return DocWriteRequest.OpType.INDEX;
+            case OP_TYPE_UNSPECIFIED:
             default:
                 throw new UnsupportedOperationException("Invalid optype: " + opType);
         }

modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/common/ScriptProtoUtils.java

@@ -56,10 +56,10 @@ public static Script parseFromProtoRequest(org.opensearch.protobufs.Script scrip
     private static Script parseFromProtoRequest(org.opensearch.protobufs.Script script, String defaultLang) {
         Objects.requireNonNull(defaultLang);
 
-        if (script.hasInlineScript()) {
-            return parseInlineScript(script.getInlineScript(), defaultLang);
-        } else if (script.hasStoredScriptId()) {
-            return parseStoredScriptId(script.getStoredScriptId());
+        if (script.hasInline()) {
+            return parseInlineScript(script.getInline(), defaultLang);
+        } else if (script.hasStored()) {
+            return parseStoredScriptId(script.getStored());
         } else {
             throw new UnsupportedOperationException("No valid script type detected");
         }
@@ -118,10 +118,10 @@ public static Script parseStoredScriptId(StoredScriptId storedScriptId) {
      * @throws UnsupportedOperationException if no language was specified
      */
     public static String parseScriptLanguage(ScriptLanguage language, String defaultLang) {
-        if (language.hasStringValue()) {
-            return language.getStringValue();
+        if (language.hasCustom()) {
+            return language.getCustom();
         }
-        switch (language.getBuiltinScriptLanguage()) {
+        switch (language.getBuiltin()) {
             case BUILTIN_SCRIPT_LANGUAGE_EXPRESSION:
                 return "expression";
             case BUILTIN_SCRIPT_LANGUAGE_JAVA:

modules/transport-grpc/src/main/java/org/opensearch/transport/grpc/proto/request/document/bulk/ActiveShardCountProtoUtils.java

@@ -38,17 +38,18 @@ private ActiveShardCountProtoUtils() {
     public static ActiveShardCount parseProto(WaitForActiveShards waitForActiveShards) {
 
         switch (waitForActiveShards.getWaitForActiveShardsCase()) {
-            case WaitForActiveShards.WaitForActiveShardsCase.WAIT_FOR_ACTIVE_SHARD_OPTIONS:
+            case WAIT_FOR_ACTIVE_SHARD_OPTIONS:
                 switch (waitForActiveShards.getWaitForActiveShardOptions()) {
-                    case WAIT_FOR_ACTIVE_SHARD_OPTIONS_UNSPECIFIED:
-                        throw new UnsupportedOperationException("No mapping for WAIT_FOR_ACTIVE_SHARD_OPTIONS_UNSPECIFIED");
                     case WAIT_FOR_ACTIVE_SHARD_OPTIONS_ALL:
                         return ActiveShardCount.ALL;
+                    case WAIT_FOR_ACTIVE_SHARD_OPTIONS_NULL:
+                    case WAIT_FOR_ACTIVE_SHARD_OPTIONS_UNSPECIFIED:
                     default:
                         return ActiveShardCount.DEFAULT;
                 }
-            case WaitForActiveShards.WaitForActiveShardsCase.INT32_VALUE:
+            case INT32_VALUE:
                 return ActiveShardCount.from(waitForActiveShards.getInt32Value());
+            case WAITFORACTIVESHARDS_NOT_SET:
             default:
                 return ActiveShardCount.DEFAULT;
         }