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

Upgrade to Flask Application Builder 4.3.9 #35085

Merged
merged 1 commit into from Oct 21, 2023

Conversation

potiuk
Copy link
Member

@potiuk potiuk commented Oct 20, 2023

This PR brings all the necessary changes to upgrade to FAB 4.3.9 from 4.3.6.

It incorporates those changes:

It also removes the limitation of the WTForms after compatibility has been implemented:


^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an 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 a newsfragment file, named {pr_number}.significant.rst or {issue_number}.significant.rst, in newsfragments.

@potiuk
Copy link
Member Author

potiuk commented Oct 20, 2023

Due to a tight integration and override, that one would require a bit careful review and double-checking whether all the changes 4.3.6 -> 4.3.9 are correctly applied.

@potiuk potiuk force-pushed the upgrade-to-fab-4.3.9 branch 2 times, most recently from 724850c to ff961e3 Compare October 20, 2023 14:48
@potiuk
Copy link
Member Author

potiuk commented Oct 20, 2023

Rebased and resolved conflicts after @vincbeck's merged #34924

This PR brings all the necessary changes to upgrade to FAB 4.3.9 from
4.3.6.

It incorporates those changes:

* dpgaspar/Flask-AppBuilder#2112
* dpgaspar/Flask-AppBuilder#2121

It also removes the limitation of the WTForms after compatibility has
been implemented:

* dpgaspar/Flask-AppBuilder#2138
@potiuk potiuk merged commit 4198146 into apache:main Oct 21, 2023
67 checks passed
@potiuk potiuk deleted the upgrade-to-fab-4.3.9 branch October 21, 2023 15:50
@jscheffl
Copy link
Contributor

FYI @wolfdn Your fix is going to be integrated in 2.7.3 :-D

@potiuk potiuk modified the milestones: Airflow 2.7.3, Airflow 2.8.0 Oct 21, 2023
@potiuk
Copy link
Member Author

potiuk commented Oct 21, 2023

Well. Just changed it to 2.8.0. It won't make it to 2.7.3 because we have quite heavy refactor for AIP-58 and we won't be able to cherry-pick this change cleanly. Sorry for that :(

@jscheffl
Copy link
Contributor

2.8.0 is also okay. We have (for our setup) no dependency. No pressure from my side.

@ephraimbuddy ephraimbuddy added the type:misc/internal Changelog: Misc changes that should appear in change log label Oct 27, 2023
return {
"name": me.get("name", ""),
"email": me["upn"],
"email": me["email"],
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this correct? After pulling latest main, this fails. Even if email is included in the scope claims it's not returned in the token, upn is included as before. (This could of course be an integration issue with the IDP on our end)

Either way, remember to include this in the release notes, because it may require updated scope in the webserver_config by the administrator.

Copy link
Member Author

@potiuk potiuk Nov 30, 2023

Choose a reason for hiding this comment

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

Well. This has been straight copied from FAB 4.3.9 - unless I made a mistake of course. We don't even analyse that we are just making sure that we have the same code as the original FAB Securiy Manager Has.

So if there is any problem with it - it should rather be raised to FAB not to us - our change is simply a direct pass-through to FAB.

However this is a very valid point - I see that last week FAB released version 4.3.10 which contains this one: dpgaspar/Flask-AppBuilder#2163 which solves precisely the problem you mention.

So ... time to upgrade to 4.3.10 it seems.

Copy link
Member Author

Choose a reason for hiding this comment

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

Merged in #35991 -> will be released in 2.8.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type:misc/internal Changelog: Misc changes that should appear in change log
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants