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

Update sample data to remove invalid licenses #3478

Merged
merged 1 commit into from Dec 7, 2023

Conversation

stacimc
Copy link
Contributor

@stacimc stacimc commented Dec 6, 2023

Fixes

Follow up to #3440

Description

#3440 stopped Flickr from attempting to record images with invalid licenses. We have some of those licenses in our sample data. This PR just does a replace of all of the following:

https://creativecommons.org/licenses/by-nd-nc/2.0/jp/

with

`https://creativecommons.org/licenses/by-nc-nd/2.0/'

See #3440 for more context.

Testing Instructions

Checkout this branch. Run just catalog/pgcli to go check the licenses shown locally for flickr:

openledger> select distinct meta_data->>'license_url' from image where provider='flickr';
+-------------------------------------------------------+
| ?column?                                              |
|-------------------------------------------------------|
| https://creativecommons.org/licenses/by-nc/2.0/       |
| https://creativecommons.org/licenses/by-nd-nc/2.0/jp/ |
| https://creativecommons.org/publicdomain/mark/1.0/    |
| https://creativecommons.org/licenses/by-nc-sa/2.0/    |
| https://creativecommons.org/licenses/by-sa/2.0/       |
| https://creativecommons.org/licenses/by-nd/2.0/       |
| https://creativecommons.org/publicdomain/zero/1.0/    |
| https://creativecommons.org/licenses/by/2.0/          |
+-------------------------------------------------------+

Note the invalid license.

Run just api/init and ensure the sample data can still be loaded.

Verify the invalid license has been replaced:

openledger> select distinct meta_data->>'license_url' from image where provider='flickr';
+-------------------------------------------------------+
| ?column?                                              |
|-------------------------------------------------------|
| https://creativecommons.org/licenses/by-nc/2.0/       |
| https://creativecommons.org/publicdomain/mark/1.0/    |
| https://creativecommons.org/licenses/by-nc-sa/2.0/    |
| https://creativecommons.org/licenses/by-sa/2.0/       |
| https://creativecommons.org/licenses/by-nd/2.0/       |
| https://creativecommons.org/publicdomain/zero/1.0/    |
| https://creativecommons.org/licenses/by/2.0/          |
| https://creativecommons.org/licenses/by-nc-nd/2.0/ |
+-------------------------------------------------------+

Checklist

  • My pull request has a descriptive title (not a vague title likeUpdate index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.
  • I ran the DAG documentation generator (if applicable).

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@stacimc stacimc added 🟩 priority: low Low priority and doesn't need to be rushed ✨ goal: improvement Improvement to an existing user-facing feature 💻 aspect: code Concerns the software code in the repository 🧱 stack: catalog Related to the catalog and Airflow DAGs labels Dec 6, 2023
@stacimc stacimc self-assigned this Dec 6, 2023
@stacimc stacimc requested a review from a team as a code owner December 6, 2023 20:01
Copy link
Contributor

@sarayourfriend sarayourfriend left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍 I didn't do local testing because so long as CI is passing then the sample data is loading, that's fine enough verification for me, I think. @stacimc let me know if that isn't a correct understanding of the change or if additional testing is needed for some reason (and then, can it be built into the test suite at all?)

Copy link
Member

@krysal krysal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worked for me!

@stacimc
Copy link
Contributor Author

stacimc commented Dec 7, 2023

@stacimc let me know if that isn't a correct understanding of the change or if additional testing is needed for some reason

@sarayourfriend I think that's totally fine! The only thing the additional testing really showed was that the licenses were changed to the correct thing, instead of some different invalid license (like if I had a typo, for example, that would've resulted in sample data that loads just fine/doesn't cause errors but isn't representative of real data).

@stacimc stacimc merged commit d7980e6 into main Dec 7, 2023
65 checks passed
@stacimc stacimc deleted the update/sample-data-licenses branch December 7, 2023 20:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
💻 aspect: code Concerns the software code in the repository ✨ goal: improvement Improvement to an existing user-facing feature 🟩 priority: low Low priority and doesn't need to be rushed 🧱 stack: catalog Related to the catalog and Airflow DAGs
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

3 participants