Permalink
Browse files

Migrate balrog.submitter.api to balrogclient (#159). r=bhearsum

  • Loading branch information...
srfraser authored and mozbhearsum committed Oct 24, 2016
1 parent d845980 commit e4bf9882aa2b5165028d73bb3d5283810655abd3
View
@@ -108,6 +108,32 @@ tasks:
owner: "{{ event.head.user.email }}"
source: "{{ event.head.repo.url }}"
- provisionerId: "{{ taskcluster.docker.provisionerId }}"
workerType: "{{ taskcluster.docker.workerType }}"
payload:
maxRunTime: 1200
image: "rail/python-test-runner"
env:
NO_VOLUME_MOUNT: 1
command:
- "/bin/bash"
- "-c"
- "git clone $GITHUB_HEAD_REPO_URL && cd balrog && git checkout $GITHUB_HEAD_BRANCH && cd client && bash run-tests.sh"
features:
dind: true
extra:
github:
env: true
events:
- pull_request.*
- push
metadata:
name: Balrog Python Client Tests
description: Balrog Python Client Tests
owner: "{{ event.head.user.email }}"
source: "{{ event.head.repo.url }}"
# TODO: make this depend on the test task after https://bugzilla.mozilla.org/show_bug.cgi?id=1252144 is fixed
- provisionerId: "{{ taskcluster.docker.provisionerId }}"
workerType: "{{ taskcluster.docker.workerType }}"
View
@@ -0,0 +1,9 @@
FROM rail/python-test-runner
WORKDIR /app
COPY balrogclient/ /app/balrogclient/
COPY setup.py /app/
COPY tox.ini /app/
@@ -0,0 +1,3 @@
from balrogclient.api import is_csrf_token_expired, SingleLocale, Release, Rule
__all__ = [ 'is_csrf_token_expired', 'SingleLocale', 'Release', 'Rule' ]
View
@@ -0,0 +1,238 @@
"""
Balrog API wrapper
"""
import json
import logging
import time
import requests
def is_csrf_token_expired(token):
"""Checks whether a CSRF token is still valid
Expects a token of the form "YYYYMMDDHHMMSS##..."
Returns:
True if the token has expired
False if the token is still valid
"""
from datetime import datetime
expiry = token.split('##')[0]
if expiry <= datetime.now().strftime('%Y%m%d%H%M%S'):
return True
return False
class API(object):
"""A class that knows how to make requests to a Balrog server, including
pre-retrieving CSRF tokens and data versions.
url_template: The URL to submit to when request() is called. Standard
Python string interpolation can be used here in
combination with url_template_vars.
prerequest_url_template: Before submitting the real request, a HEAD
operation will be done on this URL. If the
HEAD request succeeds, it is expected that
there will be X-CSRF-Token and X-Data-Version
headers in the response. If the HEAD request
results in a 404, another HEAD request to
/csrf_token will be made in attempt to get a
CSRF Token. This URL can use string
interpolation the same way url_template can.
In some cases this may be the same as the
url_template.
"""
verify = False
auth = None
url_template = None
prerequest_url_template = None
url_template_vars = None
def __init__(self, api_root='https://aus4-admin-dev.allizom.org/api',
auth=None, ca_certs=True, timeout=60,
raise_exceptions=True):
""" Creates an API object which wraps REST API of Balrog server.
api_root: API root URL of balrog server
auth : a tuple of (username, password) or None
ca_certs: CA bundle. It follows python-requests `verify' usage.
If set to False, no SSL verification is done.
If set to True, it tries to load a CA bundle from certifi
module.
If set to string, puthon-requests uses it as a pth to path to
CA bundle.
timeout : request timeout
raise_exceptions: controls exception handling of python-requests.
"""
self.api_root = api_root.rstrip('/')
self.verify = ca_certs
assert isinstance(auth, tuple) or auth is None, \
"auth should be set to tuple or None"
self.auth = auth
self.timeout = timeout
self.raise_exceptions = raise_exceptions
self.session = requests.session()
self.csrf_token = None
def request(self, data=None, method='GET'):
url = self.api_root + self.url_template % self.url_template_vars
prerequest_url = self.api_root + \
self.prerequest_url_template % self.url_template_vars
# If we'll be modifying things, do a GET first to get a CSRF token
# and possibly a data_version.
if method != 'GET' and method != 'HEAD':
# Use the URL of the resource we're going to modify first,
# because we'll need a CSRF token, and maybe its data version.
try:
res = self.do_request(prerequest_url, None, 'HEAD')
# If a data_version was specified we shouldn't overwrite it
# because the caller may be acting on a modified version of
# a specific older version of the data.
if 'data_version' not in data:
data['data_version'] = res.headers['X-Data-Version']
# We may already have a non-expired CSRF token, but it's
# faster/easier just to set it again even if we do, since
# we've already made the request.
data['csrf_token'] = self.csrf_token = res.headers[
'X-CSRF-Token']
except requests.HTTPError as excp:
# However, if the resource doesn't exist yet we may as well
# not bother doing another request solely for a token unless
# we don't have a valid one already.
if excp.response.status_code != 404:
raise
if not self.csrf_token or is_csrf_token_expired(self.csrf_token):
res = self.do_request(
self.api_root + '/csrf_token', None, 'HEAD')
data['csrf_token'] = self.csrf_token = res.headers[
'X-CSRF-Token']
return self.do_request(url, data, method)
def do_request(self, url, data, method):
logging.debug('Balrog request to %s', url)
if data is not None and 'csrf_token' in data:
sanitised_data = data.copy()
del sanitised_data['csrf_token']
logging.debug('Data sent: %s', sanitised_data)
else:
logging.debug('Data sent: %s', data)
headers = {'Accept-Encoding': 'application/json',
'Accept': 'application/json'}
before = time.time()
req = self.session.request(
method=method, url=url, data=data, timeout=self.timeout,
verify=self.verify, auth=self.auth, headers=headers)
try:
if self.raise_exceptions:
req.raise_for_status()
return req
except requests.HTTPError as excp:
logging.error('Caught HTTPError: %s', excp.response.content)
raise
finally:
stats = {
"timestamp": time.time(),
"method": method,
"url": url,
"status_code": req.status_code,
"elapsed_secs": time.time() - before,
}
logging.debug('REQUEST STATS: %s', json.dumps(stats))
def get_data(self):
resp = self.request()
return (json.loads(resp.content), resp.headers['X-Data-Version'])
class Release(API):
url_template = '/releases/%(name)s'
prerequest_url_template = '/releases/%(name)s'
def __init__(self, name, **kwargs):
super(Release, self).__init__(**kwargs)
self.name = name
self.url_template_vars = dict(name=name)
def update_release(self, product, hashFunction, releaseData,
data_version=None, schemaVersion=None):
data = dict(name=self.name, product=product,
hashFunction=hashFunction, data=releaseData)
if data_version:
data['data_version'] = data_version
if schemaVersion:
data['schema_version'] = schemaVersion
return self.request(method='POST', data=data)
class SingleLocale(API):
url_template = '/releases/%(name)s/builds/%(build_target)s/%(locale)s'
prerequest_url_template = '/releases/%(name)s'
def __init__(self, name, build_target, locale, **kwargs):
super(SingleLocale, self).__init__(**kwargs)
self.name = name
self.build_target = build_target
self.locale = locale
self.url_template_vars = dict(name=name, build_target=build_target,
locale=locale)
# keep a copy to be used in get_data()
self.release_kwargs = kwargs
def get_data(self):
data, data_version = {}, None
# If the locale-specific API end point returns 404, we have to use the
# top level blob to get the data version. Because this requires 2 not
# atomic HTTP requests, we start with the top level blob and use its
# data version.
top_level = Release(name=self.name, **self.release_kwargs)
# Use data version from the top level blob
try:
_, data_version = top_level.get_data()
except requests.HTTPError as excp:
if excp.response.status_code == 404:
# top level blob doesn't exist, assume there is no data
return data, data_version
else:
raise
# Got data version. Try to get data from the locale specific blob.
# Using data version from the top level blob prevents possible race
# conditions if another client updates the locale blob between the
# first request and the call below.
try:
data, _ = super(SingleLocale, self).get_data()
return data, data_version
except requests.HTTPError as excp:
if excp.response.status_code == 404:
# locale blob doesn't exist, no data
return data, data_version
else:
raise
def update_build(self, product, hashFunction, buildData,
alias=None, schemaVersion=None, data_version=None):
data = dict(product=product, data=buildData, hashFunction=hashFunction)
if alias:
data['alias'] = alias
if data_version:
data['data_version'] = data_version
if schemaVersion:
data['schema_version'] = schemaVersion
return self.request(method='PUT', data=data)
class Rule(API):
"""Update Balrog rules"""
url_template = '/rules/%(rule_id)s'
prerequest_url_template = '/rules/%(rule_id)s'
def __init__(self, rule_id, **kwargs):
super(Rule, self).__init__(**kwargs)
self.rule_id = rule_id
self.url_template_vars = dict(rule_id=rule_id)
def update_rule(self, **rule_data):
"""wrapper for self.request"""
return self.request(method='POST', data=rule_data)
No changes.
@@ -0,0 +1,30 @@
try:
# Python 2.6 backport with assertDictEqual()
import unittest2 as unittest
except ImportError:
import unittest
from balrogclient import is_csrf_token_expired
class TestCsrfTokenExpiry(unittest.TestCase):
"""
is_csrf_token_expired expects a token
of the form %Y%m%d%H%M%S##foo
"""
def _generate_date_string(self, days_offset=0):
from datetime import datetime, timedelta
return (datetime.now() + timedelta(days=days_offset)).strftime('%Y%m%d%H%M%S')
def test_valid_csrf_token_has_not_expired(self):
tomorrow = self._generate_date_string(days_offset=1)
self.assertFalse(is_csrf_token_expired(tomorrow))
def test_valid_csrf_token_has_expired(self):
yesterday = self._generate_date_string(days_offset=-1)
self.assertTrue(is_csrf_token_expired(yesterday))
def test_invalid_csrf_token(self):
pass
View
@@ -0,0 +1,14 @@
#!/bin/bash
IMAGE='balrogclient-test'
docker build -t ${IMAGE} -f Dockerfile.dev .
if [ -n "${NO_VOLUME_MOUNT}" ]; then
echo "Running tests without volume mount"
docker run --rm ${IMAGE} tox -c /app/tox.ini $@
else
echo "Running tests with volume mount"
docker run --rm -v $(pwd):/app ${IMAGE} tox -c /app/tox.ini $@
fi
View
@@ -0,0 +1,19 @@
#! /usr/bin/env python
from setuptools import setup, find_packages
setup(
name="balrogclient",
version="0.0.1",
description="Balrog Admin API Client",
author="Release Engineers",
author_email="release@mozilla.com",
packages=['balrogclient'],
test_suite='balrogclient.test',
install_requires=[
'requests',
],
include_package_data=True,
)
Oops, something went wrong.

0 comments on commit e4bf988

Please sign in to comment.