-
Notifications
You must be signed in to change notification settings - Fork 43
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Vault support for Forecast & AD operators #876
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
#!/usr/bin/env python | ||
from typing import Union | ||
|
||
# Copyright (c) 2024 Oracle and/or its affiliates. | ||
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/ | ||
import pytest | ||
from ads.opctl.operator.lowcode.common.utils import ( | ||
load_data, | ||
) | ||
from ads.opctl.operator.common.operator_config import InputData | ||
from unittest.mock import patch, Mock, MagicMock | ||
import unittest | ||
import pandas as pd | ||
|
||
mock_secret = { | ||
'user_name': 'mock_user', | ||
'password': 'mock_password', | ||
'service_name': 'mock_service_name' | ||
} | ||
|
||
mock_connect_args = { | ||
'user': 'mock_user', | ||
'password': 'mock_password', | ||
'service_name': 'mock_service_name', | ||
'dsn': 'mock_dsn' | ||
} | ||
|
||
# Mock data for testing | ||
mock_data = pd.DataFrame({ | ||
'id': [1, 2, 3], | ||
'name': ['Alice', 'Bob', 'Charlie'] | ||
}) | ||
|
||
mock_db_connection = MagicMock() | ||
|
||
load_secret_err_msg = "Vault exception message" | ||
db_connect_err_msg = "Mocked DB connection error" | ||
|
||
|
||
def mock_oracledb_connect_failure(*args, **kwargs): | ||
raise Exception(db_connect_err_msg) | ||
|
||
|
||
def mock_oracledb_connect(**kwargs): | ||
assert kwargs == mock_connect_args, f"Expected connect_args {mock_connect_args}, but got {kwargs}" | ||
return mock_db_connection | ||
|
||
|
||
class MockADBSecretKeeper: | ||
@staticmethod | ||
def __enter__(*args, **kwargs): | ||
return mock_secret | ||
|
||
@staticmethod | ||
def __exit__(*args, **kwargs): | ||
pass | ||
|
||
@staticmethod | ||
def load_secret(vault_secret_id, wallet_dir): | ||
return MockADBSecretKeeper() | ||
|
||
@staticmethod | ||
def load_secret_fail(*args, **kwargs): | ||
raise Exception(load_secret_err_msg) | ||
|
||
|
||
class TestDataLoad(unittest.TestCase): | ||
def setUp(self): | ||
self.data_spec = Mock(spec=InputData) | ||
self.data_spec.connect_args = { | ||
'dsn': 'mock_dsn' | ||
} | ||
self.data_spec.vault_secret_id = 'mock_secret_id' | ||
self.data_spec.table_name = 'mock_table_name' | ||
self.data_spec.url = None | ||
self.data_spec.format = None | ||
self.data_spec.columns = None | ||
self.data_spec.limit = None | ||
|
||
def testLoadSecretAndDBConnection(self): | ||
with patch('ads.secrets.ADBSecretKeeper.load_secret', side_effect=MockADBSecretKeeper.load_secret): | ||
with patch('oracledb.connect', side_effect=mock_oracledb_connect): | ||
with patch('pandas.read_sql', return_value=mock_data) as mock_read_sql: | ||
data = load_data(self.data_spec) | ||
mock_read_sql.assert_called_once_with(f"SELECT * FROM {self.data_spec.table_name}", | ||
mock_db_connection) | ||
pd.testing.assert_frame_equal(data, mock_data) | ||
|
||
def testLoadVaultFailure(self): | ||
with patch('ads.secrets.ADBSecretKeeper.load_secret', side_effect=MockADBSecretKeeper.load_secret_fail): | ||
with pytest.raises(Exception) as e: | ||
load_data(self.data_spec) | ||
|
||
expected_msg = f"Could not retrieve database credentials from vault {self.data_spec.vault_secret_id}: {load_secret_err_msg}" | ||
assert str(e.value) == expected_msg, f"Expected exception message '{expected_msg}', but got '{str(e)}'" | ||
|
||
def testDBConnectionFailure(self): | ||
with patch('ads.secrets.ADBSecretKeeper.load_secret', side_effect=MockADBSecretKeeper.load_secret): | ||
with patch('oracledb.connect', side_effect=mock_oracledb_connect_failure): | ||
with pytest.raises(Exception) as e: | ||
load_data(self.data_spec) | ||
|
||
assert str(e.value) == db_connect_err_msg , f"Expected exception message '{db_connect_err_msg }', but got '{str(e)}'" |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great handling here! Connect_args can overwrite the Vault.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ahosler Added unit tests.