Skip to content
Merged
Show file tree
Hide file tree
Changes from 67 commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
7dcf81b
initial draft
JVerwolf Aug 13, 2025
4e1b998
[CI] Auto commit changes from spotless
Aug 13, 2025
aea4029
fix bug
JVerwolf Aug 13, 2025
f17af51
Merge branch 'transport/generate-definitions' of github.com:JVerwolf/…
JVerwolf Aug 13, 2025
3681369
fix bugs
JVerwolf Aug 13, 2025
fc0e106
remove extra validation that was failing tests
JVerwolf Aug 13, 2025
4ad2c99
[CI] Auto commit changes from spotless
Aug 13, 2025
eac9d76
Merge branch 'main' into transport/generate-definitions
rjernst Aug 13, 2025
9c89556
[CI] Auto commit changes from spotless
Aug 13, 2025
d79cf69
Merge branch 'main' into transport/generate-definitions
rjernst Aug 13, 2025
dea290b
generate iter
rjernst Aug 14, 2025
d0beda5
[CI] Auto commit changes from spotless
Aug 14, 2025
c5daf35
more iter
rjernst Aug 14, 2025
0c1c962
spotless
rjernst Aug 14, 2025
c947d6a
separate method for changed vs all main resources
rjernst Aug 14, 2025
cb92818
wip
JVerwolf Aug 15, 2025
672b7f5
Merge branch 'main' of github.com:elastic/elasticsearch into transpor…
JVerwolf Aug 15, 2025
2ecf07e
iter
JVerwolf Aug 15, 2025
05becfa
spotless
JVerwolf Aug 15, 2025
4318792
Add notes to func test
JVerwolf Aug 15, 2025
cda64cc
Merge branch 'main' of github.com:elastic/elasticsearch into transpor…
JVerwolf Aug 18, 2025
367e52f
iter
JVerwolf Aug 18, 2025
50cde19
iter
JVerwolf Aug 19, 2025
0c5b6e8
iter
JVerwolf Aug 19, 2025
66684c1
Merge branch 'main' into transport/generate-definitions
rjernst Aug 20, 2025
1cfe88c
[CI] Auto commit changes from spotless
Aug 20, 2025
8d13cec
iter
JVerwolf Aug 20, 2025
f43dd4b
fix changed files helper to also get untracked files
rjernst Aug 21, 2025
975a87e
iter
JVerwolf Aug 21, 2025
2e60a3b
iter
JVerwolf Aug 21, 2025
2b8c8f6
iter
JVerwolf Aug 21, 2025
9725948
more tests
JVerwolf Aug 21, 2025
aa60bdb
more tests
JVerwolf Aug 21, 2025
5c6a25a
iter
JVerwolf Aug 25, 2025
3af7342
[CI] Auto commit changes from spotless
Aug 25, 2025
b978bbc
test iters
rjernst Aug 25, 2025
961f0b8
iter
JVerwolf Aug 25, 2025
f68236d
iter
rjernst Aug 25, 2025
ab7e605
iter
JVerwolf Aug 25, 2025
7e74258
iter
JVerwolf Aug 25, 2025
1b3629b
iter
JVerwolf Aug 25, 2025
c20a191
update tests
rjernst Aug 26, 2025
bcf305f
Merge branch 'main' into transport/generate-definitions
rjernst Aug 26, 2025
12b01db
more tests
JVerwolf Aug 26, 2025
e0732f3
more tests
JVerwolf Aug 26, 2025
65c6a6f
fix stuff
rjernst Aug 26, 2025
ab026d9
more tests
JVerwolf Aug 26, 2025
37a5707
fix increment
rjernst Aug 26, 2025
ac14cd2
fix test
JVerwolf Aug 27, 2025
ac9a56d
fix main test
rjernst Aug 27, 2025
da08370
fix test
JVerwolf Aug 27, 2025
d5c0cd5
cleanup
JVerwolf Aug 27, 2025
29276a7
[CI] Auto commit changes from spotless
Aug 27, 2025
4259b58
cleanup
JVerwolf Aug 28, 2025
4013725
cleanup
JVerwolf Aug 28, 2025
6385574
[CI] Auto commit changes from spotless
Aug 28, 2025
b2dbfef
switch to explicit env var for labels
rjernst Aug 29, 2025
caa5a70
[CI] Auto commit changes from spotless
Aug 29, 2025
9ade26c
iter
rjernst Aug 29, 2025
e5b8d15
[CI] Auto commit changes from spotless
Aug 29, 2025
ca78c83
tests complete
rjernst Aug 29, 2025
09e1aae
Merge branch 'main' of github.com:elastic/elasticsearch into transpor…
JVerwolf Aug 29, 2025
03ec728
Merge branch 'main' into transport/generate-definitions
rjernst Sep 2, 2025
8798cfc
feedback
rjernst Sep 3, 2025
aa323b6
spotless
rjernst Sep 3, 2025
a5eb9f8
cleanup
rjernst Sep 3, 2025
3d84dde
[CI] Auto commit changes from spotless
Sep 3, 2025
853498f
more feedback
rjernst Sep 4, 2025
b3d3a75
add tests for detecting name from staged/committed changes
rjernst Sep 4, 2025
f533f79
Merge branch 'main' into transport/generate-definitions
rjernst Sep 4, 2025
0c642b9
rename releaseBranch to name
rjernst Sep 4, 2025
454400a
more renames
rjernst Sep 4, 2025
bd8f430
use upstream instead of main
rjernst Sep 4, 2025
94df820
iter
rjernst Sep 4, 2025
bfa290d
test fixes
rjernst Sep 5, 2025
0a1898c
[CI] Auto commit changes from spotless
Sep 5, 2025
68a4f71
fix refactor
rjernst Sep 5, 2025
012999a
fix more refactor problems
rjernst Sep 5, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import org.gradle.testkit.runner.BuildResult
import org.gradle.testkit.runner.TaskOutcome

