Skip to content

undo #3

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
logachev wants to merge 5 commits into
base: master
Choose a base branch
from
Open

undo #3

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
757a7c1
undo
logachev Sep 5, 2021
4e91f82
fix
logachev Sep 5, 2021
54d8d7e
Fix patches
logachev Sep 5, 2021
8696eba
mock
logachev Sep 5, 2021
3d81e1f
Merge branch 'master' into kirill/failure_investigate
Sep 14, 2021
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
27 changes: 5 additions & 22 deletions tools/c7n_azure/tests_azure/test_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
# SPDX-License-Identifier: Apache-2.0
import json
import os
import platform
import re
import sys
from importlib import reload

import pytest
from adal import AdalError
Expand Down Expand Up @@ -34,13 +31,6 @@ class SessionTest(BaseTest):
'data',
'test_auth_file_no_sub.json')

def setUp(self):
super(SessionTest, self).setUp()

def tearDown(self):
super(SessionTest, self).tearDown()
reload(sys.modules['c7n_azure.session'])

def mock_init(self, client_id, secret, tenant, resource):
pass

Expand Down Expand Up @@ -259,7 +249,7 @@ def xtest_get_function_target_subscription(self):
constants.ENV_CLIENT_SECRET: 'secret',
constants.ENV_FUNCTION_MANAGEMENT_GROUP_NAME: 'test'
}, clear=True):
with patch('c7n_azure.utils.ManagedGroupHelper.get_subscriptions_list',
with patch('c7n_azure.session.ManagedGroupHelper.get_subscriptions_list',
return_value=[]):
s = Session()
self.assertEqual(s.get_function_target_subscription_name(), 'test')
Expand Down Expand Up @@ -301,9 +291,8 @@ def test_get_client_us_gov(self):
self.assertEqual(AZURE_US_GOV_CLOUD.endpoints.management + ".default",
client._client._config.credential_scopes[0])

@patch('c7n_azure.utils.get_keyvault_secret', return_value='{}')
@patch('c7n_azure.session.get_keyvault_secret', return_value='{}')
def test_compare_auth_params(self, _1):
reload(sys.modules['c7n_azure.session'])
with patch.dict(os.environ,
{
constants.ENV_TENANT_ID: 'tenant',
Expand All @@ -324,10 +313,9 @@ def test_compare_auth_params(self, _1):
self.assertFalse(file_params.pop('enable_cli_auth', None))
self.assertEqual(env_params, file_params)

@patch('c7n_azure.utils.get_keyvault_secret',
@patch('c7n_azure.session.get_keyvault_secret',
return_value='{"client_id": "client", "client_secret": "secret"}')
def test_kv_patch(self, _1):
reload(sys.modules['c7n_azure.session'])
with patch.dict(os.environ,
{
constants.ENV_TENANT_ID: 'tenant',
Expand All @@ -343,11 +331,9 @@ def test_kv_patch(self, _1):
self.assertEqual(auth_params.get('client_id'), 'client')
self.assertEqual(auth_params.get('client_secret'), 'secret')

@patch('c7n_azure.utils.get_keyvault_secret')
@patch('c7n_azure.session.get_keyvault_secret')
@patch('c7n_azure.session.log.error')
def test_initialize_session_kv_authentication_error(self, mock_log, mock_get_kv_secret):
reload(sys.modules['c7n_azure.session'])

with self.assertRaises(SystemExit):
mock_get_kv_secret.side_effect = HTTPError()

Expand Down Expand Up @@ -380,10 +366,7 @@ def test_get_auth_endpoint_storage(self):
result = s.get_auth_endpoint(constants.STORAGE_AUTH_ENDPOINT)
self.assertEqual('https://storage.azure.com/', result)

# this seems to be failing on windows ci infra
# https://github.com/cloud-custodian/cloud-custodian/runs/3506742597
@pytest.mark.skipif(platform.system() == 'Windows', reason="Windows CI Issue")
@patch('c7n_azure.utils.C7nRetryPolicy.__init__', return_value=None)
@patch('c7n_azure.session.C7nRetryPolicy.__init__', return_value=None)
def test_retry_policy_override(self, c7n_retry):
s = Session()
s.client('azure.mgmt.compute.ComputeManagementClient')
Expand Down