Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump geoip2 from 2.16.1 to 3.0.1 in /modules/ingest-geoip #2646

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Mar 29, 2022

Bumps geoip2 from 2.16.1 to 3.0.1.

Release notes

Sourced from geoip2's releases.

3.0.1

  • Updated Jackson dependencies to address CVE-2020-36518. Pull request by slunker. GitHub #306.
  • Minor doc updates.

3.0.0

  • Java 11 or greater is now required.
  • Apache HttpClient has been replaced with java.net.http.HttpClient.
  • The close() method on WebServiceClient is now deprecated. It no longer does anything.
  • On WebServiceClient.Builder:
    • connectTimeout(int) has been deprecated in favor of connectTimeout(Duration).
    • readTimeout(int) has been deprecated in favor of requestTimeout(Duration).
    • proxy(Proxy) has been deprecated in favor of proxy(ProxySelector).
  • On HttpException and InvalidRequestException, getUrl() has been deprecated in favor of getUri(). Constructors that took a URL have been replaced with the equivalent taking a URI.
  • Deprecated constructors on model and trait classes were removed.
  • Model data types were updated to better reflect database data types. In particular:
    • getGeoNameId() on City, Continent, Country, RepresentedCountry, and Subdivision now returns a Long rather than an Integer.
    • getAutonomousSystemNumber() on AsnResponse and Traits now returns a Long rather than an Integer.
Changelog

Sourced from geoip2's changelog.

3.0.1 (2022-03-29)

  • Updated Jackson dependencies to address CVE-2020-36518. Pull request by slunker. GitHub #306.
  • Minor doc updates.

3.0.0 (2022-01-24)

  • Java 11 or greater is now required.
  • Apache HttpClient has been replaced with java.net.http.HttpClient.
  • The close() method on WebServiceClient is now deprecated. It no longer does anything.
  • On WebServiceClient.Builder:
    • connectTimeout(int) has been deprecated in favor of connectTimeout(Duration).
    • readTimeout(int) has been deprecated in favor of requestTimeout(Duration).
    • proxy(Proxy) has been deprecated in favor of proxy(ProxySelector).
  • On HttpException and InvalidRequestException, getUrl() has been deprecated in favor of getUri(). Constructors that took a URL have been replaced with the equivalent taking a URI.
  • Deprecated constructors on model and trait classes were removed.
  • Model data types were updated to better reflect database data types. In particular:
    • getGeoNameId() on City, Continent, Country, RepresentedCountry, and Subdivision now returns a Long rather than an Integer.
    • getAutonomousSystemNumber() on AsnResponse and Traits now returns a Long rather than an Integer.
