18
18
import org .elasticsearch .cluster .node .DiscoveryNode ;
19
19
import org .elasticsearch .cluster .node .DiscoveryNodeUtils ;
20
20
import org .elasticsearch .cluster .node .VersionInformation ;
21
+ import org .elasticsearch .cluster .project .DefaultProjectResolver ;
22
+ import org .elasticsearch .cluster .project .ProjectResolver ;
21
23
import org .elasticsearch .common .UUIDs ;
22
24
import org .elasticsearch .common .io .stream .BytesStreamOutput ;
23
25
import org .elasticsearch .common .io .stream .NamedWriteableRegistry ;
51
53
import org .elasticsearch .test .tasks .MockTaskManager ;
52
54
import org .elasticsearch .threadpool .ThreadPool ;
53
55
import org .elasticsearch .transport .ClusterConnectionManager ;
56
+ import org .elasticsearch .transport .ClusterSettingsLinkedProjectConfigService ;
54
57
import org .elasticsearch .transport .ConnectTransportException ;
55
58
import org .elasticsearch .transport .ConnectionProfile ;
59
+ import org .elasticsearch .transport .LinkedProjectConfigService ;
56
60
import org .elasticsearch .transport .NodeNotConnectedException ;
57
61
import org .elasticsearch .transport .RequestHandlerRegistry ;
58
62
import org .elasticsearch .transport .TcpTransport ;
@@ -192,7 +196,7 @@ public static MockTransportService createNewService(
192
196
String nodeId = UUIDs .randomBase64UUID ();
193
197
return new MockTransportService (
194
198
settings ,
195
- new StubbableTransport ( transport ) ,
199
+ transport ,
196
200
threadPool ,
197
201
interceptor ,
198
202
boundAddress -> DiscoveryNodeUtils .builder (nodeId )
@@ -203,7 +207,8 @@ public static MockTransportService createNewService(
203
207
.version (version )
204
208
.build (),
205
209
clusterSettings ,
206
- createTaskManager (settings , threadPool , taskHeaders , Tracer .NOOP , nodeId )
210
+ taskHeaders ,
211
+ nodeId
207
212
);
208
213
}
209
214
@@ -223,12 +228,13 @@ public static MockTransportService createMockTransportService(Transport transpor
223
228
String nodeId = UUIDs .randomBase64UUID ();
224
229
return new MockTransportService (
225
230
Settings .EMPTY ,
226
- new StubbableTransport ( transport ) ,
231
+ transport ,
227
232
threadPool ,
228
233
TransportService .NOOP_TRANSPORT_INTERCEPTOR ,
229
234
(boundAddress ) -> DiscoveryNodeUtils .builder (nodeId ).address (boundAddress .publishAddress ()).build (),
230
235
null , // clusterSettings
231
- createTaskManager (Settings .EMPTY , threadPool , Set .of (), Tracer .NOOP , nodeId )
236
+ Set .of (),
237
+ nodeId
232
238
);
233
239
}
234
240
@@ -256,38 +262,22 @@ public MockTransportService(
256
262
interceptor ,
257
263
localNodeFactory ,
258
264
clusterSettings ,
259
- createTaskManager (settings , threadPool , taskHeaders , Tracer .NOOP , nodeId )
265
+ createTaskManager (settings , threadPool , taskHeaders , Tracer .NOOP , nodeId ),
266
+ new ClusterSettingsLinkedProjectConfigService (settings , clusterSettings , DefaultProjectResolver .INSTANCE ),
267
+ DefaultProjectResolver .INSTANCE
260
268
);
261
269
}
262
270
263
271
public MockTransportService (
264
- Settings settings ,
265
- Transport transport ,
266
- ThreadPool threadPool ,
267
- TransportInterceptor interceptor ,
268
- Function <BoundTransportAddress , DiscoveryNode > localNodeFactory ,
269
- @ Nullable ClusterSettings clusterSettings ,
270
- String nodeId
271
- ) {
272
- this (
273
- settings ,
274
- new StubbableTransport (transport ),
275
- threadPool ,
276
- interceptor ,
277
- localNodeFactory ,
278
- clusterSettings ,
279
- createTaskManager (settings , threadPool , Set .of (), Tracer .NOOP , nodeId )
280
- );
281
- }
282
-
283
- private MockTransportService (
284
272
Settings settings ,
285
273
StubbableTransport transport ,
286
274
ThreadPool threadPool ,
287
275
TransportInterceptor interceptor ,
288
276
Function <BoundTransportAddress , DiscoveryNode > localNodeFactory ,
289
277
@ Nullable ClusterSettings clusterSettings ,
290
- TaskManager taskManager
278
+ TaskManager taskManager ,
279
+ LinkedProjectConfigService linkedProjectConfigService ,
280
+ ProjectResolver projectResolver
291
281
) {
292
282
super (
293
283
settings ,
@@ -297,7 +287,9 @@ private MockTransportService(
297
287
localNodeFactory ,
298
288
clusterSettings ,
299
289
new StubbableConnectionManager (new ClusterConnectionManager (settings , transport , threadPool .getThreadContext ())),
300
- taskManager
290
+ taskManager ,
291
+ linkedProjectConfigService ,
292
+ projectResolver
301
293
);
302
294
this .original = transport .getDelegate ();
303
295
this .testExecutor = EsExecutors .newScaling (
0 commit comments