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.

Sign up for GitHub

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

Jump to bottom

Use fab models #19121

Merged
merged 7 commits into from
Oct 29, 2021
Merged

Use fab models #19121

merged 7 commits into from
Oct 29, 2021

Conversation

jhtimmins
Copy link
Contributor

Replaces almost all remaining uses of FAB naming scheme based on ViewMenu/Permission with updating naming scheme using Resource/Action/Permission

@boring-cyborg boring-cyborg bot added area:API Airflow's REST/HTTP API area:webserver Webserver related Issues labels Oct 21, 2021
@jhtimmins jhtimmins force-pushed the use-fab-models branch 4 times, most recently from a7aa815 to 3517743 Compare October 25, 2021 21:55
uranusjr
uranusjr reviewed Oct 26, 2021
View reviewed changes
airflow/models/dagbag.py Outdated Show resolved Hide resolved
airflow/security/permissions.py Outdated Show resolved Hide resolved
airflow/www/views.py Outdated Show resolved Hide resolved
tests/test_utils/permissions.py Outdated Show resolved Hide resolved
airflow/www/fab_security/sqla/models.py Show resolved Hide resolved
tests/utils/test_db.py Outdated Show resolved Hide resolved
uranusjr
uranusjr reviewed Oct 27, 2021
View reviewed changes
airflow/www/fab_security/sqla/models.py Outdated Show resolved Hide resolved
airflow/api_connexion/schemas/task_instance_schema.py Outdated Show resolved Hide resolved
airflow/www/fab_security/sqla/models.py Outdated Show resolved Hide resolved
@jhtimmins jhtimmins force-pushed the use-fab-models branch 2 times, most recently from dbc81d9 to 548b330 Compare October 27, 2021 06:32
@jhtimmins
Copy link
Contributor Author

@uranusjr @ashb Do either of y'all know what's up with these Google docs failing? it's the only test that keeps failing and I haven't touched providers.

https://github.com/apache/airflow/runs/4019119150?check_suite_focus=true#step:7:708

@jhtimmins jhtimmins requested a review from uranusjr October 28, 2021 06:14
@uranusjr
Copy link
Member

Just a wild guess, maybe it's caused by circular imports? We moved the import in airflow/models/dagbag.py from function-local to global. It is uncommon for a module in models to import things in www (it should be the other way around) and that could potentially trigger some module loading issues in edge cases since airflow/models/__init__.py imports a lot of things, including DagBag.

@jhtimmins
Copy link
Contributor Author

@uranusjr Smart, that did it!

@github-actions github-actions bot added the full tests needed We need to run full set of tests for this PR to merge label Oct 29, 2021
@github-actions
Copy link

The PR most likely needs to run full matrix of tests because it modifies parts of the core of Airflow. However, committers might decide to merge it quickly and take the risk. If they don't merge it quickly - please rebase it to the latest main at your convenience, or amend the last commit of the PR, and push it with --force-with-lease.

@jhtimmins jhtimmins merged commit e6ce871 into apache:main Oct 29, 2021
@jhtimmins jhtimmins deleted the use-fab-models branch October 29, 2021 17:47
@ephraimbuddy ephraimbuddy added the type:misc/internal Changelog: Misc changes that should appear in change log label Apr 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@uranusjr uranusjr uranusjr approved these changes

@ashb ashb Awaiting requested review from ashb ashb is a code owner

@bbovenzi bbovenzi Awaiting requested review from bbovenzi bbovenzi is a code owner

@ephraimbuddy ephraimbuddy Awaiting requested review from ephraimbuddy ephraimbuddy is a code owner

@kaxil kaxil Awaiting requested review from kaxil

@mik-laj mik-laj Awaiting requested review from mik-laj

@ryanahamilton ryanahamilton Awaiting requested review from ryanahamilton ryanahamilton is a code owner

@XD-DENG XD-DENG Awaiting requested review from XD-DENG XD-DENG is a code owner

Assignees
No one assigned
Labels
area:API Airflow's REST/HTTP API area:webserver Webserver related Issues full tests needed We need to run full set of tests for this PR to merge type:misc/internal Changelog: Misc changes that should appear in change log
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jhtimmins @uranusjr @ephraimbuddy