Skip to content

Commit bba12ed

Browse files
prwhelanprwhelan
committed
combine error messages
1 parent 345b57c commit bba12ed

File tree

7 files changed

+11
-62
lines changed

7 files changed

+11
-62
lines changed

‎x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/common/validation/SourceDestValidator.java‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ public final class SourceDestValidator {
6969
+ "alias [{0}], at least a [{1}] license is required, found license [{2}]";
7070
public static final String REMOTE_CLUSTER_LICENSE_INACTIVE = "License check failed for remote cluster "
7171
+ "alias [{0}], license is not active";
72-
public static final String REMOTE_SOURCE_INDICES_NOT_SUPPORTED = "remote source indices are not supported";
73-
public static final String CROSS_PROJECT_INDICES_NOT_SUPPORTED = "cross-project indices are not supported";
72+
public static final String REMOTE_SOURCE_AND_CROSS_PROJECT_INDICES_ARE_NOT_SUPPORTED =
73+
"remote source and cross-project indices are not supported";
7474
public static final String REMOTE_CLUSTERS_TRANSPORT_TOO_OLD =
7575
"remote clusters are expected to run at least version [{0}] (reason: [{1}])," + " but the following clusters were too old: [{2}]";
7676
public static final String PIPELINE_MISSING = "Pipeline with id [{0}] could not be found";
@@ -79,7 +79,6 @@ public final class SourceDestValidator {
7979
private final RemoteClusterService remoteClusterService;
8080
private final RemoteClusterLicenseChecker remoteClusterLicenseChecker;
8181
private final IngestService ingestService;
82-
private final boolean crossProjectEnabled;
8382
private final String nodeName;
8483
private final String license;
8584

@@ -92,7 +91,6 @@ static class Context {
9291
private final RemoteClusterService remoteClusterService;
9392
private final RemoteClusterLicenseChecker remoteClusterLicenseChecker;
9493
private final IngestService ingestService;
95-
private final boolean crossProjectEnabled;
9694
private final String[] source;
9795
private final String destIndex;
9896
private final String destPipeline;
@@ -110,7 +108,6 @@ static class Context {
110108
final RemoteClusterService remoteClusterService,
111109
final RemoteClusterLicenseChecker remoteClusterLicenseChecker,
112110
final IngestService ingestService,
113-
boolean crossProjectEnabled,
114111
final String[] source,
115112
final String destIndex,
116113
final String destPipeline,
@@ -122,7 +119,6 @@ static class Context {
122119
this.remoteClusterService = remoteClusterService;
123120
this.remoteClusterLicenseChecker = remoteClusterLicenseChecker;
124121
this.ingestService = ingestService;
125-
this.crossProjectEnabled = crossProjectEnabled;
126122
this.source = source;
127123
this.destIndex = destIndex;
128124
this.destPipeline = destPipeline;
@@ -170,10 +166,6 @@ public String getLicense() {
170166
return license;
171167
}
172168

173-
private boolean crossProjectEnabled() {
174-
return crossProjectEnabled;
175-
}
176-
177169
public SortedSet<String> resolveSource() {
178170
if (resolvedSource == null) {
179171
resolveLocalAndRemoteSource();
@@ -275,26 +267,23 @@ public interface SourceDestValidation {
275267
* Create a new Source Dest Validator
276268
*
277269
* @param indexNameExpressionResolver A valid IndexNameExpressionResolver object
278-
* @param remoteClusterService A valid RemoteClusterService object
270+
* @param remoteClusterService A valid RemoteClusterService object
279271
* @param remoteClusterLicenseChecker A RemoteClusterLicenseChecker or null if CCS is disabled
280-
* @param crossProjectEnabled Determines if cross-project is enabled for this cluster
281-
* @param nodeName the name of this node
282-
* @param license the license of the feature validated for
272+
* @param nodeName the name of this node
273+
* @param license the license of the feature validated for
283274
*/
284275
public SourceDestValidator(
285276
IndexNameExpressionResolver indexNameExpressionResolver,
286277
RemoteClusterService remoteClusterService,
287278
RemoteClusterLicenseChecker remoteClusterLicenseChecker,
288279
IngestService ingestService,
289-
boolean crossProjectEnabled,
290280
String nodeName,
291281
String license
292282
) {
293283
this.indexNameExpressionResolver = indexNameExpressionResolver;
294284
this.remoteClusterService = remoteClusterService;
295285
this.remoteClusterLicenseChecker = remoteClusterLicenseChecker;
296286
this.ingestService = ingestService;
297-
this.crossProjectEnabled = crossProjectEnabled;
298287
this.nodeName = nodeName;
299288
this.license = license;
300289
}
@@ -323,7 +312,6 @@ public void validate(
323312
remoteClusterService,
324313
remoteClusterLicenseChecker,
325314
ingestService,
326-
crossProjectEnabled,
327315
source,
328316
destIndex,
329317
destPipeline,
@@ -568,9 +556,7 @@ static class RemoteSourceNotSupportedValidation implements SourceDestValidation
568556
@Override
569557
public void validate(Context context, ActionListener<Context> listener) {
570558
if (context.resolveRemoteSource().isEmpty() == false) {
571-
context.addValidationError(
572-
context.crossProjectEnabled() ? CROSS_PROJECT_INDICES_NOT_SUPPORTED : REMOTE_SOURCE_INDICES_NOT_SUPPORTED
573-
);
559+
context.addValidationError(REMOTE_SOURCE_AND_CROSS_PROJECT_INDICES_ARE_NOT_SUPPORTED);
574560
}
575561
listener.onResponse(context);
576562
}

‎x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/common/validation/RemoteClusterMinimumVersionValidationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class RemoteClusterMinimumVersionValidationTests extends ESTestCase {
4040

4141
@Before
4242
public void setUpMocks() {
43-
context = spy(new Context(null, null, null, null, null, false, null, null, null, null, null));
43+
context = spy(new Context(null, null, null, null, null, null, null, null, null, null));
4444
doReturn(TransportVersions.V_8_10_X).when(context).getRemoteClusterVersion("cluster-A");
4545
doReturn(TransportVersions.V_8_11_X).when(context).getRemoteClusterVersion("cluster-B");
4646
doReturn(TransportVersions.V_8_12_0).when(context).getRemoteClusterVersion("cluster-C");

‎x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/common/validation/SourceDestValidatorTests.java‎

Lines changed: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ public class SourceDestValidatorTests extends ESTestCase {
125125
remoteClusterService,
126126
null,
127127
ingestService,
128-
false,
129128
"node_id",
130129
"license"
131130
);
@@ -652,7 +651,6 @@ public void testRemoteSourceBasic() throws InterruptedException {
652651
remoteClusterService,
653652
remoteClusterLicenseCheckerBasic,
654653
ingestService,
655-
false,
656654
new String[] { REMOTE_BASIC + ":" + "SOURCE_1" },
657655
"dest",
658656
null,
@@ -679,7 +677,6 @@ public void testRemoteSourceNotSupportedValidationWithLocalIndex() throws Interr
679677
remoteClusterService,
680678
remoteClusterLicenseCheckerBasic,
681679
ingestService,
682-
false,
683680
new String[] { SOURCE_1 },
684681
"dest",
685682
null,
@@ -701,7 +698,6 @@ public void testRemoteSourceNotSupportedValidationWithRemoteIndex() throws Inter
701698
remoteClusterService,
702699
remoteClusterLicenseCheckerBasic,
703700
ingestService,
704-
false,
705701
new String[] { REMOTE_BASIC + ":" + SOURCE_1 },
706702
"dest",
707703
null,
@@ -711,29 +707,10 @@ public void testRemoteSourceNotSupportedValidationWithRemoteIndex() throws Inter
711707
);
712708

713709
assertValidationWithContext(listener -> REMOTE_SOURCE_NOT_SUPPORTED_VALIDATION.validate(context, listener), c -> {
714-
assertThat(c.getValidationException().getMessage(), containsString("remote source indices are not supported"));
715-
}, null);
716-
}
717-
718-
public void testRemoteSourceNotSupportedValidationWithCrossProjectIndex() throws InterruptedException {
719-
Context context = spy(
720-
new SourceDestValidator.Context(
721-
CLUSTER_STATE,
722-
indexNameExpressionResolver,
723-
remoteClusterService,
724-
remoteClusterLicenseCheckerBasic,
725-
ingestService,
726-
true,
727-
new String[] { "project1:" + SOURCE_1 },
728-
"dest",
729-
null,
730-
"node_id",
731-
"license"
732-
)
733-
);
734-
735-
assertValidationWithContext(listener -> REMOTE_SOURCE_NOT_SUPPORTED_VALIDATION.validate(context, listener), c -> {
736-
assertThat(c.getValidationException().getMessage(), containsString("cross-project indices are not supported"));
710+
assertThat(
711+
c.getValidationException().getMessage(),
712+
containsString("remote source and cross-project indices are not supported")
713+
);
737714
}, null);
738715
}
739716

@@ -745,7 +722,6 @@ public void testRemoteSourcePlatinum() throws InterruptedException {
745722
remoteClusterService,
746723
new RemoteClusterLicenseChecker(clientWithBasicLicense, platinumFeature),
747724
ingestService,
748-
false,
749725
new String[] { REMOTE_BASIC + ":" + "SOURCE_1" },
750726
"dest",
751727
null,
@@ -777,7 +753,6 @@ public void testRemoteSourcePlatinum() throws InterruptedException {
777753
remoteClusterService,
778754
new RemoteClusterLicenseChecker(clientWithPlatinumLicense, platinumFeature),
779755
ingestService,
780-
false,
781756
new String[] { REMOTE_PLATINUM + ":" + "SOURCE_1" },
782757
"dest",
783758
null,
@@ -800,7 +775,6 @@ public void testRemoteSourcePlatinum() throws InterruptedException {
800775
remoteClusterService,
801776
new RemoteClusterLicenseChecker(clientWithPlatinumLicense, platinumFeature),
802777
ingestService,
803-
false,
804778
new String[] { REMOTE_PLATINUM + ":" + "SOURCE_1" },
805779
"dest",
806780
"node_id",
@@ -824,7 +798,6 @@ public void testRemoteSourcePlatinum() throws InterruptedException {
824798
remoteClusterService,
825799
new RemoteClusterLicenseChecker(clientWithTrialLicense, platinumFeature),
826800
ingestService,
827-
false,
828801
new String[] { REMOTE_PLATINUM + ":" + "SOURCE_1" },
829802
"dest",
830803
"node_id",
@@ -850,7 +823,6 @@ public void testRemoteSourceLicenseInActive() throws InterruptedException {
850823
remoteClusterService,
851824
new RemoteClusterLicenseChecker(clientWithExpiredBasicLicense, platinumFeature),
852825
ingestService,
853-
false,
854826
new String[] { REMOTE_BASIC + ":" + "SOURCE_1" },
855827
"dest",
856828
null,
@@ -879,7 +851,6 @@ public void testRemoteSourceDoesNotExist() throws InterruptedException {
879851
remoteClusterService,
880852
new RemoteClusterLicenseChecker(clientWithExpiredBasicLicense, platinumFeature),
881853
ingestService,
882-
false,
883854
new String[] { "non_existing_remote:" + "SOURCE_1" },
884855
"dest",
885856
null,

‎x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportPutDataFrameAnalyticsAction.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.elasticsearch.license.LicenseUtils;
2929
import org.elasticsearch.license.RemoteClusterLicenseChecker;
3030
import org.elasticsearch.license.XPackLicenseState;
31-
import org.elasticsearch.search.crossproject.CrossProjectModeDecider;
3231
import org.elasticsearch.tasks.Task;
3332
import org.elasticsearch.threadpool.ThreadPool;
3433
import org.elasticsearch.transport.TransportService;
@@ -119,7 +118,6 @@ public TransportPutDataFrameAnalyticsAction(
119118
transportService.getRemoteClusterService(),
120119
null,
121120
null,
122-
new CrossProjectModeDecider(clusterService.getSettings()).crossProjectEnabled(),
123121
clusterService.getNodeName(),
124122
License.OperationMode.PLATINUM.description()
125123
);

‎x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportStartDataFrameAnalyticsAction.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import org.elasticsearch.persistent.PersistentTasksCustomMetadata;
4545
import org.elasticsearch.persistent.PersistentTasksService;
4646
import org.elasticsearch.rest.RestStatus;
47-
import org.elasticsearch.search.crossproject.CrossProjectModeDecider;
4847
import org.elasticsearch.tasks.Task;
4948
import org.elasticsearch.tasks.TaskId;
5049
import org.elasticsearch.threadpool.ThreadPool;
@@ -157,7 +156,6 @@ public TransportStartDataFrameAnalyticsAction(
157156
transportService.getRemoteClusterService(),
158157
null,
159158
null,
160-
new CrossProjectModeDecider(clusterService.getSettings()).crossProjectEnabled(),
161159
clusterService.getNodeName(),
162160
License.OperationMode.PLATINUM.description()
163161
);

‎x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportPreviewTransformAction.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.elasticsearch.injection.guice.Inject;
3333
import org.elasticsearch.license.License;
3434
import org.elasticsearch.license.RemoteClusterLicenseChecker;
35-
import org.elasticsearch.search.crossproject.CrossProjectModeDecider;
3635
import org.elasticsearch.tasks.Task;
3736
import org.elasticsearch.tasks.TaskId;
3837
import org.elasticsearch.threadpool.ThreadPool;
@@ -117,7 +116,6 @@ public TransportPreviewTransformAction(
117116
? new RemoteClusterLicenseChecker(client, null)
118117
: null,
119118
ingestService,
120-
new CrossProjectModeDecider(clusterService.getSettings()).crossProjectEnabled(),
121119
clusterService.getNodeName(),
122120
License.OperationMode.BASIC.description()
123121
);

‎x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/action/TransportValidateTransformAction.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.elasticsearch.injection.guice.Inject;
2424
import org.elasticsearch.license.License;
2525
import org.elasticsearch.license.RemoteClusterLicenseChecker;
26-
import org.elasticsearch.search.crossproject.CrossProjectModeDecider;
2726
import org.elasticsearch.tasks.Task;
2827
import org.elasticsearch.tasks.TaskId;
2928
import org.elasticsearch.transport.TransportService;
@@ -73,7 +72,6 @@ public TransportValidateTransformAction(
7372
? new RemoteClusterLicenseChecker(client, null)
7473
: null,
7574
ingestService,
76-
new CrossProjectModeDecider(clusterService.getSettings()).crossProjectEnabled(),
7775
clusterService.getNodeName(),
7876
License.OperationMode.BASIC.description()
7977
);

0 commit comments

Comments
 (0)