diff --git a/providers/google/tests/system/google/ads/example_ads.py b/providers/google/tests/system/google/ads/example_ads.py index c0641f75ba0bd..1acf672b5b884 100644 --- a/providers/google/tests/system/google/ads/example_ads.py +++ b/providers/google/tests/system/google/ads/example_ads.py @@ -57,7 +57,10 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) # [START howto_google_ads_env_variables] ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/azure/example_azure_fileshare_to_gcs.py b/providers/google/tests/system/google/cloud/azure/example_azure_fileshare_to_gcs.py index d03c493c8dd9c..ef95d50b14bdb 100644 --- a/providers/google/tests/system/google/cloud/azure/example_azure_fileshare_to_gcs.py +++ b/providers/google/tests/system/google/cloud/azure/example_azure_fileshare_to_gcs.py @@ -29,7 +29,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_dts.py b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_dts.py index 34a575f290762..eed596a7828b5 100644 --- a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_dts.py +++ b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_dts.py @@ -50,8 +50,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_jobs.py b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_jobs.py index 7c843c14261b7..d055531b17cf1 100644 --- a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_jobs.py +++ b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_jobs.py @@ -40,8 +40,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_operations.py b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_operations.py index de79f4cfddf86..c6c4a38e3062f 100644 --- a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_operations.py +++ b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_operations.py @@ -40,7 +40,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "bigquery_operations" diff --git a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_queries.py b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_queries.py index dfc25d0756264..d6b4b16969a22 100644 --- a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_queries.py +++ b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_queries.py @@ -46,8 +46,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_queries_async.py b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_queries_async.py index 512d3e6527eee..da05ec5ecd199 100644 --- a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_queries_async.py +++ b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_queries_async.py @@ -44,7 +44,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT", "default") diff --git a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_tables.py b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_tables.py index a66ad4027dca6..01e4d33a9d590 100644 --- a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_tables.py +++ b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_tables.py @@ -47,8 +47,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "bigquery_tables" diff --git a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_to_gcs.py b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_to_gcs.py index acebfbd1c7cfc..07ac36ff1330a 100644 --- a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_to_gcs.py +++ b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_to_gcs.py @@ -39,7 +39,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "bigquery_to_gcs" diff --git a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_to_mssql.py b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_to_mssql.py index 3a79bca65ab12..dedf64cec13e0 100644 --- a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_to_mssql.py +++ b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_to_mssql.py @@ -64,7 +64,10 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) try: from airflow.providers.google.cloud.transfers.bigquery_to_mssql import BigQueryToMsSqlOperator diff --git a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_to_postgres.py b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_to_postgres.py index bbcd0ce2772cf..4f492cadad09a 100644 --- a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_to_postgres.py +++ b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_to_postgres.py @@ -62,7 +62,10 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT", "example-project") diff --git a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_transfer.py b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_transfer.py index 904dc8d5fcf0b..d9d1373c41120 100644 --- a/providers/google/tests/system/google/cloud/bigquery/example_bigquery_transfer.py +++ b/providers/google/tests/system/google/cloud/bigquery/example_bigquery_transfer.py @@ -41,8 +41,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/bigtable/example_bigtable.py b/providers/google/tests/system/google/cloud/bigtable/example_bigtable.py index 56162a2aa3099..af58b88daedf5 100644 --- a/providers/google/tests/system/google/cloud/bigtable/example_bigtable.py +++ b/providers/google/tests/system/google/cloud/bigtable/example_bigtable.py @@ -66,7 +66,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID + from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS if AIRFLOW_V_3_0_PLUS: diff --git a/providers/google/tests/system/google/cloud/cloud_batch/example_cloud_batch.py b/providers/google/tests/system/google/cloud/cloud_batch/example_cloud_batch.py index 374c37b3d2ae3..62d28311d16c4 100644 --- a/providers/google/tests/system/google/cloud/cloud_batch/example_cloud_batch.py +++ b/providers/google/tests/system/google/cloud/cloud_batch/example_cloud_batch.py @@ -41,7 +41,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/cloud_build/example_cloud_build.py b/providers/google/tests/system/google/cloud/cloud_build/example_cloud_build.py index 664164fa72554..f20ca7cf78986 100644 --- a/providers/google/tests/system/google/cloud/cloud_build/example_cloud_build.py +++ b/providers/google/tests/system/google/cloud/cloud_build/example_cloud_build.py @@ -37,9 +37,9 @@ CloudBuildListBuildsOperator, CloudBuildRetryBuildOperator, ) +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID from airflow.providers.standard.operators.bash import BashOperator -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS if AIRFLOW_V_3_0_PLUS: diff --git a/providers/google/tests/system/google/cloud/cloud_build/example_cloud_build_trigger.py b/providers/google/tests/system/google/cloud/cloud_build/example_cloud_build_trigger.py index dc3e6afe46d8c..498c23e25cdcb 100644 --- a/providers/google/tests/system/google/cloud/cloud_build/example_cloud_build_trigger.py +++ b/providers/google/tests/system/google/cloud/cloud_build/example_cloud_build_trigger.py @@ -53,7 +53,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/cloud_functions/example_functions.py b/providers/google/tests/system/google/cloud/cloud_functions/example_functions.py index e8ff7d27fb68a..fc6c18d8f750e 100644 --- a/providers/google/tests/system/google/cloud/cloud_functions/example_functions.py +++ b/providers/google/tests/system/google/cloud/cloud_functions/example_functions.py @@ -34,8 +34,7 @@ CloudFunctionDeployFunctionOperator, CloudFunctionInvokeFunctionOperator, ) - -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/cloud_memorystore/example_cloud_memorystore_redis.py b/providers/google/tests/system/google/cloud/cloud_memorystore/example_cloud_memorystore_redis.py index cde5cec708609..c4dcf96cb3a9e 100644 --- a/providers/google/tests/system/google/cloud/cloud_memorystore/example_cloud_memorystore_redis.py +++ b/providers/google/tests/system/google/cloud/cloud_memorystore/example_cloud_memorystore_redis.py @@ -53,7 +53,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") ENV_ID_LOWER = ENV_ID.lower() if ENV_ID else "" diff --git a/providers/google/tests/system/google/cloud/cloud_sql/example_cloud_sql.py b/providers/google/tests/system/google/cloud/cloud_sql/example_cloud_sql.py index b54c1fa386513..48d1fb771d11a 100644 --- a/providers/google/tests/system/google/cloud/cloud_sql/example_cloud_sql.py +++ b/providers/google/tests/system/google/cloud/cloud_sql/example_cloud_sql.py @@ -53,7 +53,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/cloud_sql/example_cloud_sql_query.py b/providers/google/tests/system/google/cloud/cloud_sql/example_cloud_sql_query.py index 4b5a34a26cccd..9c8bc708f79ca 100644 --- a/providers/google/tests/system/google/cloud/cloud_sql/example_cloud_sql_query.py +++ b/providers/google/tests/system/google/cloud/cloud_sql/example_cloud_sql_query.py @@ -55,9 +55,12 @@ # Airflow 2 path from airflow.decorators import task, task_group # type: ignore[attr-defined,no-redef] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/cloud_sql/example_cloud_sql_query_iam.py b/providers/google/tests/system/google/cloud/cloud_sql/example_cloud_sql_query_iam.py index ea8c5b9f707df..2a2d5972d1333 100644 --- a/providers/google/tests/system/google/cloud/cloud_sql/example_cloud_sql_query_iam.py +++ b/providers/google/tests/system/google/cloud/cloud_sql/example_cloud_sql_query_iam.py @@ -56,8 +56,11 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/cloud_sql/example_cloud_sql_query_ssl.py b/providers/google/tests/system/google/cloud/cloud_sql/example_cloud_sql_query_ssl.py index 8fda758665dfa..c5298025bd98c 100644 --- a/providers/google/tests/system/google/cloud/cloud_sql/example_cloud_sql_query_ssl.py +++ b/providers/google/tests/system/google/cloud/cloud_sql/example_cloud_sql_query_ssl.py @@ -58,8 +58,11 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/compute/example_compute.py b/providers/google/tests/system/google/cloud/compute/example_compute.py index edfa98d584daf..e6d9dd4527b32 100644 --- a/providers/google/tests/system/google/cloud/compute/example_compute.py +++ b/providers/google/tests/system/google/cloud/compute/example_compute.py @@ -45,7 +45,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID # [START howto_operator_gce_args_common] ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/compute/example_compute_igm.py b/providers/google/tests/system/google/cloud/compute/example_compute_igm.py index c54979e798b6f..6f36dfbfbd49c 100644 --- a/providers/google/tests/system/google/cloud/compute/example_compute_igm.py +++ b/providers/google/tests/system/google/cloud/compute/example_compute_igm.py @@ -44,7 +44,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/compute/example_compute_ssh.py b/providers/google/tests/system/google/cloud/compute/example_compute_ssh.py index 147542a6ae176..280bdbf372b99 100644 --- a/providers/google/tests/system/google/cloud/compute/example_compute_ssh.py +++ b/providers/google/tests/system/google/cloud/compute/example_compute_ssh.py @@ -40,7 +40,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID # [START howto_operator_gce_args_common] ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/compute/example_compute_ssh_os_login.py b/providers/google/tests/system/google/cloud/compute/example_compute_ssh_os_login.py index f979e94b012e0..0cc3577b3d9cc 100644 --- a/providers/google/tests/system/google/cloud/compute/example_compute_ssh_os_login.py +++ b/providers/google/tests/system/google/cloud/compute/example_compute_ssh_os_login.py @@ -40,7 +40,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID # [START howto_operator_gce_args_common] ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/compute/example_compute_ssh_parallel.py b/providers/google/tests/system/google/cloud/compute/example_compute_ssh_parallel.py index 9201e1521fb34..0ee442faa6adb 100644 --- a/providers/google/tests/system/google/cloud/compute/example_compute_ssh_parallel.py +++ b/providers/google/tests/system/google/cloud/compute/example_compute_ssh_parallel.py @@ -40,7 +40,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID # [START howto_operator_gce_args_common] ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_deidentify_content.py b/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_deidentify_content.py index ef9241ce4c002..fc93e6a351a67 100644 --- a/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_deidentify_content.py +++ b/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_deidentify_content.py @@ -44,7 +44,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID DAG_ID = "dlp_deidentify_content" ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_info_types.py b/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_info_types.py index 05bdcea25b286..e7cc03dfa13f2 100644 --- a/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_info_types.py +++ b/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_info_types.py @@ -47,7 +47,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID DAG_ID = "dlp_info_types" ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_inspect_template.py b/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_inspect_template.py index fb8161645244c..0193b53d0441e 100644 --- a/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_inspect_template.py +++ b/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_inspect_template.py @@ -43,7 +43,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID DAG_ID = "dlp_inspect_template" ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_job.py b/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_job.py index eba1e92804204..0dadb7739af54 100644 --- a/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_job.py +++ b/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_job.py @@ -42,7 +42,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID DAG_ID = "dlp_job" ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_job_trigger.py b/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_job_trigger.py index cdaf05ff7a71c..aa159b36f5071 100644 --- a/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_job_trigger.py +++ b/providers/google/tests/system/google/cloud/data_loss_prevention/example_dlp_job_trigger.py @@ -40,7 +40,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID DAG_ID = "dlp_job_trigger" ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/dataflow/example_dataflow_template.py b/providers/google/tests/system/google/cloud/dataflow/example_dataflow_template.py index 1609e427aca03..4df6249bbe452 100644 --- a/providers/google/tests/system/google/cloud/dataflow/example_dataflow_template.py +++ b/providers/google/tests/system/google/cloud/dataflow/example_dataflow_template.py @@ -43,7 +43,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/dataflow/example_dataflow_yaml.py b/providers/google/tests/system/google/cloud/dataflow/example_dataflow_yaml.py index e441e6f663c24..665317a5ea76c 100644 --- a/providers/google/tests/system/google/cloud/dataflow/example_dataflow_yaml.py +++ b/providers/google/tests/system/google/cloud/dataflow/example_dataflow_yaml.py @@ -45,7 +45,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/dataform/example_dataform.py b/providers/google/tests/system/google/cloud/dataform/example_dataform.py index a9380572adc95..ef44310f6e582 100644 --- a/providers/google/tests/system/google/cloud/dataform/example_dataform.py +++ b/providers/google/tests/system/google/cloud/dataform/example_dataform.py @@ -57,7 +57,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/datafusion/example_datafusion.py b/providers/google/tests/system/google/cloud/datafusion/example_datafusion.py index 577a20728e55d..8e3ecfce75f49 100644 --- a/providers/google/tests/system/google/cloud/datafusion/example_datafusion.py +++ b/providers/google/tests/system/google/cloud/datafusion/example_datafusion.py @@ -53,7 +53,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID # [START howto_data_fusion_env_variables] SERVICE_ACCOUNT = os.environ.get("GCP_DATAFUSION_SERVICE_ACCOUNT") diff --git a/providers/google/tests/system/google/cloud/dataplex/example_dataplex.py b/providers/google/tests/system/google/cloud/dataplex/example_dataplex.py index 938a9391f99dd..f2c27e635bbba 100644 --- a/providers/google/tests/system/google/cloud/dataplex/example_dataplex.py +++ b/providers/google/tests/system/google/cloud/dataplex/example_dataplex.py @@ -46,7 +46,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/dataplex/example_dataplex_catalog.py b/providers/google/tests/system/google/cloud/dataplex/example_dataplex_catalog.py index 5e5f57b8c592e..696ce7d440f3a 100644 --- a/providers/google/tests/system/google/cloud/dataplex/example_dataplex_catalog.py +++ b/providers/google/tests/system/google/cloud/dataplex/example_dataplex_catalog.py @@ -55,7 +55,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/dataplex/example_dataplex_dp.py b/providers/google/tests/system/google/cloud/dataplex/example_dataplex_dp.py index 0425c528e713c..a58b7415f7719 100644 --- a/providers/google/tests/system/google/cloud/dataplex/example_dataplex_dp.py +++ b/providers/google/tests/system/google/cloud/dataplex/example_dataplex_dp.py @@ -56,7 +56,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/dataplex/example_dataplex_dq.py b/providers/google/tests/system/google/cloud/dataplex/example_dataplex_dq.py index 4491208e1141f..3de7b86287f63 100644 --- a/providers/google/tests/system/google/cloud/dataplex/example_dataplex_dq.py +++ b/providers/google/tests/system/google/cloud/dataplex/example_dataplex_dq.py @@ -56,7 +56,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/dataprep/example_dataprep.py b/providers/google/tests/system/google/cloud/dataprep/example_dataprep.py index 011096736743d..52b7931549a20 100644 --- a/providers/google/tests/system/google/cloud/dataprep/example_dataprep.py +++ b/providers/google/tests/system/google/cloud/dataprep/example_dataprep.py @@ -59,8 +59,11 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataprep" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_batch.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_batch.py index cb5cdc09fec0a..326c878c33194 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_batch.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_batch.py @@ -41,7 +41,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_batch_deferrable.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_batch_deferrable.py index fa7bab8317ea8..23f9cc5bdf8ba 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_batch_deferrable.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_batch_deferrable.py @@ -40,7 +40,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_batch_deferrable" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_batch_persistent.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_batch_persistent.py index 6a86f202b4943..e68bdf8bdadad 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_batch_persistent.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_batch_persistent.py @@ -41,7 +41,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_batch_ps" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_create_existing_stopped_cluster.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_create_existing_stopped_cluster.py index 7490d82542eca..40338c0792090 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_create_existing_stopped_cluster.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_create_existing_stopped_cluster.py @@ -40,7 +40,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID DAG_ID = "dataproc_create_existing_stopped_cluster" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_deferrable.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_deferrable.py index 7840302438afe..aebf751a4136a 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_deferrable.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_deferrable.py @@ -39,7 +39,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_cluster_def" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_diagnose.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_diagnose.py index 7d69c3e200f2a..762be72200e63 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_diagnose.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_diagnose.py @@ -39,7 +39,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_diagnose_cluster" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_generator.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_generator.py index 48fd9e560ab8f..6ba662a8ca3ff 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_generator.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_generator.py @@ -45,7 +45,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_cluster_generation" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_start_stop.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_start_stop.py index b5458f87bc774..2a1c3800b111e 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_start_stop.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_start_stop.py @@ -40,7 +40,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID DAG_ID = "dataproc_cluster_start_stop" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_update.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_update.py index c726d29b90dc7..4a8d90bc0bad5 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_update.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_cluster_update.py @@ -39,7 +39,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_update" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_flink.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_flink.py index 7e5f93710d36e..a51c333c65347 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_flink.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_flink.py @@ -40,7 +40,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_flink" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_gke.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_gke.py index 7c75af49bc903..a9e3ecbfee608 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_gke.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_gke.py @@ -49,7 +49,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_gke" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_hadoop.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_hadoop.py index a82a747f5864a..43022b0adb8bc 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_hadoop.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_hadoop.py @@ -40,7 +40,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_hadoop" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_hive.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_hive.py index 39a4c8e49d36c..edc71278282bf 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_hive.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_hive.py @@ -39,7 +39,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_hive" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_pig.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_pig.py index 1167025598ac2..cc29983cc6645 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_pig.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_pig.py @@ -39,7 +39,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID DAG_ID = "dataproc_pig" ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_presto.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_presto.py index 653228f97fc0f..11f11421bd6e8 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_presto.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_presto.py @@ -39,7 +39,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_presto" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_pyspark.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_pyspark.py index 111775f802ea2..59de079015cae 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_pyspark.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_pyspark.py @@ -44,7 +44,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_pyspark" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_spark.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_spark.py index 0cd2905e4478d..d9455f35f5333 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_spark.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_spark.py @@ -39,7 +39,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_spark" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_spark_async.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_spark_async.py index fd27cd42b2a10..2ced19cd747de 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_spark_async.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_spark_async.py @@ -40,7 +40,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_spark_async" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_spark_deferrable.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_spark_deferrable.py index aff213c8ca886..8fea661290077 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_spark_deferrable.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_spark_deferrable.py @@ -40,7 +40,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_spark_deferrable" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_spark_sql.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_spark_sql.py index cc91a689cc3f6..346b1c13b3482 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_spark_sql.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_spark_sql.py @@ -39,7 +39,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_spark_sql" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_sparkr.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_sparkr.py index 7d357d02faa16..c6e791e2fd8e0 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_sparkr.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_sparkr.py @@ -44,7 +44,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_sparkr" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_trino.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_trino.py index a02eebee34dcf..c8d6c833ddd22 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_trino.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_trino.py @@ -39,7 +39,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_trino" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_workflow.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_workflow.py index 112736b1d7323..8aec246e881b5 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_workflow.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_workflow.py @@ -29,8 +29,7 @@ DataprocInstantiateInlineWorkflowTemplateOperator, DataprocInstantiateWorkflowTemplateOperator, ) - -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_workflow" diff --git a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_workflow_deferrable.py b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_workflow_deferrable.py index 9681997bdb56f..19bbc66db68e3 100644 --- a/providers/google/tests/system/google/cloud/dataproc/example_dataproc_workflow_deferrable.py +++ b/providers/google/tests/system/google/cloud/dataproc/example_dataproc_workflow_deferrable.py @@ -29,8 +29,7 @@ DataprocInstantiateInlineWorkflowTemplateOperator, DataprocInstantiateWorkflowTemplateOperator, ) - -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "dataproc_workflow_def" diff --git a/providers/google/tests/system/google/cloud/dataproc_metastore/example_dataproc_metastore.py b/providers/google/tests/system/google/cloud/dataproc_metastore/example_dataproc_metastore.py index d1a8e844f03e2..8bbc70821b242 100644 --- a/providers/google/tests/system/google/cloud/dataproc_metastore/example_dataproc_metastore.py +++ b/providers/google/tests/system/google/cloud/dataproc_metastore/example_dataproc_metastore.py @@ -48,7 +48,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID DAG_ID = "dataproc_metastore" PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/dataproc_metastore/example_dataproc_metastore_backup.py b/providers/google/tests/system/google/cloud/dataproc_metastore/example_dataproc_metastore_backup.py index 5ac0e98802bfc..3ab7acc4b611f 100644 --- a/providers/google/tests/system/google/cloud/dataproc_metastore/example_dataproc_metastore_backup.py +++ b/providers/google/tests/system/google/cloud/dataproc_metastore/example_dataproc_metastore_backup.py @@ -41,7 +41,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID DAG_ID = "dataproc_metastore_backup" diff --git a/providers/google/tests/system/google/cloud/dataproc_metastore/example_dataproc_metastore_hive_partition_sensor.py b/providers/google/tests/system/google/cloud/dataproc_metastore/example_dataproc_metastore_hive_partition_sensor.py index dbb8e5b9ba13f..65dc68e15800e 100644 --- a/providers/google/tests/system/google/cloud/dataproc_metastore/example_dataproc_metastore_hive_partition_sensor.py +++ b/providers/google/tests/system/google/cloud/dataproc_metastore/example_dataproc_metastore_hive_partition_sensor.py @@ -54,7 +54,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID DAG_ID = "hive_partition_sensor" PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/datastore/example_datastore_commit.py b/providers/google/tests/system/google/cloud/datastore/example_datastore_commit.py index 0d72cb636413a..a04f86a9b02d2 100644 --- a/providers/google/tests/system/google/cloud/datastore/example_datastore_commit.py +++ b/providers/google/tests/system/google/cloud/datastore/example_datastore_commit.py @@ -44,7 +44,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/datastore/example_datastore_query.py b/providers/google/tests/system/google/cloud/datastore/example_datastore_query.py index e67cbd7ae5228..1f35711840909 100644 --- a/providers/google/tests/system/google/cloud/datastore/example_datastore_query.py +++ b/providers/google/tests/system/google/cloud/datastore/example_datastore_query.py @@ -31,8 +31,7 @@ CloudDatastoreBeginTransactionOperator, CloudDatastoreRunQueryOperator, ) - -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/datastore/example_datastore_rollback.py b/providers/google/tests/system/google/cloud/datastore/example_datastore_rollback.py index 0e4dad5ebeb7c..235da990e8c18 100644 --- a/providers/google/tests/system/google/cloud/datastore/example_datastore_rollback.py +++ b/providers/google/tests/system/google/cloud/datastore/example_datastore_rollback.py @@ -30,8 +30,7 @@ CloudDatastoreBeginTransactionOperator, CloudDatastoreRollbackOperator, ) - -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/gcs/example_calendar_to_gcs.py b/providers/google/tests/system/google/cloud/gcs/example_calendar_to_gcs.py index f8bb372b5f253..33f149f292272 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_calendar_to_gcs.py +++ b/providers/google/tests/system/google/cloud/gcs/example_calendar_to_gcs.py @@ -40,7 +40,10 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT", "default") diff --git a/providers/google/tests/system/google/cloud/gcs/example_gcs_acl.py b/providers/google/tests/system/google/cloud/gcs/example_gcs_acl.py index c78826520e980..069d6aaa02e68 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_gcs_acl.py +++ b/providers/google/tests/system/google/cloud/gcs/example_gcs_acl.py @@ -39,7 +39,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/gcs/example_gcs_copy_delete.py b/providers/google/tests/system/google/cloud/gcs/example_gcs_copy_delete.py index c67b5154af250..e77bef7eac057 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_gcs_copy_delete.py +++ b/providers/google/tests/system/google/cloud/gcs/example_gcs_copy_delete.py @@ -43,8 +43,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/gcs/example_gcs_sensor.py b/providers/google/tests/system/google/cloud/gcs/example_gcs_sensor.py index c93a9d3f761b1..7178827c5af33 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_gcs_sensor.py +++ b/providers/google/tests/system/google/cloud/gcs/example_gcs_sensor.py @@ -41,7 +41,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/gcs/example_gcs_to_bigquery.py b/providers/google/tests/system/google/cloud/gcs/example_gcs_to_bigquery.py index 19bc48fedfb3c..aaad61b9c6b4b 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_gcs_to_bigquery.py +++ b/providers/google/tests/system/google/cloud/gcs/example_gcs_to_bigquery.py @@ -38,8 +38,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "gcs_to_bigquery_operator" diff --git a/providers/google/tests/system/google/cloud/gcs/example_gcs_to_bigquery_async.py b/providers/google/tests/system/google/cloud/gcs/example_gcs_to_bigquery_async.py index cb5c99f0032ee..caf8289a43d55 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_gcs_to_bigquery_async.py +++ b/providers/google/tests/system/google/cloud/gcs/example_gcs_to_bigquery_async.py @@ -38,8 +38,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/gcs/example_gcs_to_gcs.py b/providers/google/tests/system/google/cloud/gcs/example_gcs_to_gcs.py index 77c2fa98d1c84..6d6ae92475994 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_gcs_to_gcs.py +++ b/providers/google/tests/system/google/cloud/gcs/example_gcs_to_gcs.py @@ -53,8 +53,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/gcs/example_gcs_to_gdrive.py b/providers/google/tests/system/google/cloud/gcs/example_gcs_to_gdrive.py index cc10de41327cc..2968f5430b134 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_gcs_to_gdrive.py +++ b/providers/google/tests/system/google/cloud/gcs/example_gcs_to_gdrive.py @@ -50,8 +50,11 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/gcs/example_gcs_to_sftp.py b/providers/google/tests/system/google/cloud/gcs/example_gcs_to_sftp.py index ecab530b7e912..b8b96f8109acb 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_gcs_to_sftp.py +++ b/providers/google/tests/system/google/cloud/gcs/example_gcs_to_sftp.py @@ -38,8 +38,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/gcs/example_gcs_to_sheets.py b/providers/google/tests/system/google/cloud/gcs/example_gcs_to_sheets.py index 2485c4f5e37d2..9f9866a50ee60 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_gcs_to_sheets.py +++ b/providers/google/tests/system/google/cloud/gcs/example_gcs_to_sheets.py @@ -42,7 +42,10 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT", "default") diff --git a/providers/google/tests/system/google/cloud/gcs/example_gcs_transform.py b/providers/google/tests/system/google/cloud/gcs/example_gcs_transform.py index b8848260fab26..9d1e8569826f7 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_gcs_transform.py +++ b/providers/google/tests/system/google/cloud/gcs/example_gcs_transform.py @@ -39,8 +39,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/gcs/example_gcs_transform_timespan.py b/providers/google/tests/system/google/cloud/gcs/example_gcs_transform_timespan.py index 8b9b74d361565..2a546ed5de5cb 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_gcs_transform_timespan.py +++ b/providers/google/tests/system/google/cloud/gcs/example_gcs_transform_timespan.py @@ -40,8 +40,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/gcs/example_gcs_upload_download.py b/providers/google/tests/system/google/cloud/gcs/example_gcs_upload_download.py index 8a132fe536e64..0bdf089e2858b 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_gcs_upload_download.py +++ b/providers/google/tests/system/google/cloud/gcs/example_gcs_upload_download.py @@ -36,8 +36,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/gcs/example_gdrive_to_gcs.py b/providers/google/tests/system/google/cloud/gcs/example_gdrive_to_gcs.py index 775865577cbeb..6d61e9e33a53e 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_gdrive_to_gcs.py +++ b/providers/google/tests/system/google/cloud/gcs/example_gdrive_to_gcs.py @@ -45,8 +45,11 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/gcs/example_http_to_gcs.py b/providers/google/tests/system/google/cloud/gcs/example_http_to_gcs.py index c06e70005d092..51768dd2b9cef 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_http_to_gcs.py +++ b/providers/google/tests/system/google/cloud/gcs/example_http_to_gcs.py @@ -41,7 +41,10 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT", "default") diff --git a/providers/google/tests/system/google/cloud/gcs/example_mssql_to_gcs.py b/providers/google/tests/system/google/cloud/gcs/example_mssql_to_gcs.py index bdd9c528d9a95..c5ddffcfb7a5d 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_mssql_to_gcs.py +++ b/providers/google/tests/system/google/cloud/gcs/example_mssql_to_gcs.py @@ -24,9 +24,8 @@ from airflow.models.dag import DAG from airflow.providers.google.cloud.operators.gcs import GCSCreateBucketOperator, GCSDeleteBucketOperator - -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator try: from airflow.providers.google.cloud.transfers.mssql_to_gcs import MSSQLToGCSOperator diff --git a/providers/google/tests/system/google/cloud/gcs/example_mysql_to_gcs.py b/providers/google/tests/system/google/cloud/gcs/example_mysql_to_gcs.py index 8858d9e40a634..624cf83d28bfd 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_mysql_to_gcs.py +++ b/providers/google/tests/system/google/cloud/gcs/example_mysql_to_gcs.py @@ -62,8 +62,11 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator try: from airflow.providers.google.cloud.transfers.mysql_to_gcs import MySQLToGCSOperator diff --git a/providers/google/tests/system/google/cloud/gcs/example_oracle_to_gcs.py b/providers/google/tests/system/google/cloud/gcs/example_oracle_to_gcs.py index 8c6ddb82e6fe2..1837c35f403d4 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_oracle_to_gcs.py +++ b/providers/google/tests/system/google/cloud/gcs/example_oracle_to_gcs.py @@ -29,7 +29,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/gcs/example_presto_to_gcs.py b/providers/google/tests/system/google/cloud/gcs/example_presto_to_gcs.py index ccb37abd137a7..f2e381d350c1f 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_presto_to_gcs.py +++ b/providers/google/tests/system/google/cloud/gcs/example_presto_to_gcs.py @@ -40,7 +40,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/gcs/example_s3_to_gcs.py b/providers/google/tests/system/google/cloud/gcs/example_s3_to_gcs.py index 3cffcb894917c..1aa3f312c254d 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_s3_to_gcs.py +++ b/providers/google/tests/system/google/cloud/gcs/example_s3_to_gcs.py @@ -40,8 +40,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") GCP_PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/gcs/example_salesforce_to_gcs.py b/providers/google/tests/system/google/cloud/gcs/example_salesforce_to_gcs.py index 85f9b86edc705..1296bdc443963 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_salesforce_to_gcs.py +++ b/providers/google/tests/system/google/cloud/gcs/example_salesforce_to_gcs.py @@ -40,7 +40,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/gcs/example_sftp_to_gcs.py b/providers/google/tests/system/google/cloud/gcs/example_sftp_to_gcs.py index ed2bfeddb4403..22bcea434a50d 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_sftp_to_gcs.py +++ b/providers/google/tests/system/google/cloud/gcs/example_sftp_to_gcs.py @@ -37,8 +37,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/gcs/example_sheets.py b/providers/google/tests/system/google/cloud/gcs/example_sheets.py index 598045bbc51a4..81ab065e8d77d 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_sheets.py +++ b/providers/google/tests/system/google/cloud/gcs/example_sheets.py @@ -45,7 +45,10 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT", "default") diff --git a/providers/google/tests/system/google/cloud/gcs/example_sheets_to_gcs.py b/providers/google/tests/system/google/cloud/gcs/example_sheets_to_gcs.py index 495dc2e06c942..b639ab62c06d7 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_sheets_to_gcs.py +++ b/providers/google/tests/system/google/cloud/gcs/example_sheets_to_gcs.py @@ -42,7 +42,10 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT", "default") diff --git a/providers/google/tests/system/google/cloud/gcs/example_trino_to_gcs.py b/providers/google/tests/system/google/cloud/gcs/example_trino_to_gcs.py index ef104ac4aef87..39432c9434266 100644 --- a/providers/google/tests/system/google/cloud/gcs/example_trino_to_gcs.py +++ b/providers/google/tests/system/google/cloud/gcs/example_trino_to_gcs.py @@ -42,8 +42,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.openlineage.operator import OpenLineageTestOperator +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.openlineage.tests.system.openlineage.operator import OpenLineageTestOperator ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "trino_to_gcs" diff --git a/providers/google/tests/system/google/cloud/kubernetes_engine/example_kubernetes_engine.py b/providers/google/tests/system/google/cloud/kubernetes_engine/example_kubernetes_engine.py index f90918398880f..1dd6621ab66c4 100644 --- a/providers/google/tests/system/google/cloud/kubernetes_engine/example_kubernetes_engine.py +++ b/providers/google/tests/system/google/cloud/kubernetes_engine/example_kubernetes_engine.py @@ -38,7 +38,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID + from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/kubernetes_engine/example_kubernetes_engine_async.py b/providers/google/tests/system/google/cloud/kubernetes_engine/example_kubernetes_engine_async.py index f4359252c962f..47b2c01641f8f 100644 --- a/providers/google/tests/system/google/cloud/kubernetes_engine/example_kubernetes_engine_async.py +++ b/providers/google/tests/system/google/cloud/kubernetes_engine/example_kubernetes_engine_async.py @@ -38,7 +38,8 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID + from tests_common.test_utils.version_compat import AIRFLOW_V_3_0_PLUS ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/kubernetes_engine/example_kubernetes_engine_ray.py b/providers/google/tests/system/google/cloud/kubernetes_engine/example_kubernetes_engine_ray.py index 817e3114960e2..a6976e0c392c0 100644 --- a/providers/google/tests/system/google/cloud/kubernetes_engine/example_kubernetes_engine_ray.py +++ b/providers/google/tests/system/google/cloud/kubernetes_engine/example_kubernetes_engine_ray.py @@ -36,7 +36,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "kubernetes_engine_ray" diff --git a/providers/google/tests/system/google/cloud/managed_kafka/example_managed_kafka_consumer_group.py b/providers/google/tests/system/google/cloud/managed_kafka/example_managed_kafka_consumer_group.py index f3c45150ece2a..d07833b92d85a 100644 --- a/providers/google/tests/system/google/cloud/managed_kafka/example_managed_kafka_consumer_group.py +++ b/providers/google/tests/system/google/cloud/managed_kafka/example_managed_kafka_consumer_group.py @@ -64,7 +64,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google.gcp_api_client_helpers import create_airflow_connection +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import create_airflow_connection ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT", "default") diff --git a/providers/google/tests/system/google/cloud/spanner/example_spanner.py b/providers/google/tests/system/google/cloud/spanner/example_spanner.py index 0b9bf42b86e52..e03b1da0eaea8 100644 --- a/providers/google/tests/system/google/cloud/spanner/example_spanner.py +++ b/providers/google/tests/system/google/cloud/spanner/example_spanner.py @@ -40,7 +40,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/speech_to_text/example_speech_to_text.py b/providers/google/tests/system/google/cloud/speech_to_text/example_speech_to_text.py index b8510987c2673..4e669cb5a1a22 100644 --- a/providers/google/tests/system/google/cloud/speech_to_text/example_speech_to_text.py +++ b/providers/google/tests/system/google/cloud/speech_to_text/example_speech_to_text.py @@ -33,7 +33,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/sql_to_sheets/example_sql_to_sheets.py b/providers/google/tests/system/google/cloud/sql_to_sheets/example_sql_to_sheets.py index 3541ff6e97d50..c5b33f1bcf26c 100644 --- a/providers/google/tests/system/google/cloud/sql_to_sheets/example_sql_to_sheets.py +++ b/providers/google/tests/system/google/cloud/sql_to_sheets/example_sql_to_sheets.py @@ -59,7 +59,10 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) DAG_ID = "sql_to_sheets" ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/stackdriver/example_stackdriver.py b/providers/google/tests/system/google/cloud/stackdriver/example_stackdriver.py index dbcb7fc8209e7..dbc46eebff86a 100644 --- a/providers/google/tests/system/google/cloud/stackdriver/example_stackdriver.py +++ b/providers/google/tests/system/google/cloud/stackdriver/example_stackdriver.py @@ -46,7 +46,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/storage_transfer/example_cloud_storage_transfer_service_aws.py b/providers/google/tests/system/google/cloud/storage_transfer/example_cloud_storage_transfer_service_aws.py index b6c6277932f9d..90640634438c0 100644 --- a/providers/google/tests/system/google/cloud/storage_transfer/example_cloud_storage_transfer_service_aws.py +++ b/providers/google/tests/system/google/cloud/storage_transfer/example_cloud_storage_transfer_service_aws.py @@ -68,7 +68,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") GCP_PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/transfers/example_facebook_ads_to_gcs.py b/providers/google/tests/system/google/cloud/transfers/example_facebook_ads_to_gcs.py index 41423093d3e6a..5d20629f4a609 100644 --- a/providers/google/tests/system/google/cloud/transfers/example_facebook_ads_to_gcs.py +++ b/providers/google/tests/system/google/cloud/transfers/example_facebook_ads_to_gcs.py @@ -44,7 +44,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/transfers/example_gcs_to_sftp.py b/providers/google/tests/system/google/cloud/transfers/example_gcs_to_sftp.py index 5a9ce0793dcf4..6051b5978ec87 100644 --- a/providers/google/tests/system/google/cloud/transfers/example_gcs_to_sftp.py +++ b/providers/google/tests/system/google/cloud/transfers/example_gcs_to_sftp.py @@ -37,7 +37,7 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/transfers/example_gdrive_to_local.py b/providers/google/tests/system/google/cloud/transfers/example_gdrive_to_local.py index 1312eb482c4a4..08e724c135802 100644 --- a/providers/google/tests/system/google/cloud/transfers/example_gdrive_to_local.py +++ b/providers/google/tests/system/google/cloud/transfers/example_gdrive_to_local.py @@ -52,8 +52,11 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/cloud/transfers/example_postgres_to_gcs.py b/providers/google/tests/system/google/cloud/transfers/example_postgres_to_gcs.py index c585e9e3b2fa1..e3c468a386fe6 100644 --- a/providers/google/tests/system/google/cloud/transfers/example_postgres_to_gcs.py +++ b/providers/google/tests/system/google/cloud/transfers/example_postgres_to_gcs.py @@ -58,7 +58,10 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) DAG_ID = "postgres_to_gcs" ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/cloud/vision/example_vision_annotate_image.py b/providers/google/tests/system/google/cloud/vision/example_vision_annotate_image.py index b8fd7ebee4e4a..f5c6b862ae840 100644 --- a/providers/google/tests/system/google/cloud/vision/example_vision_annotate_image.py +++ b/providers/google/tests/system/google/cloud/vision/example_vision_annotate_image.py @@ -46,7 +46,7 @@ # [START howto_operator_vision_enums_import] from google.cloud.vision_v1 import Feature # isort:skip -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID # [END howto_operator_vision_enums_import] diff --git a/providers/google/tests/system/google/cloud/vision/example_vision_autogenerated.py b/providers/google/tests/system/google/cloud/vision/example_vision_autogenerated.py index a556d76076655..16887ee51cd86 100644 --- a/providers/google/tests/system/google/cloud/vision/example_vision_autogenerated.py +++ b/providers/google/tests/system/google/cloud/vision/example_vision_autogenerated.py @@ -64,7 +64,7 @@ # [END howto_operator_vision_reference_image_import] # [START howto_operator_vision_enums_import] from google.cloud.vision_v1 import Feature # isort:skip -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID # [END howto_operator_vision_enums_import] diff --git a/providers/google/tests/system/google/cloud/vision/example_vision_explicit.py b/providers/google/tests/system/google/cloud/vision/example_vision_explicit.py index e49a7a2589130..94a45742b1409 100644 --- a/providers/google/tests/system/google/cloud/vision/example_vision_explicit.py +++ b/providers/google/tests/system/google/cloud/vision/example_vision_explicit.py @@ -59,7 +59,7 @@ # [END howto_operator_vision_product_import_2] # [START howto_operator_vision_reference_image_import_2] from google.cloud.vision_v1.types import ReferenceImage # isort:skip -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID # [END howto_operator_vision_reference_image_import_2] diff --git a/providers/google/tests/system/google/conftest.py b/providers/google/tests/system/google/conftest.py index 1c377b7a34880..6236fdf9054ed 100644 --- a/providers/google/tests/system/google/conftest.py +++ b/providers/google/tests/system/google/conftest.py @@ -18,7 +18,9 @@ import pytest -from system.openlineage.conftest import set_transport_variable # noqa: F401 +from airflow.providers.openlineage.tests.system.openlineage.conftest import ( + set_transport_variable, # noqa: F401 +) REQUIRED_ENV_VARS = ("SYSTEM_TESTS_GCP_PROJECT",) diff --git a/providers/google/tests/system/google/marketing_platform/example_analytics_admin.py b/providers/google/tests/system/google/marketing_platform/example_analytics_admin.py index d7b03ea7bfe56..6050562bdf4e6 100644 --- a/providers/google/tests/system/google/marketing_platform/example_analytics_admin.py +++ b/providers/google/tests/system/google/marketing_platform/example_analytics_admin.py @@ -67,7 +67,10 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") DAG_ID = "google_analytics_admin" diff --git a/providers/google/tests/system/google/marketing_platform/example_campaign_manager.py b/providers/google/tests/system/google/marketing_platform/example_campaign_manager.py index 60f6ca1d31a50..6fa0084c6586c 100644 --- a/providers/google/tests/system/google/marketing_platform/example_campaign_manager.py +++ b/providers/google/tests/system/google/marketing_platform/example_campaign_manager.py @@ -61,8 +61,11 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google import DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") or DEFAULT_GCP_SYSTEM_TEST_PROJECT_ID diff --git a/providers/google/tests/system/google/marketing_platform/example_display_video.py b/providers/google/tests/system/google/marketing_platform/example_display_video.py index d6485b2cef59e..69f4e31a1bf8f 100644 --- a/providers/google/tests/system/google/marketing_platform/example_display_video.py +++ b/providers/google/tests/system/google/marketing_platform/example_display_video.py @@ -62,7 +62,10 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) DAG_ID = "display_video" ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default") diff --git a/providers/google/tests/system/google/suite/example_local_to_drive.py b/providers/google/tests/system/google/suite/example_local_to_drive.py index 4e201aee6cfec..0c10d44beb09a 100644 --- a/providers/google/tests/system/google/suite/example_local_to_drive.py +++ b/providers/google/tests/system/google/suite/example_local_to_drive.py @@ -49,7 +49,10 @@ # Compatibility for Airflow < 3.1 from airflow.utils.trigger_rule import TriggerRule # type: ignore[no-redef,attr-defined] -from system.google.gcp_api_client_helpers import create_airflow_connection, delete_airflow_connection +from airflow.providers.google.tests.system.google.gcp_api_client_helpers import ( + create_airflow_connection, + delete_airflow_connection, +) DAG_ID = "local_to_drive" ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID", "default")