mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-02-08 05:58:44 +00:00
ce5c55dbbc
* 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](https://github.com/maxmind/GeoIP2-java/compare/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>
77 lines
2.5 KiB
Groovy
77 lines
2.5 KiB
Groovy
/*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*
|
|
* The OpenSearch Contributors require contributions made to
|
|
* this file be licensed under the Apache-2.0 license or a
|
|
* compatible open source license.
|
|
*
|
|
* Modifications Copyright OpenSearch Contributors. See
|
|
* GitHub history for details.
|
|
*/
|
|
|
|
/*
|
|
* Licensed to Elasticsearch under one or more contributor
|
|
* license agreements. See the NOTICE file distributed with
|
|
* this work for additional information regarding copyright
|
|
* ownership. Elasticsearch licenses this file to you under
|
|
* the Apache License, Version 2.0 (the "License"); you may
|
|
* not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing,
|
|
* software distributed under the License is distributed on an
|
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
* KIND, either express or implied. See the License for the
|
|
* specific language governing permissions and limitations
|
|
* under the License.
|
|
*/
|
|
|
|
import org.apache.tools.ant.taskdefs.condition.Os
|
|
|
|
apply plugin: 'opensearch.yaml-rest-test'
|
|
apply plugin: 'opensearch.internal-cluster-test'
|
|
|
|
opensearchplugin {
|
|
description 'Ingest processor that uses looksup geo data based on ip adresses using the Maxmind geo database'
|
|
classname 'org.opensearch.ingest.geoip.IngestGeoIpPlugin'
|
|
}
|
|
|
|
dependencies {
|
|
api('com.maxmind.geoip2:geoip2:3.0.1')
|
|
// geoip2 dependencies:
|
|
api("com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}")
|
|
api("com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}")
|
|
api('com.maxmind.db:maxmind-db:2.0.0')
|
|
|
|
testImplementation 'org.elasticsearch:geolite2-databases:20191119'
|
|
}
|
|
|
|
restResources {
|
|
restApi {
|
|
includeCore '_common', 'indices', 'index', 'cluster', 'nodes', 'get', 'ingest'
|
|
}
|
|
}
|
|
|
|
tasks.register("copyDefaultGeoIp2DatabaseFiles", Copy) {
|
|
from { zipTree(configurations.testCompileClasspath.files.find { it.name.contains('geolite2-databases') }) }
|
|
into "${project.buildDir}/ingest-geoip"
|
|
include "*.mmdb"
|
|
}
|
|
|
|
tasks.named("bundlePlugin").configure {
|
|
dependsOn("copyDefaultGeoIp2DatabaseFiles")
|
|
from("${project.buildDir}/ingest-geoip") {
|
|
into '/'
|
|
}
|
|
}
|
|
|
|
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
|
tasks.named("test").configure {
|
|
// Windows cannot cleanup database files properly unless it loads everything on heap.
|
|
// See https://github.com/maxmind/MaxMind-DB-Reader-java#file-lock-on-windows for more information
|
|
systemProperty 'opensearch.geoip.load_db_on_heap', 'true'
|
|
}
|
|
}
|