This is an automated email from the ASF dual-hosted git repository.
jscheffl pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new bd2bb9096ad Move fab provider to new structure (#46144)
bd2bb9096ad is described below
commit bd2bb9096adc5489fa4b0234b5debb9f735cd41e
Author: Josix <[email protected]>
AuthorDate: Sat Feb 1 04:19:00 2025 +0800
Move fab provider to new structure (#46144)
* refactor(providers/fab): move fab provider to new structure
* fix: updated changed path
* refactor: Move FAB test views to provider-specific directory
* fixup! refactor(providers/fab): move fab provider to new structure
* fixup! refactor(providers/fab): move fab provider to new structure
* fixup! refactor(providers/fab): move fab provider to new structure
* fixup! refactor(providers/fab): move fab provider to new structure
---
.github/boring-cyborg.yml | 4 +-
.pre-commit-config.yaml | 12 +-
docs/.gitignore | 1 +
docs/apache-airflow-providers-fab/changelog.rst | 25 ---
.../3rd-party-licenses/LICENSES-ui.txt | 2 +-
providers/fab/README.rst | 86 +++++++++
.../fab/docs}/auth-manager/access-control.rst | 8 +-
.../fab/docs}/auth-manager/api-authentication.rst | 0
.../fab/docs}/auth-manager/index.rst | 0
.../auth-manager/webserver-authentication.rst | 0
.../fab/CHANGELOG.rst => fab/docs/changelog.rst} | 0
.../fab/docs}/cli-ref.rst | 0
.../fab/docs}/commits.rst | 0
.../fab/docs}/configurations-ref.rst | 0
.../fab/docs}/img/add-role.png | Bin
...am_fab_auth_manager_airflow_architecture.md5sum | 0
...agram_fab_auth_manager_airflow_architecture.png | Bin
...iagram_fab_auth_manager_airflow_architecture.py | 0
.../fab/docs}/img/new-role.png | Bin
.../fab/docs}/index.rst | 0
.../docs}/installing-providers-from-sources.rst | 0
.../fab/docs}/migrations-ref.rst | 0
.../fab/docs}/security.rst | 0
.../fab/docs}/stable-rest-api-ref.rst | 0
.../fab/docs}/upgrading.rst | 0
.../{src/airflow/providers => }/fab/provider.yaml | 22 ---
providers/fab/pyproject.toml | 102 +++++++++++
providers/fab/src/airflow/providers/fab/LICENSE | 201 +++++++++++++++++++++
.../src/airflow/providers/fab/__init__.py | 0
.../src/airflow/providers/fab/alembic.ini | 0
.../airflow/providers/fab/auth_manager/__init__.py | 0
.../providers/fab/auth_manager/api/__init__.py | 0
.../fab/auth_manager/api/auth/__init__.py | 0
.../fab/auth_manager/api/auth/backend/__init__.py | 0
.../auth_manager/api/auth/backend/basic_auth.py | 0
.../auth_manager/api/auth/backend/kerberos_auth.py | 0
.../fab/auth_manager/api/auth/backend/session.py | 0
.../fab/auth_manager/api_endpoints/__init__.py | 0
.../api_endpoints/role_and_permission_endpoint.py | 0
.../auth_manager/api_endpoints/user_endpoint.py | 0
.../fab/auth_manager/cli_commands/__init__.py | 0
.../fab/auth_manager/cli_commands/db_command.py | 0
.../fab/auth_manager/cli_commands/definition.py | 0
.../fab/auth_manager/cli_commands/role_command.py | 0
.../auth_manager/cli_commands/sync_perm_command.py | 0
.../fab/auth_manager/cli_commands/user_command.py | 0
.../fab/auth_manager/cli_commands/utils.py | 0
.../providers/fab/auth_manager/fab_auth_manager.py | 12 +-
.../providers/fab/auth_manager/models/__init__.py | 0
.../fab/auth_manager/models/anonymous_user.py | 0
.../providers/fab/auth_manager/models/db.py | 0
.../providers/fab/auth_manager/openapi/__init__.py | 0
.../providers/fab/auth_manager/openapi/v1.yaml | 0
.../providers/fab/auth_manager/schemas/__init__.py | 0
.../schemas/role_and_permission_schema.py | 0
.../fab/auth_manager/schemas/user_schema.py | 0
.../fab/auth_manager/security_manager/__init__.py | 0
.../fab/auth_manager/security_manager/constants.py | 0
.../fab/auth_manager/security_manager/override.py | 0
.../providers/fab/auth_manager/views/__init__.py | 0
.../fab/auth_manager/views/permissions.py | 0
.../providers/fab/auth_manager/views/roles_list.py | 0
.../providers/fab/auth_manager/views/user.py | 0
.../providers/fab/auth_manager/views/user_edit.py | 0
.../providers/fab/auth_manager/views/user_stats.py | 0
.../src/airflow/providers/fab/get_provider_info.py | 90 +++++++++
.../src/airflow/providers/fab/migrations/README | 0
.../airflow/providers/fab/migrations/__init__.py | 0
.../src/airflow/providers/fab/migrations/env.py | 0
.../providers/fab/migrations/script.py.mako | 0
.../versions/0001_1_4_0_placeholder_migration.py | 0
.../providers/fab/migrations/versions/__init__.py | 0
.../src/airflow/providers/fab/www/__init__.py | 0
.../providers/fab/www/api_connexion/__init__.py | 0
.../providers/fab/www/api_connexion/exceptions.py | 0
.../providers/fab/www/api_connexion/parameters.py | 0
.../providers/fab/www/api_connexion/security.py | 0
.../providers/fab/www/api_connexion/types.py | 0
.../{ => fab}/src/airflow/providers/fab/www/app.py | 0
.../src/airflow/providers/fab/www/constants.py | 0
.../providers/fab/www/extensions/__init__.py | 0
.../fab/www/extensions/init_appbuilder.py | 0
.../fab/www/extensions/init_jinja_globals.py | 0
.../fab/www/extensions/init_manifest_files.py | 0
.../providers/fab/www/extensions/init_security.py | 0
.../providers/fab/www/extensions/init_session.py | 0
.../providers/fab/www/extensions/init_views.py | 0
.../airflow/providers/fab/www/package-lock.json | 0
.../src/airflow/providers/fab/www/package.json | 0
.../airflow/providers/fab/www/security/__init__.py | 0
.../providers/fab/www/security/permissions.py | 0
.../airflow/providers/fab/www/security_manager.py | 0
.../src/airflow/providers/fab/www/session.py | 0
.../fab/www/static/css/bootstrap-theme.css | 0
.../providers/fab/www/static/css/loading-dots.css | 0
.../airflow/providers/fab/www/static/css/main.css | 0
.../fab/www/static/css/material-icons.css | 0
.../providers/fab/www/static/js/datetime_utils.js | 0
.../airflow/providers/fab/www/static/js/main.js | 0
.../airflow/providers/fab/www/static/sort_asc.png | 0
.../airflow/providers/fab/www/static/sort_both.png | Bin
.../airflow/providers/fab/www/static/sort_desc.png | Bin
.../fab/www/templates/airflow/_messages.html | 0
.../providers/fab/www/templates/airflow/error.html | 0
.../providers/fab/www/templates/airflow/main.html | 0
.../fab/www/templates/airflow/traceback.html | 0
.../fab/www/templates/appbuilder/index.html | 0
.../fab/www/templates/appbuilder/navbar.html | 0
.../fab/www/templates/appbuilder/navbar_menu.html | 0
.../fab/www/templates/appbuilder/navbar_right.html | 0
.../src/airflow/providers/fab/www/utils.py | 0
.../src/airflow/providers/fab/www/views.py | 0
.../airflow/providers/fab/www/webpack.config.js | 0
.../views/user_stats.py => fab/tests/conftest.py} | 21 +--
.../tests/provider_tests}/__init__.py | 2 +-
.../tests/provider_tests}/fab/__init__.py | 0
.../provider_tests}/fab/auth_manager/__init__.py | 0
.../fab/auth_manager/api/__init__.py | 0
.../fab/auth_manager/api/auth/__init__.py | 0
.../fab/auth_manager/api/auth/backend/__init__.py | 0
.../api/auth/backend/test_basic_auth.py | 0
.../api/auth/backend/test_kerberos_auth.py | 0
.../auth_manager/api/auth/backend/test_session.py | 0
.../fab/auth_manager/api_endpoints/__init__.py | 0
.../api_endpoints/api_connexion_utils.py | 0
.../api_endpoints/remote_user_api_auth_backend.py | 0
.../api_endpoints/test_asset_endpoint.py | 2 +-
.../fab/auth_manager/api_endpoints/test_auth.py | 0
.../fab/auth_manager/api_endpoints/test_cors.py | 0
.../api_endpoints/test_dag_endpoint.py | 2 +-
.../api_endpoints/test_dag_run_endpoint.py | 4 +-
.../api_endpoints/test_dag_source_endpoint.py | 2 +-
.../api_endpoints/test_dag_warning_endpoint.py | 2 +-
.../api_endpoints/test_event_log_endpoint.py | 2 +-
.../api_endpoints/test_import_error_endpoint.py | 2 +-
.../test_role_and_permission_endpoint.py | 4 +-
.../api_endpoints/test_task_instance_endpoint.py | 4 +-
.../api_endpoints/test_user_endpoint.py | 4 +-
.../api_endpoints/test_variable_endpoint.py | 2 +-
.../api_endpoints/test_xcom_endpoint.py | 2 +-
.../fab/auth_manager/cli_commands/__init__.py | 0
.../auth_manager/cli_commands/test_db_command.py | 0
.../auth_manager/cli_commands/test_definition.py | 0
.../auth_manager/cli_commands/test_role_command.py | 0
.../cli_commands/test_sync_perm_command.py | 0
.../auth_manager/cli_commands/test_user_command.py | 0
.../fab/auth_manager/cli_commands/test_utils.py | 0
.../provider_tests}/fab/auth_manager/conftest.py | 2 +-
.../fab/auth_manager/models/__init__.py | 0
.../fab/auth_manager/models/test_anonymous_user.py | 0
.../fab/auth_manager/models/test_db.py | 9 +-
.../fab/auth_manager/schemas/__init__.py | 0
.../schemas/test_role_and_permission_schema.py | 3 +-
.../fab/auth_manager/schemas/test_user_schema.py | 2 +-
.../fab/auth_manager/security_manager/__init__.py | 0
.../security_manager/test_constants.py | 0
.../auth_manager/security_manager/test_override.py | 0
.../fab/auth_manager/test_fab_auth_manager.py | 3 +-
.../fab/auth_manager/test_models.py | 0
.../fab/auth_manager/test_security.py | 4 +-
.../fab/auth_manager/views/__init__.py | 0
.../fab/auth_manager/views/test_permissions.py | 4 +-
.../fab/auth_manager/views/test_roles_list.py | 4 +-
.../fab/auth_manager/views/test_user.py | 4 +-
.../fab/auth_manager/views/test_user_edit.py | 4 +-
.../fab/auth_manager/views/test_user_stats.py | 4 +-
.../tests/provider_tests/fab/www}/__init__.py | 0
.../provider_tests/fab/www/views}/__init__.py | 0
.../tests/provider_tests/fab/www/views/conftest.py | 124 +++++++++++++
.../fab}/www/views/test_views_acl.py | 2 +-
.../fab}/www/views/test_views_custom_user_views.py | 4 +-
pyproject.toml | 3 +
scripts/ci/docker-compose/remove-sources.yml | 1 +
scripts/ci/docker-compose/tests-sources.yml | 1 +
scripts/ci/pre_commit/version_heads_map.py | 2 +-
scripts/in_container/run_migration_reference.py | 2 +-
tests/www/views/test_views_dagrun.py | 4 +-
tests/www/views/test_views_home.py | 2 +-
tests/www/views/test_views_tasks.py | 4 +-
tests/www/views/test_views_trigger_dag.py | 4 +-
tests/www/views/test_views_variable.py | 2 +-
181 files changed, 690 insertions(+), 128 deletions(-)
diff --git a/.github/boring-cyborg.yml b/.github/boring-cyborg.yml
index 13c33b81349..b844729fdd4 100644
--- a/.github/boring-cyborg.yml
+++ b/.github/boring-cyborg.yml
@@ -165,9 +165,7 @@ labelPRBasedOnFilePath:
- providers/exasol/**
provider:fab:
- - providers/src/airflow/providers/fab/**/*
- - docs/apache-airflow-providers-fab/**/*
- - providers/tests/fab/**/*
+ - providers/fab/**
provider:facebook:
- providers/facebook/**
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 617ee16ab2f..d0dc9364502 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -533,9 +533,9 @@ repos:
(?x)
^scripts/ci/pre_commit/version_heads_map\.py$|
^airflow/migrations/versions/.*$|^airflow/migrations/versions|
-
^providers/src/airflow/providers/fab/migrations/versions/.*$|^providers/src/airflow/providers/fab/migrations/versions|
+
^providers/fab/src/airflow/providers/fab/migrations/versions/.*$|^providers/fab/src/airflow/providers/fab/migrations/versions|
^airflow/utils/db.py$|
- ^providers/src/airflow/providers/fab/auth_manager/models/db.py$
+ ^providers/fab/src/airflow/providers/fab/auth_manager/models/db.py$
additional_dependencies: ['packaging','google-re2']
- id: update-version
name: Update versions in docs
@@ -624,7 +624,7 @@ repos:
^airflow/models/baseoperator.py$|
^airflow/operators/__init__.py$|
^providers/common/sql/tests/provider_tests/common/sql/operators/test_sql_execute.py$|
-
^providers/src/airflow/providers/fab/www/static/css/bootstrap-theme.css$|
+
^providers/fab/src/airflow/providers/fab/www/static/css/bootstrap-theme.css$|
^providers/src/airflow/providers/amazon/aws/hooks/emr.py$|
^providers/src/airflow/providers/amazon/aws/operators/emr.py$|
^providers/apache/cassandra/src/airflow/providers/apache/cassandra/hooks/cassandra.py$|
@@ -634,8 +634,8 @@ repos:
^providers/apache/spark/src/airflow/providers/apache/spark/hooks/|
^providers/apache/spark/src/airflow/providers/apache/spark/operators/|
^providers/exasol/src/airflow/providers/exasol/hooks/exasol.py$|
- ^providers/src/airflow/providers/fab/auth_manager/security_manager/|
-
^providers/src/airflow/providers/fab/www/static/css/bootstrap-theme.css$|
+
^providers/fab/src/airflow/providers/fab/auth_manager/security_manager/|
+
^providers/fab/src/airflow/providers/fab/www/static/css/bootstrap-theme.css$|
^providers/src/airflow/providers/google/cloud/hooks/bigquery.py$|
^providers/src/airflow/providers/google/cloud/operators/cloud_build.py$|
^providers/src/airflow/providers/google/cloud/operators/dataproc.py$|
@@ -662,7 +662,7 @@ repos:
^docs/apache-airflow-providers-apache-hdfs/connections.rst$|
^providers/apache/kafka/docs/connections/kafka.rst$|
^providers/apache/spark/docs/decorators/pyspark.rst$|
-
^docs/apache-airflow-providers-fab/auth-manager/webserver-authentication.rst$|
+ ^providers/fab/docs/auth-manager/webserver-authentication.rst$|
^docs/apache-airflow-providers-google/operators/cloud/kubernetes_engine.rst$|
^docs/apache-airflow-providers-microsoft-azure/connections/azure_cosmos.rst$|
^docs/apache-airflow-providers-cncf-kubernetes/operators.rst$|
diff --git a/docs/.gitignore b/docs/.gitignore
index 274047763ca..d84366aefc0 100644
--- a/docs/.gitignore
+++ b/docs/.gitignore
@@ -28,6 +28,7 @@ apache-airflow-providers-docker
apache-airflow-providers-edge
apache-airflow-providers-elasticsearch
apache-airflow-providers-exasol
+apache-airflow-providers-fab
apache-airflow-providers-facebook
apache-airflow-providers-ftp
apache-airflow-providers-github
diff --git a/docs/apache-airflow-providers-fab/changelog.rst
b/docs/apache-airflow-providers-fab/changelog.rst
deleted file mode 100644
index 41fc2e14c26..00000000000
--- a/docs/apache-airflow-providers-fab/changelog.rst
+++ /dev/null
@@ -1,25 +0,0 @@
-
- .. Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- .. http://www.apache.org/licenses/LICENSE-2.0
-
- .. Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
- .. NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE
- OVERWRITTEN WHEN PREPARING PACKAGES.
-
- .. IF YOU WANT TO MODIFY THIS FILE, YOU SHOULD MODIFY THE TEMPLATE
- `PROVIDER_CHANGELOG_TEMPLATE.rst.jinja2` IN the
`dev/breeze/src/airflow_breeze/templates` DIRECTORY
-
-.. include:: ../../providers/src/airflow/providers/fab/CHANGELOG.rst
diff --git a/providers/src/airflow/providers/3rd-party-licenses/LICENSES-ui.txt
b/providers/fab/3rd-party-licenses/LICENSES-ui.txt
similarity index 98%
rename from providers/src/airflow/providers/3rd-party-licenses/LICENSES-ui.txt
rename to providers/fab/3rd-party-licenses/LICENSES-ui.txt
index db0b1fb7e13..268a4a3eeb1 100644
--- a/providers/src/airflow/providers/3rd-party-licenses/LICENSES-ui.txt
+++ b/providers/fab/3rd-party-licenses/LICENSES-ui.txt
@@ -1,5 +1,5 @@
Apache Airflow
-Copyright 2016-2023 The Apache Software Foundation
+Copyright 2016-2025 The Apache Software Foundation
This product includes software developed at The Apache Software
Foundation (http://www.apache.org/).
diff --git a/providers/fab/README.rst b/providers/fab/README.rst
new file mode 100644
index 00000000000..3ad41250fbb
--- /dev/null
+++ b/providers/fab/README.rst
@@ -0,0 +1,86 @@
+
+ .. Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ .. http://www.apache.org/licenses/LICENSE-2.0
+
+ .. Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+ .. NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN!
+
+ .. IF YOU WANT TO MODIFY TEMPLATE FOR THIS FILE, YOU SHOULD MODIFY THE
TEMPLATE
+ `PROVIDER_README_TEMPLATE.rst.jinja2` IN the
`dev/breeze/src/airflow_breeze/templates` DIRECTORY
+
+
+Package ``apache-airflow-providers-fab``
+
+Release: ``2.0.0``
+
+
+`Flask App Builder <https://flask-appbuilder.readthedocs.io/>`__
+
+
+Provider package
+----------------
+
+This is a provider package for ``fab`` provider. All classes for this provider
package
+are in ``airflow.providers.fab`` python package.
+
+You can find package information and changelog for the provider
+in the `documentation
<https://airflow.apache.org/docs/apache-airflow-providers-fab/2.0.0/>`_.
+
+Installation
+------------
+
+You can install this package on top of an existing Airflow 2 installation (see
``Requirements`` below
+for the minimum Airflow version supported) via
+``pip install apache-airflow-providers-fab``
+
+The package supports the following python versions: 3.9,3.10,3.11,3.12
+
+Requirements
+------------
+
+========================================== ==================
+PIP package Version required
+========================================== ==================
+``apache-airflow`` ``>=3.0.0.dev0``
+``apache-airflow-providers-common-compat`` ``>=1.2.1``
+``flask`` ``>=2.2,<2.3``
+``flask-appbuilder`` ``==4.5.3``
+``flask-login`` ``>=0.6.2``
+``google-re2`` ``>=1.0``
+``jmespath`` ``>=0.7.0``
+========================================== ==================
+
+Cross provider package dependencies
+-----------------------------------
+
+Those are dependencies that might be needed in order to use all the features
of the package.
+You need to install the specified provider packages in order to use them.
+
+You can install such cross-provider dependencies when installing from PyPI.
For example:
+
+.. code-block:: bash
+
+ pip install apache-airflow-providers-fab[common.compat]
+
+
+==================================================================================================================
=================
+Dependent package
Extra
+==================================================================================================================
=================
+`apache-airflow-providers-common-compat
<https://airflow.apache.org/docs/apache-airflow-providers-common-compat>`_
``common.compat``
+==================================================================================================================
=================
+
+The changelog for the provider package can be found in the
+`changelog
<https://airflow.apache.org/docs/apache-airflow-providers-fab/2.0.0/changelog.html>`_.
diff --git a/docs/apache-airflow-providers-fab/auth-manager/access-control.rst
b/providers/fab/docs/auth-manager/access-control.rst
similarity index 98%
rename from docs/apache-airflow-providers-fab/auth-manager/access-control.rst
rename to providers/fab/docs/auth-manager/access-control.rst
index b6271adf082..67cd0d3678b 100644
--- a/docs/apache-airflow-providers-fab/auth-manager/access-control.rst
+++ b/providers/fab/docs/auth-manager/access-control.rst
@@ -46,7 +46,7 @@ Viewer
^^^^^^
``Viewer`` users have limited read permissions:
-.. exampleinclude::
/../../providers/src/airflow/providers/fab/auth_manager/security_manager/override.py
+.. exampleinclude::
/../../providers/fab/src/airflow/providers/fab/auth_manager/security_manager/override.py
:language: python
:start-after: [START security_viewer_perms]
:end-before: [END security_viewer_perms]
@@ -55,7 +55,7 @@ User
^^^^
``User`` users have ``Viewer`` permissions plus additional permissions:
-.. exampleinclude::
/../../providers/src/airflow/providers/fab/auth_manager/security_manager/override.py
+.. exampleinclude::
/../../providers/fab/src/airflow/providers/fab/auth_manager/security_manager/override.py
:language: python
:start-after: [START security_user_perms]
:end-before: [END security_user_perms]
@@ -64,7 +64,7 @@ Op
^^
``Op`` users have ``User`` permissions plus additional permissions:
-.. exampleinclude::
/../../providers/src/airflow/providers/fab/auth_manager/security_manager/override.py
+.. exampleinclude::
/../../providers/fab/src/airflow/providers/fab/auth_manager/security_manager/override.py
:language: python
:start-after: [START security_op_perms]
:end-before: [END security_op_perms]
@@ -74,7 +74,7 @@ Admin
``Admin`` users have all possible permissions, including granting or revoking
permissions from
other users. ``Admin`` users have ``Op`` permission plus additional
permissions:
-.. exampleinclude::
/../../providers/src/airflow/providers/fab/auth_manager/security_manager/override.py
+.. exampleinclude::
/../../providers/fab/src/airflow/providers/fab/auth_manager/security_manager/override.py
:language: python
:start-after: [START security_admin_perms]
:end-before: [END security_admin_perms]
diff --git
a/docs/apache-airflow-providers-fab/auth-manager/api-authentication.rst
b/providers/fab/docs/auth-manager/api-authentication.rst
similarity index 100%
rename from
docs/apache-airflow-providers-fab/auth-manager/api-authentication.rst
rename to providers/fab/docs/auth-manager/api-authentication.rst
diff --git a/docs/apache-airflow-providers-fab/auth-manager/index.rst
b/providers/fab/docs/auth-manager/index.rst
similarity index 100%
rename from docs/apache-airflow-providers-fab/auth-manager/index.rst
rename to providers/fab/docs/auth-manager/index.rst
diff --git
a/docs/apache-airflow-providers-fab/auth-manager/webserver-authentication.rst
b/providers/fab/docs/auth-manager/webserver-authentication.rst
similarity index 100%
rename from
docs/apache-airflow-providers-fab/auth-manager/webserver-authentication.rst
rename to providers/fab/docs/auth-manager/webserver-authentication.rst
diff --git a/providers/src/airflow/providers/fab/CHANGELOG.rst
b/providers/fab/docs/changelog.rst
similarity index 100%
rename from providers/src/airflow/providers/fab/CHANGELOG.rst
rename to providers/fab/docs/changelog.rst
diff --git a/docs/apache-airflow-providers-fab/cli-ref.rst
b/providers/fab/docs/cli-ref.rst
similarity index 100%
rename from docs/apache-airflow-providers-fab/cli-ref.rst
rename to providers/fab/docs/cli-ref.rst
diff --git a/docs/apache-airflow-providers-fab/commits.rst
b/providers/fab/docs/commits.rst
similarity index 100%
rename from docs/apache-airflow-providers-fab/commits.rst
rename to providers/fab/docs/commits.rst
diff --git a/docs/apache-airflow-providers-fab/configurations-ref.rst
b/providers/fab/docs/configurations-ref.rst
similarity index 100%
rename from docs/apache-airflow-providers-fab/configurations-ref.rst
rename to providers/fab/docs/configurations-ref.rst
diff --git a/docs/apache-airflow-providers-fab/img/add-role.png
b/providers/fab/docs/img/add-role.png
similarity index 100%
rename from docs/apache-airflow-providers-fab/img/add-role.png
rename to providers/fab/docs/img/add-role.png
diff --git
a/docs/apache-airflow-providers-fab/img/diagram_fab_auth_manager_airflow_architecture.md5sum
b/providers/fab/docs/img/diagram_fab_auth_manager_airflow_architecture.md5sum
similarity index 100%
rename from
docs/apache-airflow-providers-fab/img/diagram_fab_auth_manager_airflow_architecture.md5sum
rename to
providers/fab/docs/img/diagram_fab_auth_manager_airflow_architecture.md5sum
diff --git
a/docs/apache-airflow-providers-fab/img/diagram_fab_auth_manager_airflow_architecture.png
b/providers/fab/docs/img/diagram_fab_auth_manager_airflow_architecture.png
similarity index 100%
rename from
docs/apache-airflow-providers-fab/img/diagram_fab_auth_manager_airflow_architecture.png
rename to
providers/fab/docs/img/diagram_fab_auth_manager_airflow_architecture.png
diff --git
a/docs/apache-airflow-providers-fab/img/diagram_fab_auth_manager_airflow_architecture.py
b/providers/fab/docs/img/diagram_fab_auth_manager_airflow_architecture.py
similarity index 100%
rename from
docs/apache-airflow-providers-fab/img/diagram_fab_auth_manager_airflow_architecture.py
rename to
providers/fab/docs/img/diagram_fab_auth_manager_airflow_architecture.py
diff --git a/docs/apache-airflow-providers-fab/img/new-role.png
b/providers/fab/docs/img/new-role.png
similarity index 100%
rename from docs/apache-airflow-providers-fab/img/new-role.png
rename to providers/fab/docs/img/new-role.png
diff --git a/docs/apache-airflow-providers-fab/index.rst
b/providers/fab/docs/index.rst
similarity index 100%
rename from docs/apache-airflow-providers-fab/index.rst
rename to providers/fab/docs/index.rst
diff --git
a/docs/apache-airflow-providers-fab/installing-providers-from-sources.rst
b/providers/fab/docs/installing-providers-from-sources.rst
similarity index 100%
rename from
docs/apache-airflow-providers-fab/installing-providers-from-sources.rst
rename to providers/fab/docs/installing-providers-from-sources.rst
diff --git a/docs/apache-airflow-providers-fab/migrations-ref.rst
b/providers/fab/docs/migrations-ref.rst
similarity index 100%
rename from docs/apache-airflow-providers-fab/migrations-ref.rst
rename to providers/fab/docs/migrations-ref.rst
diff --git a/docs/apache-airflow-providers-fab/security.rst
b/providers/fab/docs/security.rst
similarity index 100%
rename from docs/apache-airflow-providers-fab/security.rst
rename to providers/fab/docs/security.rst
diff --git a/docs/apache-airflow-providers-fab/stable-rest-api-ref.rst
b/providers/fab/docs/stable-rest-api-ref.rst
similarity index 100%
rename from docs/apache-airflow-providers-fab/stable-rest-api-ref.rst
rename to providers/fab/docs/stable-rest-api-ref.rst
diff --git a/docs/apache-airflow-providers-fab/upgrading.rst
b/providers/fab/docs/upgrading.rst
similarity index 100%
rename from docs/apache-airflow-providers-fab/upgrading.rst
rename to providers/fab/docs/upgrading.rst
diff --git a/providers/src/airflow/providers/fab/provider.yaml
b/providers/fab/provider.yaml
similarity index 72%
rename from providers/src/airflow/providers/fab/provider.yaml
rename to providers/fab/provider.yaml
index 6f0e98240f2..82a59e64c7f 100644
--- a/providers/src/airflow/providers/fab/provider.yaml
+++ b/providers/fab/provider.yaml
@@ -50,28 +50,6 @@ versions:
- 1.0.1
- 1.0.0
-dependencies:
- - apache-airflow>=3.0.0.dev0
- - apache-airflow-providers-common-compat>=1.2.1
- - flask>=2.2,<2.3
- # We are tightly coupled with FAB version as we vendored-in part of FAB code
related to security manager
- # This is done as part of preparation to removing FAB as dependency, but we
are not ready for it yet
- # Every time we update FAB version here, please make sure that you review
the classes and models in
- # `airflow/providers/fab/auth_manager/security_manager/override.py` with
their upstream counterparts.
- # In particular, make sure any breaking changes, for example any new
methods, are accounted for.
- - flask-appbuilder==4.5.3
- - flask-login>=0.6.2
- - google-re2>=1.0
- - jmespath>=0.7.0
-
-additional-extras:
- - name: kerberos
- dependencies:
- - kerberos>=1.3.0
-
-devel-dependencies:
- - kerberos>=1.3.0
-
config:
fab:
description: This section contains configs specific to FAB provider.
diff --git a/providers/fab/pyproject.toml b/providers/fab/pyproject.toml
new file mode 100644
index 00000000000..f3c7914f6e7
--- /dev/null
+++ b/providers/fab/pyproject.toml
@@ -0,0 +1,102 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN!
+
+# IF YOU WANT TO MODIFY THIS FILE EXCEPT DEPENDENCIES, YOU SHOULD MODIFY THE
TEMPLATE
+# `pyproject_TEMPLATE.toml.jinja2` IN the
`dev/breeze/src/airflow_breeze/templates` DIRECTORY
+[build-system]
+requires = ["flit_core==3.10.1"]
+build-backend = "flit_core.buildapi"
+
+[project]
+name = "apache-airflow-providers-fab"
+version = "2.0.0"
+description = "Provider package apache-airflow-providers-fab for Apache
Airflow"
+readme = "README.rst"
+authors = [
+ {name="Apache Software Foundation", email="[email protected]"},
+]
+maintainers = [
+ {name="Apache Software Foundation", email="[email protected]"},
+]
+keywords = [ "airflow-provider", "fab", "airflow", "integration" ]
+classifiers = [
+ "Development Status :: 5 - Production/Stable",
+ "Environment :: Console",
+ "Environment :: Web Environment",
+ "Intended Audience :: Developers",
+ "Intended Audience :: System Administrators",
+ "Framework :: Apache Airflow",
+ "Framework :: Apache Airflow :: Provider",
+ "License :: OSI Approved :: Apache Software License",
+ "Programming Language :: Python :: 3.9",
+ "Programming Language :: Python :: 3.10",
+ "Programming Language :: Python :: 3.11",
+ "Programming Language :: Python :: 3.12",
+ "Topic :: System :: Monitoring",
+]
+requires-python = "~=3.9"
+
+# The dependencies should be modified in place in the generated file
+# Any change in the dependencies is preserved when the file is regenerated
+dependencies = [
+ "apache-airflow>=3.0.0.dev0",
+ "apache-airflow-providers-common-compat>=1.2.1",
+ "flask>=2.2,<2.3",
+ # We are tightly coupled with FAB version as we vendored-in part of FAB
code related to security manager
+ # This is done as part of preparation to removing FAB as dependency, but
we are not ready for it yet
+ # Every time we update FAB version here, please make sure that you review
the classes and models in
+ # `airflow/providers/fab/auth_manager/security_manager/override.py` with
their upstream counterparts.
+ # In particular, make sure any breaking changes, for example any new
methods, are accounted for.
+ "flask-appbuilder==4.5.3",
+ "flask-login>=0.6.2",
+ "google-re2>=1.0",
+ "jmespath>=0.7.0",
+]
+
+# The optional dependencies should be modified in place in the generated file
+# Any change in the dependencies is preserved when the file is regenerated
+[project.optional-dependencies]
+"kerberos" = [
+ "kerberos>=1.3.0",
+]
+
+# The dependency groups should be modified in place in the generated file
+# Any change in the dependencies is preserved when the file is regenerated
+[dependency-groups]
+dev = [
+ "kerberos>=1.3.0",
+]
+
+[project.urls]
+"Documentation" =
"https://airflow.apache.org/docs/apache-airflow-providers-fab/2.0.0";
+"Changelog" =
"https://airflow.apache.org/docs/apache-airflow-providers-fab/2.0.0/changelog.html";
+"Bug Tracker" = "https://github.com/apache/airflow/issues";
+"Source Code" = "https://github.com/apache/airflow";
+"Slack Chat" = "https://s.apache.org/airflow-slack";
+"Twitter" = "https://x.com/ApacheAirflow";
+"YouTube" = "https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/";
+
+[project.entry-points."apache_airflow_provider"]
+provider_info = "airflow.providers.fab.get_provider_info:get_provider_info"
+
+[tool.flit.module]
+name = "airflow.providers.fab"
+
+[tool.pytest.ini_options]
+ignore = "tests/system/"
diff --git a/providers/fab/src/airflow/providers/fab/LICENSE
b/providers/fab/src/airflow/providers/fab/LICENSE
new file mode 100644
index 00000000000..11069edd790
--- /dev/null
+++ b/providers/fab/src/airflow/providers/fab/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/providers/src/airflow/providers/fab/__init__.py
b/providers/fab/src/airflow/providers/fab/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/fab/__init__.py
rename to providers/fab/src/airflow/providers/fab/__init__.py
diff --git a/providers/src/airflow/providers/fab/alembic.ini
b/providers/fab/src/airflow/providers/fab/alembic.ini
similarity index 100%
rename from providers/src/airflow/providers/fab/alembic.ini
rename to providers/fab/src/airflow/providers/fab/alembic.ini
diff --git a/providers/src/airflow/providers/fab/auth_manager/__init__.py
b/providers/fab/src/airflow/providers/fab/auth_manager/__init__.py
similarity index 100%
copy from providers/src/airflow/providers/fab/auth_manager/__init__.py
copy to providers/fab/src/airflow/providers/fab/auth_manager/__init__.py
diff --git a/providers/src/airflow/providers/fab/auth_manager/api/__init__.py
b/providers/fab/src/airflow/providers/fab/auth_manager/api/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/fab/auth_manager/api/__init__.py
rename to providers/fab/src/airflow/providers/fab/auth_manager/api/__init__.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/api/auth/__init__.py
b/providers/fab/src/airflow/providers/fab/auth_manager/api/auth/__init__.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/api/auth/__init__.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/api/auth/__init__.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/api/auth/backend/__init__.py
b/providers/fab/src/airflow/providers/fab/auth_manager/api/auth/backend/__init__.py
similarity index 100%
copy from
providers/src/airflow/providers/fab/auth_manager/api/auth/backend/__init__.py
copy to
providers/fab/src/airflow/providers/fab/auth_manager/api/auth/backend/__init__.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/api/auth/backend/basic_auth.py
b/providers/fab/src/airflow/providers/fab/auth_manager/api/auth/backend/basic_auth.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/api/auth/backend/basic_auth.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/api/auth/backend/basic_auth.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/api/auth/backend/kerberos_auth.py
b/providers/fab/src/airflow/providers/fab/auth_manager/api/auth/backend/kerberos_auth.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/api/auth/backend/kerberos_auth.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/api/auth/backend/kerberos_auth.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/api/auth/backend/session.py
b/providers/fab/src/airflow/providers/fab/auth_manager/api/auth/backend/session.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/api/auth/backend/session.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/api/auth/backend/session.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/api_endpoints/__init__.py
b/providers/fab/src/airflow/providers/fab/auth_manager/api_endpoints/__init__.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/api_endpoints/__init__.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/api_endpoints/__init__.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/api_endpoints/role_and_permission_endpoint.py
b/providers/fab/src/airflow/providers/fab/auth_manager/api_endpoints/role_and_permission_endpoint.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/api_endpoints/role_and_permission_endpoint.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/api_endpoints/role_and_permission_endpoint.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/api_endpoints/user_endpoint.py
b/providers/fab/src/airflow/providers/fab/auth_manager/api_endpoints/user_endpoint.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/api_endpoints/user_endpoint.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/api_endpoints/user_endpoint.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/cli_commands/__init__.py
b/providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/__init__.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/cli_commands/__init__.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/__init__.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/cli_commands/db_command.py
b/providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/db_command.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/cli_commands/db_command.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/db_command.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/cli_commands/definition.py
b/providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/definition.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/cli_commands/definition.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/definition.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/cli_commands/role_command.py
b/providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/role_command.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/cli_commands/role_command.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/role_command.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/cli_commands/sync_perm_command.py
b/providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/sync_perm_command.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/cli_commands/sync_perm_command.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/sync_perm_command.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/cli_commands/user_command.py
b/providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/user_command.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/cli_commands/user_command.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/user_command.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/cli_commands/utils.py
b/providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/utils.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/cli_commands/utils.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/cli_commands/utils.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/fab_auth_manager.py
b/providers/fab/src/airflow/providers/fab/auth_manager/fab_auth_manager.py
similarity index 98%
rename from providers/src/airflow/providers/fab/auth_manager/fab_auth_manager.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/fab_auth_manager.py
index 4060f753444..c3d086b56e1 100644
--- a/providers/src/airflow/providers/fab/auth_manager/fab_auth_manager.py
+++ b/providers/fab/src/airflow/providers/fab/auth_manager/fab_auth_manager.py
@@ -313,9 +313,11 @@ class FabAuthManager(BaseAuthManager[User]):
return False
return all(
- self._is_authorized(method=method,
resource_type=resource_type, user=user)
- if resource_type != RESOURCE_DAG_RUN or not
hasattr(permissions, "resource_name")
- else self._is_authorized_dag_run(method=method,
details=details, user=user)
+ (
+ self._is_authorized(method=method,
resource_type=resource_type, user=user)
+ if resource_type != RESOURCE_DAG_RUN or not
hasattr(permissions, "resource_name")
+ else self._is_authorized_dag_run(method=method,
details=details, user=user)
+ )
for resource_type in resource_types
)
@@ -456,8 +458,8 @@ class FabAuthManager(BaseAuthManager[User]):
def get_url_user_profile(self) -> str | None:
"""Return the url to a page displaying info about the current user."""
- if not self.security_manager.user_view or
self.appbuilder.get_app.config.get(
- "AUTH_ROLE_PUBLIC", None
+ if not self.security_manager.user_view or (
+ self.appbuilder and
self.appbuilder.get_app.config.get("AUTH_ROLE_PUBLIC", None)
):
return None
return url_for(f"{self.security_manager.user_view.endpoint}.userinfo")
diff --git
a/providers/src/airflow/providers/fab/auth_manager/models/__init__.py
b/providers/fab/src/airflow/providers/fab/auth_manager/models/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/fab/auth_manager/models/__init__.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/models/__init__.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/models/anonymous_user.py
b/providers/fab/src/airflow/providers/fab/auth_manager/models/anonymous_user.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/models/anonymous_user.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/models/anonymous_user.py
diff --git a/providers/src/airflow/providers/fab/auth_manager/models/db.py
b/providers/fab/src/airflow/providers/fab/auth_manager/models/db.py
similarity index 100%
rename from providers/src/airflow/providers/fab/auth_manager/models/db.py
rename to providers/fab/src/airflow/providers/fab/auth_manager/models/db.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/openapi/__init__.py
b/providers/fab/src/airflow/providers/fab/auth_manager/openapi/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/fab/auth_manager/openapi/__init__.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/openapi/__init__.py
diff --git a/providers/src/airflow/providers/fab/auth_manager/openapi/v1.yaml
b/providers/fab/src/airflow/providers/fab/auth_manager/openapi/v1.yaml
similarity index 100%
rename from providers/src/airflow/providers/fab/auth_manager/openapi/v1.yaml
rename to providers/fab/src/airflow/providers/fab/auth_manager/openapi/v1.yaml
diff --git
a/providers/src/airflow/providers/fab/auth_manager/schemas/__init__.py
b/providers/fab/src/airflow/providers/fab/auth_manager/schemas/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/fab/auth_manager/schemas/__init__.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/schemas/__init__.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/schemas/role_and_permission_schema.py
b/providers/fab/src/airflow/providers/fab/auth_manager/schemas/role_and_permission_schema.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/schemas/role_and_permission_schema.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/schemas/role_and_permission_schema.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/schemas/user_schema.py
b/providers/fab/src/airflow/providers/fab/auth_manager/schemas/user_schema.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/schemas/user_schema.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/schemas/user_schema.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/security_manager/__init__.py
b/providers/fab/src/airflow/providers/fab/auth_manager/security_manager/__init__.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/security_manager/__init__.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/security_manager/__init__.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/security_manager/constants.py
b/providers/fab/src/airflow/providers/fab/auth_manager/security_manager/constants.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/security_manager/constants.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/security_manager/constants.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/security_manager/override.py
b/providers/fab/src/airflow/providers/fab/auth_manager/security_manager/override.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/security_manager/override.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/security_manager/override.py
diff --git a/providers/src/airflow/providers/fab/auth_manager/views/__init__.py
b/providers/fab/src/airflow/providers/fab/auth_manager/views/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/fab/auth_manager/views/__init__.py
rename to providers/fab/src/airflow/providers/fab/auth_manager/views/__init__.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/views/permissions.py
b/providers/fab/src/airflow/providers/fab/auth_manager/views/permissions.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/auth_manager/views/permissions.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/views/permissions.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/views/roles_list.py
b/providers/fab/src/airflow/providers/fab/auth_manager/views/roles_list.py
similarity index 100%
rename from providers/src/airflow/providers/fab/auth_manager/views/roles_list.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/views/roles_list.py
diff --git a/providers/src/airflow/providers/fab/auth_manager/views/user.py
b/providers/fab/src/airflow/providers/fab/auth_manager/views/user.py
similarity index 100%
rename from providers/src/airflow/providers/fab/auth_manager/views/user.py
rename to providers/fab/src/airflow/providers/fab/auth_manager/views/user.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/views/user_edit.py
b/providers/fab/src/airflow/providers/fab/auth_manager/views/user_edit.py
similarity index 100%
rename from providers/src/airflow/providers/fab/auth_manager/views/user_edit.py
rename to
providers/fab/src/airflow/providers/fab/auth_manager/views/user_edit.py
diff --git
a/providers/src/airflow/providers/fab/auth_manager/views/user_stats.py
b/providers/fab/src/airflow/providers/fab/auth_manager/views/user_stats.py
similarity index 100%
copy from providers/src/airflow/providers/fab/auth_manager/views/user_stats.py
copy to providers/fab/src/airflow/providers/fab/auth_manager/views/user_stats.py
diff --git a/providers/fab/src/airflow/providers/fab/get_provider_info.py
b/providers/fab/src/airflow/providers/fab/get_provider_info.py
new file mode 100644
index 00000000000..4624796d5c3
--- /dev/null
+++ b/providers/fab/src/airflow/providers/fab/get_provider_info.py
@@ -0,0 +1,90 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN!
+#
+# IF YOU WANT TO MODIFY THIS FILE, YOU SHOULD MODIFY THE TEMPLATE
+# `get_provider_info_TEMPLATE.py.jinja2` IN the
`dev/breeze/src/airflow_breeze/templates` DIRECTORY
+
+
+def get_provider_info():
+ return {
+ "package-name": "apache-airflow-providers-fab",
+ "name": "Fab",
+ "description": "`Flask App Builder
<https://flask-appbuilder.readthedocs.io/>`__\n",
+ "state": "ready",
+ "source-date-epoch": 1731570160,
+ "versions": [
+ "2.0.0",
+ "1.5.2",
+ "1.5.1",
+ "1.5.0",
+ "1.4.1",
+ "1.4.0",
+ "1.3.0",
+ "1.2.2",
+ "1.2.1",
+ "1.2.0",
+ "1.1.1",
+ "1.1.0",
+ "1.0.4",
+ "1.0.3",
+ "1.0.2",
+ "1.0.1",
+ "1.0.0",
+ ],
+ "config": {
+ "fab": {
+ "description": "This section contains configs specific to FAB
provider.",
+ "options": {
+ "auth_rate_limited": {
+ "description": "Boolean for enabling rate limiting on
authentication endpoints.\n",
+ "version_added": "1.0.2",
+ "type": "boolean",
+ "example": None,
+ "default": "True",
+ },
+ "auth_rate_limit": {
+ "description": "Rate limit for authentication
endpoints.\n",
+ "version_added": "1.0.2",
+ "type": "string",
+ "example": None,
+ "default": "5 per 40 second",
+ },
+ "update_fab_perms": {
+ "description": "Update FAB permissions and sync
security manager roles\non webserver startup\n",
+ "version_added": "1.0.2",
+ "type": "string",
+ "example": None,
+ "default": "True",
+ },
+ },
+ }
+ },
+ "auth-managers":
["airflow.providers.fab.auth_manager.fab_auth_manager.FabAuthManager"],
+ "dependencies": [
+ "apache-airflow>=3.0.0.dev0",
+ "apache-airflow-providers-common-compat>=1.2.1",
+ "flask>=2.2,<2.3",
+ "flask-appbuilder==4.5.3",
+ "flask-login>=0.6.2",
+ "google-re2>=1.0",
+ "jmespath>=0.7.0",
+ ],
+ "optional-dependencies": {"kerberos": ["kerberos>=1.3.0"]},
+ "devel-dependencies": ["kerberos>=1.3.0"],
+ }
diff --git a/providers/src/airflow/providers/fab/migrations/README
b/providers/fab/src/airflow/providers/fab/migrations/README
similarity index 100%
rename from providers/src/airflow/providers/fab/migrations/README
rename to providers/fab/src/airflow/providers/fab/migrations/README
diff --git a/providers/src/airflow/providers/fab/migrations/__init__.py
b/providers/fab/src/airflow/providers/fab/migrations/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/fab/migrations/__init__.py
rename to providers/fab/src/airflow/providers/fab/migrations/__init__.py
diff --git a/providers/src/airflow/providers/fab/migrations/env.py
b/providers/fab/src/airflow/providers/fab/migrations/env.py
similarity index 100%
rename from providers/src/airflow/providers/fab/migrations/env.py
rename to providers/fab/src/airflow/providers/fab/migrations/env.py
diff --git a/providers/src/airflow/providers/fab/migrations/script.py.mako
b/providers/fab/src/airflow/providers/fab/migrations/script.py.mako
similarity index 100%
rename from providers/src/airflow/providers/fab/migrations/script.py.mako
rename to providers/fab/src/airflow/providers/fab/migrations/script.py.mako
diff --git
a/providers/src/airflow/providers/fab/migrations/versions/0001_1_4_0_placeholder_migration.py
b/providers/fab/src/airflow/providers/fab/migrations/versions/0001_1_4_0_placeholder_migration.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/migrations/versions/0001_1_4_0_placeholder_migration.py
rename to
providers/fab/src/airflow/providers/fab/migrations/versions/0001_1_4_0_placeholder_migration.py
diff --git
a/providers/src/airflow/providers/fab/migrations/versions/__init__.py
b/providers/fab/src/airflow/providers/fab/migrations/versions/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/fab/migrations/versions/__init__.py
rename to
providers/fab/src/airflow/providers/fab/migrations/versions/__init__.py
diff --git a/providers/src/airflow/providers/fab/www/__init__.py
b/providers/fab/src/airflow/providers/fab/www/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/__init__.py
rename to providers/fab/src/airflow/providers/fab/www/__init__.py
diff --git a/providers/src/airflow/providers/fab/www/api_connexion/__init__.py
b/providers/fab/src/airflow/providers/fab/www/api_connexion/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/api_connexion/__init__.py
rename to providers/fab/src/airflow/providers/fab/www/api_connexion/__init__.py
diff --git
a/providers/src/airflow/providers/fab/www/api_connexion/exceptions.py
b/providers/fab/src/airflow/providers/fab/www/api_connexion/exceptions.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/api_connexion/exceptions.py
rename to
providers/fab/src/airflow/providers/fab/www/api_connexion/exceptions.py
diff --git
a/providers/src/airflow/providers/fab/www/api_connexion/parameters.py
b/providers/fab/src/airflow/providers/fab/www/api_connexion/parameters.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/api_connexion/parameters.py
rename to
providers/fab/src/airflow/providers/fab/www/api_connexion/parameters.py
diff --git a/providers/src/airflow/providers/fab/www/api_connexion/security.py
b/providers/fab/src/airflow/providers/fab/www/api_connexion/security.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/api_connexion/security.py
rename to providers/fab/src/airflow/providers/fab/www/api_connexion/security.py
diff --git a/providers/src/airflow/providers/fab/www/api_connexion/types.py
b/providers/fab/src/airflow/providers/fab/www/api_connexion/types.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/api_connexion/types.py
rename to providers/fab/src/airflow/providers/fab/www/api_connexion/types.py
diff --git a/providers/src/airflow/providers/fab/www/app.py
b/providers/fab/src/airflow/providers/fab/www/app.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/app.py
rename to providers/fab/src/airflow/providers/fab/www/app.py
diff --git a/providers/src/airflow/providers/fab/www/constants.py
b/providers/fab/src/airflow/providers/fab/www/constants.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/constants.py
rename to providers/fab/src/airflow/providers/fab/www/constants.py
diff --git a/providers/src/airflow/providers/fab/www/extensions/__init__.py
b/providers/fab/src/airflow/providers/fab/www/extensions/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/extensions/__init__.py
rename to providers/fab/src/airflow/providers/fab/www/extensions/__init__.py
diff --git
a/providers/src/airflow/providers/fab/www/extensions/init_appbuilder.py
b/providers/fab/src/airflow/providers/fab/www/extensions/init_appbuilder.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/www/extensions/init_appbuilder.py
rename to
providers/fab/src/airflow/providers/fab/www/extensions/init_appbuilder.py
diff --git
a/providers/src/airflow/providers/fab/www/extensions/init_jinja_globals.py
b/providers/fab/src/airflow/providers/fab/www/extensions/init_jinja_globals.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/www/extensions/init_jinja_globals.py
rename to
providers/fab/src/airflow/providers/fab/www/extensions/init_jinja_globals.py
diff --git
a/providers/src/airflow/providers/fab/www/extensions/init_manifest_files.py
b/providers/fab/src/airflow/providers/fab/www/extensions/init_manifest_files.py
similarity index 100%
rename from
providers/src/airflow/providers/fab/www/extensions/init_manifest_files.py
rename to
providers/fab/src/airflow/providers/fab/www/extensions/init_manifest_files.py
diff --git
a/providers/src/airflow/providers/fab/www/extensions/init_security.py
b/providers/fab/src/airflow/providers/fab/www/extensions/init_security.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/extensions/init_security.py
rename to
providers/fab/src/airflow/providers/fab/www/extensions/init_security.py
diff --git a/providers/src/airflow/providers/fab/www/extensions/init_session.py
b/providers/fab/src/airflow/providers/fab/www/extensions/init_session.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/extensions/init_session.py
rename to providers/fab/src/airflow/providers/fab/www/extensions/init_session.py
diff --git a/providers/src/airflow/providers/fab/www/extensions/init_views.py
b/providers/fab/src/airflow/providers/fab/www/extensions/init_views.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/extensions/init_views.py
rename to providers/fab/src/airflow/providers/fab/www/extensions/init_views.py
diff --git a/providers/src/airflow/providers/fab/www/package-lock.json
b/providers/fab/src/airflow/providers/fab/www/package-lock.json
similarity index 100%
rename from providers/src/airflow/providers/fab/www/package-lock.json
rename to providers/fab/src/airflow/providers/fab/www/package-lock.json
diff --git a/providers/src/airflow/providers/fab/www/package.json
b/providers/fab/src/airflow/providers/fab/www/package.json
similarity index 100%
rename from providers/src/airflow/providers/fab/www/package.json
rename to providers/fab/src/airflow/providers/fab/www/package.json
diff --git a/providers/src/airflow/providers/fab/www/security/__init__.py
b/providers/fab/src/airflow/providers/fab/www/security/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/security/__init__.py
rename to providers/fab/src/airflow/providers/fab/www/security/__init__.py
diff --git a/providers/src/airflow/providers/fab/www/security/permissions.py
b/providers/fab/src/airflow/providers/fab/www/security/permissions.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/security/permissions.py
rename to providers/fab/src/airflow/providers/fab/www/security/permissions.py
diff --git a/providers/src/airflow/providers/fab/www/security_manager.py
b/providers/fab/src/airflow/providers/fab/www/security_manager.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/security_manager.py
rename to providers/fab/src/airflow/providers/fab/www/security_manager.py
diff --git a/providers/src/airflow/providers/fab/www/session.py
b/providers/fab/src/airflow/providers/fab/www/session.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/session.py
rename to providers/fab/src/airflow/providers/fab/www/session.py
diff --git
a/providers/src/airflow/providers/fab/www/static/css/bootstrap-theme.css
b/providers/fab/src/airflow/providers/fab/www/static/css/bootstrap-theme.css
similarity index 100%
rename from
providers/src/airflow/providers/fab/www/static/css/bootstrap-theme.css
rename to
providers/fab/src/airflow/providers/fab/www/static/css/bootstrap-theme.css
diff --git
a/providers/src/airflow/providers/fab/www/static/css/loading-dots.css
b/providers/fab/src/airflow/providers/fab/www/static/css/loading-dots.css
similarity index 100%
rename from providers/src/airflow/providers/fab/www/static/css/loading-dots.css
rename to
providers/fab/src/airflow/providers/fab/www/static/css/loading-dots.css
diff --git a/providers/src/airflow/providers/fab/www/static/css/main.css
b/providers/fab/src/airflow/providers/fab/www/static/css/main.css
similarity index 100%
rename from providers/src/airflow/providers/fab/www/static/css/main.css
rename to providers/fab/src/airflow/providers/fab/www/static/css/main.css
diff --git
a/providers/src/airflow/providers/fab/www/static/css/material-icons.css
b/providers/fab/src/airflow/providers/fab/www/static/css/material-icons.css
similarity index 100%
rename from
providers/src/airflow/providers/fab/www/static/css/material-icons.css
rename to
providers/fab/src/airflow/providers/fab/www/static/css/material-icons.css
diff --git
a/providers/src/airflow/providers/fab/www/static/js/datetime_utils.js
b/providers/fab/src/airflow/providers/fab/www/static/js/datetime_utils.js
similarity index 100%
rename from providers/src/airflow/providers/fab/www/static/js/datetime_utils.js
rename to
providers/fab/src/airflow/providers/fab/www/static/js/datetime_utils.js
diff --git a/providers/src/airflow/providers/fab/www/static/js/main.js
b/providers/fab/src/airflow/providers/fab/www/static/js/main.js
similarity index 100%
rename from providers/src/airflow/providers/fab/www/static/js/main.js
rename to providers/fab/src/airflow/providers/fab/www/static/js/main.js
diff --git a/providers/src/airflow/providers/fab/www/static/sort_asc.png
b/providers/fab/src/airflow/providers/fab/www/static/sort_asc.png
similarity index 100%
rename from providers/src/airflow/providers/fab/www/static/sort_asc.png
rename to providers/fab/src/airflow/providers/fab/www/static/sort_asc.png
diff --git a/providers/src/airflow/providers/fab/www/static/sort_both.png
b/providers/fab/src/airflow/providers/fab/www/static/sort_both.png
similarity index 100%
rename from providers/src/airflow/providers/fab/www/static/sort_both.png
rename to providers/fab/src/airflow/providers/fab/www/static/sort_both.png
diff --git a/providers/src/airflow/providers/fab/www/static/sort_desc.png
b/providers/fab/src/airflow/providers/fab/www/static/sort_desc.png
similarity index 100%
rename from providers/src/airflow/providers/fab/www/static/sort_desc.png
rename to providers/fab/src/airflow/providers/fab/www/static/sort_desc.png
diff --git
a/providers/src/airflow/providers/fab/www/templates/airflow/_messages.html
b/providers/fab/src/airflow/providers/fab/www/templates/airflow/_messages.html
similarity index 100%
rename from
providers/src/airflow/providers/fab/www/templates/airflow/_messages.html
rename to
providers/fab/src/airflow/providers/fab/www/templates/airflow/_messages.html
diff --git
a/providers/src/airflow/providers/fab/www/templates/airflow/error.html
b/providers/fab/src/airflow/providers/fab/www/templates/airflow/error.html
similarity index 100%
rename from providers/src/airflow/providers/fab/www/templates/airflow/error.html
rename to
providers/fab/src/airflow/providers/fab/www/templates/airflow/error.html
diff --git
a/providers/src/airflow/providers/fab/www/templates/airflow/main.html
b/providers/fab/src/airflow/providers/fab/www/templates/airflow/main.html
similarity index 100%
rename from providers/src/airflow/providers/fab/www/templates/airflow/main.html
rename to
providers/fab/src/airflow/providers/fab/www/templates/airflow/main.html
diff --git
a/providers/src/airflow/providers/fab/www/templates/airflow/traceback.html
b/providers/fab/src/airflow/providers/fab/www/templates/airflow/traceback.html
similarity index 100%
rename from
providers/src/airflow/providers/fab/www/templates/airflow/traceback.html
rename to
providers/fab/src/airflow/providers/fab/www/templates/airflow/traceback.html
diff --git
a/providers/src/airflow/providers/fab/www/templates/appbuilder/index.html
b/providers/fab/src/airflow/providers/fab/www/templates/appbuilder/index.html
similarity index 100%
rename from
providers/src/airflow/providers/fab/www/templates/appbuilder/index.html
rename to
providers/fab/src/airflow/providers/fab/www/templates/appbuilder/index.html
diff --git
a/providers/src/airflow/providers/fab/www/templates/appbuilder/navbar.html
b/providers/fab/src/airflow/providers/fab/www/templates/appbuilder/navbar.html
similarity index 100%
rename from
providers/src/airflow/providers/fab/www/templates/appbuilder/navbar.html
rename to
providers/fab/src/airflow/providers/fab/www/templates/appbuilder/navbar.html
diff --git
a/providers/src/airflow/providers/fab/www/templates/appbuilder/navbar_menu.html
b/providers/fab/src/airflow/providers/fab/www/templates/appbuilder/navbar_menu.html
similarity index 100%
rename from
providers/src/airflow/providers/fab/www/templates/appbuilder/navbar_menu.html
rename to
providers/fab/src/airflow/providers/fab/www/templates/appbuilder/navbar_menu.html
diff --git
a/providers/src/airflow/providers/fab/www/templates/appbuilder/navbar_right.html
b/providers/fab/src/airflow/providers/fab/www/templates/appbuilder/navbar_right.html
similarity index 100%
rename from
providers/src/airflow/providers/fab/www/templates/appbuilder/navbar_right.html
rename to
providers/fab/src/airflow/providers/fab/www/templates/appbuilder/navbar_right.html
diff --git a/providers/src/airflow/providers/fab/www/utils.py
b/providers/fab/src/airflow/providers/fab/www/utils.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/utils.py
rename to providers/fab/src/airflow/providers/fab/www/utils.py
diff --git a/providers/src/airflow/providers/fab/www/views.py
b/providers/fab/src/airflow/providers/fab/www/views.py
similarity index 100%
rename from providers/src/airflow/providers/fab/www/views.py
rename to providers/fab/src/airflow/providers/fab/www/views.py
diff --git a/providers/src/airflow/providers/fab/www/webpack.config.js
b/providers/fab/src/airflow/providers/fab/www/webpack.config.js
similarity index 100%
rename from providers/src/airflow/providers/fab/www/webpack.config.js
rename to providers/fab/src/airflow/providers/fab/www/webpack.config.js
diff --git
a/providers/src/airflow/providers/fab/auth_manager/views/user_stats.py
b/providers/fab/tests/conftest.py
similarity index 61%
rename from providers/src/airflow/providers/fab/auth_manager/views/user_stats.py
rename to providers/fab/tests/conftest.py
index 0431e74cd59..068fe6bbf5a 100644
--- a/providers/src/airflow/providers/fab/auth_manager/views/user_stats.py
+++ b/providers/fab/tests/conftest.py
@@ -16,18 +16,17 @@
# under the License.
from __future__ import annotations
-from flask_appbuilder.security.views import UserStatsChartView
+import pathlib
-from airflow.providers.fab.www.security import permissions
+import pytest
+pytest_plugins = "tests_common.pytest_plugin"
-class CustomUserStatsChartView(UserStatsChartView):
- """Customize permission names for FAB's builtin UserStatsChartView."""
- class_permission_name = permissions.RESOURCE_USER_STATS_CHART
- route_base = "/userstatschartview"
- method_permission_name = {
- "chart": "read",
- "list": "read",
- }
- base_permissions = [permissions.ACTION_CAN_READ]
[email protected](tryfirst=True)
+def pytest_configure(config: pytest.Config) -> None:
+ deprecations_ignore_path =
pathlib.Path(__file__).parent.joinpath("deprecations_ignore.yml")
+ dep_path = [deprecations_ignore_path] if deprecations_ignore_path.exists()
else []
+ config.inicfg["airflow_deprecations_ignore"] = (
+ config.inicfg.get("airflow_deprecations_ignore", []) + dep_path #
type: ignore[assignment,operator]
+ )
diff --git
a/providers/src/airflow/providers/fab/auth_manager/api/auth/backend/__init__.py
b/providers/fab/tests/provider_tests/__init__.py
similarity index 90%
rename from
providers/src/airflow/providers/fab/auth_manager/api/auth/backend/__init__.py
rename to providers/fab/tests/provider_tests/__init__.py
index 217e5db9607..e8fd2285643 100644
---
a/providers/src/airflow/providers/fab/auth_manager/api/auth/backend/__init__.py
+++ b/providers/fab/tests/provider_tests/__init__.py
@@ -1,4 +1,3 @@
-#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -15,3 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+__path__ = __import__("pkgutil").extend_path(__path__, __name__) # type:
ignore
diff --git a/providers/tests/fab/__init__.py
b/providers/fab/tests/provider_tests/fab/__init__.py
similarity index 100%
rename from providers/tests/fab/__init__.py
rename to providers/fab/tests/provider_tests/fab/__init__.py
diff --git a/providers/tests/fab/auth_manager/__init__.py
b/providers/fab/tests/provider_tests/fab/auth_manager/__init__.py
similarity index 100%
rename from providers/tests/fab/auth_manager/__init__.py
rename to providers/fab/tests/provider_tests/fab/auth_manager/__init__.py
diff --git a/providers/tests/fab/auth_manager/api/__init__.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api/__init__.py
similarity index 100%
rename from providers/tests/fab/auth_manager/api/__init__.py
rename to providers/fab/tests/provider_tests/fab/auth_manager/api/__init__.py
diff --git a/providers/tests/fab/auth_manager/api/auth/__init__.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api/auth/__init__.py
similarity index 100%
rename from providers/tests/fab/auth_manager/api/auth/__init__.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api/auth/__init__.py
diff --git a/providers/tests/fab/auth_manager/api/auth/backend/__init__.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api/auth/backend/__init__.py
similarity index 100%
rename from providers/tests/fab/auth_manager/api/auth/backend/__init__.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api/auth/backend/__init__.py
diff --git
a/providers/tests/fab/auth_manager/api/auth/backend/test_basic_auth.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api/auth/backend/test_basic_auth.py
similarity index 100%
rename from providers/tests/fab/auth_manager/api/auth/backend/test_basic_auth.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api/auth/backend/test_basic_auth.py
diff --git
a/providers/tests/fab/auth_manager/api/auth/backend/test_kerberos_auth.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api/auth/backend/test_kerberos_auth.py
similarity index 100%
rename from
providers/tests/fab/auth_manager/api/auth/backend/test_kerberos_auth.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api/auth/backend/test_kerberos_auth.py
diff --git a/providers/tests/fab/auth_manager/api/auth/backend/test_session.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api/auth/backend/test_session.py
similarity index 100%
rename from providers/tests/fab/auth_manager/api/auth/backend/test_session.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api/auth/backend/test_session.py
diff --git a/providers/tests/fab/auth_manager/api_endpoints/__init__.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/__init__.py
similarity index 100%
rename from providers/tests/fab/auth_manager/api_endpoints/__init__.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/__init__.py
diff --git
a/providers/tests/fab/auth_manager/api_endpoints/api_connexion_utils.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/api_connexion_utils.py
similarity index 100%
rename from
providers/tests/fab/auth_manager/api_endpoints/api_connexion_utils.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/api_connexion_utils.py
diff --git
a/providers/tests/fab/auth_manager/api_endpoints/remote_user_api_auth_backend.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/remote_user_api_auth_backend.py
similarity index 100%
rename from
providers/tests/fab/auth_manager/api_endpoints/remote_user_api_auth_backend.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/remote_user_api_auth_backend.py
diff --git
a/providers/tests/fab/auth_manager/api_endpoints/test_asset_endpoint.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_asset_endpoint.py
similarity index 99%
rename from
providers/tests/fab/auth_manager/api_endpoints/test_asset_endpoint.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_asset_endpoint.py
index 29eb85acb06..97813f14f4e 100644
--- a/providers/tests/fab/auth_manager/api_endpoints/test_asset_endpoint.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_asset_endpoint.py
@@ -24,8 +24,8 @@ import time_machine
from airflow.providers.fab.www.api_connexion.exceptions import
EXCEPTIONS_LINK_MAP
from airflow.providers.fab.www.security import permissions
from airflow.utils import timezone
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
from tests_common.test_utils.db import clear_db_assets, clear_db_runs
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS
from tests_common.test_utils.www import _check_last_log
diff --git a/providers/tests/fab/auth_manager/api_endpoints/test_auth.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_auth.py
similarity index 100%
rename from providers/tests/fab/auth_manager/api_endpoints/test_auth.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_auth.py
diff --git a/providers/tests/fab/auth_manager/api_endpoints/test_cors.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_cors.py
similarity index 100%
rename from providers/tests/fab/auth_manager/api_endpoints/test_cors.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_cors.py
diff --git
a/providers/tests/fab/auth_manager/api_endpoints/test_dag_endpoint.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_dag_endpoint.py
similarity index 98%
rename from providers/tests/fab/auth_manager/api_endpoints/test_dag_endpoint.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_dag_endpoint.py
index 9b7ba51f25b..e842650a4f2 100644
--- a/providers/tests/fab/auth_manager/api_endpoints/test_dag_endpoint.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_dag_endpoint.py
@@ -23,8 +23,8 @@ from airflow.models import DagModel
from airflow.providers.fab.www.api_connexion.exceptions import
EXCEPTIONS_LINK_MAP
from airflow.providers.fab.www.security import permissions
from airflow.utils.session import provide_session
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
from tests_common.test_utils.db import clear_db_dags, clear_db_runs,
clear_db_serialized_dags
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS
from tests_common.test_utils.www import _check_last_log
diff --git
a/providers/tests/fab/auth_manager/api_endpoints/test_dag_run_endpoint.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_dag_run_endpoint.py
similarity index 99%
rename from
providers/tests/fab/auth_manager/api_endpoints/test_dag_run_endpoint.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_dag_run_endpoint.py
index d0aecf20f92..1a297b008cf 100644
--- a/providers/tests/fab/auth_manager/api_endpoints/test_dag_run_endpoint.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_dag_run_endpoint.py
@@ -27,12 +27,12 @@ from airflow.sdk.definitions.param import Param
from airflow.utils import timezone
from airflow.utils.session import create_session
from airflow.utils.state import DagRunState
-
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
(
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import (
create_user,
delete_roles,
delete_user,
)
+
from tests_common.test_utils.db import clear_db_dags, clear_db_runs,
clear_db_serialized_dags
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS
diff --git
a/providers/tests/fab/auth_manager/api_endpoints/test_dag_source_endpoint.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_dag_source_endpoint.py
similarity index 97%
rename from
providers/tests/fab/auth_manager/api_endpoints/test_dag_source_endpoint.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_dag_source_endpoint.py
index 66cd6477c9e..7cb7b7e7201 100644
--- a/providers/tests/fab/auth_manager/api_endpoints/test_dag_source_endpoint.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_dag_source_endpoint.py
@@ -23,8 +23,8 @@ import pytest
from airflow.models import DagBag
from airflow.providers.fab.www.security import permissions
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
from tests_common.test_utils.db import (
clear_db_dag_code,
clear_db_dags,
diff --git
a/providers/tests/fab/auth_manager/api_endpoints/test_dag_warning_endpoint.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_dag_warning_endpoint.py
similarity index 96%
rename from
providers/tests/fab/auth_manager/api_endpoints/test_dag_warning_endpoint.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_dag_warning_endpoint.py
index 34862c6b4c7..1b1f9455d68 100644
---
a/providers/tests/fab/auth_manager/api_endpoints/test_dag_warning_endpoint.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_dag_warning_endpoint.py
@@ -22,8 +22,8 @@ from airflow.models.dag import DagModel
from airflow.models.dagwarning import DagWarning
from airflow.providers.fab.www.security import permissions
from airflow.utils.session import create_session
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
from tests_common.test_utils.db import clear_db_dag_warnings, clear_db_dags
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS
diff --git
a/providers/tests/fab/auth_manager/api_endpoints/test_event_log_endpoint.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_event_log_endpoint.py
similarity index 98%
rename from
providers/tests/fab/auth_manager/api_endpoints/test_event_log_endpoint.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_event_log_endpoint.py
index 168bcae4b9f..d49dc5d25df 100644
--- a/providers/tests/fab/auth_manager/api_endpoints/test_event_log_endpoint.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_event_log_endpoint.py
@@ -21,8 +21,8 @@ import pytest
from airflow.models import Log
from airflow.providers.fab.www.security import permissions
from airflow.utils import timezone
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
from tests_common.test_utils.db import clear_db_logs
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS
diff --git
a/providers/tests/fab/auth_manager/api_endpoints/test_import_error_endpoint.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_import_error_endpoint.py
similarity index 98%
rename from
providers/tests/fab/auth_manager/api_endpoints/test_import_error_endpoint.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_import_error_endpoint.py
index 04bf4182ec3..91556957cc8 100644
---
a/providers/tests/fab/auth_manager/api_endpoints/test_import_error_endpoint.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_import_error_endpoint.py
@@ -22,8 +22,8 @@ from airflow.dag_processing.bundles.manager import
DagBundlesManager
from airflow.models.dag import DagModel
from airflow.providers.fab.www.security import permissions
from airflow.utils import timezone
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
from tests_common.test_utils.compat import ParseImportError
from tests_common.test_utils.db import clear_db_dags, clear_db_import_errors
from tests_common.test_utils.permissions import _resource_name
diff --git
a/providers/tests/fab/auth_manager/api_endpoints/test_role_and_permission_endpoint.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_role_and_permission_endpoint.py
similarity index 99%
rename from
providers/tests/fab/auth_manager/api_endpoints/test_role_and_permission_endpoint.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_role_and_permission_endpoint.py
index 6e9840d72aa..b42fe8ae2ee 100644
---
a/providers/tests/fab/auth_manager/api_endpoints/test_role_and_permission_endpoint.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_role_and_permission_endpoint.py
@@ -20,13 +20,13 @@ import pytest
from airflow.providers.fab.www.api_connexion.exceptions import
EXCEPTIONS_LINK_MAP
from airflow.providers.fab.www.security import permissions
-
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
(
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import (
create_role,
create_user,
delete_role,
delete_user,
)
+
from tests_common.test_utils.api_connexion_utils import assert_401
from tests_common.test_utils.compat import ignore_provider_compatibility_error
diff --git
a/providers/tests/fab/auth_manager/api_endpoints/test_task_instance_endpoint.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_task_instance_endpoint.py
similarity index 99%
rename from
providers/tests/fab/auth_manager/api_endpoints/test_task_instance_endpoint.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_task_instance_endpoint.py
index 24613fe7f2a..94e219ebcf0 100644
---
a/providers/tests/fab/auth_manager/api_endpoints/test_task_instance_endpoint.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_task_instance_endpoint.py
@@ -28,12 +28,12 @@ from airflow.utils.session import provide_session
from airflow.utils.state import State
from airflow.utils.timezone import datetime
from airflow.utils.types import DagRunType
-
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
(
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import (
create_user,
delete_roles,
delete_user,
)
+
from tests_common.test_utils.db import clear_db_runs, clear_rendered_ti_fields
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS
diff --git
a/providers/tests/fab/auth_manager/api_endpoints/test_user_endpoint.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_user_endpoint.py
similarity index 99%
rename from providers/tests/fab/auth_manager/api_endpoints/test_user_endpoint.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_user_endpoint.py
index 063a29ec782..14285d4695f 100644
--- a/providers/tests/fab/auth_manager/api_endpoints/test_user_endpoint.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_user_endpoint.py
@@ -25,12 +25,12 @@ from airflow.providers.fab.www.api_connexion.exceptions
import EXCEPTIONS_LINK_M
from airflow.providers.fab.www.security import permissions
from airflow.utils import timezone
from airflow.utils.session import create_session
-
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
(
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import (
create_user,
delete_role,
delete_user,
)
+
from tests_common.test_utils.api_connexion_utils import assert_401
from tests_common.test_utils.compat import ignore_provider_compatibility_error
from tests_common.test_utils.config import conf_vars
diff --git
a/providers/tests/fab/auth_manager/api_endpoints/test_variable_endpoint.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_variable_endpoint.py
similarity index 96%
rename from
providers/tests/fab/auth_manager/api_endpoints/test_variable_endpoint.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_variable_endpoint.py
index fcf29ab1af9..89683265838 100644
--- a/providers/tests/fab/auth_manager/api_endpoints/test_variable_endpoint.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_variable_endpoint.py
@@ -20,8 +20,8 @@ import pytest
from airflow.models import Variable
from airflow.providers.fab.www.security import permissions
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
from tests_common.test_utils.db import clear_db_variables
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS
diff --git
a/providers/tests/fab/auth_manager/api_endpoints/test_xcom_endpoint.py
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_xcom_endpoint.py
similarity index 98%
rename from providers/tests/fab/auth_manager/api_endpoints/test_xcom_endpoint.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_xcom_endpoint.py
index 85f40b7557c..6c3dd08b9e8 100644
--- a/providers/tests/fab/auth_manager/api_endpoints/test_xcom_endpoint.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/api_endpoints/test_xcom_endpoint.py
@@ -29,8 +29,8 @@ from airflow.providers.fab.www.security import permissions
from airflow.utils import timezone
from airflow.utils.session import create_session
from airflow.utils.types import DagRunType
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
from tests_common.test_utils.db import clear_db_dags, clear_db_runs,
clear_db_xcom
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS
diff --git a/providers/tests/fab/auth_manager/cli_commands/__init__.py
b/providers/fab/tests/provider_tests/fab/auth_manager/cli_commands/__init__.py
similarity index 100%
rename from providers/tests/fab/auth_manager/cli_commands/__init__.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/cli_commands/__init__.py
diff --git a/providers/tests/fab/auth_manager/cli_commands/test_db_command.py
b/providers/fab/tests/provider_tests/fab/auth_manager/cli_commands/test_db_command.py
similarity index 100%
rename from providers/tests/fab/auth_manager/cli_commands/test_db_command.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/cli_commands/test_db_command.py
diff --git a/providers/tests/fab/auth_manager/cli_commands/test_definition.py
b/providers/fab/tests/provider_tests/fab/auth_manager/cli_commands/test_definition.py
similarity index 100%
rename from providers/tests/fab/auth_manager/cli_commands/test_definition.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/cli_commands/test_definition.py
diff --git a/providers/tests/fab/auth_manager/cli_commands/test_role_command.py
b/providers/fab/tests/provider_tests/fab/auth_manager/cli_commands/test_role_command.py
similarity index 100%
rename from providers/tests/fab/auth_manager/cli_commands/test_role_command.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/cli_commands/test_role_command.py
diff --git
a/providers/tests/fab/auth_manager/cli_commands/test_sync_perm_command.py
b/providers/fab/tests/provider_tests/fab/auth_manager/cli_commands/test_sync_perm_command.py
similarity index 100%
rename from
providers/tests/fab/auth_manager/cli_commands/test_sync_perm_command.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/cli_commands/test_sync_perm_command.py
diff --git a/providers/tests/fab/auth_manager/cli_commands/test_user_command.py
b/providers/fab/tests/provider_tests/fab/auth_manager/cli_commands/test_user_command.py
similarity index 100%
rename from providers/tests/fab/auth_manager/cli_commands/test_user_command.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/cli_commands/test_user_command.py
diff --git a/providers/tests/fab/auth_manager/cli_commands/test_utils.py
b/providers/fab/tests/provider_tests/fab/auth_manager/cli_commands/test_utils.py
similarity index 100%
rename from providers/tests/fab/auth_manager/cli_commands/test_utils.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/cli_commands/test_utils.py
diff --git a/providers/tests/fab/auth_manager/conftest.py
b/providers/fab/tests/provider_tests/fab/auth_manager/conftest.py
similarity index 95%
rename from providers/tests/fab/auth_manager/conftest.py
rename to providers/fab/tests/provider_tests/fab/auth_manager/conftest.py
index ce73a3e0cd9..9c0f76f0306 100644
--- a/providers/tests/fab/auth_manager/conftest.py
+++ b/providers/fab/tests/provider_tests/fab/auth_manager/conftest.py
@@ -49,7 +49,7 @@ def minimal_app_for_auth_api():
(
"api",
"auth_backends",
- ):
"providers.tests.fab.auth_manager.api_endpoints.remote_user_api_auth_backend,airflow.providers.fab.auth_manager.api.auth.backend.session",
+ ):
"provider_tests.fab.auth_manager.api_endpoints.remote_user_api_auth_backend,airflow.providers.fab.auth_manager.api.auth.backend.session",
(
"core",
"auth_manager",
diff --git a/providers/tests/fab/auth_manager/models/__init__.py
b/providers/fab/tests/provider_tests/fab/auth_manager/models/__init__.py
similarity index 100%
rename from providers/tests/fab/auth_manager/models/__init__.py
rename to providers/fab/tests/provider_tests/fab/auth_manager/models/__init__.py
diff --git a/providers/tests/fab/auth_manager/models/test_anonymous_user.py
b/providers/fab/tests/provider_tests/fab/auth_manager/models/test_anonymous_user.py
similarity index 100%
rename from providers/tests/fab/auth_manager/models/test_anonymous_user.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/models/test_anonymous_user.py
diff --git a/providers/tests/fab/auth_manager/models/test_db.py
b/providers/fab/tests/provider_tests/fab/auth_manager/models/test_db.py
similarity index 96%
rename from providers/tests/fab/auth_manager/models/test_db.py
rename to providers/fab/tests/provider_tests/fab/auth_manager/models/test_db.py
index 3af94ceed7b..91e14495713 100644
--- a/providers/tests/fab/auth_manager/models/test_db.py
+++ b/providers/fab/tests/provider_tests/fab/auth_manager/models/test_db.py
@@ -19,12 +19,12 @@ from __future__ import annotations
import re
from unittest import mock
+import providers.fab.src.airflow.providers.fab as provider_fab
import pytest
from alembic.autogenerate import compare_metadata
from alembic.migration import MigrationContext
from sqlalchemy import MetaData
-import airflow.providers
from airflow.settings import engine
from airflow.utils.db import (
compare_server_default,
@@ -37,16 +37,16 @@ try:
class TestFABDBManager:
def setup_method(self):
- self.providers_dir: str = airflow.providers.__path__[0]
+ self.providers_dir: str = provider_fab.__path__[0]
def test_version_table_name_set(self, session):
assert FABDBManager(session=session).version_table_name ==
"alembic_version_fab"
def test_migration_dir_set(self, session):
- assert FABDBManager(session=session).migration_dir ==
f"{self.providers_dir}/fab/migrations"
+ assert FABDBManager(session=session).migration_dir ==
f"{self.providers_dir}/migrations"
def test_alembic_file_set(self, session):
- assert FABDBManager(session=session).alembic_file ==
f"{self.providers_dir}/fab/alembic.ini"
+ assert FABDBManager(session=session).alembic_file ==
f"{self.providers_dir}/alembic.ini"
def test_supports_table_dropping_set(self, session):
assert FABDBManager(session=session).supports_table_dropping is
True
@@ -128,5 +128,6 @@ try:
mock_initdb.assert_not_called()
else:
mock_initdb.assert_called_once()
+
except ModuleNotFoundError:
pass
diff --git a/providers/tests/fab/auth_manager/schemas/__init__.py
b/providers/fab/tests/provider_tests/fab/auth_manager/schemas/__init__.py
similarity index 100%
rename from providers/tests/fab/auth_manager/schemas/__init__.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/schemas/__init__.py
diff --git
a/providers/tests/fab/auth_manager/schemas/test_role_and_permission_schema.py
b/providers/fab/tests/provider_tests/fab/auth_manager/schemas/test_role_and_permission_schema.py
similarity index 97%
rename from
providers/tests/fab/auth_manager/schemas/test_role_and_permission_schema.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/schemas/test_role_and_permission_schema.py
index 24a4de43176..457b244150f 100644
---
a/providers/tests/fab/auth_manager/schemas/test_role_and_permission_schema.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/schemas/test_role_and_permission_schema.py
@@ -24,8 +24,7 @@ from
airflow.providers.fab.auth_manager.schemas.role_and_permission_schema impor
role_schema,
)
from airflow.providers.fab.www.security import permissions
-
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_role, delete_role
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_role, delete_role
pytestmark = pytest.mark.db_test
diff --git a/providers/tests/fab/auth_manager/schemas/test_user_schema.py
b/providers/fab/tests/provider_tests/fab/auth_manager/schemas/test_user_schema.py
similarity index 97%
rename from providers/tests/fab/auth_manager/schemas/test_user_schema.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/schemas/test_user_schema.py
index 87cdc42f4a3..735dc14056e 100644
--- a/providers/tests/fab/auth_manager/schemas/test_user_schema.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/schemas/test_user_schema.py
@@ -19,8 +19,8 @@ from __future__ import annotations
import pytest
from airflow.utils import timezone
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_role, delete_role
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_role, delete_role
from tests_common.test_utils.compat import ignore_provider_compatibility_error
with ignore_provider_compatibility_error("2.9.0+", __file__):
diff --git a/providers/tests/fab/auth_manager/security_manager/__init__.py
b/providers/fab/tests/provider_tests/fab/auth_manager/security_manager/__init__.py
similarity index 100%
rename from providers/tests/fab/auth_manager/security_manager/__init__.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/security_manager/__init__.py
diff --git
a/providers/tests/fab/auth_manager/security_manager/test_constants.py
b/providers/fab/tests/provider_tests/fab/auth_manager/security_manager/test_constants.py
similarity index 100%
rename from providers/tests/fab/auth_manager/security_manager/test_constants.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/security_manager/test_constants.py
diff --git a/providers/tests/fab/auth_manager/security_manager/test_override.py
b/providers/fab/tests/provider_tests/fab/auth_manager/security_manager/test_override.py
similarity index 100%
rename from providers/tests/fab/auth_manager/security_manager/test_override.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/security_manager/test_override.py
diff --git a/providers/tests/fab/auth_manager/test_fab_auth_manager.py
b/providers/fab/tests/provider_tests/fab/auth_manager/test_fab_auth_manager.py
similarity index 99%
rename from providers/tests/fab/auth_manager/test_fab_auth_manager.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/test_fab_auth_manager.py
index 077350ac10c..1fef2598ba0 100644
--- a/providers/tests/fab/auth_manager/test_fab_auth_manager.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/test_fab_auth_manager.py
@@ -27,8 +27,7 @@ from flask import Flask, g
from flask_appbuilder.menu import Menu
from airflow.exceptions import AirflowConfigException, AirflowException
-
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user
try:
from airflow.auth.managers.models.resource_details import AccessView,
DagAccessEntity, DagDetails
diff --git a/providers/tests/fab/auth_manager/test_models.py
b/providers/fab/tests/provider_tests/fab/auth_manager/test_models.py
similarity index 100%
rename from providers/tests/fab/auth_manager/test_models.py
rename to providers/fab/tests/provider_tests/fab/auth_manager/test_models.py
diff --git a/providers/tests/fab/auth_manager/test_security.py
b/providers/fab/tests/provider_tests/fab/auth_manager/test_security.py
similarity index 99%
rename from providers/tests/fab/auth_manager/test_security.py
rename to providers/fab/tests/provider_tests/fab/auth_manager/test_security.py
index 95c5545d878..b09674b599a 100644
--- a/providers/tests/fab/auth_manager/test_security.py
+++ b/providers/fab/tests/provider_tests/fab/auth_manager/test_security.py
@@ -50,14 +50,14 @@ from airflow.providers.fab.www.security.permissions import
ACTION_CAN_READ
from airflow.www import app as application
from airflow.www.auth import get_access_denied_message
from airflow.www.utils import CustomSQLAInterface
-
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
(
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import (
create_user,
create_user_scope,
delete_role,
delete_user,
set_user_single_role,
)
+
from tests_common.test_utils.asserts import assert_queries_count
from tests_common.test_utils.db import clear_db_dags, clear_db_runs
from tests_common.test_utils.mock_security_manager import MockSecurityManager
diff --git a/providers/tests/fab/auth_manager/views/__init__.py
b/providers/fab/tests/provider_tests/fab/auth_manager/views/__init__.py
similarity index 100%
rename from providers/tests/fab/auth_manager/views/__init__.py
rename to providers/fab/tests/provider_tests/fab/auth_manager/views/__init__.py
diff --git a/providers/tests/fab/auth_manager/views/test_permissions.py
b/providers/fab/tests/provider_tests/fab/auth_manager/views/test_permissions.py
similarity index 93%
rename from providers/tests/fab/auth_manager/views/test_permissions.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/views/test_permissions.py
index b2eb0b47c5c..08c224bcb96 100644
--- a/providers/tests/fab/auth_manager/views/test_permissions.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/views/test_permissions.py
@@ -21,9 +21,9 @@ import pytest
from airflow.providers.fab.www.security import permissions
from airflow.www import app as application
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
+from provider_tests.fab.auth_manager.views import
_assert_dataset_deprecation_warning
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
-from providers.tests.fab.auth_manager.views import
_assert_dataset_deprecation_warning
from tests_common.test_utils.www import client_with_login
diff --git a/providers/tests/fab/auth_manager/views/test_roles_list.py
b/providers/fab/tests/provider_tests/fab/auth_manager/views/test_roles_list.py
similarity index 91%
rename from providers/tests/fab/auth_manager/views/test_roles_list.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/views/test_roles_list.py
index e728b2ae328..3413dd44ce2 100644
--- a/providers/tests/fab/auth_manager/views/test_roles_list.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/views/test_roles_list.py
@@ -21,9 +21,9 @@ import pytest
from airflow.providers.fab.www.security import permissions
from airflow.www import app as application
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
+from provider_tests.fab.auth_manager.views import
_assert_dataset_deprecation_warning
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
-from providers.tests.fab.auth_manager.views import
_assert_dataset_deprecation_warning
from tests_common.test_utils.www import client_with_login
diff --git a/providers/tests/fab/auth_manager/views/test_user.py
b/providers/fab/tests/provider_tests/fab/auth_manager/views/test_user.py
similarity index 91%
rename from providers/tests/fab/auth_manager/views/test_user.py
rename to providers/fab/tests/provider_tests/fab/auth_manager/views/test_user.py
index 7dadeeaf525..88b3844eb8b 100644
--- a/providers/tests/fab/auth_manager/views/test_user.py
+++ b/providers/fab/tests/provider_tests/fab/auth_manager/views/test_user.py
@@ -21,9 +21,9 @@ import pytest
from airflow.providers.fab.www.security import permissions
from airflow.www import app as application
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
+from provider_tests.fab.auth_manager.views import
_assert_dataset_deprecation_warning
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
-from providers.tests.fab.auth_manager.views import
_assert_dataset_deprecation_warning
from tests_common.test_utils.www import client_with_login
diff --git a/providers/tests/fab/auth_manager/views/test_user_edit.py
b/providers/fab/tests/provider_tests/fab/auth_manager/views/test_user_edit.py
similarity index 91%
rename from providers/tests/fab/auth_manager/views/test_user_edit.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/views/test_user_edit.py
index afd2e537125..4f48bfb657f 100644
--- a/providers/tests/fab/auth_manager/views/test_user_edit.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/views/test_user_edit.py
@@ -21,9 +21,9 @@ import pytest
from airflow.providers.fab.www.security import permissions
from airflow.www import app as application
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
+from provider_tests.fab.auth_manager.views import
_assert_dataset_deprecation_warning
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
-from providers.tests.fab.auth_manager.views import
_assert_dataset_deprecation_warning
from tests_common.test_utils.www import client_with_login
diff --git a/providers/tests/fab/auth_manager/views/test_user_stats.py
b/providers/fab/tests/provider_tests/fab/auth_manager/views/test_user_stats.py
similarity index 91%
rename from providers/tests/fab/auth_manager/views/test_user_stats.py
rename to
providers/fab/tests/provider_tests/fab/auth_manager/views/test_user_stats.py
index 1e08c94dfb7..ce0ba9c04aa 100644
--- a/providers/tests/fab/auth_manager/views/test_user_stats.py
+++
b/providers/fab/tests/provider_tests/fab/auth_manager/views/test_user_stats.py
@@ -21,9 +21,9 @@ import pytest
from airflow.providers.fab.www.security import permissions
from airflow.www import app as application
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
+from provider_tests.fab.auth_manager.views import
_assert_dataset_deprecation_warning
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user, delete_user
-from providers.tests.fab.auth_manager.views import
_assert_dataset_deprecation_warning
from tests_common.test_utils.www import client_with_login
diff --git a/providers/src/airflow/providers/fab/auth_manager/__init__.py
b/providers/fab/tests/provider_tests/fab/www/__init__.py
similarity index 100%
copy from providers/src/airflow/providers/fab/auth_manager/__init__.py
copy to providers/fab/tests/provider_tests/fab/www/__init__.py
diff --git a/providers/src/airflow/providers/fab/auth_manager/__init__.py
b/providers/fab/tests/provider_tests/fab/www/views/__init__.py
similarity index 100%
rename from providers/src/airflow/providers/fab/auth_manager/__init__.py
rename to providers/fab/tests/provider_tests/fab/www/views/__init__.py
diff --git a/providers/fab/tests/provider_tests/fab/www/views/conftest.py
b/providers/fab/tests/provider_tests/fab/www/views/conftest.py
new file mode 100644
index 00000000000..8b770afe965
--- /dev/null
+++ b/providers/fab/tests/provider_tests/fab/www/views/conftest.py
@@ -0,0 +1,124 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+import os
+
+import jinja2
+import pytest
+from
providers.fab.tests.provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils
import delete_user
+
+from airflow import settings
+from airflow.models import DagBag
+from airflow.www.app import create_app
+
+from tests_common.test_utils.config import conf_vars
+from tests_common.test_utils.db import parse_and_sync_to_db
+from tests_common.test_utils.decorators import
dont_initialize_flask_app_submodules
+from tests_common.test_utils.www import client_with_login
+
+
[email protected](autouse=True, scope="module")
+def session():
+ settings.configure_orm()
+ return settings.Session
+
+
[email protected](autouse=True, scope="module")
+def examples_dag_bag(session):
+ parse_and_sync_to_db(os.devnull, include_examples=True)
+ dag_bag = DagBag(read_dags_from_db=True)
+ session.commit()
+ return dag_bag
+
+
[email protected](scope="module")
+def app(examples_dag_bag):
+ @dont_initialize_flask_app_submodules(
+ skip_all_except=[
+ "init_api_connexion",
+ "init_appbuilder",
+ "init_appbuilder_links",
+ "init_appbuilder_views",
+ "init_flash_views",
+ "init_jinja_globals",
+ "init_plugins",
+ "init_airflow_session_interface",
+ ]
+ )
+ def factory():
+ with conf_vars({("fab", "auth_rate_limited"): "False"}):
+ return create_app(testing=True)
+
+ app = factory()
+ app.config["WTF_CSRF_ENABLED"] = False
+ app.dag_bag = examples_dag_bag
+ app.jinja_env.undefined = jinja2.StrictUndefined
+
+ security_manager = app.appbuilder.sm
+
+ test_users = [
+ {
+ "username": "test_admin",
+ "first_name": "test_admin_first_name",
+ "last_name": "test_admin_last_name",
+ "email": "[email protected]",
+ "role": security_manager.find_role("Admin"),
+ "password": "test_admin_password",
+ },
+ {
+ "username": "test_user",
+ "first_name": "test_user_first_name",
+ "last_name": "test_user_last_name",
+ "email": "[email protected]",
+ "role": security_manager.find_role("User"),
+ "password": "test_user_password",
+ },
+ {
+ "username": "test_viewer",
+ "first_name": "test_viewer_first_name",
+ "last_name": "test_viewer_last_name",
+ "email": "[email protected]",
+ "role": security_manager.find_role("Viewer"),
+ "password": "test_viewer_password",
+ },
+ ]
+
+ for user_dict in test_users:
+ if not security_manager.find_user(username=user_dict["username"]):
+ security_manager.add_user(**user_dict)
+
+ yield app
+
+ for user_dict in test_users:
+ delete_user(app, user_dict["username"])
+
+
[email protected]
+def user_client(app):
+ return client_with_login(app, username="test_user", password="test_user")
+
+
[email protected]
+def viewer_client(app):
+ return client_with_login(app, username="test_viewer",
password="test_viewer")
+
+
[email protected]
+def admin_client(app):
+ return client_with_login(app, username="test_admin", password="test_admin")
diff --git a/tests/www/views/test_views_acl.py
b/providers/fab/tests/provider_tests/fab/www/views/test_views_acl.py
similarity index 99%
rename from tests/www/views/test_views_acl.py
rename to providers/fab/tests/provider_tests/fab/www/views/test_views_acl.py
index c28026973eb..290afe7c737 100644
--- a/tests/www/views/test_views_acl.py
+++ b/providers/fab/tests/provider_tests/fab/www/views/test_views_acl.py
@@ -30,8 +30,8 @@ from airflow.utils.session import create_session
from airflow.utils.state import State
from airflow.utils.types import DagRunType
from airflow.www.views import FILTER_STATUS_COOKIE
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user_scope
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user_scope
from tests_common.test_utils.db import clear_db_runs
from tests_common.test_utils.permissions import _resource_name
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS
diff --git a/tests/www/views/test_views_custom_user_views.py
b/providers/fab/tests/provider_tests/fab/www/views/test_views_custom_user_views.py
similarity index 99%
rename from tests/www/views/test_views_custom_user_views.py
rename to
providers/fab/tests/provider_tests/fab/www/views/test_views_custom_user_views.py
index e3f7f3e5ccc..cb2cb8bbeb3 100644
--- a/tests/www/views/test_views_custom_user_views.py
+++
b/providers/fab/tests/provider_tests/fab/www/views/test_views_custom_user_views.py
@@ -27,11 +27,11 @@ from flask_appbuilder import SQLA
from airflow import settings
from airflow.security import permissions
from airflow.www import app as application
-
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
(
+from provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils import (
create_user,
delete_role,
)
+
from tests_common.test_utils.www import (
check_content_in_response,
check_content_not_in_response,
diff --git a/pyproject.toml b/pyproject.toml
index 483896cf1a2..3314bd1b209 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -649,6 +649,7 @@ dev = [
"apache-airflow-providers-edge",
"apache-airflow-providers-elasticsearch",
"apache-airflow-providers-exasol",
+ "apache-airflow-providers-fab",
"apache-airflow-providers-facebook",
"apache-airflow-providers-ftp",
"apache-airflow-providers-github",
@@ -727,6 +728,7 @@ apache-airflow-providers-docker = { workspace = true }
apache-airflow-providers-edge = {workspace = true}
apache-airflow-providers-elasticsearch = { workspace = true }
apache-airflow-providers-exasol = { workspace = true }
+apache-airflow-providers-fab = { workspace = true }
apache-airflow-providers-facebook = { workspace = true }
apache-airflow-providers-ftp = { workspace = true }
apache-airflow-providers-github = { workspace = true }
@@ -803,6 +805,7 @@ members = [
"providers/edge",
"providers/elasticsearch",
"providers/exasol",
+ "providers/fab",
"providers/facebook",
"providers/ftp",
"providers/github",
diff --git a/scripts/ci/docker-compose/remove-sources.yml
b/scripts/ci/docker-compose/remove-sources.yml
index bacf05e198a..c2f9b4b8ea7 100644
--- a/scripts/ci/docker-compose/remove-sources.yml
+++ b/scripts/ci/docker-compose/remove-sources.yml
@@ -60,6 +60,7 @@ services:
- ../../../empty:/opt/airflow/providers/edge/src
- ../../../empty:/opt/airflow/providers/elasticsearch/src
- ../../../empty:/opt/airflow/providers/exasol/src
+ - ../../../empty:/opt/airflow/providers/fab/src
- ../../../empty:/opt/airflow/providers/facebook/src
- ../../../empty:/opt/airflow/providers/ftp/src
- ../../../empty:/opt/airflow/providers/github/src
diff --git a/scripts/ci/docker-compose/tests-sources.yml
b/scripts/ci/docker-compose/tests-sources.yml
index a39bcf25b5e..d5495d20aba 100644
--- a/scripts/ci/docker-compose/tests-sources.yml
+++ b/scripts/ci/docker-compose/tests-sources.yml
@@ -67,6 +67,7 @@ services:
- ../../../providers/edge/tests:/opt/airflow/providers/edge/tests
-
../../../providers/elasticsearch/tests:/opt/airflow/providers/elasticsearch/tests
- ../../../providers/exasol/tests:/opt/airflow/providers/exasol/tests
+ - ../../../providers/fab/tests:/opt/airflow/providers/fab/tests
- ../../../providers/facebook/tests:/opt/airflow/providers/facebook/tests
- ../../../providers/ftp/tests:/opt/airflow/providers/ftp/tests
- ../../../providers/github/tests:/opt/airflow/providers/github/tests
diff --git a/scripts/ci/pre_commit/version_heads_map.py
b/scripts/ci/pre_commit/version_heads_map.py
index 6796819444d..229d384a6e3 100755
--- a/scripts/ci/pre_commit/version_heads_map.py
+++ b/scripts/ci/pre_commit/version_heads_map.py
@@ -29,7 +29,7 @@ PROJECT_SOURCE_ROOT_DIR =
Path(__file__).resolve().parent.parent.parent.parent
DB_FILE = PROJECT_SOURCE_ROOT_DIR / "airflow" / "utils" / "db.py"
MIGRATION_PATH = PROJECT_SOURCE_ROOT_DIR / "airflow" / "migrations" /
"versions"
-PROVIDERS_SRC = PROJECT_SOURCE_ROOT_DIR / "providers" / "src"
+PROVIDERS_SRC = PROJECT_SOURCE_ROOT_DIR / "providers" / "fab" / "src"
FAB_DB_FILE = PROVIDERS_SRC / "airflow" / "providers" / "fab" / "auth_manager"
/ "models" / "db.py"
FAB_MIGRATION_PATH = PROVIDERS_SRC / "airflow" / "providers" / "fab" /
"migrations" / "versions"
diff --git a/scripts/in_container/run_migration_reference.py
b/scripts/in_container/run_migration_reference.py
index 086eb0aa336..939022f6e9b 100755
--- a/scripts/in_container/run_migration_reference.py
+++ b/scripts/in_container/run_migration_reference.py
@@ -155,7 +155,7 @@ def update_docs(revisions: Iterable[Script], app="airflow"):
)
)
if app == "fab":
- filepath = project_root / "docs" / "apache-airflow-providers-fab" /
"migrations-ref.rst"
+ filepath = project_root / "providers" / "fab" / "docs" /
"migrations-ref.rst"
else:
filepath = project_root / "docs" / "apache-airflow" /
"migrations-ref.rst"
diff --git a/tests/www/views/test_views_dagrun.py
b/tests/www/views/test_views_dagrun.py
index 12f375b870e..b6bb3f3751d 100644
--- a/tests/www/views/test_views_dagrun.py
+++ b/tests/www/views/test_views_dagrun.py
@@ -25,12 +25,12 @@ from airflow.utils import timezone
from airflow.utils.session import create_session
from airflow.utils.types import DagRunType
from airflow.www.views import DagRunModelView
-
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
(
+from
providers.fab.tests.provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils
import (
create_user,
delete_roles,
delete_user,
)
+
from tests.www.views.test_views_tasks import _get_appbuilder_pk_string
from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS
from tests_common.test_utils.www import (
diff --git a/tests/www/views/test_views_home.py
b/tests/www/views/test_views_home.py
index ae0e2c3e5d7..58689e6925a 100644
--- a/tests/www/views/test_views_home.py
+++ b/tests/www/views/test_views_home.py
@@ -27,8 +27,8 @@ from airflow.security import permissions
from airflow.utils.state import State
from airflow.www.utils import UIAlert
from airflow.www.views import FILTER_LASTRUN_COOKIE, FILTER_STATUS_COOKIE,
FILTER_TAGS_COOKIE
+from
providers.fab.tests.provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils
import create_user
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user
from tests_common.test_utils.db import clear_db_dags, clear_db_import_errors,
clear_db_serialized_dags
from tests_common.test_utils.permissions import _resource_name
from tests_common.test_utils.www import (
diff --git a/tests/www/views/test_views_tasks.py
b/tests/www/views/test_views_tasks.py
index 3efb0a13189..7cb0de9024c 100644
--- a/tests/www/views/test_views_tasks.py
+++ b/tests/www/views/test_views_tasks.py
@@ -41,12 +41,12 @@ from airflow.utils.session import create_session
from airflow.utils.state import DagRunState, State
from airflow.utils.types import DagRunType
from airflow.www.views import TaskInstanceModelView, _safe_parse_datetime
-
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
(
+from
providers.fab.tests.provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils
import (
create_user,
delete_roles,
delete_user,
)
+
from tests_common.test_utils.compat import BashOperator
from tests_common.test_utils.config import conf_vars
from tests_common.test_utils.db import clear_db_runs, clear_db_xcom
diff --git a/tests/www/views/test_views_trigger_dag.py
b/tests/www/views/test_views_trigger_dag.py
index c4136520d7f..bcd80ed555b 100644
--- a/tests/www/views/test_views_trigger_dag.py
+++ b/tests/www/views/test_views_trigger_dag.py
@@ -32,8 +32,10 @@ from airflow.utils import timezone
from airflow.utils.json import WebEncoder
from airflow.utils.session import create_session
from airflow.utils.types import DagRunType
+from
providers.fab.tests.provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils
import (
+ create_test_client,
+)
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_test_client
from tests_common.test_utils.config import conf_vars
from tests_common.test_utils.www import check_content_in_response
diff --git a/tests/www/views/test_views_variable.py
b/tests/www/views/test_views_variable.py
index f085d5021a8..c426632da23 100644
--- a/tests/www/views/test_views_variable.py
+++ b/tests/www/views/test_views_variable.py
@@ -25,8 +25,8 @@ import pytest
from airflow.models import Variable
from airflow.security import permissions
from airflow.utils.session import create_session
+from
providers.fab.tests.provider_tests.fab.auth_manager.api_endpoints.api_connexion_utils
import create_user
-from providers.tests.fab.auth_manager.api_endpoints.api_connexion_utils import
create_user
from tests_common.test_utils.www import (
_check_last_log,
check_content_in_response,
