7af22df7dc
We have seen issues with dangling threads in Armada. This is likely due to a bug [0] in the version of gRPC that we were pinned to. This patchset: - moves us to the latest versions of the gRPC python libraries which add a new `channel.close()` method to cleanup channels. - implements the python context manager api in the tiller handler - uses the context manager api to explicitly scope tiller channel creation and cleanup to each Armada API and CLI call. This also fixes a couples issues with error handling introduced in [1]. [0]: https://github.com/grpc/grpc/issues/14338 [1]: https://review.openstack.org/#/c/610384 Change-Id: I2577a20fc76c397aa33157dc12a0e1d36f49733e
102 lines
3.5 KiB
Python
102 lines
3.5 KiB
Python
# Copyright 2017 AT&T Intellectual Property. All other rights reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the 'License');
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an 'AS IS' BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import json
|
|
|
|
import mock
|
|
|
|
from armada import api
|
|
from armada.common.policies import base as policy_base
|
|
from armada.tests import test_utils
|
|
from armada.tests.unit.api import base
|
|
|
|
|
|
class RollbackReleaseControllerTest(base.BaseControllerTest):
|
|
|
|
@mock.patch.object(api, 'Tiller')
|
|
def test_rollback_controller_pass(self, mock_tiller):
|
|
rules = {'armada:rollback_release': '@'}
|
|
self.policy.set_rules(rules)
|
|
|
|
m_tiller = mock_tiller.return_value
|
|
m_tiller.__enter__.return_value = m_tiller
|
|
rollback_release = m_tiller.rollback_release
|
|
rollback_release.return_value = None
|
|
|
|
tiller_host = 'host'
|
|
tiller_port = '8080'
|
|
tiller_namespace = 'tn'
|
|
release = 'test-release'
|
|
version = '2'
|
|
dry_run = 'false'
|
|
wait = 'true'
|
|
timeout = '123'
|
|
force = 'true'
|
|
recreate_pods = 'true'
|
|
|
|
resp = self.app.simulate_post(
|
|
'/api/v1.0/rollback/{}'.format(release),
|
|
params={
|
|
'tiller_host': tiller_host,
|
|
'tiller_port': tiller_port,
|
|
'tiller_namespace': tiller_namespace,
|
|
'dry_run': dry_run,
|
|
'version': version,
|
|
'wait': wait,
|
|
'timeout': timeout,
|
|
'force': force,
|
|
'recreate_pods': recreate_pods
|
|
})
|
|
|
|
mock_tiller.assert_called_once_with(
|
|
tiller_host=tiller_host,
|
|
tiller_port=8080,
|
|
tiller_namespace=tiller_namespace,
|
|
dry_run=False)
|
|
|
|
rollback_release.assert_called_once_with(
|
|
release, 2, wait=True, timeout=123, force=True, recreate_pods=True)
|
|
|
|
self.assertEqual(200, resp.status_code)
|
|
self.assertEqual('Rollback of test-release complete.',
|
|
json.loads(resp.text)['message'])
|
|
m_tiller.__exit__.assert_called()
|
|
|
|
|
|
@test_utils.attr(type=['negative'])
|
|
class RollbackReleaseControllerNegativeTest(base.BaseControllerTest):
|
|
|
|
@mock.patch.object(api, 'Tiller')
|
|
def test_rollback_controller_tiller_exc_return_500(self, mock_tiller):
|
|
rules = {'armada:rollback_release': '@'}
|
|
self.policy.set_rules(rules)
|
|
|
|
mock_tiller.side_effect = Exception
|
|
|
|
resp = self.app.simulate_post('/api/v1.0/rollback/fake-release')
|
|
self.assertEqual(500, resp.status_code)
|
|
|
|
|
|
@test_utils.attr(type=['negative'])
|
|
class RollbackReleaseControllerNegativeRbacTest(base.BaseControllerTest):
|
|
|
|
def test_rollback_release_insufficient_permissions(self):
|
|
"""Tests the GET /api/v1.0/rollback/{release} endpoint returns 403
|
|
following failed authorization.
|
|
"""
|
|
rules = {'armada:rollback_release': policy_base.RULE_ADMIN_REQUIRED}
|
|
self.policy.set_rules(rules)
|
|
resp = self.app.simulate_post('/api/v1.0/rollback/fake-release')
|
|
self.assertEqual(403, resp.status_code)
|