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

[AIRFLOW-5458] Bump Flask-AppBuilder to 2.2.0 #6607

Merged
merged 2 commits into from
Dec 18, 2019
Merged

Conversation

paulvic
Copy link
Contributor

@paulvic paulvic commented Nov 19, 2019

Same fix as was required for Superset (apache/superset#7739)

Make sure you have checked all steps below.

Jira

  • My PR addresses the following Airflow Jira issues and references them in the PR title. For example, "[AIRFLOW-XXX] My Airflow PR"
    • https://issues.apache.org/jira/browse/AIRFLOW-5458
    • In case you are fixing a typo in the documentation you can prepend your commit with [AIRFLOW-XXX], code changes always need a Jira issue.
    • In case you are proposing a fundamental code change, you need to create an Airflow Improvement Proposal (AIP).
    • In case you are adding a dependency, check if the license complies with the ASF 3rd Party License Policy.

Description

Tests

  • My PR adds the following unit tests OR does not need testing for this extremely good reason:
    I'm not sure if we would add tests for an external package.

I have tested this manually and confirmed the issue is resolved.

Commits

  • My commits all reference Jira issues in their subject lines, and I have squashed multiple commits if they address the same issue. In addition, my commits follow the guidelines from "How to write a good git commit message":
    1. Subject is separated from body by a blank line
    2. Subject is limited to 50 characters (not including Jira issue reference)
    3. Subject does not end with a period
    4. Subject uses the imperative mood ("add", not "adding")
    5. Body wraps at 72 characters
    6. Body explains "what" and "why", not "how"

Documentation

  • In case of new functionality, my PR adds documentation that describes how to use it.
    • All the public functions and the classes in the PR contain docstrings that explain what it does
    • If you implement backwards incompatible changes, please leave a note in the Updating.md so we can assign it to a appropriate release

@ashb
Copy link
Member

ashb commented Nov 19, 2019

All in favour of this change, but have you checked the rest of the UI? Has anything else around filtering or searching broken or changed?

@codecov-io
Copy link

codecov-io commented Nov 19, 2019

Codecov Report

Merging #6607 into master will decrease coverage by 0.32%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #6607      +/-   ##
=========================================
- Coverage   83.83%   83.5%   -0.33%     
=========================================
  Files         651     651              
  Lines       37431   37431              
=========================================
- Hits        31379   31256     -123     
- Misses       6052    6175     +123
Impacted Files Coverage Δ
airflow/kubernetes/volume_mount.py 44.44% <0%> (-55.56%) ⬇️
airflow/kubernetes/volume.py 52.94% <0%> (-47.06%) ⬇️
airflow/kubernetes/pod_launcher.py 45.25% <0%> (-46.72%) ⬇️
airflow/kubernetes/refresh_config.py 50.98% <0%> (-23.53%) ⬇️
...rflow/contrib/operators/kubernetes_pod_operator.py 77.14% <0%> (-21.43%) ⬇️
airflow/jobs/local_task_job.py 85% <0%> (-5%) ⬇️
airflow/configuration.py 89.13% <0%> (-3.63%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update baae140...c448a1b. Read the comment docs.

@paulvic
Copy link
Contributor Author

paulvic commented Nov 19, 2019

All in favour of this change, but have you checked the rest of the UI? Has anything else around filtering or searching broken or changed?

I logged in with two different accounts, one with admin and the other with user role. Verified the admin had the typical admin permissions. Verified the user had limited permissions and searching, triggering DAGs, viewing logs, etc. still works correctly.

@mik-laj mik-laj added the area:webserver Webserver related Issues label Nov 25, 2019
@feng-tao
Copy link
Member

how about a custom DAG user role?

@feng-tao
Copy link
Member

cc @mistercrunch Max, do you know if FAB changes any API/interface that Airflow is using?

@zachliu
Copy link
Contributor

zachliu commented Dec 6, 2019

We've been experiencing a similar issue as AIRFLOW-5462. Everything works as expected for a valid login using the company domain specified in OAUTH_PROVIDERS's whitelist. However, if I try to login with, say, a personal Gmail account, it breaks the UI with same error traceback as AIRFLOW-5462. And unfortunately this PR doesn't solve this issue 😭

setup.py Outdated Show resolved Hide resolved
setup.py Outdated Show resolved Hide resolved
Copy link
Member

@feluelle feluelle left a comment

Choose a reason for hiding this comment

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

I cherry-picked this line to v1-10-test ( 5c3813b )

Can confirm that UI works with Flask-AppBuilder 2.2.1

setup.py Outdated Show resolved Hide resolved
@zachliu
Copy link
Contributor

zachliu commented Dec 17, 2019

I'm still having the same error using flask-AppBuilder 2.2.1 😭

@ashb
Copy link
Member

ashb commented Dec 17, 2019

@zachliu Yeah, it sounds like this change won't fix the OAuth issue :( , but will improve a few other things :)

setup.py Outdated Show resolved Hide resolved
@kaxil
Copy link
Member

kaxil commented Dec 18, 2019

@paulvic Can you update the PR based on the suggestion and we can use the same PR to resolve https://issues.apache.org/jira/browse/AIRFLOW-5458, we want to do this for 1.10.7

@ashb ashb changed the title [AIRFLOW-5462] Bump FAB to 2.2.0 to fix OAuth login issue [AIRFLOW-5458] Bump Flask-AppBuilder to 2.2.0 Dec 18, 2019
@ashb ashb merged commit 47facb4 into apache:master Dec 18, 2019
ashb pushed a commit to ashb/airflow that referenced this pull request Dec 18, 2019
This might also fix AIRFLOW-5462 (OAuth login issue)

Same fix as was required for Superset (apache/superset#7739)

(cherry picked from commit 47facb4)
ashb added a commit to ashb/airflow that referenced this pull request Dec 18, 2019
ashb added a commit to ashb/airflow that referenced this pull request Dec 18, 2019
@ashb
Copy link
Member

ashb commented Dec 18, 2019

Fab 2.0.0 only works on py3.6+ - on the release branch this change has been changed so it's this:

            'flask-appbuilder>=1.12.2, <=2.0.0;python_version<"3.6"',
            'flask-appbuilder~=2.2;python_version>="3.6"',

ashb pushed a commit that referenced this pull request Dec 18, 2019
This might also fix AIRFLOW-5462 (OAuth login issue)

Same fix as was required for Superset (apache/superset#7739)

(cherry picked from commit 47facb4)
ashb pushed a commit that referenced this pull request Dec 19, 2019
This might also fix AIRFLOW-5462 (OAuth login issue)

Same fix as was required for Superset (apache/superset#7739)

(cherry picked from commit 47facb4)
kaxil pushed a commit that referenced this pull request Dec 19, 2019
This might also fix AIRFLOW-5462 (OAuth login issue)

Same fix as was required for Superset (apache/superset#7739)

(cherry picked from commit 47facb4)
KKcorps pushed a commit to KKcorps/airflow that referenced this pull request Dec 21, 2019
This might also fix AIRFLOW-5462 (OAuth login issue)

Same fix as was required for Superset (apache/superset#7739)
asaf400 pushed a commit to asaf400/airflow that referenced this pull request Jan 1, 2020
galuszkak pushed a commit to FlyrInc/apache-airflow that referenced this pull request Mar 5, 2020
This might also fix AIRFLOW-5462 (OAuth login issue)

Same fix as was required for Superset (apache/superset#7739)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area:webserver Webserver related Issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants