-
Notifications
You must be signed in to change notification settings - Fork 25k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor BWC handling to support more flexible testing scenarios (#95803
- Loading branch information
1 parent
b5413e5
commit 6ace408
Showing
18 changed files
with
291 additions
and
220 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
168 changes: 168 additions & 0 deletions
168
...s/src/main/java/org/elasticsearch/test/cluster/local/AbstractLocalClusterSpecBuilder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
| * in compliance with, at your election, the Elastic License 2.0 or the Server | ||
| * Side Public License, v 1. | ||
| */ | ||
|
|
||
| package org.elasticsearch.test.cluster.local; | ||
|
|
||
| import org.elasticsearch.test.cluster.ElasticsearchCluster; | ||
| import org.elasticsearch.test.cluster.local.LocalClusterSpec.LocalNodeSpec; | ||
| import org.elasticsearch.test.cluster.local.distribution.DistributionType; | ||
| import org.elasticsearch.test.cluster.local.model.User; | ||
| import org.elasticsearch.test.cluster.util.Version; | ||
| import org.elasticsearch.test.cluster.util.resource.Resource; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import java.util.function.Consumer; | ||
| import java.util.function.Supplier; | ||
|
|
||
| public abstract class AbstractLocalClusterSpecBuilder<T extends ElasticsearchCluster> extends AbstractLocalSpecBuilder< | ||
| LocalClusterSpecBuilder<T>> implements LocalClusterSpecBuilder<T> { | ||
|
|
||
| private String name = "test-cluster"; | ||
| private final List<DefaultLocalNodeSpecBuilder> nodeBuilders = new ArrayList<>(); | ||
| private final List<User> users = new ArrayList<>(); | ||
| private final List<Resource> roleFiles = new ArrayList<>(); | ||
| private final List<Supplier<LocalClusterConfigProvider>> lazyConfigProviders = new ArrayList<>(); | ||
|
|
||
| public AbstractLocalClusterSpecBuilder() { | ||
| super(null); | ||
| } | ||
|
|
||
| @Override | ||
| public AbstractLocalClusterSpecBuilder<T> name(String name) { | ||
| this.name = name; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public AbstractLocalClusterSpecBuilder<T> apply(LocalClusterConfigProvider configProvider) { | ||
| configProvider.apply(this); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public LocalClusterSpecBuilder<T> apply(Supplier<LocalClusterConfigProvider> configProvider) { | ||
| lazyConfigProviders.add(configProvider); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public AbstractLocalClusterSpecBuilder<T> nodes(int nodes) { | ||
| if (nodes < nodeBuilders.size()) { | ||
| throw new IllegalArgumentException( | ||
| "Cannot shrink cluster to " + nodes + ". " + nodeBuilders.size() + " nodes already configured" | ||
| ); | ||
| } | ||
|
|
||
| int newNodes = nodes - nodeBuilders.size(); | ||
| for (int i = 0; i < newNodes; i++) { | ||
| nodeBuilders.add(new DefaultLocalNodeSpecBuilder(this)); | ||
| } | ||
|
|
||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public AbstractLocalClusterSpecBuilder<T> withNode(Consumer<? super LocalNodeSpecBuilder> config) { | ||
| DefaultLocalNodeSpecBuilder builder = new DefaultLocalNodeSpecBuilder(this); | ||
| config.accept(builder); | ||
| nodeBuilders.add(builder); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public AbstractLocalClusterSpecBuilder<T> node(int index, Consumer<? super LocalNodeSpecBuilder> config) { | ||
| try { | ||
| DefaultLocalNodeSpecBuilder builder = nodeBuilders.get(index); | ||
| config.accept(builder); | ||
| } catch (IndexOutOfBoundsException e) { | ||
| throw new IllegalArgumentException( | ||
| "No node at index + " + index + " exists. Only " + nodeBuilders.size() + " nodes have been configured" | ||
| ); | ||
| } | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public AbstractLocalClusterSpecBuilder<T> user(String username, String password) { | ||
| this.users.add(new User(username, password)); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public AbstractLocalClusterSpecBuilder<T> user(String username, String password, String role) { | ||
| this.users.add(new User(username, password, role)); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public AbstractLocalClusterSpecBuilder<T> rolesFile(Resource rolesFile) { | ||
| this.roleFiles.add(rolesFile); | ||
| return this; | ||
| } | ||
|
|
||
| protected LocalClusterSpec buildClusterSpec() { | ||
| // Apply lazily provided configuration | ||
| lazyConfigProviders.forEach(s -> s.get().apply(this)); | ||
|
|
||
| List<User> clusterUsers = users.isEmpty() ? List.of(User.DEFAULT_USER) : users; | ||
| LocalClusterSpec clusterSpec = new LocalClusterSpec(name, clusterUsers, roleFiles); | ||
| List<LocalNodeSpec> nodeSpecs; | ||
|
|
||
| if (nodeBuilders.isEmpty()) { | ||
| // No node-specific configuration so assume a single-node cluster | ||
| nodeSpecs = List.of(new DefaultLocalNodeSpecBuilder(this).build(clusterSpec)); | ||
| } else { | ||
| nodeSpecs = nodeBuilders.stream().map(node -> node.build(clusterSpec)).toList(); | ||
| } | ||
|
|
||
| clusterSpec.setNodes(nodeSpecs); | ||
| clusterSpec.validate(); | ||
|
|
||
| return clusterSpec; | ||
| } | ||
|
|
||
| public static class DefaultLocalNodeSpecBuilder extends AbstractLocalSpecBuilder<LocalNodeSpecBuilder> implements LocalNodeSpecBuilder { | ||
| private String name; | ||
|
|
||
| protected DefaultLocalNodeSpecBuilder(AbstractLocalSpecBuilder<?> parent) { | ||
| super(parent); | ||
| } | ||
|
|
||
| @Override | ||
| public DefaultLocalNodeSpecBuilder name(String name) { | ||
| this.name = name; | ||
| return this; | ||
| } | ||
|
|
||
| private LocalNodeSpec build(LocalClusterSpec cluster) { | ||
|
|
||
| return new LocalNodeSpec( | ||
| cluster, | ||
| name, | ||
| Optional.ofNullable(getVersion()).orElse(Version.CURRENT), | ||
| getSettingsProviders(), | ||
| getSettings(), | ||
| getEnvironmentProviders(), | ||
| getEnvironment(), | ||
| getModules(), | ||
| getPlugins(), | ||
| Optional.ofNullable(getDistributionType()).orElse(DistributionType.INTEG_TEST), | ||
| getFeatures(), | ||
| getKeystoreProviders(), | ||
| getKeystoreSettings(), | ||
| getKeystoreFiles(), | ||
| getKeystorePassword(), | ||
| getExtraConfigFiles(), | ||
| getSystemProperties(), | ||
| getSecrets() | ||
| ); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.