Resolve google secret manager deprecations in tests (#40548)

apache · Jul 2, 2024 · eb3e199 · eb3e199
1 parent 9557cdb
commit eb3e199
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/tests/deprecations_ignore.yml b/tests/deprecations_ignore.yml
@@ -173,9 +173,6 @@
 - tests/providers/google/cloud/operators/test_vertex_ai.py::TestVertexAICreateHyperparameterTuningJobOperator::test_execute
 - tests/providers/google/cloud/operators/test_vertex_ai.py::TestVertexAIDeleteAutoMLTrainingJobOperator::test_execute
 - tests/providers/google/cloud/operators/test_vertex_ai.py::TestVertexAIDeleteCustomTrainingJobOperator::test_execute
-- tests/providers/google/cloud/secrets/test_secret_manager.py::TestCloudSecretManagerBackend::test_connections_prefix_none_value
-- tests/providers/google/cloud/secrets/test_secret_manager.py::TestCloudSecretManagerBackend::test_get_conn_uri
-- tests/providers/google/cloud/secrets/test_secret_manager.py::TestCloudSecretManagerBackend::test_get_conn_uri_non_existent_key
 - tests/providers/google/cloud/sensors/test_gcs.py::TestTsFunction::test_should_support_cron
 - tests/providers/google/cloud/sensors/test_gcs.py::TestTsFunction::test_should_support_datetime
 - tests/providers/google/cloud/transfers/test_bigquery_to_postgres.py::TestBigQueryToPostgresOperator::test_execute_good_request_to_bq

diff --git a/tests/providers/google/cloud/secrets/test_secret_manager.py b/tests/providers/google/cloud/secrets/test_secret_manager.py
@@ -107,7 +107,7 @@ def test_get_conn_uri(self, mock_client_callable, mock_get_creds, connections_pr
 
         secrets_manager_backend = CloudSecretManagerBackend(connections_prefix=connections_prefix)
         secret_id = secrets_manager_backend.build_path(connections_prefix, CONN_ID, SEP)
-        returned_uri = secrets_manager_backend.get_conn_uri(conn_id=CONN_ID)
+        returned_uri = secrets_manager_backend.get_conn_value(conn_id=CONN_ID)
         assert CONN_URI == returned_uri
         mock_client.secret_version_path.assert_called_once_with(PROJECT_ID, secret_id, "latest")
 
@@ -131,7 +131,7 @@ def test_get_conn_uri_non_existent_key(self, mock_client_callable, mock_get_cred
         secrets_manager_backend = CloudSecretManagerBackend(connections_prefix=CONNECTIONS_PREFIX)
         secret_id = secrets_manager_backend.build_path(CONNECTIONS_PREFIX, CONN_ID, SEP)
         with caplog.at_level(level=logging.DEBUG, logger=secrets_manager_backend.client.log.name):
-            assert secrets_manager_backend.get_conn_uri(conn_id=CONN_ID) is None
+            assert secrets_manager_backend.get_conn_value(conn_id=CONN_ID) is None
             assert secrets_manager_backend.get_connection(conn_id=CONN_ID) is None
             assert re.search(
                 f"Google Cloud API Call Error \\(NotFound\\): Secret ID {secret_id} not found",
@@ -226,7 +226,7 @@ def test_connections_prefix_none_value(self, mock_client_callable, mock_get_cred
                 secrets_manager_backend = CloudSecretManagerBackend(connections_prefix=None)
 
                 mock_is_valid_prefix_sep.assert_not_called()
-                assert secrets_manager_backend.get_conn_uri(conn_id=CONN_ID) is None
+                assert secrets_manager_backend.get_conn_value(conn_id=CONN_ID) is None
                 mock_get_secret.assert_not_called()
 
     @mock.patch(MODULE_NAME + ".get_credentials_and_project_id")