Skip to content

Commit

Permalink
fix type ignore
Browse files Browse the repository at this point in the history
  • Loading branch information
VolkerSchiewe committed May 17, 2024
1 parent c5edcf6 commit 6faf960
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 22 deletions.
28 changes: 13 additions & 15 deletions cosmos/operators/eks.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
try:
from airflow.providers.amazon.aws.hooks.eks import EksHook
except ImportError as e:
breakpoint()
raise ImportError("EksOperator is not compatible with airflow < 2.4") from e

DEFAULT_CONN_ID = "aws_default"
Expand All @@ -41,13 +40,13 @@ class DbtEksBaseOperator(DbtKubernetesBaseOperator):
)

def __init__(
self,
cluster_name: str,
pod_name: str | None = None,
namespace: str | None = DEFAULT_NAMESPACE,
aws_conn_id: str = DEFAULT_CONN_ID,
region: str | None = None,
**kwargs: Any,
self,
cluster_name: str,
pod_name: str | None = None,
namespace: str | None = DEFAULT_NAMESPACE,
aws_conn_id: str = DEFAULT_CONN_ID,
region: str | None = None,
**kwargs: Any,
) -> None:
self.cluster_name = cluster_name
self.pod_name = pod_name
Expand All @@ -70,7 +69,7 @@ def execute(self, context: Context) -> Any | None: # type: ignore
region_name=self.region,
)
with eks_hook.generate_config_file(
eks_cluster_name=self.cluster_name, pod_namespace=self.namespace
eks_cluster_name=self.cluster_name, pod_namespace=self.namespace
) as self.config_file:
return super().execute(context)

Expand All @@ -81,7 +80,7 @@ class DbtBuildEksOperator(DbtEksBaseOperator, DbtBuildKubernetesOperator):
"""

template_fields: Sequence[str] = (
DbtEksBaseOperator.template_fields + DbtBuildKubernetesOperator.template_fields # type: ignore[operator]
DbtEksBaseOperator.template_fields + DbtBuildKubernetesOperator.template_fields # type: ignore[operator]
)


Expand All @@ -97,7 +96,7 @@ class DbtSeedEksOperator(DbtEksBaseOperator, DbtSeedKubernetesOperator):
"""

template_fields: Sequence[str] = (
DbtEksBaseOperator.template_fields + DbtSeedKubernetesOperator.template_fields # type: ignore[operator]
DbtEksBaseOperator.template_fields + DbtSeedKubernetesOperator.template_fields # type: ignore[operator]
)


Expand All @@ -113,7 +112,7 @@ class DbtRunEksOperator(DbtEksBaseOperator, DbtRunKubernetesOperator):
"""

template_fields: Sequence[str] = (
DbtEksBaseOperator.template_fields + DbtRunKubernetesOperator.template_fields # type: ignore[operator]
DbtEksBaseOperator.template_fields + DbtRunKubernetesOperator.template_fields # type: ignore[operator]
)


Expand All @@ -123,7 +122,7 @@ class DbtTestEksOperator(DbtEksBaseOperator, DbtTestKubernetesOperator):
"""

template_fields: Sequence[str] = (
DbtEksBaseOperator.template_fields + DbtTestKubernetesOperator.template_fields # type: ignore[operator]
DbtEksBaseOperator.template_fields + DbtTestKubernetesOperator.template_fields # type: ignore[operator]
)


Expand All @@ -133,6 +132,5 @@ class DbtRunOperationEksOperator(DbtEksBaseOperator, DbtRunOperationKubernetesOp
"""

template_fields: Sequence[str] = (
DbtEksBaseOperator.template_fields + DbtRunOperationKubernetesOperator.template_fields
# type: ignore[operator]
DbtEksBaseOperator.template_fields + DbtRunOperationKubernetesOperator.template_fields # type: ignore[operator]
)
11 changes: 4 additions & 7 deletions tests/operators/test_eks.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
DbtSeedEksOperator,
DbtTestEksOperator,
)

module_available = True
except ImportError:
module_available = False


@pytest.fixture()
def mock_kubernetes_execute():
with patch("cosmos.operators.kubernetes.KubernetesPodOperator.execute") as mock_execute:
Expand All @@ -34,9 +36,7 @@ def mock_kubernetes_execute():
}


@pytest.mark.skipif(
not module_available, reason="EKS Operator not available"
)
@pytest.mark.skipif(not module_available, reason="EKS Operator not available")
@pytest.mark.parametrize(
"command_name,command_operator",
[
Expand Down Expand Up @@ -65,10 +65,7 @@ def test_dbt_kubernetes_build_command(command_name, command_operator):
]



@pytest.mark.skipif(
not module_available, reason="EKS Operator not available"
)
@pytest.mark.skipif(not module_available, reason="EKS Operator not available")
@patch("cosmos.operators.kubernetes.DbtKubernetesBaseOperator.build_kube_args")
@patch("cosmos.operators.eks.EksHook.generate_config_file")
def test_dbt_kubernetes_operator_execute(mock_generate_config_file, mock_build_kube_args, mock_kubernetes_execute):
Expand Down

0 comments on commit 6faf960

Please sign in to comment.