From 5c739ccfebbf1ed061cad0e30b7910815cf17bfd Mon Sep 17 00:00:00 2001 From: VladaZakharova Date: Tue, 3 Dec 2024 00:55:47 +0100 Subject: [PATCH] Fix cloud_sql and example_composer system tests (#44560) Co-authored-by: Ulada Zakharava --- .../google/cloud/cloud_sql/example_cloud_sql_query_iam.py | 3 ++- .../system/google/cloud/composer/example_cloud_composer.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/providers/tests/system/google/cloud/cloud_sql/example_cloud_sql_query_iam.py b/providers/tests/system/google/cloud/cloud_sql/example_cloud_sql_query_iam.py index 7e04c8d493f98..c699deef7cc17 100644 --- a/providers/tests/system/google/cloud/cloud_sql/example_cloud_sql_query_iam.py +++ b/providers/tests/system/google/cloud/cloud_sql/example_cloud_sql_query_iam.py @@ -65,6 +65,7 @@ "dataDiskSizeGb": 30, "pricingPlan": "PER_USE", "ipConfiguration": {}, + "databaseFlags": [{"name": "cloudsql_iam_authentication", "value": "on"}], }, # For using a different database version please check the link below. # https://cloud.google.com/sql/docs/mysql/admin-api/rest/v1/SqlDatabaseVersion @@ -119,7 +120,7 @@ def cloud_sql_instance_create_body(database_provider: dict[str, Any]) -> dict[st CLOUD_SQL_DATABASE_NAME = "test_db" CLOUD_SQL_USER = "test_user" -CLOUD_IAM_SA = os.environ.get("CLOUD_IAM_SA", "test_iam_sa") +CLOUD_IAM_SA = os.environ.get("SYSTEM_TESTS_CLOUDSQL_SA", "test_iam_sa") CLOUD_SQL_IP_ADDRESS = "127.0.0.1" CLOUD_SQL_PUBLIC_PORT = 5432 diff --git a/providers/tests/system/google/cloud/composer/example_cloud_composer.py b/providers/tests/system/google/cloud/composer/example_cloud_composer.py index f04a2c8596a1e..8f069c78ac7fd 100644 --- a/providers/tests/system/google/cloud/composer/example_cloud_composer.py +++ b/providers/tests/system/google/cloud/composer/example_cloud_composer.py @@ -47,7 +47,7 @@ ENVIRONMENT = { "config": { - "software_config": {"image_version": "composer-2.5.0-airflow-2.5.3"}, + "software_config": {"image_version": "composer-2-airflow-2"}, } } # [END howto_operator_composer_simple_environment]