Skip to content

fix: use key_content configuration value if available #993

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: use key_content configuration value if available #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/oci_cli/cli_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,11 @@ def get_session_token_signer(client_config):
token = security_token_file.read()

try:
private_key = oci.signer.load_private_key_from_file(client_config.get('key_file'), client_config.get('pass_phrase'))
key_content = client_config.get("key_content")
if key_content:
private_key = oci.signer.load_private_key(key_content, client_config.get('pass_phrase'))
else:
private_key = oci.signer.load_private_key_from_file(client_config.get('key_file'), client_config.get('pass_phrase'))
except exceptions.MissingPrivateKeyPassphrase:
client_config['pass_phrase'] = prompt_for_passphrase()
private_key = oci.signer.load_private_key_from_file(client_config.get('key_file'), client_config.get('pass_phrase'))
Expand Down
33 changes: 33 additions & 0 deletions tests/unit/test_cli_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import oci
import tempfile
import unittest
from unittest.mock import patch
from oci_cli import cli_util


Expand All @@ -32,6 +33,36 @@ def build_config(ctx):

class TestCliUtil(unittest.TestCase):

@patch('oci.signer.load_private_key')
@patch('oci.signer.load_private_key_from_file')
def test_get_session_token_signer(self, mock_load_private_key, mock_load_private_key_from_file):
# Test when 'key_content' is not in client_config
client_config_key_file = {
'key_file': 'test_key_file',
'pass_phrase': 'test_passphrase',
}
cli_util.get_session_token_signer(client_config_key_file)
mock_load_private_key_from_file.assert_called_once_with(
client_config_key_file.get('key_file'),
client_config_key_file.get('pass_phrase'),
)
mock_load_private_key.assert_not_called()

# Test when 'key_content' is in client_config
mock_load_private_key.reset_mock()
mock_load_private_key_from_file.reset_mock()

client_config_key_content = {
'key_content': 'test_key_content',
'pass_phrase': 'test_passphrase'
}
cli_util.get_session_token_signer(client_config_key_content)
mock_load_private_key.assert_called_once_with(
client_config_key_content.get('key_content'),
client_config_key_content.get('pass_phrase'),
)
mock_load_private_key_from_file.assert_not_called()

def test_iam_coalesce_provided_and_default_value(self):
ctx = Obj()
ctx.obj = Obj()
Expand Down Expand Up @@ -142,3 +173,5 @@ def test_get_possible_subtype_based_on_payload(self):

subtype = cli_util.get_possible_subtype_based_on_payload(oci.core.models.InstanceConfigurationInstanceDetails, 'core', payload)
assert subtype.__class__.__name__ == 'ComputeInstanceDetails'

# Add the import statement for patch