This is an automated email from the ASF dual-hosted git repository.
vincbeck 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 c10f67b36a Move security manager override to its own module (#32987)
c10f67b36a is described below
commit c10f67b36ad101a5f447a5dc075a02fffec7d0f0
Author: Vincent <[email protected]>
AuthorDate: Thu Aug 3 14:26:11 2023 -0400
Move security manager override to its own module (#32987)
---
airflow/auth/managers/base_auth_manager.py | 2 +-
airflow/auth/managers/fab/fab_auth_manager.py | 2 +-
airflow/auth/managers/fab/{models.py => models/__init__.py} | 2 +-
airflow/auth/managers/fab/{auth => models}/anonymous_user.py | 2 +-
airflow/auth/managers/fab/{auth => security_manager}/__init__.py | 0
.../override.py} | 2 +-
airflow/auth/managers/{model => models}/__init__.py | 0
airflow/auth/managers/{model => models}/base_user.py | 0
.../auth/managers/fab/security_manager}/__init__.py | 1 -
.../test_override.py} | 8 ++++----
tests/auth/managers/fab/test_fab_auth_manager.py | 2 +-
tests/www/test_security.py | 2 +-
12 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/airflow/auth/managers/base_auth_manager.py
b/airflow/auth/managers/base_auth_manager.py
index cb40ee9c87..bcc5e13892 100644
--- a/airflow/auth/managers/base_auth_manager.py
+++ b/airflow/auth/managers/base_auth_manager.py
@@ -20,7 +20,7 @@ from __future__ import annotations
from abc import abstractmethod
from typing import TYPE_CHECKING
-from airflow.auth.managers.model.base_user import BaseUser
+from airflow.auth.managers.models.base_user import BaseUser
from airflow.exceptions import AirflowException
from airflow.utils.log.logging_mixin import LoggingMixin
diff --git a/airflow/auth/managers/fab/fab_auth_manager.py
b/airflow/auth/managers/fab/fab_auth_manager.py
index 7a23953b35..848f5ff188 100644
--- a/airflow/auth/managers/fab/fab_auth_manager.py
+++ b/airflow/auth/managers/fab/fab_auth_manager.py
@@ -23,7 +23,7 @@ from flask_login import current_user
from airflow import AirflowException
from airflow.auth.managers.base_auth_manager import BaseAuthManager
from airflow.auth.managers.fab.models import User
-from airflow.auth.managers.fab.security_manager_override import
FabAirflowSecurityManagerOverride
+from airflow.auth.managers.fab.security_manager.override import
FabAirflowSecurityManagerOverride
class FabAuthManager(BaseAuthManager):
diff --git a/airflow/auth/managers/fab/models.py
b/airflow/auth/managers/fab/models/__init__.py
similarity index 99%
rename from airflow/auth/managers/fab/models.py
rename to airflow/auth/managers/fab/models/__init__.py
index 475499707e..cb11e8fb06 100644
--- a/airflow/auth/managers/fab/models.py
+++ b/airflow/auth/managers/fab/models/__init__.py
@@ -40,7 +40,7 @@ from sqlalchemy import (
)
from sqlalchemy.orm import backref, declared_attr, relationship
-from airflow.auth.managers.model.base_user import BaseUser
+from airflow.auth.managers.models.base_user import BaseUser
from airflow.models.base import Base
"""
diff --git a/airflow/auth/managers/fab/auth/anonymous_user.py
b/airflow/auth/managers/fab/models/anonymous_user.py
similarity index 96%
rename from airflow/auth/managers/fab/auth/anonymous_user.py
rename to airflow/auth/managers/fab/models/anonymous_user.py
index c11669f0c6..ba75de0d3c 100644
--- a/airflow/auth/managers/fab/auth/anonymous_user.py
+++ b/airflow/auth/managers/fab/models/anonymous_user.py
@@ -20,7 +20,7 @@ from __future__ import annotations
from flask import current_app
from flask_login import AnonymousUserMixin
-from airflow.auth.managers.model.base_user import BaseUser
+from airflow.auth.managers.models.base_user import BaseUser
class AnonymousUser(AnonymousUserMixin, BaseUser):
diff --git a/airflow/auth/managers/fab/auth/__init__.py
b/airflow/auth/managers/fab/security_manager/__init__.py
similarity index 100%
rename from airflow/auth/managers/fab/auth/__init__.py
rename to airflow/auth/managers/fab/security_manager/__init__.py
diff --git a/airflow/auth/managers/fab/security_manager_override.py
b/airflow/auth/managers/fab/security_manager/override.py
similarity index 99%
rename from airflow/auth/managers/fab/security_manager_override.py
rename to airflow/auth/managers/fab/security_manager/override.py
index c6649ce6ab..f452fe912c 100644
--- a/airflow/auth/managers/fab/security_manager_override.py
+++ b/airflow/auth/managers/fab/security_manager/override.py
@@ -26,7 +26,7 @@ from flask_jwt_extended import JWTManager
from flask_login import LoginManager
from werkzeug.security import generate_password_hash
-from airflow.auth.managers.fab.auth.anonymous_user import AnonymousUser
+from airflow.auth.managers.fab.models.anonymous_user import AnonymousUser
class FabAirflowSecurityManagerOverride:
diff --git a/airflow/auth/managers/model/__init__.py
b/airflow/auth/managers/models/__init__.py
similarity index 100%
copy from airflow/auth/managers/model/__init__.py
copy to airflow/auth/managers/models/__init__.py
diff --git a/airflow/auth/managers/model/base_user.py
b/airflow/auth/managers/models/base_user.py
similarity index 100%
rename from airflow/auth/managers/model/base_user.py
rename to airflow/auth/managers/models/base_user.py
diff --git a/airflow/auth/managers/model/__init__.py
b/tests/auth/managers/fab/security_manager/__init__.py
similarity index 99%
rename from airflow/auth/managers/model/__init__.py
rename to tests/auth/managers/fab/security_manager/__init__.py
index 217e5db960..13a83393a9 100644
--- a/airflow/auth/managers/model/__init__.py
+++ b/tests/auth/managers/fab/security_manager/__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
diff --git a/tests/auth/managers/fab/test_security_manager_override.py
b/tests/auth/managers/fab/security_manager/test_override.py
similarity index 94%
rename from tests/auth/managers/fab/test_security_manager_override.py
rename to tests/auth/managers/fab/security_manager/test_override.py
index b93c1d866c..6b6965b9a6 100644
--- a/tests/auth/managers/fab/test_security_manager_override.py
+++ b/tests/auth/managers/fab/security_manager/test_override.py
@@ -21,7 +21,7 @@ from unittest.mock import Mock
import pytest
-from airflow.auth.managers.fab.security_manager_override import
FabAirflowSecurityManagerOverride
+from airflow.auth.managers.fab.security_manager.override import
FabAirflowSecurityManagerOverride
appbuilder = Mock()
actionmodelview = Mock()
@@ -85,9 +85,9 @@ def security_manager_override():
)
with mock.patch(
- "airflow.auth.managers.fab.security_manager_override.LoginManager"
+ "airflow.auth.managers.fab.security_manager.override.LoginManager"
) as mock_login_manager, mock.patch(
- "airflow.auth.managers.fab.security_manager_override.JWTManager"
+ "airflow.auth.managers.fab.security_manager.override.JWTManager"
) as mock_jwt_manager:
mock_login_manager_instance = Mock()
mock_login_manager.return_value = mock_login_manager_instance
@@ -113,7 +113,7 @@ class TestFabAirflowSecurityManagerOverride:
security_manager_override.load_user("123")
mock_get_user_by_id.assert_called_once_with(123)
- @mock.patch("airflow.auth.managers.fab.security_manager_override.g",
spec={})
+ @mock.patch("airflow.auth.managers.fab.security_manager.override.g",
spec={})
def test_load_user_jwt(self, mock_g, security_manager_override):
mock_user = Mock()
mock_load_user = Mock(return_value=mock_user)
diff --git a/tests/auth/managers/fab/test_fab_auth_manager.py
b/tests/auth/managers/fab/test_fab_auth_manager.py
index c36ef8686d..cb4ef8ebc2 100644
--- a/tests/auth/managers/fab/test_fab_auth_manager.py
+++ b/tests/auth/managers/fab/test_fab_auth_manager.py
@@ -24,7 +24,7 @@ import pytest
from airflow import AirflowException
from airflow.auth.managers.fab.fab_auth_manager import FabAuthManager
from airflow.auth.managers.fab.models import User
-from airflow.auth.managers.fab.security_manager_override import
FabAirflowSecurityManagerOverride
+from airflow.auth.managers.fab.security_manager.override import
FabAirflowSecurityManagerOverride
from airflow.www.security import ApplessAirflowSecurityManager
diff --git a/tests/www/test_security.py b/tests/www/test_security.py
index dec262f25f..6ec4193913 100644
--- a/tests/www/test_security.py
+++ b/tests/www/test_security.py
@@ -30,9 +30,9 @@ from flask_appbuilder import SQLA, Model, expose, has_access
from flask_appbuilder.views import BaseView, ModelView
from sqlalchemy import Column, Date, Float, Integer, String
-from airflow.auth.managers.fab.auth.anonymous_user import AnonymousUser
from airflow.auth.managers.fab.fab_auth_manager import FabAuthManager
from airflow.auth.managers.fab.models import User, assoc_permission_role
+from airflow.auth.managers.fab.models.anonymous_user import AnonymousUser
from airflow.configuration import initialize_config
from airflow.exceptions import AirflowException
from airflow.models import DagModel
