Refactor license checker task to work with Apache Rat v0.16.1 #16121

hainenber · 2024-09-29T13:04:22Z

Description

[Describe what this change achieves]
Apache Rat v0.16+ has a major refactor that is quite breaking to current Ant integration for :licenseChecker task. This PR is to remediate it.

Refactor license checker task to work with Apache Rat v0.16.1

Testing

I deliberately change a file's license header to disallowed BSD4 and deleting entire header of another file. The precommit task works as expected.

Related Issues

Resolves #16071

Check List

Functionality includes testing.
API changes companion pull request created, if applicable.
Public documentation issue/PR created, if applicable.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

github-actions · 2024-09-29T13:17:19Z

❌ Gradle check result for b1d0060: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

github-actions · 2024-09-29T14:53:59Z

❌ Gradle check result for 86efeeb: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

hainenber · 2024-09-29T15:09:16Z

Yikes, seems to be plenty of flaky tests. Seems to be unrelated to my change :/

Signed-off-by: hainenber <[email protected]>

hainenber · 2024-10-01T01:08:06Z

Apologies for the force push but I need to rebase added changes with --sign-off argument. Thanks @sandeshkr419 for the tip!

github-actions · 2024-10-01T02:04:40Z

❌ Gradle check result for 03d2954: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

hainenber · 2024-10-01T14:54:07Z

Yikes, rebase sheenanigan!

Signed-off-by: hainenber <[email protected]>

reta · 2024-10-01T15:03:30Z

Yikes, rebase sheenanigan!

Thanks @hainenber for this change, I've asked one of the Apache RAT committers (@Claudenw) to take a look and help us out with possible disruptions that may come with 0.17

Claudenw · 2024-10-01T15:09:17Z

The method of calling the Rat executable is very questionable. I wrote most of the changes for Rat 0.16 and 0.16.1 and for the upcoming 0.17. I am not certain that this code will continue to work going forward.

The recommended way forward is to look at https://github.com/apache/creadur-rat/blob/apache-rat-project-0.16.1/apache-rat-core/src/main/resources/org/apache/rat/default.xml and write a configuration file that does what you want with respect to licenses and approved licenses.

You should then be able to call the rat executable passing --licenses <your/file/here> to read your configuration. You will also need to pass the directory to process.

If you are using the Ant task you can simply create an instance of the Ant Report task and call the setLicenses() method passing your configuration file, and probably call setUseDefaultLicenses(false) to disable the default licenses.

Finally, you could create an instance of ReportConfiguration, set the properties you want, and call Reporter.report(config). See the antTask/Report.exec() method for an example.

As an aside, there is a gradle Rat plugin. However, it has not been updated and will probably not be updated until after 0.17 is released as we are cleaning up how options are made available to the UIs (e.g. Maven, Ant, Gradle).

If you would like further information please reach out to me: [email protected]

hainenber · 2024-10-01T15:37:11Z

hi @Claudenw , thanks for visiting by and leaving a review! Checking RAT's master branch, I'm pretty sure It'll be broken again 😄 (though not requiring heavy refactor like this)

Consider that the :licenseHeader task is currently configured to be ran programmatically as Ant task, I believe this is the approach I'll try my hands around.

Finally, you could create an instance of ReportConfiguration, set the properties you want, and call Reporter.report(config). See the antTask/Report.exec() method for an example.

github-actions · 2024-10-01T16:03:58Z

✅ Gradle check result for 9b2dc22: SUCCESS

codecov · 2024-10-01T16:06:03Z

Codecov Report

Attention: Patch coverage is 0% with 65 lines in your changes missing coverage. Please review.

Project coverage is 71.87%. Comparing base (a767e92) to head (9b2dc22).
Report is 3 commits behind head on main.

Files with missing lines	Patch %	Lines
...nsearch/gradle/precommit/LicenseHeadersTask.groovy	0.00%	65 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main   #16121      +/-   ##
============================================
- Coverage     71.98%   71.87%   -0.11%     
+ Complexity    64542    64478      -64     
============================================
  Files          5288     5289       +1     
  Lines        301474   301524      +50     
  Branches      43552    43562      +10     
============================================
- Hits         217024   216730     -294     
- Misses        66657    66994     +337     
- Partials      17793    17800       +7

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

hainenber · 2024-10-01T16:09:18Z

✅ Gradle check result for 9b2dc22: SUCCESS

Why would you be green when im about to refactor? 😭

Claudenw · 2024-10-02T08:22:45Z

@hainenber Paul Merlin ([email protected] has a Gradle plugin for Rat. You may want to contact him to see if it makes sense to use his plugin.

…g per recommendation Signed-off-by: hainenber <[email protected]>

Signed-off-by: Đỗ Trọng Hải <[email protected]>

hainenber · 2024-10-06T09:43:40Z

Refactored following this approach as recommended by Claude. Initially I tried a bit with Gradle plugin one but yeahhh, let's wait until 0.17.1 coming out and all things got cleaned up.

Finally, you could create an instance of ReportConfiguration, set the properties you want, and call Reporter.report(config). See the antTask/Report.exec() method for an example.

The new change works as expected. An example for a file with unapproved BSD4 license and another one without any header

github-actions · 2024-10-06T10:42:43Z

❌ Gradle check result for 31bd039: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

Claudenw · 2024-10-07T09:59:38Z

@hainenber I think you misunderstood me. I didn't mean to reuse the ant tasks (unless you can call Ant tasks directly, then it might make sense) but to implement something similar.

First, move all your license definitions into an XML file. This will keep the definitions separate from code and will allow you to use the same definitions if you run the command line or any other Rat UI.

<?xml version="1.0" encoding="UTF-8"?>
<!--
  ~ 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.
  -->

<rat-config>
    <families>
        <family id="AL" name="Apache License Version 2.0" />
        <family id="GEN" name="Generated Files" />
        <family id='BSD-3' name="BSD 3 clause" />
    </families>
    <licenses>
        <license family="AL">
            <any id="ALStandard">
                <text>Licensed under the Apache License, Version 2.0 (the
                    "License")</text>
                <text>Licensed to the Apache Software Foundation (ASF) under
                    one or more contributor license agreements; and to You under
                    the Apache License, Version 2.0.</text>
                <text>http://www.apache.org/licenses/LICENSE-2.0</text>
                <text>https://www.apache.org/licenses/LICENSE-2.0</text>
                <text>http://www.apache.org/licenses/LICENSE-2.0.html</text>
                <text>https://www.apache.org/licenses/LICENSE-2.0.html</text>
                <text>http://www.apache.org/licenses/LICENSE-2.0.txt</text>
                <text>https://www.apache.org/licenses/LICENSE-2.0.txt</text>
                <spdx name='Apache-2.0' />
            </any>
        </license>

        <license family="GEN">
            <note>
                Files that are automatically generated.</note>
            <or>
                <any resource="/org/apache/rat/generation-keywords.txt" />
                <text>ANTLR GENERATED CODE</text>
            </or>
        </license>

        <license family='BSD-3'>
            <any>
                <all>
                    <copyright />
                    <text id="BSD-3-txt">

                        Redistribution and use in source and binary forms, with
                        or without modification, are permitted provided that the
                        following conditions are met:

                        1. Redistributions of source code must retain the above
                        copyright notice, this list of conditions and the
                        following disclaimer.

                        2. Redistributions in binary form must reproduce the
                        above copyright notice, this list of conditions and the
                        following disclaimer in the documentation and/or other
                        materials provided with the distribution.

                        3. Neither the name of the copyright holder nor the
                        names of its contributors may be used to endorse or
                        promote products derived from this software without
                        specific prior written permission.

                        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
                        CONTRIBUTORS “AS IS” AND ANY EXPRESS OR IMPLIED
                        WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
                        WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
                        PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
                        COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
                        DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
                        CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
                        PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
                        USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
                        CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
                        CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
                        NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
                        USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
                        OF SUCH DAMAGE.</text>

                </all>
                <spdx name='BSD-3-Clause' />
            </any>
        </license>
    </licenses>
    <approved>
        <family license_ref='AL' />
        <family license_ref="BSD-3" />
        <family license_ref='GEN' />
    </approved>
    <matchers>
        <matcher class="org.apache.rat.configuration.builders.AllBuilder" />
        <matcher class="org.apache.rat.configuration.builders.AnyBuilder" />
        <matcher class="org.apache.rat.configuration.builders.CopyrightBuilder" />
        <matcher class="org.apache.rat.configuration.builders.MatcherRefBuilder" />
        <matcher class="org.apache.rat.configuration.builders.NotBuilder" />
        <matcher class="org.apache.rat.configuration.builders.RegexBuilder" />
        <matcher class="org.apache.rat.configuration.builders.SpdxBuilder" />
        <matcher class="org.apache.rat.configuration.builders.TextBuilder" />
    </matchers>
</rat-config>

I called the above file rat-config.xml and placed it in the same directory as the java code below, but you can put it anywhere as long as you can open it in the java code.

In looking at your code you define several licenses that I don't think make sense. (see my latest review notes).

The actual Gradle task should looks something like:

/*
 * 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.
 */

package org.opensearch.gradle.precommit;

import org.apache.rat.Defaults;
import org.apache.rat.ReportConfiguration;
import org.apache.rat.Reporter;
import org.apache.rat.walker.DirectoryWalker;
import org.apache.rat.report.claim.ClaimStatistic;
import org.apache.rat.utils.Log;
import org.gradle.api.DefaultTask;
import org.gradle.api.tasks.OutputFile;
import org.gradle.api.tasks.TaskAction;


import java.io.File;
import java.io.IOException;
import java.nio.file.Files;

public class RatTask  extends DefaultTask {

    // I don't know if the annotations sets the file or not. 
    @OutputFile
    File reportFile;

    public RatTask() {
    }
    // I assume the TaskAction annotation will cause this code to run when the task is called in Gradle.
    @TaskAction
    final void executeTask() {
        try {
            Files.deleteIfExists(reportFile.toPath());
        } catch (IOException e) {
            throw new IllegalStateException("Can not delete "+reportFile.getName());
        }

        // create an empty configuration with the Logger defined below.
        ReportConfiguration configuration = new ReportConfiguration(new Logger(this.getLogger()));

        // set the file to write the results to.  If not set standard out will be used.
        configuration.setOut(reportFile);

        // setup the defaults. to read the rat-config.xml and not to read the default configuraitons.
        Defaults.Builder defaultsBuilder = Defaults.builder().add(this.getClass().getResource("rat-config.xml"))
            .noDefault();

        // set the configuration from the defaults.
        configuration.setFrom(defaultsBuilder.build());

        // create a directory walker from the directory of the project.  The Ant project has the concept of a Union of nested
        // resources.  If Gradle has the same concept that could be used here to create the list of files to process.  In that
        // case see the Rat Ant task code ResourceCollectionContainer.java to for an example of how to wrap it.
        DirectoryWalker directoryWalker = new DirectoryWalker(this.getProject().getRootDir(), configuration.getInputFileFilter(), configuration.getDirectoryFilter());
        configuration.setReportable(directoryWalker);

        // Execute the report
        ClaimStatistic result;
        try {
            result = Reporter.report(configuration);
        } catch (Exception e) {
            throw new IllegalStateException("Can not execute Rat report", e);
        }
        if (result.getNumUnknown() > 0 || result.getNumUnApproved() > 0) {
            throw new IllegalStateException("License header problems were found! Full details: " + reportFile.getAbsolutePath());
        }
    }

    // class that wraps the Gradle logger for use within Rat.
    private class Logger implements Log {
        private final org.gradle.api.logging.Logger gradleLogger;
        Logger(org.gradle.api.logging.Logger gradleLogger) {
            this.gradleLogger = gradleLogger;
        }

        @Override
        public void log(Level level, String msg) {
            switch (level) {
                case DEBUG:
                    gradleLogger.debug(msg);
                    break;
                case INFO:
                    gradleLogger.info(msg);
                    break;
                case WARN:
                    gradleLogger.warn(msg);
                    break;
                case ERROR:
                    gradleLogger.error(msg);
                    break;
                case OFF:
                default:
                    break;
            }
        }
    }
}

Claudenw · 2024-10-07T10:02:33Z