Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[airflow] Group ImportPathMoved and ProviderName to avoid misusing (AIR303) #16157

Merged
merged 1 commit into from
Feb 18, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 71 additions & 66 deletions crates/ruff_linter/src/rules/airflow/rules/moved_to_provider_in_3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
};

let replacement = match qualified_name.segments() {
// ProviderName: for cases that only one name has been moved
// apache-airflow-providers-amazon
["airflow", "hooks", "S3_hook", "S3Hook"] => Replacement::ProviderName{
name: "airflow.providers.amazon.aws.hooks.s3.S3Hook",
Expand Down Expand Up @@ -412,30 +413,6 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
provider: "fab",
version: "1.0.0"
},
["airflow", "api", "auth", "backend", "basic_auth", ..] => Replacement::ImportPathMoved{
original_path: "airflow.api.auth.backend.basic_auth",
new_path: "airflow.providers.fab.auth_manager.api.auth.backend.basic_auth",
provider:"fab",
version: "1.0.0"
},
["airflow", "api", "auth", "backend", "kerberos_auth", ..] => Replacement::ImportPathMoved{
original_path:"airflow.api.auth.backend.kerberos_auth",
new_path: "airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth",
provider: "fab",
version:"1.0.0"
},
["airflow", "auth", "managers", "fab", "api", "auth", "backend", "kerberos_auth", ..] => Replacement::ImportPathMoved{
original_path: "airflow.auth_manager.api.auth.backend.kerberos_auth",
new_path: "airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth",
provider: "fab",
version: "1.0.0"
},
["airflow", "auth", "managers", "fab", "security_manager", "override", ..] => Replacement::ImportPathMoved{
original_path: "airflow.auth.managers.fab.security_manager.override",
new_path: "airflow.providers.fab.auth_manager.security_manager.override",
provider: "fab",
version: "1.0.0"
},

// apache-airflow-providers-apache-hdfs
["airflow", "hooks", "webhdfs_hook", "WebHDFSHook"] => Replacement::ProviderName{
Expand Down Expand Up @@ -514,7 +491,7 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
name: "airflow.providers.apache.hive.hooks.hive.HiveCliHook",
provider: "apache-hive",
version: "1.0.0"
},
},
["airflow", "hooks", "hive_hooks", "HiveMetastoreHook"] => Replacement::ProviderName{
name: "airflow.providers.apache.hive.hooks.hive.HiveMetastoreHook",
provider: "apache-hive",
Expand Down Expand Up @@ -896,6 +873,75 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
version: "1.0.0"
},

// apache-airflow-providers-standard
["airflow", "sensors", "filesystem", "FileSensor"] => Replacement::ProviderName{
name: "airflow.providers.standard.sensors.filesystem.FileSensor",
provider: "standard",
version: "0.0.2"
},
["airflow", "operators", "trigger_dagrun", "TriggerDagRunOperator"] => Replacement::ProviderName{
name: "airflow.providers.standard.operators.trigger_dagrun.TriggerDagRunOperator",
provider: "standard",
version: "0.0.2"
},
["airflow", "sensors", "external_task", "ExternalTaskMarker"] => Replacement::ProviderName{
name: "airflow.providers.standard.sensors.external_task.ExternalTaskMarker",
provider: "standard",
version: "0.0.3"
},
["airflow", "sensors", "external_task", "ExternalTaskSensor"] => Replacement::ProviderName{
name: "airflow.providers.standard.sensors.external_task.ExternalTaskSensor",
provider: "standard",
version: "0.0.3"
},

// apache-airflow-providers-sqlite
["airflow", "hooks", "sqlite_hook", "SqliteHook"] => Replacement::ProviderName{
name: "airflow.providers.sqlite.hooks.sqlite.SqliteHook",
provider: "sqlite",
version: "1.0.0"
},
["airflow", "operators", "sqlite_operator", "SqliteOperator"] => Replacement::ProviderName{
name: "airflow.providers.sqlite.operators.sqlite.SqliteOperator",
provider: "sqlite",
version: "1.0.0"
},