class AbstractTransportVersionFuncTest extends AbstractGradleFuncTest {

def javaResource(String project, String path, String content) {
file("${project}/src/main/resources/${path}").withWriter { writer ->
writer << content
Expand Down Expand Up @@ -45,10 +46,18 @@ class AbstractTransportVersionFuncTest extends AbstractGradleFuncTest {
return referableAndReferencedTransportVersion(name, ids, "Test${name.capitalize()}")
}

def referableAndReferencedTransportVersion(String name, String ids, String classname) {
def referencedTransportVersion(String name) {
referencedTransportVersion(name, "Test${name.capitalize()}")
}

def referencedTransportVersion(String name, String classname) {
javaSource("myserver", "org.elasticsearch", classname, "", """
static final TransportVersion usage = TransportVersion.fromName("${name}");
""")
}

def referableAndReferencedTransportVersion(String name, String ids, String classname) {
referencedTransportVersion(name, classname)
referableTransportVersion(name, ids)
}

Expand All @@ -74,6 +83,20 @@ class AbstractTransportVersionFuncTest extends AbstractGradleFuncTest {
assertOutputContains(result.output, expectedOutput)
}

void assertReferableDefinition(String name, String content) {
File definitionFile = file("myserver/src/main/resources/transport/definitions/referable/${name}.csv")
assert definitionFile.exists()
assert definitionFile.text.strip() == content
}

void assertReferableDefinitionDoesNotExist(String name) {
assert file("myserver/src/main/resources/transport/definitions/referable/${name}.csv").exists() == false
}

void assertUpperBound(String releaseBranch, String content) {
assert file("myserver/src/main/resources/transport/upper_bounds/${releaseBranch}.csv").text.strip() == content
}

def setup() {
configurationCacheCompatible = false
internalBuild()
Expand All @@ -86,12 +109,17 @@ class AbstractTransportVersionFuncTest extends AbstractGradleFuncTest {
apply plugin: 'java-library'
apply plugin: 'elasticsearch.transport-version-references'
apply plugin: 'elasticsearch.transport-version-resources'

tasks.named('generateTransportVersionDefinition') {
mainReleaseBranch = '9.2'
}
"""
referableTransportVersion("existing_91", "8012000")
referableTransportVersion("existing_92", "8123000,8012001")
unreferableTransportVersion("initial_9_0_0", "8000000")
transportVersionUpperBound("9.2", "existing_92", "8123000")
transportVersionUpperBound("9.1", "existing_92", "8012001")
transportVersionUpperBound("9.0", "initial_9_0_0", "8000000")
// a mock version of TransportVersion, just here so we can compile Dummy.java et al
javaSource("myserver", "org.elasticsearch", "TransportVersion", "", """
public static TransportVersion fromName(String name) {
Expand Down
Loading