Skip to content

Commit ad8ecf0

Browse files
adnapibarnknize
adnapibar
authored and
nknize
committed
[Rename] buildSrc directory, build-tools module (opensearch-project#182)
This PR refactors the build-tools module as part of the Elasticsearch to OpenSearch renaming effort. Signed-off-by: Rabi Panda <[email protected]>
1 parent 3eee518 commit ad8ecf0

File tree

289 files changed

+1226
-1241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

289 files changed

+1226
-1241
lines changed

‎buildSrc/build.gradle

+22-22
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ plugins {
2626
id 'java-test-fixtures'
2727
}
2828

29-
group = 'org.elasticsearch.gradle'
29+
group = 'org.opensearch.gradle'
3030

3131
String minimumGradleVersion = file('src/main/resources/minimumGradleVersion').text.trim()
3232
if (GradleVersion.current() < GradleVersion.version(minimumGradleVersion)) {
33-
throw new GradleException("Gradle ${minimumGradleVersion}+ is required to build elasticsearch")
33+
throw new GradleException("Gradle ${minimumGradleVersion}+ is required to build opensearch")
3434
}
3535

3636
if (project == rootProject) {
@@ -47,7 +47,7 @@ if (project == rootProject) {
4747
// we write this back out below to load it in the Build.java which will be shown in rest main action
4848
// to indicate this being a snapshot build or a release build.
4949
Properties props = VersionPropertiesLoader.loadBuildSrcVersion(project.file('version.properties'))
50-
version = props.getProperty("elasticsearch")
50+
version = props.getProperty("opensearch")
5151

5252
def generateVersionProperties = tasks.register("generateVersionProperties", WriteProperties) {
5353
outputFile = "${buildDir}/version.properties"
@@ -64,7 +64,7 @@ processResources {
6464
*****************************************************************************/
6565

6666
if (JavaVersion.current() < JavaVersion.VERSION_11) {
67-
throw new GradleException('At least Java 11 is required to build elasticsearch gradle tools')
67+
throw new GradleException('At least Java 11 is required to build opensearch gradle tools')
6868
}
6969

7070
sourceSets {
@@ -142,8 +142,8 @@ if (project == rootProject) {
142142
// this happens when included as a normal project in the build, which we do
143143
// to enforce precommit checks like forbidden apis, as well as setup publishing
144144
if (project != rootProject) {
145-
apply plugin: 'elasticsearch.build'
146-
apply plugin: 'elasticsearch.publish'
145+
apply plugin: 'opensearch.build'
146+
apply plugin: 'opensearch.publish'
147147

148148
allprojects {
149149
targetCompatibility = 10
@@ -159,7 +159,7 @@ if (project != rootProject) {
159159
disableTasks('forbiddenApisMain', 'forbiddenApisTest', 'forbiddenApisIntegTest', 'forbiddenApisTestFixtures')
160160
jarHell.enabled = false
161161
thirdPartyAudit.enabled = false
162-
if (org.elasticsearch.gradle.info.BuildParams.inFipsJvm) {
162+
if (org.opensearch.gradle.info.BuildParams.inFipsJvm) {
163163
// We don't support running gradle with a JVM that is in FIPS 140 mode, so we don't test it.
164164
// WaitForHttpResourceTests tests would fail as they use JKS/PKCS12 keystores
165165
test.enabled = false
@@ -176,10 +176,10 @@ if (project != rootProject) {
176176
distribution project(':distribution:archives:oss-linux-tar')
177177
distribution project(':distribution:archives:oss-linux-aarch64-tar')
178178

179-
integTestRuntimeOnly(project(":libs:elasticsearch-core"))
179+
integTestRuntimeOnly(project(":libs:opensearch-core"))
180180
}
181181

182-
// for external projects we want to remove the marker file indicating we are running the Elasticsearch project
182+
// for external projects we want to remove the marker file indicating we are running the OpenSearch project
183183
processResources {
184184
exclude 'buildSrc.marker'
185185
into('META-INF') {
@@ -213,19 +213,19 @@ if (project != rootProject) {
213213
naming.clear()
214214
naming {
215215
Tests {
216-
baseClass 'org.elasticsearch.gradle.test.GradleUnitTestCase'
216+
baseClass 'org.opensearch.gradle.test.GradleUnitTestCase'
217217
}
218218
IT {
219-
baseClass 'org.elasticsearch.gradle.test.GradleIntegrationTestCase'
219+
baseClass 'org.opensearch.gradle.test.GradleIntegrationTestCase'
220220
}
221221
}
222222
}
223223

224224
tasks.register("integTest", Test) {
225225
inputs.dir(file("src/testKit")).withPropertyName("testkit dir").withPathSensitivity(PathSensitivity.RELATIVE)
226226
systemProperty 'test.version_under_test', version
227-
onlyIf { org.elasticsearch.gradle.info.BuildParams.inFipsJvm == false }
228-
maxParallelForks = System.getProperty('tests.jvms', org.elasticsearch.gradle.info.BuildParams.defaultParallel.toString()) as Integer
227+
onlyIf { org.opensearch.gradle.info.BuildParams.inFipsJvm == false }
228+
maxParallelForks = System.getProperty('tests.jvms', org.opensearch.gradle.info.BuildParams.defaultParallel.toString()) as Integer
229229
testClassesDirs = sourceSets.integTest.output.classesDirs
230230
classpath = sourceSets.integTest.runtimeClasspath
231231
}
@@ -265,27 +265,27 @@ class VersionPropertiesLoader {
265265
}
266266

267267
protected static void loadBuildSrcVersion(Properties loadedProps, Properties systemProperties) {
268-
String elasticsearch = loadedProps.getProperty("elasticsearch")
269-
if (elasticsearch == null) {
270-
throw new IllegalStateException("Elasticsearch version is missing from properties.")
268+
String opensearch = loadedProps.getProperty("opensearch")
269+
if (opensearch == null) {
270+
throw new IllegalStateException("OpenSearch version is missing from properties.")
271271
}
272-
if (elasticsearch.matches("[0-9]+\\.[0-9]+\\.[0-9]+") == false) {
272+
if (opensearch.matches("[0-9]+\\.[0-9]+\\.[0-9]+") == false) {
273273
throw new IllegalStateException(
274-
"Expected elasticsearch version to be numbers only of the form X.Y.Z but it was: " +
275-
elasticsearch
274+
"Expected opensearch version to be numbers only of the form X.Y.Z but it was: " +
275+
opensearch
276276
)
277277
}
278278
String qualifier = systemProperties.getProperty("build.version_qualifier", "");
279279
if (qualifier.isEmpty() == false) {
280280
if (qualifier.matches("(alpha|beta|rc)\\d+") == false) {
281281
throw new IllegalStateException("Invalid qualifier: " + qualifier)
282282
}
283-
elasticsearch += "-" + qualifier
283+
opensearch += "-" + qualifier
284284
}
285285
final String buildSnapshotSystemProperty = systemProperties.getProperty("build.snapshot", "true");
286286
switch (buildSnapshotSystemProperty) {
287287
case "true":
288-
elasticsearch += "-SNAPSHOT"
288+
opensearch += "-SNAPSHOT"
289289
break;
290290
case "false":
291291
// do nothing
@@ -294,6 +294,6 @@ class VersionPropertiesLoader {
294294
throw new IllegalArgumentException(
295295
"build.snapshot was set to [" + buildSnapshotSystemProperty + "] but can only be unset or [true|false]");
296296
}
297-
loadedProps.put("elasticsearch", elasticsearch)
297+
loadedProps.put("opensearch", opensearch)
298298
}
299299
}

‎buildSrc/formatterConfig.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<profiles version="17">
3-
<profile kind="CodeFormatterProfile" name="Elasticsearch" version="17">
3+
<profile kind="CodeFormatterProfile" name="OpenSearch" version="17">
44
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
55
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
66
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>

‎buildSrc/reaper/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ apply plugin: 'java'
33
jar {
44
archiveFileName = "${project.name}.jar"
55
manifest {
6-
attributes 'Main-Class': 'org.elasticsearch.gradle.reaper.Reaper'
6+
attributes 'Main-Class': 'org.opensearch.gradle.reaper.Reaper'
77
}
88
}

‎buildSrc/reaper/src/main/java/org/elasticsearch/gradle/reaper/Reaper.java ‎buildSrc/reaper/src/main/java/org/opensearch/gradle/reaper/Reaper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.gradle.reaper;
20+
package org.opensearch.gradle.reaper;
2121

2222
import java.io.Closeable;
2323
import java.io.IOException;

‎buildSrc/src/integTest/groovy/org/elasticsearch/gradle/DistributionDownloadPluginFuncTest.groovy ‎buildSrc/src/integTest/groovy/org/opensearch/gradle/DistributionDownloadPluginFuncTest.groovy

+26-25
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.gradle
20+
package org.opensearch.gradle
2121

22-
import org.elasticsearch.gradle.fixtures.AbstractGradleFuncTest
23-
import org.elasticsearch.gradle.transform.SymbolicLinkPreservingUntarTransform
22+
23+
import org.opensearch.gradle.fixtures.AbstractGradleFuncTest
24+
import org.opensearch.gradle.transform.SymbolicLinkPreservingUntarTransform
2425
import org.gradle.testkit.runner.TaskOutcome
2526
import spock.lang.Unroll
2627

27-
import static org.elasticsearch.gradle.fixtures.DistributionDownloadFixture.withMockedDistributionDownload
28+
import static org.opensearch.gradle.fixtures.DistributionDownloadFixture.withMockedDistributionDownload
2829

2930
class DistributionDownloadPluginFuncTest extends AbstractGradleFuncTest {
3031

@@ -44,16 +45,16 @@ class DistributionDownloadPluginFuncTest extends AbstractGradleFuncTest {
4445

4546
where:
4647
version | platform | distType
47-
VersionProperties.getElasticsearch() | ElasticsearchDistribution.Platform.LINUX | "current"
48-
"8.1.0-SNAPSHOT" | ElasticsearchDistribution.Platform.LINUX | "bwc"
49-
"7.0.0" | ElasticsearchDistribution.Platform.WINDOWS | "released"
48+
VersionProperties.getOpenSearch() | OpenSearchDistribution.Platform.LINUX | "current"
49+
"8.1.0-SNAPSHOT" | OpenSearchDistribution.Platform.LINUX | "bwc"
50+
"7.0.0" | OpenSearchDistribution.Platform.WINDOWS | "released"
5051
}
5152

5253

5354
def "transformed versions are kept across builds"() {
5455
given:
55-
def version = VersionProperties.getElasticsearch()
56-
def platform = ElasticsearchDistribution.Platform.LINUX
56+
def version = VersionProperties.getOpenSearch()
57+
def platform = OpenSearchDistribution.Platform.LINUX
5758

5859
buildFile << applyPluginAndSetupDistro(version, platform)
5960
buildFile << """
@@ -76,24 +77,24 @@ class DistributionDownloadPluginFuncTest extends AbstractGradleFuncTest {
7677

7778
def "transforms are reused across projects"() {
7879
given:
79-
def version = VersionProperties.getElasticsearch()
80-
def platform = ElasticsearchDistribution.Platform.LINUX
80+
def version = VersionProperties.getOpenSearch()
81+
def platform = OpenSearchDistribution.Platform.LINUX
8182

8283
3.times {
8384
settingsFile << """
8485
include ':sub-$it'
8586
"""
8687
}
8788
buildFile.text = """
88-
import org.elasticsearch.gradle.Architecture
89+
import org.opensearch.gradle.Architecture
8990
9091
plugins {
91-
id 'elasticsearch.distribution-download'
92+
id 'opensearch.distribution-download'
9293
}
93-
94+
9495
subprojects {
95-
apply plugin: 'elasticsearch.distribution-download'
96-
96+
apply plugin: 'opensearch.distribution-download'
97+
9798
${setupTestDistro(version, platform)}
9899
${setupDistroTask()}
99100
}
@@ -108,35 +109,35 @@ class DistributionDownloadPluginFuncTest extends AbstractGradleFuncTest {
108109

109110
then:
110111
result.tasks.size() == 3
111-
result.output.count("Unpacking elasticsearch-oss-${version}-linux-x86_64.tar.gz " +
112+
result.output.count("Unpacking opensearch-oss-${version}-linux-x86_64.tar.gz " +
112113
"using SymbolicLinkPreservingUntarTransform.") == 1
113114
}
114115

115116
private boolean assertExtractedDistroCreated(String relativePath) {
116117
File distroExtracted = new File(testProjectDir.root, relativePath)
117118
assert distroExtracted.exists()
118119
assert distroExtracted.isDirectory()
119-
assert new File(distroExtracted, "elasticsearch-1.2.3/bin/elasticsearch").exists()
120+
assert new File(distroExtracted, "opensearch-1.2.3/bin/opensearch").exists()
120121
true
121122
}
122123

123-
private static String applyPluginAndSetupDistro(String version, ElasticsearchDistribution.Platform platform) {
124+
private static String applyPluginAndSetupDistro(String version, OpenSearchDistribution.Platform platform) {
124125
"""
125-
import org.elasticsearch.gradle.Architecture
126+
import org.opensearch.gradle.Architecture
126127
127128
plugins {
128-
id 'elasticsearch.distribution-download'
129+
id 'opensearch.distribution-download'
129130
}
130131
131132
${setupTestDistro(version, platform)}
132133
${setupDistroTask()}
133-
134+
134135
"""
135136
}
136137

137-
private static String setupTestDistro(String version, ElasticsearchDistribution.Platform platform) {
138+
private static String setupTestDistro(String version, OpenSearchDistribution.Platform platform) {
138139
return """
139-
elasticsearch_distributions {
140+
opensearch_distributions {
140141
test_distro {
141142
version = "$version"
142143
type = "archive"
@@ -150,7 +151,7 @@ class DistributionDownloadPluginFuncTest extends AbstractGradleFuncTest {
150151
private static String setupDistroTask() {
151152
return """
152153
tasks.register("setupDistro", Sync) {
153-
from(elasticsearch_distributions.test_distro.extracted)
154+
from(opensearch_distributions.test_distro.extracted)
154155
into("build/distro")
155156
}
156157
"""

‎buildSrc/src/integTest/groovy/org/elasticsearch/gradle/JdkDownloadPluginFuncTest.groovy ‎buildSrc/src/integTest/groovy/org/opensearch/gradle/JdkDownloadPluginFuncTest.groovy

+16-16
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
* under the License.
1818
*/
1919

20-
package org.elasticsearch.gradle
20+
package org.opensearch.gradle
2121

2222
import com.github.tomakehurst.wiremock.WireMockServer
23-
import org.elasticsearch.gradle.fixtures.AbstractGradleFuncTest
24-
import org.elasticsearch.gradle.fixtures.WiremockFixture
25-
import org.elasticsearch.gradle.transform.SymbolicLinkPreservingUntarTransform
26-
import org.elasticsearch.gradle.transform.UnzipTransform
23+
import org.opensearch.gradle.fixtures.AbstractGradleFuncTest
24+
import org.opensearch.gradle.transform.SymbolicLinkPreservingUntarTransform
25+
import org.opensearch.gradle.transform.UnzipTransform
26+
import org.opensearch.gradle.fixtures.WiremockFixture
2727
import spock.lang.Unroll
2828

2929
import java.nio.file.Files
@@ -32,8 +32,8 @@ import java.nio.file.Paths
3232
import java.util.regex.Matcher
3333
import java.util.regex.Pattern
3434

35-
import static org.elasticsearch.gradle.JdkDownloadPlugin.VENDOR_ADOPTOPENJDK
36-
import static org.elasticsearch.gradle.JdkDownloadPlugin.VENDOR_OPENJDK
35+
import static JdkDownloadPlugin.VENDOR_ADOPTOPENJDK
36+
import static JdkDownloadPlugin.VENDOR_OPENJDK
3737

3838
class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
3939

@@ -49,9 +49,9 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
4949
def mockedContent = filebytes(jdkVendor, platform)
5050
buildFile.text = """
5151
plugins {
52-
id 'elasticsearch.jdk-download'
52+
id 'opensearch.jdk-download'
5353
}
54-
54+
5555
jdks {
5656
myJdk {
5757
vendor = '$jdkVendor'
@@ -104,12 +104,12 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
104104
}
105105
buildFile.text = """
106106
plugins {
107-
id 'elasticsearch.jdk-download' apply false
107+
id 'opensearch.jdk-download' apply false
108108
}
109-
109+
110110
subprojects {
111-
apply plugin: 'elasticsearch.jdk-download'
112-
111+
apply plugin: 'opensearch.jdk-download'
112+
113113
jdks {
114114
myJdk {
115115
vendor = '$jdkVendor'
@@ -149,10 +149,10 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
149149
def mockedContent = filebytes(VENDOR_ADOPTOPENJDK, platform)
150150
buildFile.text = """
151151
plugins {
152-
id 'elasticsearch.jdk-download'
152+
id 'opensearch.jdk-download'
153153
}
154154
apply plugin: 'base'
155-
apply plugin: 'elasticsearch.jdk-download'
155+
apply plugin: 'opensearch.jdk-download'
156156
157157
jdks {
158158
myJdk {
@@ -162,7 +162,7 @@ class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
162162
architecture = "x64"
163163
}
164164
}
165-
165+
166166
tasks.register("getJdk") {
167167
dependsOn jdks.myJdk
168168
doLast {

0 commit comments

Comments
 (0)