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-4934] Fix ProxyFix due to Werkzeug upgrade #5563

Merged
merged 1 commit into from
Jul 12, 2019

Conversation

nritholtz
Copy link
Contributor

@nritholtz nritholtz commented Jul 11, 2019

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-XXX
    • 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.

https://issues.apache.org/jira/browse/AIRFLOW-4934

Description

  • Here are some details about my PR, including screenshots of any UI changes:

Since Werkzeug 0.15, enable_proxy_fix doesn't work as expected as per this Github issue.

We should fix it to at least respect what was previous behavior. We can eventually also offer a configuration to customize the new behavior, however this is breaking old behavior, and is (I believe) required within the next/current Airflow release due to Flask pinning the Werkzeug version.

Tests

  • My PR adds the following unit tests OR does not need testing for this extremely good reason:

Consumption of Werkzeug client (similar to #3983)

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

Code Quality

  • Passes flake8

@codecov-io
Copy link

codecov-io commented Jul 11, 2019

Codecov Report

Merging #5563 into master will increase coverage by <.01%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #5563      +/-   ##
=========================================
+ Coverage   78.99%     79%   +<.01%     
=========================================
  Files         489     489              
  Lines       30741   30741              
=========================================
+ Hits        24284   24287       +3     
+ Misses       6457    6454       -3
Impacted Files Coverage Δ
airflow/www/app.py 97.32% <0%> (ø) ⬆️
airflow/models/taskinstance.py 93.18% <0%> (+0.49%) ⬆️

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 d2f2249...dbe9374. Read the comment docs.

@ashb ashb merged commit ccfe23d into apache:master Jul 12, 2019
@ashb
Copy link
Member

ashb commented Jul 12, 2019

Oh one thing: how does this work if Werkzeug 0.14 is still installed? Does that version accept the these arguments? if not we should pin Flask >=1.1.0

@nritholtz nritholtz deleted the AIRFLOW-4934 branch July 12, 2019 13:46
@ashb
Copy link
Member

ashb commented Jul 12, 2019

It does not, so this will break if anyone still has Werkzeug 0.14 installed. I'm going to revert this for now.

0.15 also moved the import to werkzeug.middleware.proxy_fix.ProxyFix.

ashb pushed a commit to ashb/airflow that referenced this pull request Jul 12, 2019
andriisoldatenko pushed a commit to andriisoldatenko/airflow that referenced this pull request Jul 26, 2019
wmorris75 pushed a commit to modmed/incubator-airflow that referenced this pull request Jul 29, 2019
dharamsk pushed a commit to postmates/airflow that referenced this pull request Aug 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants