You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2020/12/28 16:07:10 UTC
[airflow] branch master updated: Adds missing LDAP "extra"
dependencies to ldap provider. (#13308)
This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/master by this push:
new d23ac9b Adds missing LDAP "extra" dependencies to ldap provider. (#13308)
d23ac9b is described below
commit d23ac9b235c5b30a5d2d3a3a7edf60e0085d68de
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Mon Dec 28 17:07:00 2020 +0100
Adds missing LDAP "extra" dependencies to ldap provider. (#13308)
It seems that for quite some time (1.10.4) the "ldap" extra
missed python-ldap dependency.
https://issues.apache.org/jira/browse/AIRFLOW-5261
Also LDAP seems to be popular enough to be added as default
extra in the production image.
Fixes #13306
---
BREEZE.rst | 6 +++---
Dockerfile | 4 +++-
Dockerfile.ci | 1 +
scripts/ci/images/ci_verify_prod_image.sh | 1 +
scripts/ci/libraries/_initialization.sh | 2 +-
setup.py | 1 +
6 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/BREEZE.rst b/BREEZE.rst
index 600e856..80db896 100644
--- a/BREEZE.rst
+++ b/BREEZE.rst
@@ -1326,7 +1326,7 @@ This is the current syntax for `./breeze <./breeze>`_:
Production image:
async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,
- http,google,microsoft.azure,mysql,postgres,redis,sendgrid,sftp,slack,ssh,statsd,
+ http,ldap,google,microsoft.azure,mysql,postgres,redis,sendgrid,sftp,slack,ssh,statsd,
virtualenv
--image-tag TAG
@@ -1914,7 +1914,7 @@ This is the current syntax for `./breeze <./breeze>`_:
Production image:
async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,
- http,google,microsoft.azure,mysql,postgres,redis,sendgrid,sftp,slack,ssh,statsd,
+ http,ldap,google,microsoft.azure,mysql,postgres,redis,sendgrid,sftp,slack,ssh,statsd,
virtualenv
--image-tag TAG
@@ -2436,7 +2436,7 @@ This is the current syntax for `./breeze <./breeze>`_:
Production image:
async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,
- http,google,microsoft.azure,mysql,postgres,redis,sendgrid,sftp,slack,ssh,statsd,
+ http,ldap,google,microsoft.azure,mysql,postgres,redis,sendgrid,sftp,slack,ssh,statsd,
virtualenv
--image-tag TAG
diff --git a/Dockerfile b/Dockerfile
index eb7f9c5..29cb5ed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,7 +34,7 @@
# much smaller.
#
ARG AIRFLOW_VERSION="2.0.0.dev0"
-ARG AIRFLOW_EXTRAS="async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,http,google,microsoft.azure,mysql,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv"
+ARG AIRFLOW_EXTRAS="async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,http,ldap,google,microsoft.azure,mysql,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv"
ARG ADDITIONAL_AIRFLOW_EXTRAS=""
ARG ADDITIONAL_PYTHON_DEPS=""
@@ -91,6 +91,7 @@ ARG DEV_APT_DEPS="\
ldap-utils \
libffi-dev \
libkrb5-dev \
+ libldap2-dev \
libpq-dev \
libsasl2-2 \
libsasl2-dev \
@@ -347,6 +348,7 @@ ARG RUNTIME_APT_DEPS="\
krb5-user \
ldap-utils \
libffi6 \
+ libldap-2.4-2 \
libsasl2-2 \
libsasl2-modules \
libssl1.1 \
diff --git a/Dockerfile.ci b/Dockerfile.ci
index 80d0397..848faeb 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -86,6 +86,7 @@ RUN mkdir -pv /usr/share/man/man1 \
graphviz \
gosu \
libffi-dev \
+ libldap2-dev \
libkrb5-dev \
libpq-dev \
libsasl2-2 \
diff --git a/scripts/ci/images/ci_verify_prod_image.sh b/scripts/ci/images/ci_verify_prod_image.sh
index 6a31c4b..ac61eb2 100755
--- a/scripts/ci/images/ci_verify_prod_image.sh
+++ b/scripts/ci/images/ci_verify_prod_image.sh
@@ -160,6 +160,7 @@ function verify_production_image_features() {
check_feature "Import: elasticsearch" "python -c 'import elasticsearch,es.elastic, elasticsearch_dsl'"
check_feature "Import: grpc" "python -c 'import grpc, google.auth, google_auth_httplib2'"
check_feature "Import: hashicorp" "python -c 'import hvac'"
+ check_feature "Import: ldap" "python -c 'import ldap'"
for google_import in "${GOOGLE_IMPORTS[@]}"
do
check_feature "Import google: ${google_import}" "python -c 'import ${google_import}'"
diff --git a/scripts/ci/libraries/_initialization.sh b/scripts/ci/libraries/_initialization.sh
index 4b099e3..efd7269 100644
--- a/scripts/ci/libraries/_initialization.sh
+++ b/scripts/ci/libraries/_initialization.sh
@@ -176,7 +176,7 @@ function initialization::initialize_base_variables() {
"ssh"
)
export INSTALLED_PROVIDERS
- export INSTALLED_EXTRAS="async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,http,imap,google,microsoft.azure,mysql,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv"
+ export INSTALLED_EXTRAS="async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,http,imap,ldap,google,microsoft.azure,mysql,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv"
# default version of PIP USED (This has to be < 20.3 until https://github.com/apache/airflow/issues/12838 is solved)
AIRFLOW_PIP_VERSION=${AIRFLOW_PIP_VERSION:="20.2.4"}
diff --git a/setup.py b/setup.py
index edeac86..e6cad74 100644
--- a/setup.py
+++ b/setup.py
@@ -317,6 +317,7 @@ kubernetes = [
kylin = ['kylinpy>=2.6']
ldap = [
'ldap3>=2.5.1',
+ 'python-ldap',
]
mongo = [
'dnspython>=1.13.0,<2.0.0',