This is an automated email from the ASF dual-hosted git repository.
eladkal pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new dc5b909b22 Resolve secrets manager backend deprecations in tests
(#40491)
dc5b909b22 is described below
commit dc5b909b22e55a79136da8eadcdd9da6a53bd465
Author: Gopal Dirisala <[email protected]>
AuthorDate: Tue Jul 2 10:05:43 2024 +0530
Resolve secrets manager backend deprecations in tests (#40491)
* Resolve secrets manager backend deprecations in tests
* Resolve secrets manager backend deprecations in tests
---
tests/deprecations_ignore.yml | 4 ---
.../amazon/aws/secrets/test_secrets_manager.py | 33 ++++++++++++++++------
2 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/tests/deprecations_ignore.yml b/tests/deprecations_ignore.yml
index aff223d007..32a17d88b9 100644
--- a/tests/deprecations_ignore.yml
+++ b/tests/deprecations_ignore.yml
@@ -80,10 +80,6 @@
-
tests/providers/amazon/aws/deferrable/hooks/test_redshift_cluster.py::TestRedshiftAsyncHook::test_pause_cluster
-
tests/providers/amazon/aws/deferrable/hooks/test_redshift_cluster.py::TestRedshiftAsyncHook::test_resume_cluster
-
tests/providers/amazon/aws/deferrable/hooks/test_redshift_cluster.py::TestRedshiftAsyncHook::test_resume_cluster_exception
--
tests/providers/amazon/aws/secrets/test_secrets_manager.py::TestSecretsManagerBackend::test_get_conn_value_broken_field_mode
--
tests/providers/amazon/aws/secrets/test_secrets_manager.py::TestSecretsManagerBackend::test_get_conn_value_broken_field_mode_extra_words_added
--
tests/providers/amazon/aws/secrets/test_secrets_manager.py::TestSecretsManagerBackend::test_get_connection_broken_field_mode_extra_allows_nested_json
--
tests/providers/amazon/aws/secrets/test_secrets_manager.py::TestSecretsManagerBackend::test_get_connection_broken_field_mode_url_encoding
-
tests/providers/amazon/aws/triggers/test_redshift_cluster.py::TestRedshiftClusterTrigger::test_redshift_cluster_sensor_trigger_exception
-
tests/providers/amazon/aws/triggers/test_redshift_cluster.py::TestRedshiftClusterTrigger::test_redshift_cluster_sensor_trigger_resuming_status
-
tests/providers/amazon/aws/triggers/test_redshift_cluster.py::TestRedshiftClusterTrigger::test_redshift_cluster_sensor_trigger_success
diff --git a/tests/providers/amazon/aws/secrets/test_secrets_manager.py
b/tests/providers/amazon/aws/secrets/test_secrets_manager.py
index 39f2d4710a..dcf9c6f138 100644
--- a/tests/providers/amazon/aws/secrets/test_secrets_manager.py
+++ b/tests/providers/amazon/aws/secrets/test_secrets_manager.py
@@ -22,6 +22,7 @@ from unittest import mock
import pytest
from moto import mock_aws
+from airflow.exceptions import AirflowProviderDeprecationWarning
from airflow.providers.amazon.aws.secrets.secrets_manager import
SecretsManagerBackend
@@ -69,9 +70,13 @@ class TestSecretsManagerBackend:
),
}
- secrets_manager_backend = SecretsManagerBackend(
- are_secret_values_urlencoded=are_secret_values_urlencoded
- )
+ with pytest.warns(
+ AirflowProviderDeprecationWarning,
+ match=r"The `secret_values_are_urlencoded` is deprecated. This
kwarg only exists to assist in migrating away from URL-encoding secret values
for JSON secrets. To remove this warning, make sure your JSON secrets are
\*NOT\* URL-encoded, and then remove this kwarg from backend_kwargs.",
+ ):
+ secrets_manager_backend = SecretsManagerBackend(
+ are_secret_values_urlencoded=are_secret_values_urlencoded
+ )
secrets_manager_backend.client.create_secret(**create_param)
conn = secrets_manager_backend.get_connection(conn_id="test_postgres")
@@ -98,7 +103,11 @@ class TestSecretsManagerBackend:
),
}
- secrets_manager_backend = SecretsManagerBackend(full_url_mode=False)
+ with pytest.warns(
+ AirflowProviderDeprecationWarning,
+ match="The `full_url_mode` kwarg is deprecated. Going forward, the
`SecretsManagerBackend` will support both URL-encoded and JSON-encoded secrets
at the same time. The encoding of the secret will be determined automatically.",
+ ):
+ secrets_manager_backend =
SecretsManagerBackend(full_url_mode=False)
secrets_manager_backend.client.create_secret(**create_param)
conn = secrets_manager_backend.get_connection(conn_id="test_postgres")
@@ -115,7 +124,11 @@ class TestSecretsManagerBackend:
),
}
- secrets_manager_backend = SecretsManagerBackend(full_url_mode=False)
+ with pytest.warns(
+ AirflowProviderDeprecationWarning,
+ match="The `full_url_mode` kwarg is deprecated. Going forward, the
`SecretsManagerBackend` will support both URL-encoded and JSON-encoded secrets
at the same time. The encoding of the secret will be determined automatically.",
+ ):
+ secrets_manager_backend =
SecretsManagerBackend(full_url_mode=False)
secrets_manager_backend.client.create_secret(**create_param)
conn = secrets_manager_backend.get_connection(conn_id="test_postgres")
@@ -133,9 +146,13 @@ class TestSecretsManagerBackend:
),
}
- secrets_manager_backend = SecretsManagerBackend(
- full_url_mode=False, extra_conn_words={"user": ["usuario"]}
- )
+ with pytest.warns(
+ AirflowProviderDeprecationWarning,
+ match="The `full_url_mode` kwarg is deprecated. Going forward, the
`SecretsManagerBackend` will support both URL-encoded and JSON-encoded secrets
at the same time. The encoding of the secret will be determined automatically.",
+ ):
+ secrets_manager_backend = SecretsManagerBackend(
+ full_url_mode=False, extra_conn_words={"user": ["usuario"]}
+ )
secrets_manager_backend.client.create_secret(**create_param)
conn = secrets_manager_backend.get_connection(conn_id="test_postgres")
