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

Add downgrade to some FAB migrations #20874

Merged
merged 4 commits into from
Jan 17, 2022

Conversation

ephraimbuddy
Copy link
Contributor

There are some FAB migrations that don't have downgrades.
This PR fixes it


^ Add meaningful description above

Read the Pull Request Guidelines for more information.
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.

@ephraimbuddy ephraimbuddy marked this pull request as draft January 14, 2022 13:21
@ephraimbuddy ephraimbuddy marked this pull request as ready for review January 14, 2022 13:36
@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.

@github-actions github-actions bot added the full tests needed We need to run full set of tests for this PR to merge label Jan 14, 2022
@@ -319,3 +344,7 @@ def upgrade():

def downgrade():
"""Unapply Resource based permissions."""
log = logging.getLogger()
handlers = log.handlers[:]
Copy link
Member

Choose a reason for hiding this comment

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

Worth adding a note why this is needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think this logging is not necessary, however, I copied it from the upgrade function

db = SQLA()
db.session = settings.Session
undo_migrate_to_new_dag_permissions(db)
db.session.commit()
Copy link
Member

Choose a reason for hiding this comment

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

This commit seems unnecessary?

Copy link
Member

@uranusjr uranusjr Jan 17, 2022

Choose a reason for hiding this comment

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

Also from what I can tell undo_migrate_to_new_dag_permissions only uses db.session; why not just pass that into the function, but the entire db object?

Copy link
Member

@uranusjr uranusjr left a comment

Choose a reason for hiding this comment

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

Generally looks good, but there’re a couple of things I’m not sure about.

@ephraimbuddy ephraimbuddy reopened this Jan 17, 2022
@ephraimbuddy ephraimbuddy merged commit f964fd4 into apache:main Jan 17, 2022
@ephraimbuddy ephraimbuddy deleted the fab-downgrades branch January 17, 2022 12:45
@ephraimbuddy ephraimbuddy added this to the Airflow 2.2.4 milestone Jan 19, 2022
@jedcunningham jedcunningham added the type:bug-fix Changelog: Bug Fixes label Jan 26, 2022
jedcunningham pushed a commit that referenced this pull request Jan 26, 2022
There are some FAB migrations that don't have downgrades.
This PR fixes it

(cherry picked from commit f964fd4)
jedcunningham pushed a commit that referenced this pull request Jan 27, 2022
There are some FAB migrations that don't have downgrades.
This PR fixes it

(cherry picked from commit f964fd4)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
full tests needed We need to run full set of tests for this PR to merge type:bug-fix Changelog: Bug Fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants