fix merge errors

Author: razvan

airflow/opa-auth-manager/opa_auth_manager/opa_fab_auth_manager.py

@@ -5,22 +5,13 @@
 from airflow.providers.fab.auth_manager.models import User
 from airflow.providers.fab.auth_manager.fab_auth_manager import FabAuthManager
 
-from airflow.api_fastapi.auth.managers.base_auth_manager import ResourceMethod
-from airflow.configuration import conf
-from airflow.api_fastapi.auth.managers.models.resource_details import (
-from airflow.providers.fab.auth_manager.models import User
-from airflow.providers.fab.auth_manager.fab_auth_manager import FabAuthManager
-
 from airflow.api_fastapi.auth.managers.base_auth_manager import ResourceMethod
 from airflow.configuration import conf
 from airflow.api_fastapi.auth.managers.models.resource_details import (
     AccessView,
     AssetDetails,
     AssetAliasDetails,
     BackfillDetails,
-    AssetDetails,
-    AssetAliasDetails,
-    BackfillDetails,
     ConfigurationDetails,
     ConnectionDetails,
     DagAccessEntity,
@@ -83,33 +74,22 @@ class OpaFabAuthManager(FabAuthManager, LoggingMixin):
     AUTH_OPA_REQUEST_URL_DEFAULT = "http://opa:8081/v1/data/airflow"
     AUTH_OPA_REQUEST_TIMEOUT_DEFAULT = 10
 
-    @override
-    def init_flask_resources(self) -> None:
     @override
     def init_flask_resources(self) -> None:
         """
         Run operations when Airflow is initializing.
         """
 
-        super().init_flask_resources()
         super().init_flask_resources()
 
         Stats.incr(METRIC_NAME_OPA_CACHE_LIMIT_REACHED, count=0)
 
         self.opa_cache = Cache(
-            maxsize=conf.getint(
-                "core",
-                "AUTH_OPA_CACHE_MAXSIZE",
-                fallback=self.AUTH_OPA_CACHE_MAXSIZE_DEFAULT,
             maxsize=conf.getint(
                 "core",
                 "AUTH_OPA_CACHE_MAXSIZE",
                 fallback=self.AUTH_OPA_CACHE_MAXSIZE_DEFAULT,
             ),
-            ttl=conf.getint(
-                "core",
-                "AUTH_OPA_CACHE_TTL_IN_SEC",
-                fallback=self.AUTH_OPA_CACHE_TTL_IN_SEC_DEFAULT,
             ttl=conf.getint(
                 "core",
                 "AUTH_OPA_CACHE_TTL_IN_SEC",
@@ -151,10 +131,6 @@ def _is_authorized_in_opa(self, endpoint: str, input: OpaInput) -> bool:
             response = self.call_opa(
                 f"{opa_url}/{endpoint}",
                 json=input.to_dict(),
-                timeout=conf.getint(
-                    "core",
-                    "AUTH_OPA_REQUEST_TIMEOUT",
-                    fallback=self.AUTH_OPA_REQUEST_TIMEOUT_DEFAULT,
                 timeout=conf.getint(
                     "core",
                     "AUTH_OPA_REQUEST_TIMEOUT",
@@ -173,7 +149,6 @@ def is_authorized_configuration(
         method: ResourceMethod,
         details: Optional[ConfigurationDetails] = None,
         user: User,
-        user: User,
     ) -> bool:
         """
         Return whether the user is authorized to perform a given action on
@@ -217,7 +192,6 @@ def is_authorized_connection(
         method: ResourceMethod,
         details: Optional[ConnectionDetails] = None,
         user: User,
-        user: User,
     ) -> bool:
         """
         Return whether the user is authorized to perform a given action on a connection.
@@ -261,7 +235,6 @@ def is_authorized_dag(
         access_entity: Optional[DagAccessEntity] = None,
         details: Optional[DagDetails] = None,
         user: User,
-        user: User,
     ) -> bool:
         """
         Return whether the user is authorized to perform a given action on a DAG.
@@ -426,7 +399,6 @@ def is_authorized_pool(
         method: ResourceMethod,
         details: Optional[PoolDetails] = None,
         user: User,
-        user: User,
     ) -> bool:
         """
         Return whether the user is authorized to perform a given action on a pool.
@@ -469,7 +441,6 @@ def is_authorized_variable(
         method: ResourceMethod,
         details: Optional[VariableDetails] = None,
         user: User,
-        user: User,
     ) -> bool:
         """
         Return whether the user is authorized to perform a given action on a variable.
@@ -511,7 +482,6 @@ def is_authorized_view(
         *,
         access_view: AccessView,
         user: User,
-        user: User,
     ) -> bool:
         """
         Return whether the user is authorized to access a read-only state of the installation.
@@ -545,7 +515,6 @@ def is_authorized_custom_view(
         method: Union[ResourceMethod, str],
         resource_name: str,
         user: User,
-        user: User,
     ) -> bool:
         """
         Return whether the user is authorized to perform a given action on a custom view.