From 22b34054de0b573c6e375ca1b4e5d01674a85d42 Mon Sep 17 00:00:00 2001 From: Tung Bui Date: Thu, 22 Feb 2024 22:42:50 +0700 Subject: [PATCH 1/2] Fix unexpected keyword argument 'secret_path' in secrets.kv.v2 --- airflow/providers/hashicorp/_internal_client/vault_client.py | 2 +- .../providers/hashicorp/_internal_client/test_vault_client.py | 4 ++-- tests/providers/hashicorp/hooks/test_vault.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/airflow/providers/hashicorp/_internal_client/vault_client.py b/airflow/providers/hashicorp/_internal_client/vault_client.py index aa2991f736aa6..af5aea6f85676 100644 --- a/airflow/providers/hashicorp/_internal_client/vault_client.py +++ b/airflow/providers/hashicorp/_internal_client/vault_client.py @@ -472,6 +472,6 @@ def create_or_update_secret( ) 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..9f60738582bf8 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") diff --git a/tests/providers/hashicorp/hooks/test_vault.py b/tests/providers/hashicorp/hooks/test_vault.py index b9db1e7c1f34d..358b9d175757d 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( From b3d4d8d5a3a092ea9506fb8cc24a4f53f3584067 Mon Sep 17 00:00:00 2001 From: Tung Bui Date: Fri, 23 Feb 2024 08:05:12 +0700 Subject: [PATCH 2/2] Fix the input argument in secrets.kv.v1 --- airflow/providers/hashicorp/_internal_client/vault_client.py | 2 +- .../providers/hashicorp/_internal_client/test_vault_client.py | 4 ++-- tests/providers/hashicorp/hooks/test_vault.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/airflow/providers/hashicorp/_internal_client/vault_client.py b/airflow/providers/hashicorp/_internal_client/vault_client.py index af5aea6f85676..5d0ef90afca13 100644 --- a/airflow/providers/hashicorp/_internal_client/vault_client.py +++ b/airflow/providers/hashicorp/_internal_client/vault_client.py @@ -468,7 +468,7 @@ 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( diff --git a/tests/providers/hashicorp/_internal_client/test_vault_client.py b/tests/providers/hashicorp/_internal_client/test_vault_client.py index 9f60738582bf8..2973178e0a65c 100644 --- a/tests/providers/hashicorp/_internal_client/test_vault_client.py +++ b/tests/providers/hashicorp/_internal_client/test_vault_client.py @@ -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 358b9d175757d..1880be99749e6 100644 --- a/tests/providers/hashicorp/hooks/test_vault.py +++ b/tests/providers/hashicorp/hooks/test_vault.py @@ -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 )