Skip to content

Commit

Permalink
Refactor data plane api utils (#7472)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jiec-msft
jiec-msft committed Apr 9, 2024
1 parent 03d4a1d commit f0f14b3
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 30 deletions.
20 changes: 4 additions & 16 deletions src/spring/azext_spring/managed_components/managed_component_operations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from ..log_stream.writer import (DefaultWriter, PrefixWriter)
from ..log_stream.log_stream_operations import log_stream_from_url
from ..log_stream.log_stream_validators import validate_thread_number
from .._utils import (get_proxy_api_endpoint, BearerAuth)
from .._utils import (get_bearer_auth, get_hostname)


logger = get_logger(__name__)
Expand All @@ -42,7 +42,7 @@ def __init__(self, follow, lines, since, limit):
def managed_component_logs(cmd, client, resource_group, service,
name=None, all_instances=None, instance=None,
follow=None, max_log_requests=5, lines=50, since=None, limit=2048):
auth = _get_bearer_auth(cmd)
auth = get_bearer_auth(cmd.cli_ctx)
exceptions = []
threads = None
queryOptions = QueryOptions(follow=follow, lines=lines, since=since, limit=limit)
Expand Down Expand Up @@ -91,7 +91,7 @@ def _get_component(component):
def _get_log_stream_urls(cmd, client, resource_group, service, component_name,
all_instances, instance, queryOptions: QueryOptions):
component_api_name = _get_component(component_name).get_api_name()
hostname = _get_hostname(cmd, client, resource_group, service)
hostname = get_hostname(cmd.cli_ctx, client, resource_group, service)
url_dict = {}

if component_name and not all_instances and not instance:
Expand Down Expand Up @@ -135,18 +135,6 @@ def _get_stream_url(hostname, component_name, instance_name, queryOptions: Query
return url


def _get_bearer_auth(cmd):
profile = Profile(cli_ctx=cmd.cli_ctx)
creds, _, tenant = profile.get_raw_token()
token = creds[1]
return BearerAuth(token)


def _get_hostname(cmd, client, resource_group, service):
resource = client.services.get(resource_group, service)
return get_proxy_api_endpoint(cmd.cli_ctx, resource)


def _get_log_threads(all_instances, url_dict, auth, exceptions):
threads = []
need_prefix = all_instances is True
Expand Down Expand Up @@ -187,7 +175,7 @@ def _sequential_start_threads(threads: [Thread]):


def _get_log_threads_without_component(cmd, client, resource_group, service, instance_name, auth, exceptions, queryOptions: QueryOptions):
hostname = _get_hostname(cmd, client, resource_group, service)
hostname = get_hostname(cmd.cli_ctx, client, resource_group, service)
url_template = "https://{}/api/logstream/managedComponentInstances/{}"
url = url_template.format(hostname, instance_name)
url = _attach_logs_query_options(url, queryOptions)
Expand Down
28 changes: 14 additions & 14 deletions src/spring/azext_spring/tests/latest/managed_component/test_managed_component_scenarios.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ def test_scg_operator_component_instance_list(self, is_enterprise_tier_mock, cli
@mock.patch('azext_spring.log_stream.log_stream_operations.requests', autospec=True)
@mock.patch('azext_spring.commands.cf_spring', autospec=True)
@mock.patch('azext_spring.managed_components.validators_managed_component.is_enterprise_tier', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_hostname', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_bearer_auth', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations.get_hostname', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations.get_bearer_auth', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_default_writer', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_prefix_writer', autospec=True)
def test_acs_log_stream(self, _get_prefix_writer_mock, _get_default_writer_mock, _get_bearer_auth_mock,
Expand Down Expand Up @@ -201,8 +201,8 @@ def test_acs_log_stream(self, _get_prefix_writer_mock, _get_default_writer_mock,
@mock.patch('azext_spring.log_stream.log_stream_operations.requests', autospec=True)
@mock.patch('azext_spring.commands.cf_spring', autospec=True)
@mock.patch('azext_spring.managed_components.validators_managed_component.is_enterprise_tier', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_hostname', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_bearer_auth', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations.get_hostname', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations.get_bearer_auth', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_default_writer', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_prefix_writer', autospec=True)
def test_flux_log_stream(self, _get_prefix_writer_mock, _get_default_writer_mock, _get_bearer_auth_mock,
Expand Down Expand Up @@ -246,8 +246,8 @@ def test_flux_log_stream(self, _get_prefix_writer_mock, _get_default_writer_mock
@mock.patch('azext_spring.log_stream.log_stream_operations.requests', autospec=True)
@mock.patch('azext_spring.commands.cf_spring', autospec=True)
@mock.patch('azext_spring.managed_components.validators_managed_component.is_enterprise_tier', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_hostname', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_bearer_auth', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations.get_hostname', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations.get_bearer_auth', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_default_writer', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_prefix_writer', autospec=True)
def test_scg_log_stream(self, _get_prefix_writer_mock, _get_default_writer_mock, _get_bearer_auth_mock,
Expand Down Expand Up @@ -291,8 +291,8 @@ def test_scg_log_stream(self, _get_prefix_writer_mock, _get_default_writer_mock,
@mock.patch('azext_spring.log_stream.log_stream_operations.requests', autospec=True)
@mock.patch('azext_spring.commands.cf_spring', autospec=True)
@mock.patch('azext_spring.managed_components.validators_managed_component.is_enterprise_tier', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_hostname', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_bearer_auth', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations.get_hostname', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations.get_bearer_auth', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_default_writer', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_prefix_writer', autospec=True)
def test_scg_operator_log_stream(self, _get_prefix_writer_mock, _get_default_writer_mock, _get_bearer_auth_mock,
Expand Down Expand Up @@ -336,8 +336,8 @@ def test_scg_operator_log_stream(self, _get_prefix_writer_mock, _get_default_wri
@mock.patch('azext_spring.log_stream.log_stream_operations.requests', autospec=True)
@mock.patch('azext_spring.commands.cf_spring', autospec=True)
@mock.patch('azext_spring.managed_components.validators_managed_component.is_enterprise_tier', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_hostname', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_bearer_auth', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations.get_hostname', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations.get_bearer_auth', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_default_writer', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_prefix_writer', autospec=True)
def test_log_stream_without_instance_info_1(self, _get_prefix_writer_mock, _get_default_writer_mock,
Expand Down Expand Up @@ -381,8 +381,8 @@ def test_log_stream_without_instance_info_1(self, _get_prefix_writer_mock, _get_
@mock.patch('azext_spring.log_stream.log_stream_operations.requests', autospec=True)
@mock.patch('azext_spring.commands.cf_spring', autospec=True)
@mock.patch('azext_spring.managed_components.validators_managed_component.is_enterprise_tier', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_hostname', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_bearer_auth', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations.get_hostname', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations.get_bearer_auth', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_default_writer', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_prefix_writer', autospec=True)
def test_log_stream_without_instance_info_1(self, _get_prefix_writer_mock, _get_default_writer_mock,
Expand Down Expand Up @@ -426,8 +426,8 @@ def test_log_stream_without_instance_info_1(self, _get_prefix_writer_mock, _get_
@mock.patch('azext_spring.log_stream.log_stream_operations.iter_lines', autospec=True)
@mock.patch('azext_spring.log_stream.log_stream_operations.requests', autospec=True)
@mock.patch('azext_spring.managed_components.validators_managed_component.is_enterprise_tier', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_hostname', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_bearer_auth', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations.get_hostname', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations.get_bearer_auth', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_default_writer', autospec=True)
@mock.patch('azext_spring.managed_components.managed_component_operations._get_prefix_writer', autospec=True)
def test_log_stream_only_by_instance_name(self, _get_prefix_writer_mock, _get_default_writer_mock,
Expand Down

0 comments on commit f0f14b3

Please sign in to comment.