diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9128c7d428..dbc089ed3d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/src/integrationTest/java/org/opensearch/security/grpc/GrpcClientAuthNoneTests.java b/src/integrationTest/java/org/opensearch/security/grpc/GrpcClientAuthNoneTests.java index 41dc8421c2..9bfaa7f88b 100644 --- a/src/integrationTest/java/org/opensearch/security/grpc/GrpcClientAuthNoneTests.java +++ b/src/integrationTest/java/org/opensearch/security/grpc/GrpcClientAuthNoneTests.java @@ -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; diff --git a/src/integrationTest/java/org/opensearch/security/grpc/GrpcClientAuthOptionalTests.java b/src/integrationTest/java/org/opensearch/security/grpc/GrpcClientAuthOptionalTests.java index c2667c7d98..ed0dd2ece1 100644 --- a/src/integrationTest/java/org/opensearch/security/grpc/GrpcClientAuthOptionalTests.java +++ b/src/integrationTest/java/org/opensearch/security/grpc/GrpcClientAuthOptionalTests.java @@ -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; diff --git a/src/integrationTest/java/org/opensearch/security/grpc/GrpcClientAuthRequireTests.java b/src/integrationTest/java/org/opensearch/security/grpc/GrpcClientAuthRequireTests.java index f671c0e130..578c228fdb 100644 --- a/src/integrationTest/java/org/opensearch/security/grpc/GrpcClientAuthRequireTests.java +++ b/src/integrationTest/java/org/opensearch/security/grpc/GrpcClientAuthRequireTests.java @@ -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; diff --git a/src/integrationTest/java/org/opensearch/security/grpc/GrpcHelpers.java b/src/integrationTest/java/org/opensearch/security/grpc/GrpcHelpers.java index 6b2c1a5ca2..b7ab411557 100644 --- a/src/integrationTest/java/org/opensearch/security/grpc/GrpcHelpers.java +++ b/src/integrationTest/java/org/opensearch/security/grpc/GrpcHelpers.java @@ -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; @@ -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; @@ -48,17 +48,17 @@ public class GrpcHelpers { protected static final TestCertificates UN_TRUSTED_TEST_CERTIFICATES = new TestCertificates(); protected static final Map 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 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 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" ); @@ -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() );