Skip to content

Commit 5d34dd3

Browse files
Bump test only protobuf to 0.13.0 (#5553)
Signed-off-by: Finn Carroll <carrofin@amazon.com>
1 parent 7ced461 commit 5d34dd3

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ buildscript {
3434
guava_version = '33.4.8-jre'
3535
jaxb_version = '2.3.9'
3636
spring_version = '6.2.10'
37-
protobuf_plugin_version = '0.6.0'
37+
protobuf_plugin_version = '0.13.0'
3838

3939
if (buildVersionQualifier) {
4040
opensearch_build += "-${buildVersionQualifier}"

src/integrationTest/java/org/opensearch/security/grpc/GrpcClientAuthNoneTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,12 @@ public static void assertBulkAndSearchTestIndex(ManagedChannel channel) {
5757

5858
BulkResponse bulkResp = GrpcHelpers.doBulk(channel, testIndex, testDocs);
5959
assertNotNull(bulkResp);
60-
assertFalse(bulkResp.hasBulkErrorResponse());
61-
assertEquals(testDocs, bulkResp.getBulkResponseBody().getItemsCount());
60+
assertFalse(bulkResp.getErrors());
61+
assertEquals(testDocs, bulkResp.getItemsCount());
6262

6363
SearchResponse searchResp = GrpcHelpers.doMatchAll(channel, testIndex, 10);
6464
assertNotNull(searchResp);
65-
assertEquals(SearchResponse.ResponseCase.RESPONSE_BODY.getNumber(), searchResp.getResponseCase().getNumber());
66-
assertEquals(testDocs, searchResp.getResponseBody().getHits().getTotal().getTotalHits().getValue());
65+
assertEquals(testDocs, searchResp.getHits().getTotal().getTotalHits().getValue());
6766

6867
channel.shutdown();
6968
}

src/integrationTest/java/org/opensearch/security/grpc/GrpcHelpers.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.opensearch.protobufs.BulkResponse;
2222
import org.opensearch.protobufs.IndexOperation;
2323
import org.opensearch.protobufs.MatchAllQuery;
24+
import org.opensearch.protobufs.OperationContainer;
2425
import org.opensearch.protobufs.QueryContainer;
2526
import org.opensearch.protobufs.Refresh;
2627
import org.opensearch.protobufs.SearchRequest;
@@ -134,17 +135,18 @@ public static ManagedChannel secureUntrustedChannel(TransportAddress addr) throw
134135
}
135136

136137
public static BulkResponse doBulk(ManagedChannel channel, String index, long numDocs) {
137-
BulkRequest.Builder requestBuilder = BulkRequest.newBuilder().setRefresh(Refresh.REFRESH_TRUE);
138+
BulkRequest.Builder requestBuilder = BulkRequest.newBuilder().setRefresh(Refresh.REFRESH_TRUE).setIndex(index);
138139
for (int i = 0; i < numDocs; i++) {
139140
String docBody = """
140141
{
141142
"field": "doc %d body"
142143
}
143144
""".formatted(i);
144-
IndexOperation indexOp = IndexOperation.newBuilder().setIndex(index).setId(String.valueOf(i)).build();
145+
IndexOperation.Builder indexOp = IndexOperation.newBuilder().setXId(String.valueOf(i));
146+
OperationContainer.Builder opCont = OperationContainer.newBuilder().setIndex(indexOp);
145147
BulkRequestBody requestBody = BulkRequestBody.newBuilder()
146-
.setIndex(indexOp)
147-
.setDoc(com.google.protobuf.ByteString.copyFromUtf8(docBody))
148+
.setOperationContainer(opCont)
149+
.setObject(com.google.protobuf.ByteString.copyFromUtf8(docBody))
148150
.build();
149151
requestBuilder.addRequestBody(requestBody);
150152
}

0 commit comments

Comments
 (0)