// apache-airflow-providers-zendesk
["airflow", "hooks", "zendesk_hook", "ZendeskHook"] =>
Replacement::ProviderName{
name: "airflow.providers.zendesk.hooks.zendesk.ZendeskHook",
provider: "zendesk",
version: "1.0.0"
},

// ImportPathMoved: for cases that the whole module has been moved
// apache-airflow-providers-fab
["airflow", "api", "auth", "backend", "basic_auth", ..] => Replacement::ImportPathMoved{
original_path: "airflow.api.auth.backend.basic_auth",
new_path: "airflow.providers.fab.auth_manager.api.auth.backend.basic_auth",
provider:"fab",
version: "1.0.0"
},
["airflow", "api", "auth", "backend", "kerberos_auth", ..] => Replacement::ImportPathMoved{
original_path:"airflow.api.auth.backend.kerberos_auth",
new_path: "airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth",
provider: "fab",
version:"1.0.0"
},
["airflow", "auth", "managers", "fab", "api", "auth", "backend", "kerberos_auth", ..] => Replacement::ImportPathMoved{
original_path: "airflow.auth_manager.api.auth.backend.kerberos_auth",
new_path: "airflow.providers.fab.auth_manager.api.auth.backend.kerberos_auth",
provider: "fab",
version: "1.0.0"
},
["airflow", "auth", "managers", "fab", "security_manager", "override", ..] => Replacement::ImportPathMoved{
original_path: "airflow.auth.managers.fab.security_manager.override",
new_path: "airflow.providers.fab.auth_manager.security_manager.override",
provider: "fab",
version: "1.0.0"
},

// apache-airflow-providers-standard
["airflow", "operators", "bash", ..] => Replacement::ImportPathMoved{
original_path: "airflow.operators.bash",
Expand Down Expand Up @@ -963,7 +1009,6 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
provider: "standard",
version: "0.0.1"
},

["airflow", "triggers", "external_task", ..] => Replacement::ImportPathMoved{
original_path: "airflow.triggers.external_task",
new_path: "airflow.providers.standard.triggers.external_task",
Expand All @@ -982,46 +1027,6 @@ fn check_names_moved_to_provider(checker: &Checker, expr: &Expr, ranged: TextRan
provider: "standard",
version: "0.0.3"
},
["airflow", "sensors", "filesystem", "FileSensor"] => Replacement::ProviderName{
name: "airflow.providers.standard.sensors.filesystem.FileSensor",
provider: "standard",
version: "0.0.2"
},
["airflow", "operators", "trigger_dagrun", "TriggerDagRunOperator"] => Replacement::ProviderName{
name: "airflow.providers.standard.operators.trigger_dagrun.TriggerDagRunOperator",
provider: "standard",
version: "0.0.2"
},
["airflow", "sensors", "external_task", "ExternalTaskMarker"] => Replacement::ProviderName{
name: "airflow.providers.standard.sensors.external_task.ExternalTaskMarker",
provider: "standard",
version: "0.0.3"
},
["airflow", "sensors", "external_task", "ExternalTaskSensor"] => Replacement::ProviderName{
name: "airflow.providers.standard.sensors.external_task.ExternalTaskSensor",
provider: "standard",
version: "0.0.3"
},

// apache-airflow-providers-sqlite
["airflow", "hooks", "sqlite_hook", "SqliteHook"] => Replacement::ProviderName{
name: "airflow.providers.sqlite.hooks.sqlite.SqliteHook",
provider: "sqlite",
version: "1.0.0"
},
["airflow", "operators", "sqlite_operator", "SqliteOperator"] => Replacement::ProviderName{
name: "airflow.providers.sqlite.operators.sqlite.SqliteOperator",
provider: "sqlite",
version: "1.0.0"
},

// apache-airflow-providers-zendesk
["airflow", "hooks", "zendesk_hook", "ZendeskHook"] =>
Replacement::ProviderName{
name: "airflow.providers.zendesk.hooks.zendesk.ZendeskHook",
provider: "zendesk",
version: "1.0.0"
},
_ => return,
};
checker.report_diagnostic(Diagnostic::new(
Expand Down
Loading