Add GeoIP CLI integration test #71381
Merged
Conversation
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
probakowski
added
>test
|
Pinging @elastic/es-core-features (Team:Core/Features) |
martijnvg
reviewed
Apr 7, 2021
| @@ -59,6 +60,7 @@ | |||
| import static org.hamcrest.Matchers.is; | |||
| import static org.hamcrest.Matchers.nullValue; | |||
|
|
|||
| @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST) | |||
There was a problem hiding this comment.
I think the test cluster can be reused? So this annotation can be removed?
| @@ -72,7 +74,8 @@ | |||
| protected Settings nodeSettings(int nodeOrdinal, Settings otherSettings) { | |||
| Settings.Builder settings = Settings.builder().put(super.nodeSettings(nodeOrdinal, otherSettings)); | |||
| if (ENDPOINT != null) { | |||
| settings.put(GeoIpDownloader.ENDPOINT_SETTING.getKey(), ENDPOINT); | |||
| String endpoint = getTestName().endsWith("Cli") ? ENDPOINT + "cli/overview.json" : ENDPOINT; | |||
There was a problem hiding this comment.
maybe set/overwrite the custom endpoint for cli files in the testGeoIpDatabasesDownloadCli() test instead of here with a conditional? I think it is clearer to have this logic where it is used.
There was a problem hiding this comment.
I refactored CLI case to separate class so it's cleaner now
| Path source = Path.of("source"); | ||
| Files.createDirectory(source); | ||
|
|
||
| Path target = Path.of("target"); |
There was a problem hiding this comment.
Do these paths end up in the build directory of the geoid-fixture module?
Otherwise perhaps we should create tmp dirs instead?
There was a problem hiding this comment.
Fixtures are run inside docker container which is then discarded, I think we can get away with using current directory
probakowski
added a commit
to probakowski/elasticsearch
that referenced
this pull request
Apr 8, 2021
This change adds additional test to GeoIpDownloaderIT which tests that artifacts produces by GeoIP CLI tool can be consumed by cluster the same way as from our original service. It does so by running the tool from fixture which then simply serves the generated files (this is exactly the way users are supposed to use the tool as well). Relates to elastic#68920 # Conflicts: # test/fixtures/geoip-fixture/src/main/java/fixture/geoip/GeoIpHttpFixture.java
probakowski
added a commit
that referenced
this pull request
Apr 8, 2021
* Add GeoIP CLI integration test (#71381) This change adds additional test to GeoIpDownloaderIT which tests that artifacts produces by GeoIP CLI tool can be consumed by cluster the same way as from our original service. It does so by running the tool from fixture which then simply serves the generated files (this is exactly the way users are supposed to use the tool as well). Relates to #68920 # Conflicts: # test/fixtures/geoip-fixture/src/main/java/fixture/geoip/GeoIpHttpFixture.java * fix compilation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change adds additional test to
GeoIpDownloaderITwhich tests that artifacts produces by GeoIP CLI tool can be consumed by cluster the same way as from our original service.It does so by running the tool from fixture which then simply serves the generated files (this is exactly the way users are supposed to use the tool as well).
Relates to #68920