From 3568b09e8c7501bd84d08d594038dea9b8e20a23 Mon Sep 17 00:00:00 2001 From: Tung Leo Date: Fri, 23 Feb 2024 04:47:01 -0500 Subject: [PATCH] Fix unexpected keyword argument 'secret_path' in secrets.kv.v2 (#37626) * Fix unexpected keyword argument 'secret_path' in secrets.kv.v2 * Fix the input argument in secrets.kv.v1 --- .../providers/hashicorp/_internal_client/vault_client.py | 4 ++-- .../hashicorp/_internal_client/test_vault_client.py | 8 ++++---- tests/providers/hashicorp/hooks/test_vault.py | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/airflow/providers/hashicorp/_internal_client/vault_client.py b/airflow/providers/hashicorp/_internal_client/vault_client.py index aa2991f736aa6..5d0ef90afca13 100644 --- a/airflow/providers/hashicorp/_internal_client/vault_client.py +++ b/airflow/providers/hashicorp/_internal_client/vault_client.py @@ -468,10 +468,10 @@ def create_or_update_secret( mount_point, secret_path = self._parse_secret_path(secret_path) if self.kv_engine_version == 1: response = self.client.secrets.kv.v1.create_or_update_secret( - secret_path=secret_path, secret=secret, mount_point=mount_point, method=method + path=secret_path, secret=secret, mount_point=mount_point, method=method ) else: response = self.client.secrets.kv.v2.create_or_update_secret( - secret_path=secret_path, secret=secret, mount_point=mount_point, cas=cas + path=secret_path, secret=secret, mount_point=mount_point, cas=cas ) return response diff --git a/tests/providers/hashicorp/_internal_client/test_vault_client.py b/tests/providers/hashicorp/_internal_client/test_vault_client.py index ba8e0a0cd715e..2973178e0a65c 100644 --- a/tests/providers/hashicorp/_internal_client/test_vault_client.py +++ b/tests/providers/hashicorp/_internal_client/test_vault_client.py @@ -1061,7 +1061,7 @@ def test_create_or_update_secret_v2(self, mock_hvac): ) vault_client.create_or_update_secret(secret_path="path", secret={"key": "value"}) mock_client.secrets.kv.v2.create_or_update_secret.assert_called_once_with( - mount_point="secret", secret_path="path", secret={"key": "value"}, cas=None + mount_point="secret", path="path", secret={"key": "value"}, cas=None ) @mock.patch("airflow.providers.hashicorp._internal_client.vault_client.hvac") @@ -1093,7 +1093,7 @@ def test_create_or_update_secret_v2_cas(self, mock_hvac): ) vault_client.create_or_update_secret(secret_path="path", secret={"key": "value"}, cas=10) mock_client.secrets.kv.v2.create_or_update_secret.assert_called_once_with( - mount_point="secret", secret_path="path", secret={"key": "value"}, cas=10 + mount_point="secret", path="path", secret={"key": "value"}, cas=10 ) @mock.patch("airflow.providers.hashicorp._internal_client.vault_client.hvac") @@ -1111,7 +1111,7 @@ def test_create_or_update_secret_v1(self, mock_hvac): ) vault_client.create_or_update_secret(secret_path="path", secret={"key": "value"}) mock_client.secrets.kv.v1.create_or_update_secret.assert_called_once_with( - mount_point="secret", secret_path="path", secret={"key": "value"}, method=None + mount_point="secret", path="path", secret={"key": "value"}, method=None ) @mock.patch("airflow.providers.hashicorp._internal_client.vault_client.hvac") @@ -1145,7 +1145,7 @@ def test_create_or_update_secret_v1_post(self, mock_hvac): ) vault_client.create_or_update_secret(secret_path="path", secret={"key": "value"}, method="post") mock_client.secrets.kv.v1.create_or_update_secret.assert_called_once_with( - mount_point="secret", secret_path="path", secret={"key": "value"}, method="post" + mount_point="secret", path="path", secret={"key": "value"}, method="post" ) @mock.patch("airflow.providers.hashicorp._internal_client.vault_client.hvac") diff --git a/tests/providers/hashicorp/hooks/test_vault.py b/tests/providers/hashicorp/hooks/test_vault.py index b9db1e7c1f34d..1880be99749e6 100644 --- a/tests/providers/hashicorp/hooks/test_vault.py +++ b/tests/providers/hashicorp/hooks/test_vault.py @@ -1208,7 +1208,7 @@ def test_create_or_update_secret_v2(self, mock_hvac, mock_get_connection): test_hook = VaultHook(**kwargs) test_hook.create_or_update_secret(secret_path="path", secret={"key": "value"}) mock_client.secrets.kv.v2.create_or_update_secret.assert_called_once_with( - mount_point="secret", secret_path="path", secret={"key": "value"}, cas=None + mount_point="secret", path="path", secret={"key": "value"}, cas=None ) @mock.patch("airflow.providers.hashicorp.hooks.vault.VaultHook.get_connection") @@ -1227,7 +1227,7 @@ def test_create_or_update_secret_v2_cas(self, mock_hvac, mock_get_connection): test_hook = VaultHook(**kwargs) test_hook.create_or_update_secret(secret_path="path", secret={"key": "value"}, cas=10) mock_client.secrets.kv.v2.create_or_update_secret.assert_called_once_with( - mount_point="secret", secret_path="path", secret={"key": "value"}, cas=10 + mount_point="secret", path="path", secret={"key": "value"}, cas=10 ) @pytest.mark.parametrize( @@ -1253,7 +1253,7 @@ def test_create_or_update_secret_v1(self, mock_hvac, mock_get_connection, method test_hook = VaultHook(**kwargs) test_hook.create_or_update_secret(secret_path="path", secret={"key": "value"}, method=method) mock_client.secrets.kv.v1.create_or_update_secret.assert_called_once_with( - mount_point="secret", secret_path="path", secret={"key": "value"}, method=expected_method + mount_point="secret", path="path", secret={"key": "value"}, method=expected_method )