Make API auth_backend compatible to 1.10.x and 2.0 #394
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit does the following: - uses `airflow.api.auth.backend.basic_auth` for Airflow >= 2.0 - uses `airflow.api.auth.backend.default` for Airflow <2 - allow overriding API auth backend by setting `AIRFLOW__API__AUTH_BACKEND` in Dockerfile or `.env`
kaxil
requested review from
adam2k,
andriisoldatenko and
schnie
as code owners
Codecov Report
@@ Coverage Diff @@
## main #394 +/- ##
=======================================
Coverage 54.51% 54.51%
=======================================
Files 32 32
Lines 2313 2313
=======================================
Hits 1261 1261
Misses 963 963
Partials 89 89 Continue to review full report at Codecov.
|
kaxil
commented
Dec 6, 2020
airflow/include/composeyml.go
Outdated
| @@ -62,7 +62,12 @@ services: | |||
| webserver: | |||
| image: {{ .AirflowImage }} | |||
| command: > | |||
| bash -c '{ airflow create_user "$$@" || airflow users create "$$@"; } && { airflow sync_perm || airflow sync-perm; } && airflow webserver' -- -r Admin -u admin -e admin@example.com -f admin -l user -p admin | |||
| bash -c 'if [[ -z "$$AIRFLOW__API__AUTH_BACKEND" ]] && [[ $$(airflow version | tail -1) =~ "2."[0-9]+\.[0.9]+.* ]]; | |||
There was a problem hiding this comment.
tail -1 is needed to cope up with the case like the following:
❯ docker exec --user root -it d9744db5a0fc bash
root@d9744db5a0fc:/usr/local/airflow# airflow version
[2020-12-06 00:44:44,070] {plugins_manager.py:111} ERROR - Failed to import plugin astronomer_version_check
Traceback (most recent call last):
File "/usr/local/lib/python3.7/site-packages/airflow/plugins_manager.py", line 105, in load_entrypoint_plugins
plugin_obj = entry_point.load()
File "/usr/local/lib/python3.7/site-packages/pkg_resources/__init__.py", line 2446, in load
self.require(*args, **kwargs)
File "/usr/local/lib/python3.7/site-packages/pkg_resources/__init__.py", line 2469, in require
items = working_set.resolve(reqs, env, installer, extras=self.extras)
File "/usr/local/lib/python3.7/site-packages/pkg_resources/__init__.py", line 775, in resolve
raise VersionConflict(dist, req).with_context(dependent_req)
pkg_resources.ContextualVersionConflict: (marshmallow 2.21.0 (/usr/local/lib/python3.7/site-packages), Requirement.parse('marshmallow>=3.0.0'), {'marshmallow-sqlalchemy'})
1.10.12.dev9+astro.2
|
Ping @andriisoldatenko @ashb Will be need this for next 0.23 release |
Instead of getting Airflow version and matching regex, we just check if `basic_auth.py` file exists or not.
|
@ashb Updated the PR to check for file existence. WDYT now? |
ashb
approved these changes
Dec 8, 2020
kaxil
added a commit
that referenced
this pull request
Dec 8, 2020
This commit does the following: - uses `airflow.api.auth.backend.basic_auth` for Airflow >= 2.0 - uses `airflow.api.auth.backend.default` for Airflow <2 - allow overriding API auth backend by setting `AIRFLOW__API__AUTH_BACKEND` in Dockerfile or `.env` (cherry picked from commit f67cd49)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit does the following:
airflow.api.auth.backend.basic_authfor Airflow >= 2.0airflow.api.auth.backend.defaultfor Airflow <2AIRFLOW__API__AUTH_BACKENDin Dockerfile or.envI have tested this with the following Docker files:
and by overriding the value