You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@beam.apache.org by "derrickaw (via GitHub)" <gi...@apache.org> on 2026/01/09 15:31:30 UTC

[PR] fix dual license pull issue [beam]

derrickaw opened a new pull request, #37270:
URL: https://github.com/apache/beam/pull/37270

   https://github.com/apache/beam/actions/runs/20829445215/job/59839497539?pr=37260
   
   When a dependency is dual licensed, the current script fails.
   
   ------------------------
   
   Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:
   
    - [ ] Mention the appropriate issue in your description (for example: `addresses #123`), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment `fixes #<ISSUE NUMBER>` instead.
    - [ ] Update `CHANGES.md` with noteworthy changes.
    - [ ] If this contribution is large, please file an Apache [Individual Contributor License Agreement](https://www.apache.org/licenses/icla.pdf).
   
   See the [Contributor Guide](https://beam.apache.org/contribute) for more tips on [how to make review process smoother](https://github.com/apache/beam/blob/master/CONTRIBUTING.md#make-the-reviewers-job-easier).
   
   To check the build health, please visit [https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md](https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md)
   
   GitHub Actions Tests Status (on master branch)
   ------------------------------------------------------------------------------------------------
   [![Build python source distribution and wheels](https://github.com/apache/beam/actions/workflows/build_wheels.yml/badge.svg?event=schedule&&?branch=master)](https://github.com/apache/beam/actions?query=workflow%3A%22Build+python+source+distribution+and+wheels%22+branch%3Amaster+event%3Aschedule)
   [![Python tests](https://github.com/apache/beam/actions/workflows/python_tests.yml/badge.svg?event=schedule&&?branch=master)](https://github.com/apache/beam/actions?query=workflow%3A%22Python+Tests%22+branch%3Amaster+event%3Aschedule)
   [![Java tests](https://github.com/apache/beam/actions/workflows/java_tests.yml/badge.svg?event=schedule&&?branch=master)](https://github.com/apache/beam/actions?query=workflow%3A%22Java+Tests%22+branch%3Amaster+event%3Aschedule)
   [![Go tests](https://github.com/apache/beam/actions/workflows/go_tests.yml/badge.svg?event=schedule&&?branch=master)](https://github.com/apache/beam/actions?query=workflow%3A%22Go+tests%22+branch%3Amaster+event%3Aschedule)
   
   See [CI.md](https://github.com/apache/beam/blob/master/CI.md) for more information about GitHub Actions CI or the [workflows README](https://github.com/apache/beam/blob/master/.github/workflows/README.md) to see a list of phrases to trigger workflows.
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@beam.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix dual license pull issue [beam]

Posted by "Abacn (via GitHub)" <gi...@apache.org>.
Abacn commented on code in PR #37270:
URL: https://github.com/apache/beam/pull/37270#discussion_r2676841262


##########
sdks/java/container/license_scripts/pull_licenses_java.py:
##########
@@ -58,86 +58,90 @@ def pull_from_url(file_name, url, dep, no_list, use_cache=False):
     if url == 'skip':
         return
 
-    # Replace file path with absolute path to manual licenses
-    if url.startswith('file://{}'):
-        url = url.format(manual_license_path)
-        logging.info('Replaced local file URL with {url} for {dep}'.format(url=url, dep=dep))
-
-    # Take into account opensource.org changes that cause 404 on licenses
-    if 'opensource.org' in url and url.endswith('-license.php'):
-        url = url.replace('-license.php', '')
-
-    if use_cache:
-        md5sum = hashlib.md5(url.encode()).hexdigest()
-        if md5sum not in CACHED_LICENSES:
-            pulled_file_name = cached_license_path + "/" + md5sum
-            logging.info(f"Requested license {url} not in cache. Pulling it into {pulled_file_name}")
+    # Split the url string by commas in case of multiple/dual licenses
+    urls_to_try = [u.strip() for u in url.split(',')]

Review Comment:
   consider parsing url in upstream caller? pull_from_url is not only used by pulling license but also sources and notice. It now assumes "," in url means splitter for all cases (might not be true)
   
   that is here: https://github.com/apache/beam/blob/e50241b581a61ff8821d9713eeaffe68f030e8da/sdks/java/container/license_scripts/pull_licenses_java.py#L225
   
   also there is a non-technical question that whether we need to pull all licenses or the one that we prefer to use. There is a docstring:
   
   https://github.com/apache/beam/blob/e50241b581a61ff8821d9713eeaffe68f030e8da/sdks/java/container/license_scripts/pull_licenses_java.py#L186
   
   noting a "moduleLicense" field specifies the license type. In the case of dual license, what value does this field show?



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@beam.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix dual license pull issue [beam]

Posted by "codecov[bot] (via GitHub)" <gi...@apache.org>.
codecov[bot] commented on PR #37270:
URL: https://github.com/apache/beam/pull/37270#issuecomment-3729583484

   ## [Codecov](https://app.codecov.io/gh/apache/beam/pull/37270?dropdown=coverage&src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) Report
   :white_check_mark: All modified and coverable lines are covered by tests.
   :white_check_mark: Project coverage is 55.16%. Comparing base ([`d7fa511`](https://app.codecov.io/gh/apache/beam/commit/d7fa511ee8a1ebaf5ee020e253d1bfe0bd6e0767?dropdown=coverage&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache)) to head ([`e50241b`](https://app.codecov.io/gh/apache/beam/commit/e50241b581a61ff8821d9713eeaffe68f030e8da?dropdown=coverage&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache)).
   :warning: Report is 2 commits behind head on master.
   
   <details><summary>Additional details and impacted files</summary>
   
   
   
   ```diff
   @@            Coverage Diff            @@
   ##             master   #37270   +/-   ##
   =========================================
     Coverage     55.16%   55.16%           
     Complexity     1676     1676           
   =========================================
     Files          1068     1068           
     Lines        167265   167265           
     Branches       1208     1208           
   =========================================
     Hits          92279    92279           
     Misses        72800    72800           
     Partials       2186     2186           
   ```
   </details>
   
   [:umbrella: View full report in Codecov by Sentry](https://app.codecov.io/gh/apache/beam/pull/37270?dropdown=coverage&src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache).   
   :loudspeaker: Have feedback on the report? [Share it here](https://about.codecov.io/codecov-pr-comment-feedback/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache).
   <details><summary> :rocket: New features to boost your workflow: </summary>
   
   - :snowflake: [Test Analytics](https://docs.codecov.com/docs/test-analytics): Detect flaky tests, report on failures, and find test suite problems.
   - :package: [JS Bundle Analysis](https://docs.codecov.com/docs/javascript-bundle-analysis): Save yourself from yourself by tracking and limiting bundle sizes in JS merges.
   </details>


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@beam.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix dual license pull issue [beam]

Posted by "Abacn (via GitHub)" <gi...@apache.org>.
Abacn commented on code in PR #37270:
URL: https://github.com/apache/beam/pull/37270#discussion_r2677186260


##########
sdks/java/container/license_scripts/pull_licenses_java.py:
##########
@@ -58,86 +58,90 @@ def pull_from_url(file_name, url, dep, no_list, use_cache=False):
     if url == 'skip':
         return
 
-    # Replace file path with absolute path to manual licenses
-    if url.startswith('file://{}'):
-        url = url.format(manual_license_path)
-        logging.info('Replaced local file URL with {url} for {dep}'.format(url=url, dep=dep))
-
-    # Take into account opensource.org changes that cause 404 on licenses
-    if 'opensource.org' in url and url.endswith('-license.php'):
-        url = url.replace('-license.php', '')
-
-    if use_cache:
-        md5sum = hashlib.md5(url.encode()).hexdigest()
-        if md5sum not in CACHED_LICENSES:
-            pulled_file_name = cached_license_path + "/" + md5sum
-            logging.info(f"Requested license {url} not in cache. Pulling it into {pulled_file_name}")
+    # Split the url string by commas in case of multiple/dual licenses
+    urls_to_try = [u.strip() for u in url.split(',')]

Review Comment:
   I see, "moduleLicense" field indeed has "OR". This could potentially break SOURCE_CODE_REQUIRED_LICENSES logic here:
   
   https://github.com/apache/beam/blob/58c2b331948be340b305df8c6cdb631839627b5b/sdks/java/container/license_scripts/pull_licenses_java.py#L256
   
   saying it's dual licensed with both `SOURCE_CODE_REQUIRED_LICENSES`, we no longer detect it as source code required.
   
   If his happens, we probably treat dual license case-by-case, that is to maintain a list of dual licensed dependency and prefer one license.
   
   cc: @damccorm 



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@beam.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix dual license pull issue [beam]

Posted by "Abacn (via GitHub)" <gi...@apache.org>.
Abacn merged PR #37270:
URL: https://github.com/apache/beam/pull/37270


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@beam.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix dual license pull issue [beam]

Posted by "derrickaw (via GitHub)" <gi...@apache.org>.
derrickaw commented on code in PR #37270:
URL: https://github.com/apache/beam/pull/37270#discussion_r2677334534


##########
sdks/java/container/license_scripts/pull_licenses_java.py:
##########
@@ -58,86 +58,90 @@ def pull_from_url(file_name, url, dep, no_list, use_cache=False):
     if url == 'skip':
         return
 
-    # Replace file path with absolute path to manual licenses
-    if url.startswith('file://{}'):
-        url = url.format(manual_license_path)
-        logging.info('Replaced local file URL with {url} for {dep}'.format(url=url, dep=dep))
-
-    # Take into account opensource.org changes that cause 404 on licenses
-    if 'opensource.org' in url and url.endswith('-license.php'):
-        url = url.replace('-license.php', '')
-
-    if use_cache:
-        md5sum = hashlib.md5(url.encode()).hexdigest()
-        if md5sum not in CACHED_LICENSES:
-            pulled_file_name = cached_license_path + "/" + md5sum
-            logging.info(f"Requested license {url} not in cache. Pulling it into {pulled_file_name}")
+    # Split the url string by commas in case of multiple/dual licenses
+    urls_to_try = [u.strip() for u in url.split(',')]

Review Comment:
   I double checked the logic and it seems to hold since its iterating over the required licenses (['lgpl', 'gpl', 'cddl', 'mpl', 'gnu', 'mozilla public license']) and checking within the string "(Apache-2.0 OR EPL-2.0)".  I guess the only decision left is do we want both or prefer Apache? Thanks.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@beam.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix dual license pull issue [beam]

Posted by "Abacn (via GitHub)" <gi...@apache.org>.
Abacn commented on PR #37270:
URL: https://github.com/apache/beam/pull/37270#issuecomment-3730085571

   LGTM in term of fixing script. For the TODO we can discuss later


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@beam.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix dual license pull issue [beam]

Posted by "gemini-code-assist[bot] (via GitHub)" <gi...@apache.org>.
gemini-code-assist[bot] commented on PR #37270:
URL: https://github.com/apache/beam/pull/37270#issuecomment-3729406358

   ## Summary of Changes
   
   Hello @derrickaw, I'm Gemini Code Assist[^1]! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!
   
   This pull request addresses a critical issue in the Java container's license pulling script where the process would fail for dependencies that are dual-licensed or provide multiple license URLs. The `pull_from_url` function has been enhanced to parse and sequentially attempt to retrieve licenses from all specified URLs, thereby ensuring the script's robustness and accuracy in handling diverse licensing configurations.
   
   ### Highlights
   
   * **Dual License Support**: The `pull_from_url` function now correctly handles dependencies that specify multiple license URLs, typically separated by commas. The script will attempt to fetch each URL until a license is successfully retrieved.
   * **Robust License Fetching**: The license pulling logic has been refactored to iterate through a list of potential license URLs, improving resilience when a dependency might offer licenses from multiple sources.
   * **Typo Correction**: A minor typo in the `shutil.copy` call within the `pull_from_url` function was corrected, changing `pull_file_name` to `pulled_file_name` to ensure correct file handling when caching is active.
   
   🧠 **New Feature in Public Preview:** You can now enable **Memory** to help **Gemini Code Assist** learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. **Click [here](https://codeassist.google/code-review/login) to enable Memory in your admin console.**
   
   
   
   
   
   
   
   <details>
   <summary><b>Using Gemini Code Assist</b></summary>
   <br>
   
   The full guide for Gemini Code Assist can be found on our [documentation page](https://developers.google.com/gemini-code-assist/docs/review-github-code), here are some quick tips.
   
   <b>Invoking Gemini</b>
   
   You can request assistance from Gemini at any point by creating a comment using either `/gemini <command>` or `@gemini-code-assist <command>`. Below is a summary of the supported commands on the current page.
   
   Feature | Command | Description
   --- | --- | ---
   Code Review | `/gemini review` | Performs a code review for the current pull request in its current state.
   Pull Request Summary | `/gemini summary` | Provides a summary of the current pull request in its current state.
   Comment | @gemini-code-assist | Responds in comments when explicitly tagged, both in pull request comments and review comments.
   Help | `/gemini help` | Displays a list of available commands.
   
   <b>Customization</b>
   
   To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a `.gemini/` folder in the base of the repository. Detailed instructions can be found [here](https://developers.google.com/gemini-code-assist/docs/customize-gemini-behavior-github).
   
   <b>Limitations & Feedback</b>
   
   Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with :thumbsup: and :thumbsdown: on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up [here](https://google.qualtrics.com/jfe/form/SV_2cyuGuTWsEw84yG).
   
   <b>You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the [Gemini Code Assist IDE Extension](https://cloud.google.com/products/gemini/code-assist).</b>
   </details>
   
   
   
   
   [^1]: Review the [Privacy Notices](https://policies.google.com/privacy), [Generative AI Prohibited Use Policy](https://policies.google.com/terms/generative-ai/use-policy), [Terms of Service](https://policies.google.com/terms), and learn how to configure Gemini Code Assist in GitHub [here](https://developers.google.com/gemini-code-assist/docs/customize-gemini-behavior-github). Gemini can make mistakes, so double check it and [use code with caution](https://support.google.com/legal/answer/13505487).
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@beam.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix dual license pull issue [beam]

Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #37270:
URL: https://github.com/apache/beam/pull/37270#issuecomment-3729579020

   Assigning reviewers:
   
   R: @chamikaramj for label java.
   
   
   Note: If you would like to opt out of this review, comment `assign to next reviewer`.
   
   Available commands:
   - `stop reviewer notifications` - opt out of the automated review tooling
   - `remind me after tests pass` - tag the comment author after tests pass
   - `waiting on author` - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)
   
   The PR bot will only process comments in the main thread (not review comments).


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@beam.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org


Re: [PR] fix dual license pull issue [beam]

Posted by "derrickaw (via GitHub)" <gi...@apache.org>.
derrickaw commented on code in PR #37270:
URL: https://github.com/apache/beam/pull/37270#discussion_r2677092548


##########
sdks/java/container/license_scripts/pull_licenses_java.py:
##########
@@ -58,86 +58,90 @@ def pull_from_url(file_name, url, dep, no_list, use_cache=False):
     if url == 'skip':
         return
 
-    # Replace file path with absolute path to manual licenses
-    if url.startswith('file://{}'):
-        url = url.format(manual_license_path)
-        logging.info('Replaced local file URL with {url} for {dep}'.format(url=url, dep=dep))
-
-    # Take into account opensource.org changes that cause 404 on licenses
-    if 'opensource.org' in url and url.endswith('-license.php'):
-        url = url.replace('-license.php', '')
-
-    if use_cache:
-        md5sum = hashlib.md5(url.encode()).hexdigest()
-        if md5sum not in CACHED_LICENSES:
-            pulled_file_name = cached_license_path + "/" + md5sum
-            logging.info(f"Requested license {url} not in cache. Pulling it into {pulled_file_name}")
+    # Split the url string by commas in case of multiple/dual licenses
+    urls_to_try = [u.strip() for u in url.split(',')]

Review Comment:
   > consider parsing url in upstream caller? pull_from_url is not only used by pulling license but also sources and notice. It now assumes "," in url means splitter for all cases (might not be true)
   > 
   > that is here:
   > 
   > https://github.com/apache/beam/blob/e50241b581a61ff8821d9713eeaffe68f030e8da/sdks/java/container/license_scripts/pull_licenses_java.py#L225
   
   Done
   
   > 
   > also there is a non-technical question that whether we need to pull all licenses or the one that we prefer to use. There is a docstring:
   > 
   > https://github.com/apache/beam/blob/e50241b581a61ff8821d9713eeaffe68f030e8da/sdks/java/container/license_scripts/pull_licenses_java.py#L186
   > 
   > noting a "moduleLicense" field specifies the license type. In the case of dual license, what value does this field show?
   
    {'moduleName': 'biz.aQute.bnd:biz.aQute.bnd.annotation', 'moduleUrl': 'https://bnd.bndtools.org/', 'moduleVersion': '7.1.0', **'moduleLicense': '(Apache-2.0 OR EPL-2.0)'**, 'moduleLicenseUrl': 'https://opensource.org/licenses/Apache-2.0,https://opensource.org/licenses/EPL-2.0'}
   
   I updated the code to still do both.  Is that ok, or do you prefer the Apache one or does it matter which? Thanks.
   
   



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: github-unsubscribe@beam.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org