Skip to content

Bump gradle to 8.14.3 and move gRPC transport out of experimental #5542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 5, 2025
Merged

Bump gradle to 8.14.3 and move gRPC transport out of experimental #5542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d246a00
gRPC trasport moved out of experimental in core - Security plugin ITs…
finnegancarroll Aug 5, 2025
208f493
Fix gRPC import.
finnegancarroll Aug 5, 2025
bd151fc
Remove plugin install - Fix more imports.
finnegancarroll Aug 5, 2025
72ab0f3
Spotless apply
finnegancarroll Aug 5, 2025
161013b
Bump gradle -> 8.14.3.
finnegancarroll Aug 5, 2025
2e2215f
Add back in gRPC plugin, ITs run against internal node.
finnegancarroll Aug 5, 2025
dc9201d
Spotless apply
finnegancarroll Aug 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=845952a9d6afa783db70bb3b0effaae45ae5542ca2bb7929619e8af49cb634cf
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
distributionSha256Sum=ed1a8d686605fd7c23bdf62c7fc7add1c5b23b2bbc3721e661934ef4a4911d7c
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion src/integrationTest/java/org/opensearch/security/grpc/GrpcClientAuthNoneTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
import org.junit.Test;
import org.junit.runner.RunWith;

import org.opensearch.plugin.transport.grpc.GrpcPlugin;
import org.opensearch.protobufs.BulkResponse;
import org.opensearch.protobufs.SearchResponse;
import org.opensearch.test.framework.cluster.ClusterManager;
import org.opensearch.test.framework.cluster.LocalCluster;
import org.opensearch.transport.grpc.GrpcPlugin;

import io.grpc.ManagedChannel;
import io.grpc.StatusRuntimeException;
Expand Down
2 changes: 1 addition & 1 deletion src/integrationTest/java/org/opensearch/security/grpc/GrpcClientAuthOptionalTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
import org.junit.Test;
import org.junit.runner.RunWith;

import org.opensearch.plugin.transport.grpc.GrpcPlugin;
import org.opensearch.test.framework.cluster.ClusterManager;
import org.opensearch.test.framework.cluster.LocalCluster;
import org.opensearch.transport.grpc.GrpcPlugin;

import io.grpc.ManagedChannel;
import io.grpc.StatusRuntimeException;
Expand Down
2 changes: 1 addition & 1 deletion src/integrationTest/java/org/opensearch/security/grpc/GrpcClientAuthRequireTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
import org.junit.Test;
import org.junit.runner.RunWith;

import org.opensearch.plugin.transport.grpc.GrpcPlugin;
import org.opensearch.test.framework.cluster.ClusterManager;
import org.opensearch.test.framework.cluster.LocalCluster;
import org.opensearch.transport.grpc.GrpcPlugin;

import io.grpc.ManagedChannel;
import io.grpc.StatusRuntimeException;
Expand Down
20 changes: 10 additions & 10 deletions src/integrationTest/java/org/opensearch/security/grpc/GrpcHelpers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

import org.opensearch.common.transport.PortsRange;
import org.opensearch.core.common.transport.TransportAddress;
import org.opensearch.plugin.transport.grpc.ssl.SecureNetty4GrpcServerTransport;
import org.opensearch.protobufs.BulkRequest;
import org.opensearch.protobufs.BulkRequestBody;
import org.opensearch.protobufs.BulkResponse;
Expand All @@ -32,6 +31,7 @@
import org.opensearch.test.framework.certificate.TestCertificates;
import org.opensearch.test.framework.cluster.LocalCluster;
import org.opensearch.test.framework.cluster.LocalOpenSearchCluster;
import org.opensearch.transport.grpc.ssl.SecureNetty4GrpcServerTransport;

import io.grpc.ChannelCredentials;
import io.grpc.Grpc;
Expand All @@ -48,17 +48,17 @@ public class GrpcHelpers {
protected static final TestCertificates UN_TRUSTED_TEST_CERTIFICATES = new TestCertificates();

protected static final Map<String, Object> CLIENT_AUTH_NONE = Map.of(
"plugins.security.ssl.aux.experimental-secure-transport-grpc.clientauth_mode",
"plugins.security.ssl.aux.secure-transport-grpc.clientauth_mode",
"NONE"
);

protected static final Map<String, Object> CLIENT_AUTH_OPT = Map.of(
"plugins.security.ssl.aux.experimental-secure-transport-grpc.clientauth_mode",
"plugins.security.ssl.aux.secure-transport-grpc.clientauth_mode",
"OPTIONAL"
);

protected static final Map<String, Object> CLIENT_AUTH_REQUIRE = Map.of(
"plugins.security.ssl.aux.experimental-secure-transport-grpc.clientauth_mode",
"plugins.security.ssl.aux.secure-transport-grpc.clientauth_mode",
"REQUIRE"
);

Expand All @@ -68,16 +68,16 @@ public class GrpcHelpers {
"plugins.security.ssl_only",
true,
"aux.transport.types",
"experimental-secure-transport-grpc",
"aux.transport.experimental-secure-transport-grpc.port",
"secure-transport-grpc",
"aux.transport.secure-transport-grpc.port",
PORTS_RANGE.getPortRangeString(),
"plugins.security.ssl.aux.experimental-secure-transport-grpc.enabled",
"plugins.security.ssl.aux.secure-transport-grpc.enabled",
true,
"plugins.security.ssl.aux.experimental-secure-transport-grpc.pemkey_filepath",
"plugins.security.ssl.aux.secure-transport-grpc.pemkey_filepath",
TEST_CERTIFICATES.getNodeKey(0, null).getAbsolutePath(),
"plugins.security.ssl.aux.experimental-secure-transport-grpc.pemcert_filepath",
"plugins.security.ssl.aux.secure-transport-grpc.pemcert_filepath",
TEST_CERTIFICATES.getNodeCertificate(0).getAbsolutePath(),
"plugins.security.ssl.aux.experimental-secure-transport-grpc.pemtrustedcas_filepath",
"plugins.security.ssl.aux.secure-transport-grpc.pemtrustedcas_filepath",
TEST_CERTIFICATES.getRootCertificate().getAbsolutePath()
);

Expand Down
Loading