diff --git a/endpoints/web.py b/endpoints/web.py index 884f4e6ea..7e61589af 100644 --- a/endpoints/web.py +++ b/endpoints/web.py @@ -9,10 +9,11 @@ from health.healthcheck import get_healthchecker from data import model from data.model.oauth import DatabaseAuthorizationProvider -from app import app, billing as stripe, build_logs, avatar, signer +from app import app, billing as stripe, build_logs, avatar, signer, log_archive from auth.auth import require_session_login, process_oauth from auth.permissions import (AdministerOrganizationPermission, ReadRepositoryPermission, - SuperUserPermission, AdministerRepositoryPermission) + SuperUserPermission, AdministerRepositoryPermission, + ModifyRepositoryPermission) from util.invoice import renderInvoiceToPdf from util.seo import render_snapshot @@ -248,6 +249,31 @@ def robots(): return send_from_directory('static', 'robots.txt') +@web.route('/buildlogs/', methods=['GET']) +@route_show_if(features.BUILD_SUPPORT) +@require_session_login +def buildlogs(build_uuid): + build = model.get_repository_build(build_uuid) + if not build: + abort(403) + + repo = build.repository + if not ModifyRepositoryPermission(repo.namespace_user.username, repo.name).can(): + abort(403) + + # If the logs have been archived, just return a URL of the completed archive + if build.logs_archived: + return redirect(log_archive.get_file_url(build.uuid)) + + _, logs = build_logs.get_log_entries(build.uuid, 0) + response = jsonify({ + 'logs': [log for log in logs] + }) + + response.headers["Content-Disposition"] = "attachment;filename=" + build.uuid + ".json" + return response + + @web.route('/receipt', methods=['GET']) @route_show_if(features.BILLING) @require_session_login diff --git a/requirements-nover.txt b/requirements-nover.txt index ea1d0b7b7..5887736f4 100644 --- a/requirements-nover.txt +++ b/requirements-nover.txt @@ -21,7 +21,6 @@ paramiko xhtml2pdf redis hiredis -docker-py flask-restful==0.2.12 jsonschema git+https://github.com/NateFerrero/oauth2lib.git @@ -51,4 +50,6 @@ pygpgme cachetools mock psutil -stringscore \ No newline at end of file +stringscore +python-swiftclient +python-keystoneclient \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 4bf48a27f..88cd19748 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,67 +1,90 @@ -APScheduler==3.0.1 +APScheduler==3.0.3 +Babel==1.3 Flask==0.10.1 Flask-Login==0.2.11 Flask-Mail==0.9.1 Flask-Principal==0.4.0 Flask-RESTful==0.2.12 Jinja2==2.7.3 -LogentriesLogger==0.2.1 -Mako==1.0.0 +Logentries==0.7 +Mako==1.0.1 MarkupSafe==0.23 -Pillow==2.7.0 -PyMySQL==0.6.3 +Pillow==2.8.1 +PyMySQL==0.6.6 PyPDF2==1.24 PyYAML==3.11 -SQLAlchemy==0.9.8 -WebOb==1.4 -Werkzeug==0.9.6 -aiowsgi==0.3 -alembic==0.7.4 +SQLAlchemy==1.0.3 +WebOb==1.4.1 +Werkzeug==0.10.4 +aiowsgi==0.5 +alembic==0.7.5.post2 +argparse==1.3.0 autobahn==0.9.3-3 backports.ssl-match-hostname==3.4.0.2 beautifulsoup4==4.3.2 blinker==1.3 -boto==2.35.1 +boto==2.38.0 cachetools==1.0.0 -docker-py==0.7.1 -ecdsa==0.11 +certifi==2015.04.28 +cffi==0.9.2 +cryptography==0.8.2 +ecdsa==0.13 +enum34==1.0.4 +funcparserlib==0.3.6 futures==2.2.0 gevent==1.0.1 gipc==0.5.0 greenlet==0.4.5 gunicorn==18.0 -hiredis==0.1.5 -html5lib==0.999 +hiredis==0.2.0 +html5lib==0.99999 +iso8601==0.1.10 itsdangerous==0.24 jsonschema==2.4.0 -marisa-trie==0.7 -mixpanel-py==3.2.1 +marisa-trie==0.7.2 +mixpanel-py==4.0.2 mock==1.0.1 +msgpack-python==0.4.6 +netaddr==0.7.14 +netifaces==0.10.4 +oauthlib==0.7.2 +oslo.config==1.11.0 +oslo.i18n==1.6.0 +oslo.serialization==1.5.0 +oslo.utils==1.5.0 paramiko==1.15.2 -peewee==2.4.7 +pbr==0.11.0 +peewee==2.6.0 +prettytable==0.7.2 psutil==2.2.1 -psycopg2==2.5.4 +psycopg2==2.6 py-bcrypt==0.4 +pyOpenSSL==0.15.1 +pyasn1==0.1.7 +pycparser==2.12 pycrypto==2.6.1 -python-dateutil==2.4.0 +pygpgme==0.3 +python-dateutil==2.4.2 +python-keystoneclient==1.4.0 python-ldap==2.4.19 python-magic==0.4.6 -pygpgme==0.3 -pytz==2014.10 -pyOpenSSL==0.14 -raven==5.1.1 +python-swiftclient==2.4.0 +pytz==2015.2 +raven==5.3.0 redis==2.10.3 reportlab==2.7 -requests==2.5.1 +requests==2.6.2 requests-oauthlib==0.4.2 +simplejson==3.7.1 six==1.9.0 +stevedore==1.4.0 stringscore==0.1.0 -stripe==1.20.1 +stripe==1.22.2 trollius==1.0.4 -tzlocal==1.1.2 -urllib3==1.10.2 +tzlocal==1.1.3 +urllib3==1.10.3 waitress==0.8.9 -websocket-client==0.23.0 +websocket-client==0.30.0 wsgiref==0.1.2 xhtml2pdf==0.0.6 git+https://github.com/DevTable/aniso8601-fake.git @@ -73,4 +96,4 @@ git+https://github.com/DevTable/python-etcd.git git+https://github.com/NateFerrero/oauth2lib.git git+https://github.com/coreos/py-bitbucket.git git+https://github.com/coreos/pyapi-gitlab.git -git+https://github.com/coreos/mockldap.git +git+https://github.com/coreos/mockldap.git \ No newline at end of file diff --git a/static/css/core-ui.css b/static/css/core-ui.css index 58ab72b81..adf6bc084 100644 --- a/static/css/core-ui.css +++ b/static/css/core-ui.css @@ -388,6 +388,29 @@ a:focus { width: 400px; } +.config-map-field-element table { + margin-bottom: 10px; +} + +.config-map-field-element .form-control-container { + border-top: 1px solid #eee; + padding-top: 10px; +} + +.config-map-field-element .form-control-container select, .config-map-field-element .form-control-container input { + margin-bottom: 10px; +} + +.config-map-field-element .empty { + color: #ccc; + margin-bottom: 10px; + display: block; +} + +.config-map-field-element .item-title { + font-weight: bold; +} + .config-contact-field { margin-bottom: 4px; } diff --git a/static/css/directives/ui/build-logs-view.css b/static/css/directives/ui/build-logs-view.css index e69a3ad57..746a6c1d7 100644 --- a/static/css/directives/ui/build-logs-view.css +++ b/static/css/directives/ui/build-logs-view.css @@ -157,6 +157,24 @@ transition: all 0.15s ease-in-out; } +.build-logs-view .download-button i.fa { + margin-right: 10px; +} + +.build-logs-view .download-button { + position: absolute; + top: 6px; + right: 124px; + z-index: 2; + transition: all 0.15s ease-in-out; +} + +.build-logs-view .download-button:not(:hover) { + background: transparent; + border: 1px solid transparent; + color: #ddd; +} + .build-logs-view .copy-button:not(.zeroclipboard-is-hover) { background: transparent; border: 1px solid transparent; diff --git a/static/directives/build-logs-view.html b/static/directives/build-logs-view.html index f99a7eb00..aa79cec8a 100644 --- a/static/directives/build-logs-view.html +++ b/static/directives/build-logs-view.html @@ -3,6 +3,12 @@ Copy Logs + + Download Logs + + diff --git a/static/directives/config/config-map-field.html b/static/directives/config/config-map-field.html new file mode 100644 index 000000000..7089e2010 --- /dev/null +++ b/static/directives/config/config-map-field.html @@ -0,0 +1,20 @@ +
+ + + + + + +
{{ key }}{{ value }} + Remove +
+ No entries defined +
+ Add Key-Value: + + + +
+
diff --git a/static/directives/config/config-setup-tool.html b/static/directives/config/config-setup-tool.html index 978be4c74..065d55134 100644 --- a/static/directives/config/config-setup-tool.html +++ b/static/directives/config/config-setup-tool.html @@ -189,6 +189,7 @@ + @@ -197,10 +198,15 @@ {{ field.title }}: + + ng-if="field.kind == 'text'" + is-optional="field.optional">
diff --git a/static/directives/config/config-string-field.html b/static/directives/config/config-string-field.html index 7714fd541..703891f89 100644 --- a/static/directives/config/config-string-field.html +++ b/static/directives/config/config-string-field.html @@ -2,7 +2,7 @@
+ ng-pattern="getRegexp(pattern)" ng-required="!isOptional">
{{ errorMessage }}
diff --git a/static/directives/repository-events-table.html b/static/directives/repository-events-table.html index 5ec0a02db..a2331e7fe 100644 --- a/static/directives/repository-events-table.html +++ b/static/directives/repository-events-table.html @@ -15,10 +15,10 @@
No notifications have been setup for this repository.
-