From 638a45009cb76059dd914c70eb4aa7e777768da2 Mon Sep 17 00:00:00 2001 From: Simon Cooper Date: Fri, 26 Apr 2024 09:30:46 +0100 Subject: [PATCH] Update several references to TransportVersion.toString to use toReleaseVersion (#107902) --- docs/changelog/107902.yaml | 5 +++++ .../script/mustache/MultiSearchTemplateIT.java | 4 ++-- .../script/mustache/SearchTemplateIT.java | 12 ++++++++---- .../features/ResetFeatureStateRequest.java | 14 -------------- .../resolve/ResolveClusterActionRequest.java | 8 ++++---- .../resolve/ResolveClusterActionResponse.java | 4 ++-- .../indices/resolve/ResolveClusterInfo.java | 4 ++-- .../shards/IndicesShardStoresRequest.java | 2 +- .../action/search/TransportSearchHelper.java | 2 +- .../cluster/coordination/NodeJoinExecutor.java | 6 +++--- .../PublicationTransportHandler.java | 6 +++++- .../io/stream/VersionCheckingStreamOutput.java | 4 ++-- .../java/org/elasticsearch/search/SearchHit.java | 2 +- .../search/builder/SearchSourceBuilder.java | 12 ++++++++---- .../search/dfs/DfsSearchResult.java | 6 ++++-- .../search/query/QuerySearchResult.java | 2 +- .../elasticsearch/transport/InboundDecoder.java | 4 ++-- .../stream/VersionCheckingStreamOutputTests.java | 4 ++-- .../transport/InboundDecoderTests.java | 4 ++-- .../FailBeforeCurrentVersionQueryBuilder.java | 4 ++-- .../common/validation/SourceDestValidator.java | 7 +++---- .../action/user/GetUserPrivilegesResponse.java | 4 ++-- .../core/security/authc/Authentication.java | 12 ++++++------ ...moteClusterMinimumVersionValidationTests.java | 8 ++++---- .../user/GetUserPrivilegesResponseTests.java | 4 ++-- .../termsenum/TransportTermsEnumActionTests.java | 4 +++- .../ml/action/TransportStartDatafeedAction.java | 2 +- .../TransportStartDatafeedActionTests.java | 2 +- .../xpack/security/authc/ApiKeyService.java | 16 ++++++++-------- .../CrossClusterAccessAuthenticationService.java | 4 ++-- .../security/authz/store/NativeRolesStore.java | 4 ++-- .../SecurityServerTransportInterceptor.java | 2 +- .../xpack/security/authc/ApiKeyServiceTests.java | 12 ++++++------ ...sClusterAccessAuthenticationServiceTests.java | 4 ++-- .../authz/store/NativeRolesStoreTests.java | 4 ++-- .../SecurityServerTransportInterceptorTests.java | 2 +- .../blobstore/testkit/BlobAnalyzeAction.java | 4 +++- .../testkit/RepositoryAnalyzeAction.java | 6 +++--- .../upgrades/ApiKeyBackwardsCompatibilityIT.java | 8 ++++---- 39 files changed, 113 insertions(+), 105 deletions(-) create mode 100644 docs/changelog/107902.yaml diff --git a/docs/changelog/107902.yaml b/docs/changelog/107902.yaml new file mode 100644 index 000000000000..6b25f8c12df6 --- /dev/null +++ b/docs/changelog/107902.yaml @@ -0,0 +1,5 @@ +pr: 107902 +summary: Update several references to `TransportVersion.toString` to use `toReleaseVersion` +area: Infra/Core +type: bug +issues: [] diff --git a/modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/MultiSearchTemplateIT.java b/modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/MultiSearchTemplateIT.java index 0c3376c9c8a9..c01f6ef46d0c 100644 --- a/modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/MultiSearchTemplateIT.java +++ b/modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/MultiSearchTemplateIT.java @@ -208,8 +208,8 @@ public class MultiSearchTemplateIT extends ESIntegTestCase { String expectedCause = Strings.format( "[fail_before_current_version] was released first in version %s, failed compatibility " + "check trying to send it to node with version %s", - FailBeforeCurrentVersionQueryBuilder.FUTURE_VERSION, - TransportVersions.MINIMUM_CCS_VERSION + FailBeforeCurrentVersionQueryBuilder.FUTURE_VERSION.toReleaseVersion(), + TransportVersions.MINIMUM_CCS_VERSION.toReleaseVersion() ); String actualCause = ex.getCause().getMessage(); assertEquals(expectedCause, actualCause); diff --git a/modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/SearchTemplateIT.java b/modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/SearchTemplateIT.java index 510ff01cf93f..e17fb4b26cd2 100644 --- a/modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/SearchTemplateIT.java +++ b/modules/lang-mustache/src/internalClusterTest/java/org/elasticsearch/script/mustache/SearchTemplateIT.java @@ -37,6 +37,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertResp import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.matchesRegex; /** * Full integration test of the template query plugin. @@ -441,10 +442,13 @@ public class SearchTemplateIT extends ESSingleNodeTestCase { ); assertThat(primary.getMessage(), containsString("'search.check_ccs_compatibility' setting is enabled.")); - String expectedCause = "[fail_before_current_version] was released first in version XXXXXXX, failed compatibility check trying to" - + " send it to node with version XXXXXXX"; - String actualCause = underlying.getMessage().replaceAll("\\d{7,}", "XXXXXXX"); - assertEquals(expectedCause, actualCause); + assertThat( + underlying.getMessage(), + matchesRegex( + "\\[fail_before_current_version] was released first in version .+," + + " failed compatibility check trying to send it to node with version .+" + ) + ); } public static void assertHitCount(SearchTemplateRequestBuilder requestBuilder, long expectedHitCount) { diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/features/ResetFeatureStateRequest.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/features/ResetFeatureStateRequest.java index 2c6769f5edd5..5a7bd2aee361 100644 --- a/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/features/ResetFeatureStateRequest.java +++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/features/ResetFeatureStateRequest.java @@ -8,8 +8,6 @@ package org.elasticsearch.action.admin.cluster.snapshots.features; -import org.elasticsearch.TransportVersion; -import org.elasticsearch.TransportVersions; import org.elasticsearch.action.ActionRequestValidationException; import org.elasticsearch.action.support.master.MasterNodeRequest; import org.elasticsearch.common.io.stream.StreamInput; @@ -20,14 +18,7 @@ import java.io.IOException; /** Request for resetting feature state */ public class ResetFeatureStateRequest extends MasterNodeRequest { - private static final TransportVersion FEATURE_RESET_ON_MASTER = TransportVersions.V_7_14_0; - public static ResetFeatureStateRequest fromStream(StreamInput in) throws IOException { - if (in.getTransportVersion().before(FEATURE_RESET_ON_MASTER)) { - throw new IllegalStateException( - "feature reset is not available in a cluster that have nodes with version before " + FEATURE_RESET_ON_MASTER - ); - } return new ResetFeatureStateRequest(in); } @@ -39,11 +30,6 @@ public class ResetFeatureStateRequest extends MasterNodeRequest { private static void blockForbiddenVersions(TransportVersion joiningTransportVersion) { if (FORBIDDEN_VERSIONS.contains(joiningTransportVersion)) { throw new IllegalStateException( - "A node with transport version " + joiningTransportVersion + " is forbidden from joining this cluster" + "A node with transport version " + joiningTransportVersion.toReleaseVersion() + " is forbidden from joining this cluster" ); } } @@ -427,9 +427,9 @@ public class NodeJoinExecutor implements ClusterStateTaskExecutor { if (joiningCompatibilityVersions.transportVersion().before(minClusterTransportVersion)) { throw new IllegalStateException( "node with transport version [" - + joiningCompatibilityVersions.transportVersion() + + joiningCompatibilityVersions.transportVersion().toReleaseVersion() + "] may not join a cluster with minimum transport version [" - + minClusterTransportVersion + + minClusterTransportVersion.toReleaseVersion() + "]" ); } diff --git a/server/src/main/java/org/elasticsearch/cluster/coordination/PublicationTransportHandler.java b/server/src/main/java/org/elasticsearch/cluster/coordination/PublicationTransportHandler.java index 5c5c5eee17da..d8bf85fc02b3 100644 --- a/server/src/main/java/org/elasticsearch/cluster/coordination/PublicationTransportHandler.java +++ b/server/src/main/java/org/elasticsearch/cluster/coordination/PublicationTransportHandler.java @@ -456,7 +456,11 @@ public class PublicationTransportHandler { final ReleasableBytesReference bytes = serializedDiffs.get(connection.getTransportVersion()); assert bytes != null - : "failed to find serialized diff for node " + destination + " of version [" + connection.getTransportVersion() + "]"; + : "failed to find serialized diff for node " + + destination + + " of version [" + + connection.getTransportVersion().toReleaseVersion() + + "]"; // acquire a ref to the context just in case we need to try again with the full cluster state if (tryIncRef() == false) { diff --git a/server/src/main/java/org/elasticsearch/common/io/stream/VersionCheckingStreamOutput.java b/server/src/main/java/org/elasticsearch/common/io/stream/VersionCheckingStreamOutput.java index 42fb7f4a6afe..5f81f7bd9771 100644 --- a/server/src/main/java/org/elasticsearch/common/io/stream/VersionCheckingStreamOutput.java +++ b/server/src/main/java/org/elasticsearch/common/io/stream/VersionCheckingStreamOutput.java @@ -67,9 +67,9 @@ public final class VersionCheckingStreamOutput extends StreamOutput { "[" + namedWriteable.getWriteableName() + "] was released first in version " - + namedWriteable.getMinimalSupportedVersion() + + namedWriteable.getMinimalSupportedVersion().toReleaseVersion() + ", failed compatibility check trying to send it to node with version " - + getTransportVersion() + + getTransportVersion().toReleaseVersion() ); } } diff --git a/server/src/main/java/org/elasticsearch/search/SearchHit.java b/server/src/main/java/org/elasticsearch/search/SearchHit.java index 62a62fb93a4a..92875071dd04 100644 --- a/server/src/main/java/org/elasticsearch/search/SearchHit.java +++ b/server/src/main/java/org/elasticsearch/search/SearchHit.java @@ -307,7 +307,7 @@ public final class SearchHit implements Writeable, ToXContentObject, RefCounted if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { out.writeVInt(rank); } else if (rank != NO_RANK) { - throw new IllegalArgumentException("cannot serialize [rank] to version [" + out.getTransportVersion() + "]"); + throw new IllegalArgumentException("cannot serialize [rank] to version [" + out.getTransportVersion().toReleaseVersion() + "]"); } out.writeOptionalText(id); if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) { diff --git a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java index 741a0e680b52..cb2c53a97fbc 100644 --- a/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java +++ b/server/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java @@ -299,7 +299,9 @@ public final class SearchSourceBuilder implements Writeable, ToXContentObject, R if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_9_X)) { out.writeCollection(subSearchSourceBuilders); } else if (out.getTransportVersion().before(TransportVersions.V_8_4_0) && subSearchSourceBuilders.size() >= 2) { - throw new IllegalArgumentException("cannot serialize [sub_searches] to version [" + out.getTransportVersion() + "]"); + throw new IllegalArgumentException( + "cannot serialize [sub_searches] to version [" + out.getTransportVersion().toReleaseVersion() + "]" + ); } else { out.writeOptionalNamedWriteable(query()); } @@ -346,8 +348,10 @@ public final class SearchSourceBuilder implements Writeable, ToXContentObject, R if (out.getTransportVersion().before(TransportVersions.V_8_7_0)) { if (knnSearch.size() > 1) { throw new IllegalArgumentException( - "Versions before 8070099 don't support multiple [knn] search clauses and search was sent to [" - + out.getTransportVersion() + "Versions before [" + + TransportVersions.V_8_7_0.toReleaseVersion() + + "] don't support multiple [knn] search clauses and search was sent to [" + + out.getTransportVersion().toReleaseVersion() + "]" ); } @@ -359,7 +363,7 @@ public final class SearchSourceBuilder implements Writeable, ToXContentObject, R if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { out.writeOptionalNamedWriteable(rankBuilder); } else if (rankBuilder != null) { - throw new IllegalArgumentException("cannot serialize [rank] to version [" + out.getTransportVersion() + "]"); + throw new IllegalArgumentException("cannot serialize [rank] to version [" + out.getTransportVersion().toReleaseVersion() + "]"); } } diff --git a/server/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java b/server/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java index b9cbd5baa1eb..b76912e8b742 100644 --- a/server/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java +++ b/server/src/main/java/org/elasticsearch/search/dfs/DfsSearchResult.java @@ -141,8 +141,10 @@ public final class DfsSearchResult extends SearchPhaseResult { if (knnResults != null && knnResults.size() > 1) { throw new IllegalArgumentException( "Cannot serialize multiple KNN results to nodes using previous transport version [" - + out.getTransportVersion() - + "], minimum required transport version is [8070099]" + + out.getTransportVersion().toReleaseVersion() + + "], minimum required transport version is [" + + TransportVersions.V_8_7_0.toReleaseVersion() + + "]" ); } out.writeOptionalWriteable(knnResults == null || knnResults.isEmpty() ? null : knnResults.get(0)); diff --git a/server/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java b/server/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java index 816b956251df..90b4885e65c0 100644 --- a/server/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java +++ b/server/src/main/java/org/elasticsearch/search/query/QuerySearchResult.java @@ -456,7 +456,7 @@ public final class QuerySearchResult extends SearchPhaseResult { if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) { out.writeOptionalNamedWriteable(rankShardResult); } else if (rankShardResult != null) { - throw new IllegalArgumentException("cannot serialize [rank] to version [" + out.getTransportVersion() + "]"); + throw new IllegalArgumentException("cannot serialize [rank] to version [" + out.getTransportVersion().toReleaseVersion() + "]"); } } diff --git a/server/src/main/java/org/elasticsearch/transport/InboundDecoder.java b/server/src/main/java/org/elasticsearch/transport/InboundDecoder.java index 056af07b1391..2c498597779f 100644 --- a/server/src/main/java/org/elasticsearch/transport/InboundDecoder.java +++ b/server/src/main/java/org/elasticsearch/transport/InboundDecoder.java @@ -246,9 +246,9 @@ public class InboundDecoder implements Releasable { if (TransportVersion.isCompatible(remoteVersion) == false) { throw new IllegalStateException( "Received message from unsupported version: [" - + remoteVersion + + remoteVersion.toReleaseVersion() + "] minimal compatible version is: [" - + TransportVersions.MINIMUM_COMPATIBLE + + TransportVersions.MINIMUM_COMPATIBLE.toReleaseVersion() + "]" ); } diff --git a/server/src/test/java/org/elasticsearch/common/io/stream/VersionCheckingStreamOutputTests.java b/server/src/test/java/org/elasticsearch/common/io/stream/VersionCheckingStreamOutputTests.java index bee63e72a3a0..7be3a8e716ac 100644 --- a/server/src/test/java/org/elasticsearch/common/io/stream/VersionCheckingStreamOutputTests.java +++ b/server/src/test/java/org/elasticsearch/common/io/stream/VersionCheckingStreamOutputTests.java @@ -49,9 +49,9 @@ public class VersionCheckingStreamOutputTests extends ESTestCase { ); assertEquals( "[test_writable] was released first in version " - + TransportVersion.current() + + TransportVersion.current().toReleaseVersion() + ", failed compatibility check trying to send it to node with version " - + streamVersion, + + streamVersion.toReleaseVersion(), e.getMessage() ); } diff --git a/server/src/test/java/org/elasticsearch/transport/InboundDecoderTests.java b/server/src/test/java/org/elasticsearch/transport/InboundDecoderTests.java index ffcd3a3386f1..8eba0277e490 100644 --- a/server/src/test/java/org/elasticsearch/transport/InboundDecoderTests.java +++ b/server/src/test/java/org/elasticsearch/transport/InboundDecoderTests.java @@ -477,9 +477,9 @@ public class InboundDecoderTests extends ESTestCase { } catch (IllegalStateException expected) { assertEquals( "Received message from unsupported version: [" - + invalid + + invalid.toReleaseVersion() + "] minimal compatible version is: [" - + TransportVersions.MINIMUM_COMPATIBLE + + TransportVersions.MINIMUM_COMPATIBLE.toReleaseVersion() + "]", expected.getMessage() ); diff --git a/test/framework/src/main/java/org/elasticsearch/search/FailBeforeCurrentVersionQueryBuilder.java b/test/framework/src/main/java/org/elasticsearch/search/FailBeforeCurrentVersionQueryBuilder.java index 6c08ff43033e..f1cb62ff41eb 100644 --- a/test/framework/src/main/java/org/elasticsearch/search/FailBeforeCurrentVersionQueryBuilder.java +++ b/test/framework/src/main/java/org/elasticsearch/search/FailBeforeCurrentVersionQueryBuilder.java @@ -22,7 +22,7 @@ import java.io.IOException; public class FailBeforeCurrentVersionQueryBuilder extends DummyQueryBuilder { public static final String NAME = "fail_before_current_version"; - public static final int FUTURE_VERSION = TransportVersion.current().id() + 11_111; + public static final TransportVersion FUTURE_VERSION = TransportVersion.fromId(TransportVersion.current().id() + 11_111); public FailBeforeCurrentVersionQueryBuilder(StreamInput in) throws IOException { super(in); @@ -49,6 +49,6 @@ public class FailBeforeCurrentVersionQueryBuilder extends DummyQueryBuilder { public TransportVersion getMinimalSupportedVersion() { // this is what causes the failure - it always reports a version in the future, so it is never compatible with // current or minimum CCS TransportVersion - return new TransportVersion(FUTURE_VERSION); + return FUTURE_VERSION; } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/common/validation/SourceDestValidator.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/common/validation/SourceDestValidator.java index 9962f14ec373..700158712707 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/common/validation/SourceDestValidator.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/common/validation/SourceDestValidator.java @@ -71,8 +71,7 @@ public final class SourceDestValidator { + "alias [{0}], license is not active"; public static final String REMOTE_SOURCE_INDICES_NOT_SUPPORTED = "remote source indices are not supported"; public static final String REMOTE_CLUSTERS_TRANSPORT_TOO_OLD = - "remote clusters are expected to run at least transport version [{0}] (reason: [{1}])," - + " but the following clusters were too old: [{2}]"; + "remote clusters are expected to run at least version [{0}] (reason: [{1}])," + " but the following clusters were too old: [{2}]"; public static final String PIPELINE_MISSING = "Pipeline with id [{0}] could not be found"; private final IndexNameExpressionResolver indexNameExpressionResolver; @@ -491,12 +490,12 @@ public final class SourceDestValidator { if (oldRemoteClusterVersions.isEmpty() == false) { context.addValidationError( REMOTE_CLUSTERS_TRANSPORT_TOO_OLD, - minExpectedVersion, + minExpectedVersion.toReleaseVersion(), reason, oldRemoteClusterVersions.entrySet() .stream() .sorted(comparingByKey()) // sort to have a deterministic order among clusters in the resulting string - .map(e -> e.getKey() + " (" + e.getValue() + ")") + .map(e -> e.getKey() + " (" + e.getValue().toReleaseVersion() + ")") .collect(joining(", ")) ); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUserPrivilegesResponse.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUserPrivilegesResponse.java index 2cd37df4ef15..9f62513e1b69 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUserPrivilegesResponse.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/action/user/GetUserPrivilegesResponse.java @@ -111,9 +111,9 @@ public final class GetUserPrivilegesResponse extends ActionResponse { } else if (hasRemoteIndicesPrivileges()) { throw new IllegalArgumentException( "versions of Elasticsearch before [" - + TransportVersions.V_8_8_0 + + TransportVersions.V_8_8_0.toReleaseVersion() + "] can't handle remote indices privileges and attempted to send to [" - + out.getTransportVersion() + + out.getTransportVersion().toReleaseVersion() + "]" ); } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java index 6a06be1b63b7..6ef2441011e6 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authc/Authentication.java @@ -226,9 +226,9 @@ public final class Authentication implements ToXContentObject { if (isCrossClusterAccess() && olderVersion.before(TRANSPORT_VERSION_ADVANCED_REMOTE_CLUSTER_SECURITY)) { throw new IllegalArgumentException( "versions of Elasticsearch before [" - + TRANSPORT_VERSION_ADVANCED_REMOTE_CLUSTER_SECURITY + + TRANSPORT_VERSION_ADVANCED_REMOTE_CLUSTER_SECURITY.toReleaseVersion() + "] can't handle cross cluster access authentication and attempted to rewrite for [" - + olderVersion + + olderVersion.toReleaseVersion() + "]" ); } @@ -576,9 +576,9 @@ public final class Authentication implements ToXContentObject { if (isCrossClusterAccess && out.getTransportVersion().before(TRANSPORT_VERSION_ADVANCED_REMOTE_CLUSTER_SECURITY)) { throw new IllegalArgumentException( "versions of Elasticsearch before [" - + TRANSPORT_VERSION_ADVANCED_REMOTE_CLUSTER_SECURITY + + TRANSPORT_VERSION_ADVANCED_REMOTE_CLUSTER_SECURITY.toReleaseVersion() + "] can't handle cross cluster access authentication and attempted to send to [" - + out.getTransportVersion() + + out.getTransportVersion().toReleaseVersion() + "]" ); } @@ -1368,9 +1368,9 @@ public final class Authentication implements ToXContentObject { () -> "Cross cluster access authentication has authentication field in metadata [" + authenticationFromMetadata + "] that may require a rewrite from version [" - + effectiveSubjectVersion + + effectiveSubjectVersion.toReleaseVersion() + "] to [" - + olderVersion + + olderVersion.toReleaseVersion() + "]" ); final Map rewrittenMetadata = new HashMap<>(metadata); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/common/validation/RemoteClusterMinimumVersionValidationTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/common/validation/RemoteClusterMinimumVersionValidationTests.java index 57166d996d12..299279ee13f1 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/common/validation/RemoteClusterMinimumVersionValidationTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/common/validation/RemoteClusterMinimumVersionValidationTests.java @@ -82,8 +82,8 @@ public class RemoteClusterMinimumVersionValidationTests extends ESTestCase { ctx -> assertThat( ctx.getValidationException().validationErrors(), contains( - "remote clusters are expected to run at least transport version [7110099] (reason: [some reason]), " - + "but the following clusters were too old: [cluster-A (7100099)]" + "remote clusters are expected to run at least version [7.11.0] (reason: [some reason]), " + + "but the following clusters were too old: [cluster-A (7.10.0)]" ) ) ) @@ -100,8 +100,8 @@ public class RemoteClusterMinimumVersionValidationTests extends ESTestCase { ctx -> assertThat( ctx.getValidationException().validationErrors(), contains( - "remote clusters are expected to run at least transport version [7120099] (reason: [some reason]), " - + "but the following clusters were too old: [cluster-A (7100099), cluster-B (7110099)]" + "remote clusters are expected to run at least version [7.12.0] (reason: [some reason]), " + + "but the following clusters were too old: [cluster-A (7.10.0), cluster-B (7.11.0)]" ) ) ) diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/user/GetUserPrivilegesResponseTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/user/GetUserPrivilegesResponseTests.java index 9556d0918631..1cf61fac174a 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/user/GetUserPrivilegesResponseTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/action/user/GetUserPrivilegesResponseTests.java @@ -100,9 +100,9 @@ public class GetUserPrivilegesResponseTests extends ESTestCase { ex.getMessage(), containsString( "versions of Elasticsearch before [" - + TransportVersions.V_8_8_0 + + TransportVersions.V_8_8_0.toReleaseVersion() + "] can't handle remote indices privileges and attempted to send to [" - + version + + version.toReleaseVersion() + "]" ) ); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/termsenum/TransportTermsEnumActionTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/termsenum/TransportTermsEnumActionTests.java index cb06dffead14..975d08eb4527 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/termsenum/TransportTermsEnumActionTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/termsenum/TransportTermsEnumActionTests.java @@ -84,7 +84,9 @@ public class TransportTermsEnumActionTests extends ESSingleNodeTestCase { assertThat( ex.getCause().getCause().getMessage(), containsString( - "was released first in version " + version + ", failed compatibility check trying to send it to node with version" + "was released first in version " + + version.toReleaseVersion() + + ", failed compatibility check trying to send it to node with version" ) ); } diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartDatafeedAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartDatafeedAction.java index 2067bae04856..ab0ada00b8aa 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartDatafeedAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartDatafeedAction.java @@ -318,7 +318,7 @@ public class TransportStartDatafeedAction extends TransportMasterNodeAction, ActionListener< && clusterService.state().getMinTransportVersion().before(TRANSPORT_VERSION_ADVANCED_REMOTE_CLUSTER_SECURITY)) { listener.onFailure( new IllegalStateException( - "all nodes must have transport version [" - + TRANSPORT_VERSION_ADVANCED_REMOTE_CLUSTER_SECURITY + "all nodes must have version [" + + TRANSPORT_VERSION_ADVANCED_REMOTE_CLUSTER_SECURITY.toReleaseVersion() + "] or higher to support remote indices privileges" ) ); diff --git a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java index 462b41a51946..1a6888764673 100644 --- a/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java +++ b/x-pack/plugin/security/src/main/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptor.java @@ -318,7 +318,7 @@ public class SecurityServerTransportInterceptor implements TransportInterceptor "Settings for remote cluster [" + remoteClusterAlias + "] indicate cross cluster access headers should be sent but target cluster version [" - + connection.getTransportVersion() + + connection.getTransportVersion().toReleaseVersion() + "] does not support receiving them" ); } diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ApiKeyServiceTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ApiKeyServiceTests.java index 269031804f7e..0cb7a270099a 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ApiKeyServiceTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/ApiKeyServiceTests.java @@ -2710,8 +2710,8 @@ public class ApiKeyServiceTests extends ESTestCase { assertThat( e.getMessage(), containsString( - "all nodes must have transport version [" - + TRANSPORT_VERSION_ADVANCED_REMOTE_CLUSTER_SECURITY + "all nodes must have version [" + + TRANSPORT_VERSION_ADVANCED_REMOTE_CLUSTER_SECURITY.toReleaseVersion() + "] or higher to support creating cross cluster API keys" ) ); @@ -2856,8 +2856,8 @@ public class ApiKeyServiceTests extends ESTestCase { assertThat( e1.getMessage(), containsString( - "all nodes must have transport version [" - + WORKFLOWS_RESTRICTION_VERSION + "all nodes must have version [" + + WORKFLOWS_RESTRICTION_VERSION.toReleaseVersion() + "] or higher to support restrictions for API keys" ) ); @@ -2874,8 +2874,8 @@ public class ApiKeyServiceTests extends ESTestCase { assertThat( e2.getMessage(), containsString( - "all nodes must have transport version [" - + WORKFLOWS_RESTRICTION_VERSION + "all nodes must have version [" + + WORKFLOWS_RESTRICTION_VERSION.toReleaseVersion() + "] or higher to support restrictions for API keys" ) ); diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/CrossClusterAccessAuthenticationServiceTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/CrossClusterAccessAuthenticationServiceTests.java index 6e03aff9a842..3bb776e0f726 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/CrossClusterAccessAuthenticationServiceTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authc/CrossClusterAccessAuthenticationServiceTests.java @@ -108,8 +108,8 @@ public class CrossClusterAccessAuthenticationServiceTests extends ESTestCase { assertThat( actual.getCause().getCause().getMessage(), equalTo( - "all nodes must have transport version [" - + TRANSPORT_VERSION_ADVANCED_REMOTE_CLUSTER_SECURITY + "all nodes must have version [" + + TRANSPORT_VERSION_ADVANCED_REMOTE_CLUSTER_SECURITY.toReleaseVersion() + "] or higher to support cross cluster requests through the dedicated remote cluster port" ) ); diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStoreTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStoreTests.java index 49d5a67b7d20..ad1ab132bb32 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStoreTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/store/NativeRolesStoreTests.java @@ -435,8 +435,8 @@ public class NativeRolesStoreTests extends ESTestCase { assertThat( e.getMessage(), containsString( - "all nodes must have transport version [" - + TRANSPORT_VERSION_ADVANCED_REMOTE_CLUSTER_SECURITY + "all nodes must have version [" + + TRANSPORT_VERSION_ADVANCED_REMOTE_CLUSTER_SECURITY.toReleaseVersion() + "] or higher to support remote indices privileges" ) ); diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptorTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptorTests.java index 6d5ba44ccabf..2d8307eae8ba 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptorTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/transport/SecurityServerTransportInterceptorTests.java @@ -1005,7 +1005,7 @@ public class SecurityServerTransportInterceptorTests extends ESTestCase { "Settings for remote cluster [" + remoteClusterAlias + "] indicate cross cluster access headers should be sent but target cluster version [" - + connection.getTransportVersion() + + connection.getTransportVersion().toReleaseVersion() + "] does not support receiving them" ) ); diff --git a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/BlobAnalyzeAction.java b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/BlobAnalyzeAction.java index d9c85eb37aaa..aa0cf3e3cfc1 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/BlobAnalyzeAction.java +++ b/x-pack/plugin/snapshot-repo-test-kit/src/main/java/org/elasticsearch/repositories/blobstore/testkit/BlobAnalyzeAction.java @@ -716,7 +716,9 @@ class BlobAnalyzeAction extends HandledTransportAction