Commits
  • ddcc4c4 [maven-release-plugin] prepare release v3.0.1
  • 4339c1e update version number in README.md
  • 2b291fb Prepare for 3.0.1
  • 6643f62 Update jackson-databind to 2.13.2.2
  • 06fc64f Merge pull request #306 from slunker/main
  • 29f257e Merge pull request #307 from maxmind/dependabot/maven/com.fasterxml.jackson.c...
  • 973e842 Bump jackson-databind from 2.13.2 to 2.13.2.1
  • fbb460f Bump jackson-databind to 2.23.2.1
  • 26e2f25 Merge pull request #305 from maxmind/dependabot/maven/org.codehaus.mojo-versi...
  • 1e61c74 Bump versions-maven-plugin from 2.9.0 to 2.10.0
  • Additional commits viewable in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps [geoip2](https://github.com/maxmind/GeoIP2-java) from 2.16.1 to 3.0.1.
- [Release notes](https://github.com/maxmind/GeoIP2-java/releases)
- [Changelog](https://github.com/maxmind/GeoIP2-java/blob/main/CHANGELOG.md)
- [Commits](maxmind/GeoIP2-java@v2.16.1...v3.0.1)

---
updated-dependencies:
- dependency-name: com.maxmind.geoip2:geoip2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot requested a review from a team as a code owner March 29, 2022 16:25
@dependabot dependabot bot added the dependencies Pull requests that update a dependency file label Mar 29, 2022
Signed-off-by: dependabot[bot] <support@github.com>
@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure 935f0eb
Log 3853

Reports 3853

@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure e23fddd
Log 3858

Reports 3858

@mch2
Copy link
Member

mch2 commented Mar 30, 2022

:modules:ingest-geoip:thirdPartyAudit failed in tests but not seeing any indication why. Trying locally...

nvm, precommit failures, will see what breaking changes are involved in bringing in a new major version.

/home/runner/work/OpenSearch/OpenSearch/modules/ingest-geoip/src/main/java/org/opensearch/ingest/geoip/GeoIpProcessor.java:367: error: incompatible types: Long cannot be converted to Integer

        Integer asn = response.getAutonomousSystemNumber();
> Task :modules:ingest-geoip:compileJava FAILED

Signed-off-by: Marc Handalian <handalm@amazon.com>
@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure 3527a56
Log 4145

Reports 4145

Precommit is failing because forbiddenApis was configured to ignore missing classes
that are present.

Signed-off-by: Marc Handalian <handalm@amazon.com>
@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure 31e850c
Log 4166

Reports 4166

@mch2
Copy link
Member

mch2 commented Apr 5, 2022

Some valid org.opensearch.ingest.geoip.GeoIpProcessorTests failures. Taking a look

@mch2
Copy link
Member

mch2 commented Apr 5, 2022

Tests are failing bc of the change from long to int.

REPRODUCE WITH: ./gradlew ':modules:ingest-geoip:test' --tests "org.opensearch.ingest.geoip.GeoIpProcessorTests.testAsn" -Dtests.seed=7294888768981369 -Dtests.security.manager=true -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=ar-LB -Dtests.timezone=Pacific/Gambier -Druntime.java=17
WARNING: System::setSecurityManager has been called by org.gradle.api.internal.tasks.testing.worker.TestWorker (file:/home/ubuntu/.gradle/wrapper/dists/gradle-7.4.2-all/9uukhhbclvbegdvsww0j0cr3p/gradle-7.4.2/lib/plugins/gradle-testing-base-7.4.2.jar)
WARNING: Please consider reporting this to the maintainers of org.gradle.api.internal.tasks.testing.worker.TestWorker
WARNING: System::setSecurityManager will be removed in a future release

org.opensearch.ingest.geoip.GeoIpProcessorTests > testAsn FAILED
    java.lang.AssertionError: 
    Expected: <1136>
         but: was <1136L>
        at __randomizedtesting.SeedInfo.seed([7294888768981369:29C8FD95B2698F92]:0)
        at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:18)
        at org.junit.Assert.assertThat(Assert.java:964)
        at org.junit.Assert.assertThat(Assert.java:930)
        at org.opensearch.ingest.geoip.GeoIpProcessorTests.testAsn(GeoIpProcessorTests.java:311)

I'm thinking this is ok to include as a breaking change for 3.0 and change our API to return the long value directly. Thoughts? @nknize

@nknize
Copy link
Collaborator

nknize commented Apr 5, 2022

I'm thinking this is ok to include as a breaking change for 3.0 and change our API to return the long value directly.

Yes, it's fine to refactor GeoIpProcessor asn variable to a Long instead of an Integer since that changed in the maxmind library.

Signed-off-by: Marc Handalian <handalm@amazon.com>
@opensearch-ci-bot
Copy link
Collaborator

❌   Gradle Check failure cebd853
Log 4206

Reports 4206

@mch2
Copy link
Member

mch2 commented Apr 5, 2022

❌   Gradle Check failure cebd853 Log 4206

Reports 4206

* What went wrong:
Execution failed for task ':test:framework:test'.
> Process 'Gradle Test Executor 408' finished with non-zero exit value 1
  This problem might be caused by incorrect test process configuration.
  Please refer to the test execution section in the User Manual at https://docs.gradle.org/7.4.2/userguide/java_testing.html#sec:test_execution

Looks like an execution error not on a specific test, retrying.

@mch2
Copy link
Member

mch2 commented Apr 5, 2022

start gradle check

@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success cebd853
Log 4225

Reports 4225

@dblock dblock added backport 2.x Backport to 2.x branch backport 2.0 Backport to 2.0 branch labels Apr 6, 2022
@dblock dblock merged commit ce5c55d into main Apr 6, 2022
@dependabot dependabot bot deleted the dependabot/gradle/modules/ingest-geoip/com.maxmind.geoip2-geoip2-3.0.1 branch April 6, 2022 14:33
@dblock
Copy link
Member

dblock commented Apr 6, 2022

Backporting to 2.x and 2.0, stop me if I am doing it wrong.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 6, 2022
* Bump geoip2 from 2.16.1 to 3.0.1 in /modules/ingest-geoip

Bumps [geoip2](https://github.com/maxmind/GeoIP2-java) from 2.16.1 to 3.0.1.
- [Release notes](https://github.com/maxmind/GeoIP2-java/releases)
- [Changelog](https://github.com/maxmind/GeoIP2-java/blob/main/CHANGELOG.md)
- [Commits](maxmind/GeoIP2-java@v2.16.1...v3.0.1)

---
updated-dependencies:
- dependency-name: com.maxmind.geoip2:geoip2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Updating SHAs

Signed-off-by: dependabot[bot] <support@github.com>

* Fix breaking change with geoip2 version 3.0.1.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Fix precommit failures caused by ignoreMissingClasses check.

Precommit is failing because forbiddenApis was configured to ignore missing classes
that are present.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Change asn in GeoIpProcessorTests from int to long.

Signed-off-by: Marc Handalian <handalm@amazon.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Co-authored-by: Marc Handalian <handalm@amazon.com>
(cherry picked from commit ce5c55d)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 6, 2022
* Bump geoip2 from 2.16.1 to 3.0.1 in /modules/ingest-geoip

Bumps [geoip2](https://github.com/maxmind/GeoIP2-java) from 2.16.1 to 3.0.1.
- [Release notes](https://github.com/maxmind/GeoIP2-java/releases)
- [Changelog](https://github.com/maxmind/GeoIP2-java/blob/main/CHANGELOG.md)
- [Commits](maxmind/GeoIP2-java@v2.16.1...v3.0.1)

---
updated-dependencies:
- dependency-name: com.maxmind.geoip2:geoip2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Updating SHAs

Signed-off-by: dependabot[bot] <support@github.com>

* Fix breaking change with geoip2 version 3.0.1.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Fix precommit failures caused by ignoreMissingClasses check.

Precommit is failing because forbiddenApis was configured to ignore missing classes
that are present.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Change asn in GeoIpProcessorTests from int to long.

Signed-off-by: Marc Handalian <handalm@amazon.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Co-authored-by: Marc Handalian <handalm@amazon.com>
(cherry picked from commit ce5c55d)
kotwanikunal pushed a commit that referenced this pull request Apr 6, 2022
)

* Bump geoip2 from 2.16.1 to 3.0.1 in /modules/ingest-geoip

Bumps [geoip2](https://github.com/maxmind/GeoIP2-java) from 2.16.1 to 3.0.1.
- [Release notes](https://github.com/maxmind/GeoIP2-java/releases)
- [Changelog](https://github.com/maxmind/GeoIP2-java/blob/main/CHANGELOG.md)
- [Commits](maxmind/GeoIP2-java@v2.16.1...v3.0.1)

---
updated-dependencies:
- dependency-name: com.maxmind.geoip2:geoip2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Updating SHAs

Signed-off-by: dependabot[bot] <support@github.com>

* Fix breaking change with geoip2 version 3.0.1.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Fix precommit failures caused by ignoreMissingClasses check.

Precommit is failing because forbiddenApis was configured to ignore missing classes
that are present.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Change asn in GeoIpProcessorTests from int to long.

Signed-off-by: Marc Handalian <handalm@amazon.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Co-authored-by: Marc Handalian <handalm@amazon.com>
(cherry picked from commit ce5c55d)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
kotwanikunal pushed a commit that referenced this pull request Apr 6, 2022
)

* Bump geoip2 from 2.16.1 to 3.0.1 in /modules/ingest-geoip

Bumps [geoip2](https://github.com/maxmind/GeoIP2-java) from 2.16.1 to 3.0.1.
- [Release notes](https://github.com/maxmind/GeoIP2-java/releases)
- [Changelog](https://github.com/maxmind/GeoIP2-java/blob/main/CHANGELOG.md)
- [Commits](maxmind/GeoIP2-java@v2.16.1...v3.0.1)

---
updated-dependencies:
- dependency-name: com.maxmind.geoip2:geoip2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Updating SHAs

Signed-off-by: dependabot[bot] <support@github.com>

* Fix breaking change with geoip2 version 3.0.1.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Fix precommit failures caused by ignoreMissingClasses check.

Precommit is failing because forbiddenApis was configured to ignore missing classes
that are present.

Signed-off-by: Marc Handalian <handalm@amazon.com>

* Change asn in GeoIpProcessorTests from int to long.

Signed-off-by: Marc Handalian <handalm@amazon.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Co-authored-by: Marc Handalian <handalm@amazon.com>
(cherry picked from commit ce5c55d)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch backport 2.0 Backport to 2.0 branch dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants