Update licenses and attributions for GeoIP module (#75178)

Update licenses and attributions for GeoIP module

Author: probakowski

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/DependencyLicensesTask.java

@@ -34,6 +34,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -114,6 +115,11 @@ public class DependencyLicensesTask extends DefaultTask {
      */
     private Set<String> ignoreShas = new HashSet<>();
 
+    /**
+     *  Names of files that should be ignored by the check
+     */
+    private LinkedHashSet<String> ignoreFiles = new LinkedHashSet<>();
+
     /**
      * Add a mapping from a regex pattern for the jar name, to a prefix to find
      * the LICENSE and NOTICE file for that jar.
@@ -164,6 +170,13 @@ public void ignoreSha(String dep) {
         ignoreShas.add(dep);
     }
 
+    /**
+     * Add a file that should be ignored by the check. This should be used for additional license files not tied to jar dependency
+     */
+    public void ignoreFile(String file) {
+        ignoreFiles.add(file);
+    }
+
     @TaskAction
     public void checkDependencies() throws IOException, NoSuchAlgorithmException {
         if (dependencies == null) {
@@ -202,6 +215,10 @@ public void checkDependencies() throws IOException, NoSuchAlgorithmException {
             }
         }
 
+        licenses.keySet().removeAll(ignoreFiles);
+        notices.keySet().removeAll(ignoreFiles);
+        sources.keySet().removeAll(ignoreFiles);
+
         checkDependencies(licenses, notices, sources, shaFiles);
 
         licenses.forEach((item, exists) -> failIfAnyMissing(item, exists, "license"));
@@ -338,6 +355,12 @@ private String getFileName(String name, Map<String, ?> counters, String type) {
         return fileName;
     }
 
+    @Input
+    @Optional
+    public LinkedHashSet<String> getIgnoreFiles() {
+        return new LinkedHashSet<>(ignoreFiles);
+    }
+
     @Input
     public LinkedHashMap<String, String> getMappings() {
         return new LinkedHashMap<>(mappings);

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/LicenseAnalyzer.java

@@ -151,7 +151,15 @@ public class LicenseAnalyzer {
         new LicenseMatcher("EPL-2.0", true, false, Pattern.compile("Eclipse Public License - v 2.0", Pattern.DOTALL)),
         new LicenseMatcher("EDL-1.0", true, false, Pattern.compile("Eclipse Distribution License - v 1.0", Pattern.DOTALL)),
         new LicenseMatcher("LGPL-2.1", true, true, Pattern.compile("GNU LESSER GENERAL PUBLIC LICENSE.*Version 2.1", Pattern.DOTALL)),
-        new LicenseMatcher("LGPL-3.0", true, true, Pattern.compile("GNU LESSER GENERAL PUBLIC LICENSE.*Version 3", Pattern.DOTALL)) };
+        new LicenseMatcher("LGPL-3.0", true, true, Pattern.compile("GNU LESSER GENERAL PUBLIC LICENSE.*Version 3", Pattern.DOTALL)),
+        new LicenseMatcher("GeoLite", false, false,
+            Pattern.compile("The Elastic GeoIP Database Service uses the GeoLite2 Data created " +
+                "and licensed by MaxMind,\nwhich is governed by MaxMind’s GeoLite2 End User License Agreement, " +
+                "available at https://www.maxmind.com/en/geolite2/eula.\n", Pattern.DOTALL)),
+        new LicenseMatcher("GeoIp-Database-Service", false, false,
+            Pattern.compile("By using the GeoIP Database Service, you agree to the Elastic GeoIP Database Service Agreement,\n" +
+                "available at www.elastic.co/elastic-geoip-database-service-terms.", Pattern.DOTALL))};
+
 
     public static LicenseInfo licenseType(File licenseFile) {
         for (LicenseMatcher matcher : matchers) {

modules/ingest-geoip/build.gradle

@@ -101,3 +101,9 @@ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
 tasks.named("forbiddenPatterns").configure {
   exclude '**/*.mmdb'
 }
+
+tasks.named("dependencyLicenses").configure {
+  mapping from: /geoip.*/, to: 'maxmind-geolite2-eula'
+  mapping from: /maxmind-db.*/, to: 'maxmind-db-reader'
+  ignoreFile 'elastic-geoip-database-service-agreement-LICENSE.txt'
+}

modules/ingest-geoip/licenses/elastic-geoip-database-service-agreement-LICENSE.txt

@@ -0,0 +1,2 @@
+By using the GeoIP Database Service, you agree to the Elastic GeoIP Database Service Agreement,
+available at www.elastic.co/elastic-geoip-database-service-terms.

modules/ingest-geoip/licenses/geoip2-LICENSE.txt

@@ -0,0 +1 @@
+This software is Copyright (c) 2014-2020 by MaxMind, Inc. This is free software, licensed under the Apache License, Version 2.0.

modules/ingest-geoip/licenses/geoip2-NOTICE.txt

@@ -0,0 +1,2 @@
+The Elastic GeoIP Database Service uses the GeoLite2 Data created and licensed by MaxMind,
+which is governed by MaxMind’s GeoLite2 End User License Agreement, available at https://www.maxmind.com/en/geolite2/eula.

modules/ingest-geoip/licenses/maxmind-db-NOTICE.txt

@@ -0,0 +1 @@
+This product includes the GeoLite2 Data created by MaxMind, available at https://www.maxmind.com.