From 716d7a737b0f69316cb6eecdd689e92232064e26 Mon Sep 17 00:00:00 2001 From: Jimmy Zelinskie Date: Mon, 24 Nov 2014 16:07:38 -0500 Subject: [PATCH] Strip whitespace from ALL the things. --- Bobfile | 2 +- app.py | 2 +- auth/scopes.py | 2 +- buildstatus/building.svg | 2 +- buildstatus/failed.svg | 2 +- buildstatus/none.svg | 2 +- buildstatus/ready.svg | 2 +- conf/gunicorn_local.py | 2 +- conf/gunicorn_registry.py | 2 +- conf/gunicorn_verbs.py | 2 +- conf/gunicorn_web.py | 2 +- conf/root-base.conf | 2 +- conf/server-base.conf | 4 +- config.py | 6 +- data/buildlogs.py | 2 +- ...4abf14783d_add_log_entry_kind_for_verbs.py | 2 +- ...c79d9_prepare_the_database_for_the_new_.py | 2 +- .../5a07499ce53f_set_up_initial_database.py | 2 +- data/model/__init__.py | 2 +- data/model/oauth.py | 4 +- data/queue.py | 2 +- data/userevent.py | 4 +- emails/base.html | 8 +- endpoints/api/__init__.py | 2 +- endpoints/api/billing.py | 10 +- endpoints/api/build.py | 4 +- endpoints/api/discovery.py | 6 +- endpoints/api/logs.py | 8 +- endpoints/api/organization.py | 32 +- endpoints/api/permission.py | 6 +- endpoints/api/prototype.py | 16 +- endpoints/api/repoemail.py | 2 +- endpoints/api/repository.py | 4 +- endpoints/api/repositorynotification.py | 4 +- endpoints/api/robot.py | 2 +- endpoints/api/search.py | 4 +- endpoints/api/subscribe.py | 4 +- endpoints/api/superuser.py | 6 +- endpoints/api/tag.py | 2 +- endpoints/api/team.py | 18 +- endpoints/api/trigger.py | 16 +- endpoints/api/user.py | 10 +- endpoints/csrf.py | 2 +- endpoints/index.py | 8 +- endpoints/notificationevent.py | 10 +- endpoints/notificationhelper.py | 2 +- endpoints/notificationmethod.py | 10 +- endpoints/trackhelper.py | 2 +- endpoints/trigger.py | 8 +- endpoints/verbs.py | 4 +- endpoints/web.py | 12 +- endpoints/webhooks.py | 2 +- events/build_failure.html | 4 +- events/build_start.html | 2 +- events/build_success.html | 4 +- events/repo_push.html | 4 +- external_libraries.py | 4 +- features/__init__.py | 2 +- grunt/Gruntfile.js | 4 +- health/healthcheck.py | 8 +- initdb.py | 10 +- requirements-nover.txt | 2 +- screenshots/README.md | 2 +- static/css/quay.css | 42 +-- static/directives/angular-tour-ui.html | 2 +- static/directives/application-manager.html | 2 +- static/directives/billing-invoices.html | 2 +- static/directives/billing-options.html | 2 +- static/directives/build-log-error.html | 2 +- .../create-external-notification-dialog.html | 12 +- static/directives/docker-auth-dialog.html | 2 +- static/directives/dropdown-select.html | 2 +- static/directives/entity-reference.html | 2 +- static/directives/entity-search.html | 10 +- static/directives/external-login-button.html | 8 +- .../external-notification-view.html | 2 +- static/directives/header-bar.html | 6 +- static/directives/location-view.html | 2 +- static/directives/logs-view.html | 18 +- .../manual-trigger-build-dialog.html | 4 +- static/directives/markdown-input.html | 4 +- static/directives/namespace-selector.html | 2 +- static/directives/notification-bar.html | 2 +- static/directives/plan-manager.html | 8 +- static/directives/plans-table.html | 2 +- static/directives/popup-input-button.html | 4 +- static/directives/prototype-manager.html | 12 +- static/directives/repo-breadcrumb.html | 4 +- static/directives/robots-manager.html | 4 +- static/directives/setup-trigger-dialog.html | 14 +- static/directives/signin-form.html | 4 +- static/directives/step-view-step.html | 2 +- static/directives/step-view.html | 2 +- static/directives/tour-content.html | 10 +- static/directives/trigger-setup-github.html | 24 +- static/directives/user-setup.html | 4 +- static/img/500/background.svg | 2 +- static/img/500/ship.svg | 4 +- static/js/app.js | 306 +++++++++--------- static/js/controllers.js | 102 +++--- static/js/graphing.js | 76 ++--- static/js/tour.js | 14 +- static/js/untar.js | 8 +- static/partials/about.html | 2 +- static/partials/confirm-invite.html | 2 +- static/partials/contact.html | 2 +- static/partials/guide.html | 2 +- static/partials/image-view.html | 10 +- static/partials/landing-normal.html | 12 +- static/partials/landing.html | 2 +- static/partials/manage-application.html | 6 +- static/partials/new-organization.html | 6 +- static/partials/new-repo.html | 24 +- static/partials/org-admin.html | 12 +- static/partials/organizations.html | 2 +- static/partials/plans.html | 6 +- static/partials/repo-admin.html | 30 +- static/partials/repo-build.html | 6 +- static/partials/repo-list.html | 4 +- static/partials/security.html | 2 +- static/partials/super-user.html | 30 +- static/partials/team-view.html | 14 +- static/partials/user-admin.html | 18 +- static/partials/view-repo.html | 26 +- static/robots.txt | 2 +- static/sitemap.xml | 4 +- static/tutorial/create-container.html | 4 +- storage/basestorage.py | 6 +- storage/distributedstorage.py | 2 +- storage/fakestorage.py | 2 +- templates/500.html | 4 +- templates/base.html | 4 +- templates/disclaimer.html | 2 +- templates/index.html | 2 +- templates/message.html | 2 +- templates/oauthorize.html | 4 +- templates/privacy.html | 2 +- templates/tos.html | 36 +-- test/data/test.db | Bin 251904 -> 251904 bytes test/fulldbtest.sh | 2 +- test/test_api_usage.py | 138 ++++---- test/test_endpoint_security.py | 2 +- test/test_gc.py | 8 +- test/test_image_sharing.py | 2 +- test/test_streamlayerformat.py | 6 +- test/testconfig.py | 2 +- test/testlogs.py | 2 +- tools/emailinvoice.py | 2 +- tools/migratebranchregex.py | 2 +- tools/migrateimage.py | 2 +- tools/parsebuildpack.py | 2 +- tools/renderinvoice.py | 2 +- util/changes.py | 2 +- util/checksums.py | 2 +- util/dockerfileparse.py | 4 +- util/dockerloadformat.py | 8 +- util/gzipstream.py | 2 +- util/gzipwrap.py | 6 +- util/invoice.py | 8 +- util/morecollections.py | 2 +- util/queuefile.py | 4 +- util/queuemetrics.py | 2 +- util/queueprocess.py | 4 +- util/streamingjsonencoder.py | 16 +- util/streamlayerformat.py | 4 +- util/tarfileappender.py | 6 +- util/tarlayerformat.py | 4 +- util/useremails.py | 6 +- workers/diffsworker.py | 2 +- workers/dockerfilebuild.py | 4 +- workers/notificationworker.py | 4 +- 171 files changed, 807 insertions(+), 807 deletions(-) diff --git a/Bobfile b/Bobfile index 37f001b79..86b721675 100644 --- a/Bobfile +++ b/Bobfile @@ -19,4 +19,4 @@ version = 1 project = "builder" tags = ["git:short"] -# vim:ft=toml \ No newline at end of file +# vim:ft=toml diff --git a/app.py b/app.py index 33c22d818..908c2681e 100644 --- a/app.py +++ b/app.py @@ -29,7 +29,7 @@ from data.userevent import UserEventsBuilderModule class Config(BaseConfig): """ Flask config enhanced with a `from_yamlfile` method """ - + def from_yamlfile(self, config_file): with open(config_file) as f: c = yaml.load(f) diff --git a/auth/scopes.py b/auth/scopes.py index c71e5faa7..e2192a2bd 100644 --- a/auth/scopes.py +++ b/auth/scopes.py @@ -77,7 +77,7 @@ IMPLIED_SCOPES = { def scopes_from_scope_string(scopes): if not scopes: return {} - + return {ALL_SCOPES.get(scope, None) for scope in scopes.split(',')} diff --git a/buildstatus/building.svg b/buildstatus/building.svg index 6a2e8fc8c..dc7aeae7b 100644 --- a/buildstatus/building.svg +++ b/buildstatus/building.svg @@ -1 +1 @@ -Docker ImageDocker Imagebuildingbuilding \ No newline at end of file +Docker ImageDocker Imagebuildingbuilding \ No newline at end of file diff --git a/buildstatus/failed.svg b/buildstatus/failed.svg index 1a3d79f75..069d9f4e4 100644 --- a/buildstatus/failed.svg +++ b/buildstatus/failed.svg @@ -1 +1 @@ -Docker ImageDocker Imagebuild failedbuild failed \ No newline at end of file +Docker ImageDocker Imagebuild failedbuild failed \ No newline at end of file diff --git a/buildstatus/none.svg b/buildstatus/none.svg index 0f513d9cd..3c31d29b1 100644 --- a/buildstatus/none.svg +++ b/buildstatus/none.svg @@ -1 +1 @@ -Docker ImageDocker Imagenonenone \ No newline at end of file +Docker ImageDocker Imagenonenone \ No newline at end of file diff --git a/buildstatus/ready.svg b/buildstatus/ready.svg index 4ea770599..111262e3b 100644 --- a/buildstatus/ready.svg +++ b/buildstatus/ready.svg @@ -1 +1 @@ -Docker ImageDocker Imagereadyready \ No newline at end of file +Docker ImageDocker Imagereadyready \ No newline at end of file diff --git a/conf/gunicorn_local.py b/conf/gunicorn_local.py index 3d2a36844..aa16e63ec 100644 --- a/conf/gunicorn_local.py +++ b/conf/gunicorn_local.py @@ -4,4 +4,4 @@ worker_class = 'gevent' timeout = 2000 daemon = False logconfig = 'conf/logging.conf' -pythonpath = '.' \ No newline at end of file +pythonpath = '.' diff --git a/conf/gunicorn_registry.py b/conf/gunicorn_registry.py index 3a7d4462b..4f7bb37f2 100644 --- a/conf/gunicorn_registry.py +++ b/conf/gunicorn_registry.py @@ -4,4 +4,4 @@ worker_class = 'gevent' timeout = 2000 logconfig = 'conf/logging.conf' pythonpath = '.' -preload_app = True \ No newline at end of file +preload_app = True diff --git a/conf/gunicorn_verbs.py b/conf/gunicorn_verbs.py index c23b3f304..eaf8041df 100644 --- a/conf/gunicorn_verbs.py +++ b/conf/gunicorn_verbs.py @@ -3,4 +3,4 @@ workers = 4 timeout = 2000 logconfig = 'conf/logging.conf' pythonpath = '.' -preload_app = True \ No newline at end of file +preload_app = True diff --git a/conf/gunicorn_web.py b/conf/gunicorn_web.py index 919dfc88d..bdfa8001a 100644 --- a/conf/gunicorn_web.py +++ b/conf/gunicorn_web.py @@ -4,4 +4,4 @@ worker_class = 'gevent' timeout = 30 logconfig = 'conf/logging.conf' pythonpath = '.' -preload_app = True \ No newline at end of file +preload_app = True diff --git a/conf/root-base.conf b/conf/root-base.conf index 31c32d25d..be8072945 100644 --- a/conf/root-base.conf +++ b/conf/root-base.conf @@ -4,4 +4,4 @@ error_log /var/log/nginx/nginx.error.log; events { worker_connections 1024; accept_mutex off; -} \ No newline at end of file +} diff --git a/conf/server-base.conf b/conf/server-base.conf index 75c6594bb..da46a5d5f 100644 --- a/conf/server-base.conf +++ b/conf/server-base.conf @@ -24,7 +24,7 @@ location / { location /realtime { proxy_pass http://web_app_server; proxy_buffering off; - proxy_request_buffering off; + proxy_request_buffering off; } location /v1/ { @@ -59,4 +59,4 @@ location /v1/_ping { add_header X-Docker-Registry-Version 0.6.0; add_header X-Docker-Registry-Standalone 0; return 200 'true'; -} \ No newline at end of file +} diff --git a/config.py b/config.py index 506e23b74..4627dc9a2 100644 --- a/config.py +++ b/config.py @@ -49,9 +49,9 @@ class DefaultConfig(object): REGISTRY_TITLE = 'Quay.io' REGISTRY_TITLE_SHORT = 'Quay.io' CONTACT_INFO = [ - 'mailto:support@quay.io', - 'irc://chat.freenode.net:6665/quayio', - 'tel:+1-888-930-3475', + 'mailto:support@quay.io', + 'irc://chat.freenode.net:6665/quayio', + 'tel:+1-888-930-3475', 'https://twitter.com/quayio', ] diff --git a/data/buildlogs.py b/data/buildlogs.py index 6e24f501b..17e5b397f 100644 --- a/data/buildlogs.py +++ b/data/buildlogs.py @@ -48,7 +48,7 @@ class RedisBuildLogs(object): return self._redis.rpush(self._logs_key(build_id), json.dumps(log_obj)) - 1 def get_log_entries(self, build_id, start_index): - """ + """ Returns a tuple of the current length of the list and an iterable of the requested log entries. """ diff --git a/data/migrations/versions/204abf14783d_add_log_entry_kind_for_verbs.py b/data/migrations/versions/204abf14783d_add_log_entry_kind_for_verbs.py index 6765a6aef..981c46087 100644 --- a/data/migrations/versions/204abf14783d_add_log_entry_kind_for_verbs.py +++ b/data/migrations/versions/204abf14783d_add_log_entry_kind_for_verbs.py @@ -25,4 +25,4 @@ def downgrade(tables): (tables.logentrykind.delete() .where(tables.logentrykind.c.name == op.inline_literal('repo_verb'))) - ) \ No newline at end of file + ) diff --git a/data/migrations/versions/325a4d7c79d9_prepare_the_database_for_the_new_.py b/data/migrations/versions/325a4d7c79d9_prepare_the_database_for_the_new_.py index e3be811b6..d6bdcb35e 100644 --- a/data/migrations/versions/325a4d7c79d9_prepare_the_database_for_the_new_.py +++ b/data/migrations/versions/325a4d7c79d9_prepare_the_database_for_the_new_.py @@ -71,7 +71,7 @@ def upgrade(tables): op.create_index('repositorynotification_repository_id', 'repositorynotification', ['repository_id'], unique=False) op.create_index('repositorynotification_uuid', 'repositorynotification', ['uuid'], unique=False) op.add_column(u'notification', sa.Column('dismissed', sa.Boolean(), nullable=False)) - + # Manually add the new notificationkind types op.bulk_insert(tables.notificationkind, [ diff --git a/data/migrations/versions/5a07499ce53f_set_up_initial_database.py b/data/migrations/versions/5a07499ce53f_set_up_initial_database.py index 78d7674bd..0e786de14 100644 --- a/data/migrations/versions/5a07499ce53f_set_up_initial_database.py +++ b/data/migrations/versions/5a07499ce53f_set_up_initial_database.py @@ -114,7 +114,7 @@ def upgrade(tables): {'id':30, 'name':'create_prototype_permission'}, {'id':31, 'name':'modify_prototype_permission'}, {'id':32, 'name':'delete_prototype_permission'}, - + {'id':33, 'name':'setup_repo_trigger'}, {'id':34, 'name':'delete_repo_trigger'}, diff --git a/data/model/__init__.py b/data/model/__init__.py index 8258c9c94..f7c9ba24b 100644 --- a/data/model/__init__.py +++ b/data/model/__init__.py @@ -1 +1 @@ -from data.model.legacy import * \ No newline at end of file +from data.model.legacy import * \ No newline at end of file diff --git a/data/model/oauth.py b/data/model/oauth.py index 51bfc053e..8bdca1020 100644 --- a/data/model/oauth.py +++ b/data/model/oauth.py @@ -102,7 +102,7 @@ class DatabaseAuthorizationProvider(AuthorizationProvider): .get()) return found.data except OAuthAccessToken.DoesNotExist: - return None + return None def persist_authorization_code(self, client_id, code, scope): app = OAuthApplication.get(client_id=client_id) @@ -261,7 +261,7 @@ def list_access_tokens_for_user(user): .join(User) .where(OAuthAccessToken.authorized_user == user)) - return query + return query def list_applications_for_org(org): diff --git a/data/queue.py b/data/queue.py index ea6b7d08f..159bd56ce 100644 --- a/data/queue.py +++ b/data/queue.py @@ -44,7 +44,7 @@ class WorkQueue(object): def update_metrics(self): if self._reporter is None: return - + with self._transaction_factory(db): now = datetime.utcnow() name_match_query = self._name_match_query() diff --git a/data/userevent.py b/data/userevent.py index 508ea572f..5523da2e5 100644 --- a/data/userevent.py +++ b/data/userevent.py @@ -102,13 +102,13 @@ class UserEventListener(object): data = None try: - data = json.loads(item['data'] or '{}') + data = json.loads(item['data'] or '{}') except: pass if data: yield event_id, data - + def stop(self): """ Unsubscribes from the channel(s). Should be called once the connection diff --git a/emails/base.html b/emails/base.html index 33dac53de..e01343d53 100644 --- a/emails/base.html +++ b/emails/base.html @@ -22,11 +22,11 @@
- +
- +
{{ app_title }}
{{ app_title }}
- +
@@ -37,7 +37,7 @@ {% block content %}{% endblock %}
- + diff --git a/endpoints/api/__init__.py b/endpoints/api/__init__.py index 1943051e0..b523cf4c2 100644 --- a/endpoints/api/__init__.py +++ b/endpoints/api/__init__.py @@ -289,7 +289,7 @@ def require_fresh_login(func): if not user.password_hash or last_login >= valid_span: return func(*args, **kwargs) - + raise FreshLoginRequired() return wrapped diff --git a/endpoints/api/billing.py b/endpoints/api/billing.py index c41bcec77..c246e4475 100644 --- a/endpoints/api/billing.py +++ b/endpoints/api/billing.py @@ -84,7 +84,7 @@ def get_invoices(customer_id): 'total': i.total, 'plan': i.lines.data[0].plan.id if i.lines.data[0].plan else None } - + try: invoices = billing.Invoice.all(customer=customer_id, count=12) except stripe.APIConnectionError as e: @@ -247,7 +247,7 @@ class UserPlan(ApiResource): except stripe.APIConnectionError as e: abort(503, message='Cannot contact Stripe') - if cus.subscription: + if cus.subscription: return subscription_view(cus.subscription, private_repos) return { @@ -313,7 +313,7 @@ class OrganizationPlan(ApiResource): except stripe.APIConnectionError as e: abort(503, message='Cannot contact Stripe') - if cus.subscription: + if cus.subscription: return subscription_view(cus.subscription, private_repos) return { @@ -338,7 +338,7 @@ class UserInvoiceList(ApiResource): user = get_authenticated_user() if not user.stripe_id: raise NotFound() - + return get_invoices(user.stripe_id) @@ -356,7 +356,7 @@ class OrgnaizationInvoiceList(ApiResource): organization = model.get_organization(orgname) if not organization.stripe_id: raise NotFound() - + return get_invoices(organization.stripe_id) raise Unauthorized() diff --git a/endpoints/api/build.py b/endpoints/api/build.py index 33398c15c..8eb565f50 100644 --- a/endpoints/api/build.py +++ b/endpoints/api/build.py @@ -42,7 +42,7 @@ def user_view(user): def trigger_view(trigger): - if trigger and trigger.uuid: + if trigger and trigger.uuid: config_dict = get_trigger_config(trigger) build_trigger = BuildTrigger.get_trigger_for_service(trigger.service.name) return { @@ -200,7 +200,7 @@ class RepositoryBuildStatus(RepositoryParamResource): if (not build or build.repository.name != repository or build.repository.namespace_user.username != namespace): raise NotFound() - + can_write = ModifyRepositoryPermission(namespace, repository).can() return build_status_view(build, can_write) diff --git a/endpoints/api/discovery.py b/endpoints/api/discovery.py index c3525639f..4e0ff56b1 100644 --- a/endpoints/api/discovery.py +++ b/endpoints/api/discovery.py @@ -39,7 +39,7 @@ def swagger_route_data(include_internal=False, compact=False): if 'view_class' in dir(endpoint_method): view_class = endpoint_method.view_class - + param_data_map = {} if '__api_path_params' in dir(view_class): param_data_map = view_class.__api_path_params @@ -126,7 +126,7 @@ def swagger_route_data(include_internal=False, compact=False): if not internal or (internal and include_internal): # Swagger requires valid nicknames on all operations. - if new_operation.get('nickname'): + if new_operation.get('nickname'): operations.append(new_operation) else: logger.debug('Operation missing nickname: %s' % method) @@ -149,7 +149,7 @@ def swagger_route_data(include_internal=False, compact=False): if not internal or (internal and include_internal): apis.append(new_resource) - + # If compact form was requested, simply return the APIs. if compact: return {'apis': apis} diff --git a/endpoints/api/logs.py b/endpoints/api/logs.py index 8585339e3..271ca9d02 100644 --- a/endpoints/api/logs.py +++ b/endpoints/api/logs.py @@ -15,7 +15,7 @@ def log_view(log): view = { 'kind': log.kind.name, 'metadata': json.loads(log.metadata_json), - 'ip': log.ip, + 'ip': log.ip, 'datetime': format_date(log.datetime), } @@ -40,7 +40,7 @@ def get_logs(start_time, end_time, performer_name=None, repository=None, namespa except ValueError: start_time = None - if not start_time: + if not start_time: start_time = datetime.today() - timedelta(7) # One week if end_time: @@ -49,8 +49,8 @@ def get_logs(start_time, end_time, performer_name=None, repository=None, namespa end_time = end_time + timedelta(days=1) except ValueError: end_time = None - - if not end_time: + + if not end_time: end_time = datetime.today() logs = model.list_logs(start_time, end_time, performer=performer, repository=repository, diff --git a/endpoints/api/organization.py b/endpoints/api/organization.py index f6a381ace..954500735 100644 --- a/endpoints/api/organization.py +++ b/endpoints/api/organization.py @@ -143,7 +143,7 @@ class Organization(ApiResource): org = model.get_organization(orgname) except model.InvalidOrganizationException: raise NotFound() - + org_data = request.get_json() if 'invoice_email' in org_data: logger.debug('Changing invoice_email for organization: %s', org.username) @@ -153,10 +153,10 @@ class Organization(ApiResource): new_email = org_data['email'] if model.find_user_by_email(new_email): raise request_error(message='E-mail address already used') - + logger.debug('Changing email address for organization: %s', org.username) model.update_email(org, new_email) - + teams = model.get_teams_within_org(org) return org_view(org, teams) raise Unauthorized() @@ -186,13 +186,13 @@ class OrgPrivateRepositories(ApiResource): plan = get_plan(cus.subscription.plan.id) if plan: repos_allowed = plan['privateRepos'] - + data['privateAllowed'] = (private_repos < repos_allowed) - + if AdministerOrganizationPermission(orgname).can(): data['privateCount'] = private_repos - + return data raise Unauthorized() @@ -211,19 +211,19 @@ class OrgnaizationMemberList(ApiResource): org = model.get_organization(orgname) except model.InvalidOrganizationException: raise NotFound() - + # Loop to create the members dictionary. Note that the members collection # will return an entry for *every team* a member is on, so we will have # duplicate keys (which is why we pre-build the dictionary). members_dict = {} - members = model.get_organization_members_with_teams(org) + members = model.get_organization_members_with_teams(org) for member in members: if not member.user.username in members_dict: members_dict[member.user.username] = {'name': member.user.username, 'kind': 'user', 'is_robot': member.user.robot, 'teams': []} - + members_dict[member.user.username]['teams'].append(member.team.name) return {'members': members_dict} @@ -244,7 +244,7 @@ class OrganizationMember(ApiResource): org = model.get_organization(orgname) except model.InvalidOrganizationException: raise NotFound() - + member_dict = None member_teams = model.get_organization_members_with_teams(org, membername=membername) for member in member_teams: @@ -253,7 +253,7 @@ class OrganizationMember(ApiResource): 'kind': 'user', 'is_robot': member.user.robot, 'teams': []} - + member_dict['teams'].append(member.team.name) if not member_dict: @@ -364,7 +364,7 @@ class OrganizationApplications(ApiResource): org = model.get_organization(orgname) except model.InvalidOrganizationException: raise NotFound() - + app_data = request.get_json() application = model.oauth.create_application( org, app_data['name'], @@ -397,7 +397,7 @@ class OrganizationApplicationResource(ApiResource): 'required': [ 'name', 'redirect_uri', - 'application_uri' + 'application_uri' ], 'properties': { 'name': { @@ -452,7 +452,7 @@ class OrganizationApplicationResource(ApiResource): org = model.get_organization(orgname) except model.InvalidOrganizationException: raise NotFound() - + application = model.oauth.lookup_application(org, client_id) if not application: raise NotFound() @@ -485,7 +485,7 @@ class OrganizationApplicationResource(ApiResource): org = model.get_organization(orgname) except model.InvalidOrganizationException: raise NotFound() - + application = model.oauth.delete_application(org, client_id) if not application: raise NotFound() @@ -510,7 +510,7 @@ class OrganizationApplicationResetClientSecret(ApiResource): org = model.get_organization(orgname) except model.InvalidOrganizationException: raise NotFound() - + application = model.oauth.lookup_application(org, client_id) if not application: raise NotFound() diff --git a/endpoints/api/permission.py b/endpoints/api/permission.py index 601a549e3..f0fb69f74 100644 --- a/endpoints/api/permission.py +++ b/endpoints/api/permission.py @@ -70,7 +70,7 @@ class RepositoryUserPermissionList(RepositoryParamResource): org_members) role_view_func = wrapped_role_org_view - + # Load and return the permissions. repo_perms = model.get_all_repo_users(namespace, repository) return { @@ -150,7 +150,7 @@ class RepositoryUserPermission(RepositoryParamResource): pass except model.DataModelException as ex: raise request_error(exception=ex) - + log_action('change_repo_permission', namespace, {'username': username, 'repo': repository, 'role': new_permission['role']}, @@ -170,7 +170,7 @@ class RepositoryUserPermission(RepositoryParamResource): log_action('delete_repo_permission', namespace, {'username': username, 'repo': repository}, repo=model.get_repository(namespace, repository)) - + return 'Deleted', 204 diff --git a/endpoints/api/prototype.py b/endpoints/api/prototype.py index bedc19832..c1394e300 100644 --- a/endpoints/api/prototype.py +++ b/endpoints/api/prototype.py @@ -49,7 +49,7 @@ def log_prototype_action(action_kind, orgname, prototype, **kwargs): log_params['delegate_user'] = prototype.delegate_user.username elif prototype.delegate_team: log_params['delegate_team'] = prototype.delegate_team.name - + log_action(action_kind, orgname, log_params) @@ -100,7 +100,7 @@ class PermissionPrototypeList(ApiResource): 'name': { 'type': 'string', 'description': 'The name for the delegate team or user', - }, + }, 'kind': { 'type': 'string', 'description': 'Whether the delegate is a user or a team', @@ -108,7 +108,7 @@ class PermissionPrototypeList(ApiResource): 'user', 'team', ], - }, + }, }, }, }, @@ -128,7 +128,7 @@ class PermissionPrototypeList(ApiResource): permissions = model.get_prototype_permissions(org) org_members = model.get_organization_member_set(orgname) return {'prototypes': [prototype_view(p, org_members) for p in permissions]} - + raise Unauthorized() @nickname('createOrganizationPrototypePermission') @@ -148,7 +148,7 @@ class PermissionPrototypeList(ApiResource): if ('activating_user' in details and details['activating_user'] and 'name' in details['activating_user']): activating_username = details['activating_user']['name'] - + delegate = details['delegate'] if 'delegate' in details else {} delegate_kind = delegate.get('kind', None) delegate_name = delegate.get('name', None) @@ -174,7 +174,7 @@ class PermissionPrototypeList(ApiResource): log_prototype_action('create_prototype_permission', orgname, prototype) org_members = model.get_organization_member_set(orgname) return prototype_view(prototype, org_members) - + raise Unauthorized() @@ -221,7 +221,7 @@ class PermissionPrototype(ApiResource): log_prototype_action('delete_prototype_permission', orgname, prototype) return 'Deleted', 204 - + raise Unauthorized() @nickname('updateOrganizationPrototypePermission') @@ -249,5 +249,5 @@ class PermissionPrototype(ApiResource): original_role=existing.role.name) org_members = model.get_organization_member_set(orgname) return prototype_view(prototype, org_members) - + raise Unauthorized() diff --git a/endpoints/api/repoemail.py b/endpoints/api/repoemail.py index db4c9b571..3a9151b7d 100644 --- a/endpoints/api/repoemail.py +++ b/endpoints/api/repoemail.py @@ -45,7 +45,7 @@ class RepositoryAuthorizedEmail(RepositoryParamResource): @nickname('sendAuthorizeRepoEmail') def post(self, namespace, repository, email): """ Starts the authorization process for an e-mail address on a repository. """ - + with tf(db): record = model.get_email_authorized_for_repo(namespace, repository, email) if record and record.confirmed: diff --git a/endpoints/api/repository.py b/endpoints/api/repository.py index be8c9e8f9..edaf2da58 100644 --- a/endpoints/api/repository.py +++ b/endpoints/api/repository.py @@ -201,7 +201,7 @@ class Repository(RepositoryParamResource): } raise NotFound() - + @require_repo_write @nickname('updateRepo') @validate_json_request('RepoUpdate') @@ -212,7 +212,7 @@ class Repository(RepositoryParamResource): values = request.get_json() repo.description = values['description'] repo.save() - + log_action('set_repo_description', namespace, {'repo': repository, 'description': values['description']}, repo=repo) diff --git a/endpoints/api/repositorynotification.py b/endpoints/api/repositorynotification.py index d9f84a8bc..6dadf3567 100644 --- a/endpoints/api/repositorynotification.py +++ b/endpoints/api/repositorynotification.py @@ -78,7 +78,7 @@ class RepositoryNotificationList(RepositoryParamResource): json['config']) resp = notification_view(notification) - log_action('add_repo_notification', namespace, + log_action('add_repo_notification', namespace, {'repo': repository, 'notification_id': notification.uuid, 'event': json['event'], 'method': json['method']}, repo=repo) @@ -117,7 +117,7 @@ class RepositoryNotification(RepositoryParamResource): def delete(self, namespace, repository, uuid): """ Deletes the specified notification. """ notification = model.delete_repo_notification(namespace, repository, uuid) - log_action('delete_repo_notification', namespace, + log_action('delete_repo_notification', namespace, {'repo': repository, 'notification_id': uuid, 'event': notification.event.name, 'method': notification.method.name}, repo=model.get_repository(namespace, repository)) diff --git a/endpoints/api/robot.py b/endpoints/api/robot.py index b8338c911..b7614a356 100644 --- a/endpoints/api/robot.py +++ b/endpoints/api/robot.py @@ -96,7 +96,7 @@ class OrgRobot(ApiResource): parent = model.get_organization(orgname) robot, password = model.get_robot(robot_shortname, parent) return robot_view(robot.username, password) - + raise Unauthorized() @require_scope(scopes.ORG_ADMIN) diff --git a/endpoints/api/search.py b/endpoints/api/search.py index 1cce618d9..080615582 100644 --- a/endpoints/api/search.py +++ b/endpoints/api/search.py @@ -36,7 +36,7 @@ class EntitySearch(ApiResource): robot_namespace = namespace_name if args['includeTeams']: - teams = model.get_matching_teams(prefix, organization) + teams = model.get_matching_teams(prefix, organization) if args['includeOrgs'] and AdministerOrganizationPermission(namespace_name) \ and namespace_name.startswith(prefix): @@ -124,6 +124,6 @@ class FindRepositories(ApiResource): matching = model.get_matching_repositories(prefix, username) return { 'repositories': [repo_view(repo) for repo in matching - if (repo.visibility.name == 'public' or + if (repo.visibility.name == 'public' or ReadRepositoryPermission(repo.namespace_user.username, repo.name).can())] } diff --git a/endpoints/api/subscribe.py b/endpoints/api/subscribe.py index 2c3fba359..fc93c330f 100644 --- a/endpoints/api/subscribe.py +++ b/endpoints/api/subscribe.py @@ -68,7 +68,7 @@ def subscribe(user, plan, token, require_business_plan): # They want a real paying plan, create the customer and plan # simultaneously card = token - + try: cus = billing.Customer.create(email=user.email, plan=plan, card=card) user.stripe_id = cus.id @@ -116,7 +116,7 @@ def subscribe(user, plan, token, require_business_plan): return carderror_response(e) except stripe.APIConnectionError as e: return connection_response(e) - + response_json = subscription_view(cus.subscription, private_repos) check_repository_usage(user, plan_found) log_action('account_change_plan', user.username, {'plan': plan}) diff --git a/endpoints/api/superuser.py b/endpoints/api/superuser.py index 4e99fe128..3e3315b57 100644 --- a/endpoints/api/superuser.py +++ b/endpoints/api/superuser.py @@ -38,7 +38,7 @@ class SuperUserLogs(ApiResource): performer_name = args['performer'] start_time = args['starttime'] end_time = args['endtime'] - + return get_logs(start_time, end_time) abort(403) @@ -196,7 +196,7 @@ class SuperUserManagement(ApiResource): user = model.get_user(username) if not user or user.organization or user.robot: abort(404) - + return user_view(user) abort(403) @@ -237,7 +237,7 @@ class SuperUserManagement(ApiResource): if 'email' in user_data: model.update_email(user, user_data['email']) - + return user_view(user) abort(403) diff --git a/endpoints/api/tag.py b/endpoints/api/tag.py index 779b821ae..718b220c5 100644 --- a/endpoints/api/tag.py +++ b/endpoints/api/tag.py @@ -36,7 +36,7 @@ class RepositoryTag(RepositoryParamResource): image = model.get_repo_image(namespace, repository, image_id) if not image: raise NotFound() - + original_image_id = None try: original_tag_image = model.get_tag_image(namespace, repository, tag) diff --git a/endpoints/api/team.py b/endpoints/api/team.py index a448cefc9..1bb9f9e1a 100644 --- a/endpoints/api/team.py +++ b/endpoints/api/team.py @@ -28,7 +28,7 @@ def try_accept_invite(code, user): def handle_addinvite_team(inviter, team, user=None, email=None): - invite = model.add_or_invite_to_team(inviter, team, user, email, + invite = model.add_or_invite_to_team(inviter, team, user, email, requires_invite = features.MAILING) if not invite: # User was added to the team directly. @@ -146,7 +146,7 @@ class OrganizationTeam(ApiResource): team = model.set_team_org_permission(team, details['role'], get_authenticated_user().username) log_action('org_set_team_role', orgname, {'team': teamname, 'role': details['role']}) - + return team_view(orgname, team), 200 raise Unauthorized() @@ -181,7 +181,7 @@ class TeamMemberList(ApiResource): team = model.get_organization_team(orgname, teamname) except model.InvalidTeamException: raise NotFound() - + members = model.get_organization_team_members(team.id) invites = [] @@ -220,14 +220,14 @@ class TeamMember(ApiResource): user = model.get_user(membername) if not user: raise request_error(message='Unknown user') - + # Add or invite the user to the team. inviter = get_authenticated_user() invite = handle_addinvite_team(inviter, team, user=user) if not invite: log_action('org_add_team_member', orgname, {'member': membername, 'team': teamname}) return member_view(user, invited=False) - + # User was invited. log_action('org_invite_team_member', orgname, { 'user': membername, @@ -254,7 +254,7 @@ class TeamMember(ApiResource): team = model.get_organization_team(orgname, teamname) except model.InvalidTeamException: raise NotFound() - + # Find the member. member = model.get_user(membername) if not member: @@ -294,7 +294,7 @@ class InviteTeamMember(ApiResource): team = model.get_organization_team(orgname, teamname) except model.InvalidTeamException: raise NotFound() - + # Invite the email to the team. inviter = get_authenticated_user() invite = handle_addinvite_team(inviter, team, email=email) @@ -320,7 +320,7 @@ class InviteTeamMember(ApiResource): team = model.get_organization_team(orgname, teamname) except model.InvalidTeamException: raise NotFound() - + # Delete the invite. model.delete_team_email_invite(team, email) log_action('org_delete_team_member_invite', orgname, { @@ -345,7 +345,7 @@ class TeamMemberInvite(ApiResource): # Accept the invite for the current user. team = try_accept_invite(code, get_authenticated_user()) if not team: - raise NotFound() + raise NotFound() orgname = team.organization.username return { diff --git a/endpoints/api/trigger.py b/endpoints/api/trigger.py index 56bc061dc..e75b2ec07 100644 --- a/endpoints/api/trigger.py +++ b/endpoints/api/trigger.py @@ -76,7 +76,7 @@ class BuildTrigger(RepositoryParamResource): # We are just going to eat this error logger.warning('Trigger deactivation problem: %s', ex) - log_action('delete_repo_trigger', namespace, + log_action('delete_repo_trigger', namespace, {'repo': repository, 'trigger_id': trigger_uuid, 'service': trigger.service.name, 'config': config_dict}, repo=model.get_repository(namespace, repository)) @@ -192,7 +192,7 @@ class BuildTriggerActivate(RepositoryParamResource): # Make sure the namespace matches that of the trigger. if robot_namespace != namespace: - raise Unauthorized() + raise Unauthorized() # Set the pull robot. trigger.pull_robot = pull_robot @@ -224,7 +224,7 @@ class BuildTriggerActivate(RepositoryParamResource): repo = model.get_repository(namespace, repository) log_action('setup_repo_trigger', namespace, {'repo': repository, 'namespace': namespace, - 'trigger_id': trigger.uuid, 'service': trigger.service.name, + 'trigger_id': trigger.uuid, 'service': trigger.service.name, 'pull_robot': trigger.pull_robot.username if trigger.pull_robot else None, 'config': final_config}, repo=repo) @@ -284,7 +284,7 @@ class BuildTriggerAnalyze(RepositoryParamResource): 'status': 'error', 'message': 'Could not parse the Dockerfile specified' } - + # Determine the base image (i.e. the FROM) for the Dockerfile. base_image = parsed.get_base_image() if not base_image: @@ -346,7 +346,7 @@ class BuildTriggerAnalyze(RepositoryParamResource): # Make sure the current user can see/administer the robot. (robot_namespace, shortname) = parse_robot_username(user.username) return AdministerOrganizationPermission(robot_namespace).can() - + repo_users = list(model.get_all_repo_users_transitive(base_namespace, base_repository)) read_robots = [robot_view(user) for user in repo_users if is_valid_robot(user)] @@ -366,7 +366,7 @@ class BuildTriggerAnalyze(RepositoryParamResource): } raise NotFound() - + @resource('/v1/repository//trigger//start') class ActivateBuildTrigger(RepositoryParamResource): @@ -462,7 +462,7 @@ class BuildTriggerFieldValues(RepositoryParamResource): if values is None: raise NotFound() - + return { 'values': values } @@ -486,7 +486,7 @@ class BuildTriggerSources(RepositoryParamResource): user_permission = UserAdminPermission(trigger.connected_user.username) if user_permission.can(): trigger_handler = BuildTriggerBase.get_trigger_for_service(trigger.service.name) - + return { 'sources': trigger_handler.list_build_sources(trigger.auth_token) } diff --git a/endpoints/api/user.py b/endpoints/api/user.py index 8cad4b30a..b7d92e2b1 100644 --- a/endpoints/api/user.py +++ b/endpoints/api/user.py @@ -171,7 +171,7 @@ class User(ApiResource): user = get_authenticated_user() user_data = request.get_json() - try: + try: if 'password' in user_data: logger.debug('Changing password for user: %s', user.username) log_action('account_change_password', user.username) @@ -189,8 +189,8 @@ class User(ApiResource): if model.find_user_by_email(new_email): # Email already used. raise request_error(message='E-mail address already used') - - if features.MAILING: + + if features.MAILING: logger.debug('Sending email to change email address for user: %s', user.username) code = model.create_confirm_email_code(user, new_email=new_email) @@ -206,7 +206,7 @@ class User(ApiResource): raise request_error(message='Username is already in use') model.change_username(user, new_username) - + except model.InvalidPasswordException, ex: raise request_error(exception=ex) @@ -275,7 +275,7 @@ class PrivateRepositories(ApiResource): plan = get_plan(cus.subscription.plan.id) if plan: repos_allowed = plan['privateRepos'] - + return { 'privateCount': private_repos, 'privateAllowed': (private_repos < repos_allowed) diff --git a/endpoints/csrf.py b/endpoints/csrf.py index 7fa8194bc..b4b40d17c 100644 --- a/endpoints/csrf.py +++ b/endpoints/csrf.py @@ -37,4 +37,4 @@ def csrf_protect(func): return wrapper -app.jinja_env.globals['csrf_token'] = generate_csrf_token \ No newline at end of file +app.jinja_env.globals['csrf_token'] = generate_csrf_token diff --git a/endpoints/index.py b/endpoints/index.py index d97dd94f5..85afc6710 100644 --- a/endpoints/index.py +++ b/endpoints/index.py @@ -146,7 +146,7 @@ def get_user(): 'username': '$oauthtoken', 'email': None, }) - elif get_authenticated_user(): + elif get_authenticated_user(): return jsonify({ 'username': get_authenticated_user().username, 'email': get_authenticated_user().email, @@ -205,7 +205,7 @@ def create_repository(namespace, repository): elif repo: permission = ModifyRepositoryPermission(namespace, repository) if not permission.can(): - abort(403, + abort(403, message='You do not have permission to modify repository %(namespace)s/%(repository)s', issue='no-repo-write-permission', namespace=namespace, repository=repository) @@ -214,7 +214,7 @@ def create_repository(namespace, repository): permission = CreateRepositoryPermission(namespace) if not permission.can(): logger.info('Attempt to create a new repo with insufficient perms.') - abort(403, + abort(403, message='You do not have permission to create repositories in namespace "%(namespace)s"', issue='no-create-permission', namespace=namespace) @@ -369,7 +369,7 @@ def get_search(): matching = [] results = [result_view(repo) for repo in matching - if (repo.visibility.name == 'public' or + if (repo.visibility.name == 'public' or ReadRepositoryPermission(repo.namespace_user.username, repo.name).can())] data = { diff --git a/endpoints/notificationevent.py b/endpoints/notificationevent.py index 617beb177..3f27623f5 100644 --- a/endpoints/notificationevent.py +++ b/endpoints/notificationevent.py @@ -83,7 +83,7 @@ class BuildQueueEvent(NotificationEvent): def get_level(self, event_data, notification_data): return 'info' - + def get_sample_data(self, repository): build_uuid = 'fake-build-id' @@ -94,9 +94,9 @@ class BuildQueueEvent(NotificationEvent): 'docker_tags': ['latest', 'foo', 'bar'], 'trigger_kind': 'GitHub' }, subpage='/build?current=%s' % build_uuid) - + def get_summary(self, event_data, notification_data): - return 'Build queued for repository %s' % (event_data['repository']) + return 'Build queued for repository %s' % (event_data['repository']) class BuildStartEvent(NotificationEvent): @@ -116,7 +116,7 @@ class BuildStartEvent(NotificationEvent): 'docker_tags': ['latest', 'foo', 'bar'], 'trigger_kind': 'GitHub' }, subpage='/build?current=%s' % build_uuid) - + def get_summary(self, event_data, notification_data): return 'Build started for repository %s' % (event_data['repository']) @@ -161,7 +161,7 @@ class BuildFailureEvent(NotificationEvent): 'trigger_kind': 'GitHub', 'error_message': 'This is a fake error message' }, subpage='/build?current=%s' % build_uuid) - + def get_summary(self, event_data, notification_data): return 'Build failure for repository %s' % (event_data['repository']) diff --git a/endpoints/notificationhelper.py b/endpoints/notificationhelper.py index 0b73513d9..405a0bdcc 100644 --- a/endpoints/notificationhelper.py +++ b/endpoints/notificationhelper.py @@ -6,7 +6,7 @@ import json def build_event_data(repo, extra_data={}, subpage=None): repo_string = '%s/%s' % (repo.namespace_user.username, repo.name) - homepage = '%s://%s/repository/%s' % (app.config['PREFERRED_URL_SCHEME'], + homepage = '%s://%s/repository/%s' % (app.config['PREFERRED_URL_SCHEME'], app.config['SERVER_HOSTNAME'], repo_string) diff --git a/endpoints/notificationmethod.py b/endpoints/notificationmethod.py index 0d43498f2..d7085f1f0 100644 --- a/endpoints/notificationmethod.py +++ b/endpoints/notificationmethod.py @@ -40,7 +40,7 @@ class NotificationMethod(object): Validates that the notification can be created with the given data. Throws a CannotValidateNotificationMethodException on failure. """ - raise NotImplementedError + raise NotImplementedError def perform(self, notification, event_handler, notification_data): """ @@ -70,7 +70,7 @@ class QuayNotificationMethod(NotificationMethod): status, err_message, target_users = self.find_targets(repository, config_data) if err_message: raise CannotValidateNotificationMethodException(err_message) - + def find_targets(self, repository, config_data): target_info = config_data['target'] @@ -100,7 +100,7 @@ class QuayNotificationMethod(NotificationMethod): except model.InvalidTeamException: # Probably deleted. return (True, 'Unknown team %s' % target_info['name'], None) - + # Lookup the team's members return (True, None, model.get_organization_team_members(team.id)) @@ -194,7 +194,7 @@ class WebhookMethod(NotificationMethod): class FlowdockMethod(NotificationMethod): """ Method for sending notifications to Flowdock via the Team Inbox API: - https://www.flowdock.com/api/team-inbox + https://www.flowdock.com/api/team-inbox """ @classmethod def method_name(cls): @@ -288,7 +288,7 @@ class HipchatMethod(NotificationMethod): 'color': color, 'message': event_handler.get_message(notification_data['event_data'], notification_data), 'notify': level == 'error', - 'message_format': 'html', + 'message_format': 'html', } try: diff --git a/endpoints/trackhelper.py b/endpoints/trackhelper.py index a92955708..d26db7e7e 100644 --- a/endpoints/trackhelper.py +++ b/endpoints/trackhelper.py @@ -59,4 +59,4 @@ def track_and_log(event_name, repo, **kwargs): model.log_action(event_name, namespace, performer=get_authenticated_user(), ip=request.remote_addr, metadata=metadata, - repository=repo) \ No newline at end of file + repository=repo) diff --git a/endpoints/trigger.py b/endpoints/trigger.py index ec4434858..fdfde7000 100644 --- a/endpoints/trigger.py +++ b/endpoints/trigger.py @@ -100,7 +100,7 @@ class BuildTrigger(object): raise NotImplementedError def activate(self, trigger_uuid, standard_webhook_url, auth_token, config): - """ + """ Activates the trigger for the service, with the given new configuration. Returns new configuration that should be stored if successful. """ @@ -246,7 +246,7 @@ class GithubBuildTrigger(BuildTrigger): gh_client = self._get_client(auth_token) source = config['build_source'] - try: + try: repo = gh_client.get_repo(source) # Find the first matching branch. @@ -381,7 +381,7 @@ class GithubBuildTrigger(BuildTrigger): raise SkipRequestException() if should_skip_commit(commit_message): - raise SkipRequestException() + raise SkipRequestException() short_sha = GithubBuildTrigger.get_display_name(commit_sha) @@ -419,7 +419,7 @@ class GithubBuildTrigger(BuildTrigger): branches = self.list_field_values(auth_token, config, 'branch_name') tags = self.list_field_values(auth_token, config, 'tag_name') - return ([{'kind': 'branch', 'name': b} for b in branches] + + return ([{'kind': 'branch', 'name': b} for b in branches] + [{'kind': 'tag', 'name': tag} for tag in tags]) if field_name == 'tag_name': diff --git a/endpoints/verbs.py b/endpoints/verbs.py index c2dfa17a6..f0aef83c4 100644 --- a/endpoints/verbs.py +++ b/endpoints/verbs.py @@ -40,7 +40,7 @@ def _open_stream(namespace, repository, tag, synthetic_image_id, image_json, ima current_image_path = store.image_layer_path(current_image_entry.storage.uuid) current_image_stream = store.stream_read_file(current_image_entry.storage.locations, current_image_path) - + current_image_id = current_image_entry.id logger.debug('Returning image layer %s: %s' % (current_image_id, current_image_path)) yield current_image_stream @@ -56,7 +56,7 @@ def _write_synthetic_image_to_storage(linked_storage_uuid, linked_locations, que def handle_exception(ex): logger.debug('Exception when building squashed image %s: %s', linked_storage_uuid, ex) - + with database.UseThenDisconnect(app.config): model.delete_derived_storage_by_uuid(linked_storage_uuid) diff --git a/endpoints/web.py b/endpoints/web.py index f957e2a97..7fcb09daa 100644 --- a/endpoints/web.py +++ b/endpoints/web.py @@ -234,7 +234,7 @@ def receipt(): invoice = stripe.Invoice.retrieve(invoice_id) if invoice: user_or_org = model.get_user_or_org_by_customer_id(invoice.customer) - + if user_or_org: if user_or_org.organization: admin_org = AdministerOrganizationPermission(user_or_org.username) @@ -244,9 +244,9 @@ def receipt(): else: if not user_or_org.username == current_user.db_user().username: abort(404) - return + return - file_data = renderInvoiceToPdf(invoice, user_or_org) + file_data = renderInvoiceToPdf(invoice, user_or_org) return Response(file_data, mimetype="application/pdf", headers={"Content-Disposition": "attachment;filename=receipt.pdf"}) @@ -263,7 +263,7 @@ def confirm_repo_email(): record = model.confirm_email_authorization_for_repo(code) except model.DataModelException as ex: return render_page_template('confirmerror.html', error_message=ex.message) - + message = """ Your E-mail address has been authorized to receive notifications for repository %s/%s. @@ -285,13 +285,13 @@ def confirm_email(): user, new_email, old_email = model.confirm_user_email(code) except model.DataModelException as ex: return render_page_template('confirmerror.html', error_message=ex.message) - + if new_email: send_email_changed(user.username, old_email, new_email) common_login(user) - return redirect(url_for('web.user', tab='email') + return redirect(url_for('web.user', tab='email') if new_email else url_for('web.index')) diff --git a/endpoints/webhooks.py b/endpoints/webhooks.py index 24d8edf3d..2a8627100 100644 --- a/endpoints/webhooks.py +++ b/endpoints/webhooks.py @@ -72,7 +72,7 @@ def stripe_webhook(): @process_auth def build_trigger_webhook(trigger_uuid, **kwargs): logger.debug('Webhook received with uuid %s', trigger_uuid) - + try: trigger = model.get_build_trigger(trigger_uuid) except model.InvalidBuildTriggerException: diff --git a/events/build_failure.html b/events/build_failure.html index cb93ebff4..7551a467a 100644 --- a/events/build_failure.html +++ b/events/build_failure.html @@ -1,2 +1,2 @@ -Build failed for repository -{{ event_data.repository | repository_reference }} ({{ event_data.build_id }}): {{ event_data.error_message }} \ No newline at end of file +Build failed for repository +{{ event_data.repository | repository_reference }} ({{ event_data.build_id }}): {{ event_data.error_message }} diff --git a/events/build_start.html b/events/build_start.html index 81a0c7fd2..19c9efbc8 100644 --- a/events/build_start.html +++ b/events/build_start.html @@ -1,2 +1,2 @@ -Build started for repository +Build started for repository {{ event_data.repository | repository_reference }} ({{ event_data.build_id }}) diff --git a/events/build_success.html b/events/build_success.html index aee961326..6ecfa6a7b 100644 --- a/events/build_success.html +++ b/events/build_success.html @@ -1,2 +1,2 @@ -Build completed for repository -{{ event_data.repository | repository_reference }} ({{ event_data.build_id }}) \ No newline at end of file +Build completed for repository +{{ event_data.repository | repository_reference }} ({{ event_data.build_id }}) diff --git a/events/repo_push.html b/events/repo_push.html index 0c531d909..c8674c82f 100644 --- a/events/repo_push.html +++ b/events/repo_push.html @@ -1,7 +1,7 @@ {% if notification_data.performer_data.entity_name %} {{ notification_data.performer_data.entity_name | user_reference }} pushed {% else %} -Push of +Push of {% endif %} {% if event_data.updated_tags %} @@ -9,4 +9,4 @@ Push of {% for tag in event_data.updated_tags %}{%if loop.index > 1 %}, {% endif %}{{ (event_data.repository, tag) | repository_tag_reference }}{% endfor %} in {% endif %} - repository {{ event_data.repository | repository_reference }} \ No newline at end of file + repository {{ event_data.repository | repository_reference }} diff --git a/external_libraries.py b/external_libraries.py index 8f3de73a1..febf9abb1 100644 --- a/external_libraries.py +++ b/external_libraries.py @@ -52,7 +52,7 @@ def format_local_name(url): filename = filename + '.css' else: filename = filename + '.js' - + return filename @@ -71,7 +71,7 @@ if __name__ == '__main__': for url in EXTERNAL_FONTS: print 'Downloading %s' % url response = urllib2.urlopen('https://' + url) - + filename = os.path.basename(url).split('?')[0] with open('static/fonts/' + filename, "wb") as local_file: local_file.write(response.read()) diff --git a/features/__init__.py b/features/__init__.py index 9318a9b4a..b5822681e 100644 --- a/features/__init__.py +++ b/features/__init__.py @@ -28,4 +28,4 @@ class FeatureNameValue(object): def __nonzero__(self): return self.value.__nonzero__() - + diff --git a/grunt/Gruntfile.js b/grunt/Gruntfile.js index 3799ebc74..526252bd1 100644 --- a/grunt/Gruntfile.js +++ b/grunt/Gruntfile.js @@ -40,7 +40,7 @@ module.exports = function(grunt) { sourceMap: true, sourceMapName: '../static/dist/<%= pkg.name %>.min.map' }, - js_min: { + js_min: { files: { '../static/dist/<%= pkg.name %>.min.js': ['../static/dist/<%= pkg.name %>.js'] } @@ -78,4 +78,4 @@ module.exports = function(grunt) { // Default task(s). grunt.registerTask('default', ['ngtemplates', 'concat', 'cssmin', 'uglify']); -}; \ No newline at end of file +}; diff --git a/health/healthcheck.py b/health/healthcheck.py index 69d389e89..dc0ae7e6f 100644 --- a/health/healthcheck.py +++ b/health/healthcheck.py @@ -12,7 +12,7 @@ class HealthCheck(object): Conducts any custom healthcheck work, returning a dict representing the HealthCheck output and a boolean indicating whether the instance is healthy. """ - raise NotImplementedError + raise NotImplementedError @classmethod def get_check(cls, name, parameters): @@ -44,12 +44,12 @@ class ProductionHealthCheck(HealthCheck): def __init__(self, access_key, secret_key): self.access_key = access_key self.secret_key = secret_key - + @classmethod def check_name(cls): return 'ProductionHealthCheck' - def conduct_healthcheck(self, db_healthy, buildlogs_healthy): + def conduct_healthcheck(self, db_healthy, buildlogs_healthy): data = { 'db_healthy': db_healthy, 'buildlogs_healthy': buildlogs_healthy @@ -81,4 +81,4 @@ class ProductionHealthCheck(HealthCheck): # requests once RDS comes back up. return (data, not is_rds_working) - return (data, db_healthy) \ No newline at end of file + return (data, db_healthy) diff --git a/initdb.py b/initdb.py index e060b08bc..74199d024 100644 --- a/initdb.py +++ b/initdb.py @@ -28,7 +28,7 @@ SAMPLE_CMDS = [["/bin/bash"], ["/bin/sh", "-c", "sed -i 's/#\\(force_color_prompt\\)/\\1/' /etc/skel/.bashrc"], ["/bin/sh", "-c", "#(nop) EXPOSE [8080]"], - ["/bin/sh", "-c", + ["/bin/sh", "-c", "#(nop) MAINTAINER Jake Moshenko "], None] @@ -152,7 +152,7 @@ def setup_database_for_testing(testcase): global db_initialized_for_testing if not db_initialized_for_testing: - logger.debug('Setting up DB for testing.') + logger.debug('Setting up DB for testing.') # Setup the database. wipe_database() @@ -191,7 +191,7 @@ def initialize_database(): LoginService.create(name='ldap') BuildTriggerService.create(name='github') - + LogEntryKind.create(name='account_change_plan') LogEntryKind.create(name='account_change_cc') LogEntryKind.create(name='account_change_password') @@ -231,7 +231,7 @@ def initialize_database(): LogEntryKind.create(name='create_prototype_permission') LogEntryKind.create(name='modify_prototype_permission') LogEntryKind.create(name='delete_prototype_permission') - + LogEntryKind.create(name='setup_repo_trigger') LogEntryKind.create(name='delete_repo_trigger') @@ -498,7 +498,7 @@ def populate_database(): week_ago = today - timedelta(6) six_ago = today - timedelta(5) four_ago = today - timedelta(4) - + model.log_action('org_create_team', org.username, performer=new_user_1, timestamp=week_ago, metadata={'team': 'readers'}) diff --git a/requirements-nover.txt b/requirements-nover.txt index 262e0594d..741efe889 100644 --- a/requirements-nover.txt +++ b/requirements-nover.txt @@ -36,4 +36,4 @@ psycopg2 pyyaml git+https://github.com/DevTable/aniso8601-fake.git git+https://github.com/DevTable/anunidecode.git -gipc \ No newline at end of file +gipc diff --git a/screenshots/README.md b/screenshots/README.md index 2903bdd70..5c74ce6b9 100644 --- a/screenshots/README.md +++ b/screenshots/README.md @@ -8,4 +8,4 @@ debug run (i.e. hit localhost): ``` casperjs screenshots.js --d -``` \ No newline at end of file +``` diff --git a/static/css/quay.css b/static/css/quay.css index 25934010b..415628dc5 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -92,7 +92,7 @@ .co-m-navbar { background-color: white; margin: 0; - padding-left: 10px; + padding-left: 10px; } .co-fx-box-shadow { @@ -185,7 +185,7 @@ nav.navbar-default .navbar-nav>li>a.active { top: 14px; left: 0px; - width: 12px; + width: 12px; height: 12px; display: inline-block; border-radius: 50%; @@ -619,7 +619,7 @@ i.toggle-icon:hover { .logs-view-element .log .log-description code { max-width: 300px; - display: inline-block; + display: inline-block; vertical-align: middle; overflow: hidden; text-overflow: ellipsis; @@ -636,7 +636,7 @@ i.toggle-icon:hover { .billing-options-element .current-card .no-card-outline { - display: inline-block; + display: inline-block; width: 73px; height: 44px; vertical-align: middle; @@ -789,17 +789,17 @@ i.toggle-icon:hover { -webkit-animation-fill-mode: forwards; } -@-moz-keyframes scaleup { +@-moz-keyframes scaleup { 0% { -moz-transform: scale(0); } 100% { -moz-transform: scale(1); } } -@-webkit-keyframes scaleup { +@-webkit-keyframes scaleup { 0% { -webkit-transform: scale(0); } 100% { -webkit-transform: scale(1); } } -@keyframes scaleup { +@keyframes scaleup { 0% { transform: scale(0); } 100% { transform: scale(1); } } @@ -997,7 +997,7 @@ i.toggle-icon:hover { float: right; vertical-align: middle; font-size: 20px; -} +} .accordion-toggle { cursor: pointer; @@ -1340,7 +1340,7 @@ i.toggle-icon:hover { bottom: 0px; right: 20px; font-size: 12px; - color: #aaa; + color: #aaa; } .plans-list .plan .count { @@ -2379,7 +2379,7 @@ p.editable:hover i { border-radius: 4px; } -.clipboard-copied-message { +.clipboard-copied-message { -webkit-animation: fadeOut 4s ease-in-out 0s 1 forwards; -moz-animation: fadeOut 4s ease-in-out 0s 1 forwards; -ms-animation: fadeOut 4s ease-in-out 0s 1 forwards; @@ -3167,7 +3167,7 @@ p.editable:hover i { } .usage-caption { - display: inline-block; + display: inline-block; color: #aaa; font-size: 26px; margin-left: 10px; @@ -3257,7 +3257,7 @@ p.editable:hover i { margin-right: 10px; } -.org-view .highlight .team-title { +.org-view .highlight .team-title { animation: highlighttemp 1s 2; animation-timing-function: ease-in-out; animation-direction: alternate; @@ -3271,22 +3271,22 @@ p.editable:hover i { -webkit-animation-direction: alternate; } -@-moz-keyframes highlighttemp { +@-moz-keyframes highlighttemp { 0% { background-color: white; } 100% { background-color: rgba(92, 184, 92, 0.36); } } -@-webkit-keyframes highlighttemp { +@-webkit-keyframes highlighttemp { 0% { background-color: white; } 100% { background-color: rgba(92, 184, 92, 0.36); } } -@keyframes highlighttemp { +@keyframes highlighttemp { 0% { background-color: white; } 100% { background-color: rgba(92, 184, 92, 0.36); } } -.org-view .team-title { +.org-view .team-title { font-size: 20px; text-transform: none; padding: 4px; @@ -4626,7 +4626,7 @@ have a fixed width and height (but it's not required). .tour-section.tour-header { margin-top: 40px; margin-bottom: 40px; -} +} .tour-section.tour-header .tour-section-title { text-align: center; @@ -4735,13 +4735,13 @@ have a fixed width and height (but it's not required). color: #888; } -.testimonial .speaker-info .speaker-title a { +.testimonial .speaker-info .speaker-title a { text-decoration: none; color: #888; } .learn-more { - float: right; + float: right; font-size: 22px; } @@ -4775,7 +4775,7 @@ i.slack-icon { .external-notification-view-element { margin: 10px; - padding: 6px; + padding: 6px; border: 1px solid #eee; border-radius: 6px; } @@ -4871,4 +4871,4 @@ i.slack-icon { #startTriggerDialog #runForm .field-title { width: 120px; padding-right: 10px; -} \ No newline at end of file +} diff --git a/static/directives/angular-tour-ui.html b/static/directives/angular-tour-ui.html index 4f4102162..d2fc3ed9d 100644 --- a/static/directives/angular-tour-ui.html +++ b/static/directives/angular-tour-ui.html @@ -1,7 +1,7 @@
-
+

{{ tour.title }}

diff --git a/static/directives/application-manager.html b/static/directives/application-manager.html index df870d7a5..824fd36f7 100644 --- a/static/directives/application-manager.html +++ b/static/directives/application-manager.html @@ -13,7 +13,7 @@ Application Name Application URI - + {{ app.name }} {{ app.application_uri }} diff --git a/static/directives/billing-invoices.html b/static/directives/billing-invoices.html index 2e2bfd469..e022fef03 100644 --- a/static/directives/billing-invoices.html +++ b/static/directives/billing-invoices.html @@ -15,7 +15,7 @@ Status - + {{ invoice.date * 1000 | date:'medium' }} diff --git a/static/directives/billing-options.html b/static/directives/billing-options.html index 374715a2f..47b1d9c28 100644 --- a/static/directives/billing-options.html +++ b/static/directives/billing-options.html @@ -1,4 +1,4 @@ -
+
diff --git a/static/directives/build-log-error.html b/static/directives/build-log-error.html index 13b399bb9..1b27fb447 100644 --- a/static/directives/build-log-error.html +++ b/static/directives/build-log-error.html @@ -9,7 +9,7 @@ - +
Note: The credentials {{ getLocalPullInfo().login.username }} for registry {{ getLocalPullInfo().login.registry }} cannot diff --git a/static/directives/create-external-notification-dialog.html b/static/directives/create-external-notification-dialog.html index bf0c5da03..650862690 100644 --- a/static/directives/create-external-notification-dialog.html +++ b/static/directives/create-external-notification-dialog.html @@ -37,7 +37,7 @@ handle-item-selected="handleEventSelected(datum)" clear-value="clearCounter"> - +
+
- JSON metadata representing the event will be POSTed to the URL. + JSON metadata representing the event will be POSTed to the URL.

- The contents for each event can be found in the user guide: + The contents for each event can be found in the user guide: http://docs.quay.io/guides/notifications.html @@ -118,7 +118,7 @@
- +
- +
+
diff --git a/static/directives/entity-reference.html b/static/directives/entity-reference.html index ea65db875..1406b632f 100644 --- a/static/directives/entity-reference.html +++ b/static/directives/entity-reference.html @@ -1,6 +1,6 @@ - + {{entity.name}} {{entity.name}} diff --git a/static/directives/entity-search.html b/static/directives/entity-search.html index 63abb1528..80114df88 100644 --- a/static/directives/entity-search.html +++ b/static/directives/entity-search.html @@ -34,22 +34,22 @@ Robot accounts are not permitted - +
  • {{ team.name }}
    • - + - +
  • {{ robot.name }} - +
    • - +
  • diff --git a/static/directives/external-login-button.html b/static/directives/external-login-button.html index 1afe0c71d..10701f941 100644 --- a/static/directives/external-login-button.html +++ b/static/directives/external-login-button.html @@ -1,22 +1,22 @@
    • - +
    Issue A diff --git a/static/directives/header-bar.html b/static/directives/header-bar.html index fe154341f..748948b1d 100644 --- a/static/directives/header-bar.html +++ b/static/directives/header-bar.html @@ -19,15 +19,15 @@
  • Organizations
    • - +
      -
    • +
    • - + diff --git a/static/directives/location-view.html b/static/directives/location-view.html index ace3dad53..8a5ebb421 100644 --- a/static/directives/location-view.html +++ b/static/directives/location-view.html @@ -3,7 +3,7 @@ - +
      diff --git a/static/directives/logs-view.html b/static/directives/logs-view.html index 28509b897..5038895ea 100644 --- a/static/directives/logs-view.html +++ b/static/directives/logs-view.html @@ -19,25 +19,25 @@
    - +
    -
    +
    -
    +
    Showing {{(logs | visibleLogFilter:kindsAllowed | filter:search | limitTo:150).length}} of {{(logs | visibleLogFilter:kindsAllowed | filter:search).length}} matching logs
    -
    +
    -
    - +
    +
    @@ -45,7 +45,7 @@ - +
    Date/Time User/Token/App
    @@ -54,7 +54,7 @@ {{ log.datetime }} - +
    @@ -64,7 +64,7 @@
    - + diff --git a/static/directives/manual-trigger-build-dialog.html b/static/directives/manual-trigger-build-dialog.html index e82879e8a..a5eb0dce5 100644 --- a/static/directives/manual-trigger-build-dialog.html +++ b/static/directives/manual-trigger-build-dialog.html @@ -8,7 +8,7 @@
    - +
    @@ -35,4 +35,4 @@ - \ No newline at end of file + diff --git a/static/directives/markdown-input.html b/static/directives/markdown-input.html index 010c2f90a..b989b83b3 100644 --- a/static/directives/markdown-input.html +++ b/static/directives/markdown-input.html @@ -15,10 +15,10 @@
    -
    +
    - +
    diff --git a/static/directives/namespace-selector.html b/static/directives/namespace-selector.html index 98f6a353a..5cc7985b6 100644 --- a/static/directives/namespace-selector.html +++ b/static/directives/namespace-selector.html @@ -14,7 +14,7 @@ ng-class="(requireCreate && !namespaces[org.name].can_create_repo) ? 'disabled' : ''"> - {{ org.name }} + {{ org.name }}
    - + diff --git a/static/directives/plan-manager.html b/static/directives/plan-manager.html index e15e887be..0c72e3b17 100644 --- a/static/directives/plan-manager.html +++ b/static/directives/plan-manager.html @@ -7,7 +7,7 @@ You are using more private repositories than your plan allows. Please upgrade your subscription to avoid disruptions in your organization's service. - +
    You are at your current plan's number of allowed private repositories. It might be time to think about upgrading your subscription to avoid future disruptions in your organization's service. @@ -16,13 +16,13 @@
    You are nearing the number of allowed private repositories. It might be time to think about upgrading your subscription to avoid future disruptions in your organization's service. -
    +
    Free trial until {{ parseDate(subscription.trialEnd) | date }}
    - +
    Price
    - + - + diff --git a/static/directives/popup-input-button.html b/static/directives/popup-input-button.html index dc1895345..d6acadeb2 100644 --- a/static/directives/popup-input-button.html +++ b/static/directives/popup-input-button.html @@ -1,6 +1,6 @@ - + diff --git a/static/directives/prototype-manager.html b/static/directives/prototype-manager.html index 35e5b9c0c..68aaaffc7 100644 --- a/static/directives/prototype-manager.html +++ b/static/directives/prototype-manager.html @@ -5,7 +5,7 @@
    Default permissions provide a means of specifying additional permissions that should be granted automatically to a repository when it is created.
    - +
    - + - +
    diff --git a/static/directives/plans-table.html b/static/directives/plans-table.html index 3b51df849..2870a06de 100644 --- a/static/directives/plans-table.html +++ b/static/directives/plans-table.html @@ -6,7 +6,7 @@ Price
    {{ plan.title }} {{ plan.privateRepos }}
    Repository Creator @@ -31,9 +31,9 @@ Permission
    + @@ -74,7 +74,7 @@ -
    @@ -108,7 +108,7 @@
    -
    +
    diff --git a/static/directives/repo-breadcrumb.html b/static/directives/repo-breadcrumb.html index d76e4c8fd..d9614d687 100644 --- a/static/directives/repo-breadcrumb.html +++ b/static/directives/repo-breadcrumb.html @@ -11,7 +11,7 @@ {{repo.name}} - + {{image.id.substr(0, 12)}} @@ -19,7 +19,7 @@ {{repo.namespace}} - {{repo.name}} + {{repo.name}} {{subsection}} diff --git a/static/directives/robots-manager.html b/static/directives/robots-manager.html index c11c07cf8..6c9dd8fdd 100644 --- a/static/directives/robots-manager.html +++ b/static/directives/robots-manager.html @@ -15,14 +15,14 @@ Robot Account Name - + {{ getPrefix(robotInfo.name) }}+{{ getShortenedName(robotInfo.name) }} - + diff --git a/static/directives/setup-trigger-dialog.html b/static/directives/setup-trigger-dialog.html index a44893c68..a8d40a268 100644 --- a/static/directives/setup-trigger-dialog.html +++ b/static/directives/setup-trigger-dialog.html @@ -11,12 +11,12 @@
    Setting up trigger...
    -
    +
    @@ -40,7 +40,7 @@
    A robot account is required for this build trigger because - the + the Dockerfile found @@ -56,7 +56,7 @@
    Please select the credentials to use when pulling the base image:
    - Note: In order to set pull credentials for a build trigger, you must be an + Note: In order to set pull credentials for a build trigger, you must be an Administrator of the namespace {{ repository.namespace }}
    @@ -79,14 +79,14 @@
    -
    Note: We've automatically selected robot account - , + , since it has access to the private repository.
    - - + + - \ No newline at end of file + diff --git a/static/directives/step-view.html b/static/directives/step-view.html index 45947d3f6..8d3124291 100644 --- a/static/directives/step-view.html +++ b/static/directives/step-view.html @@ -1,3 +1,3 @@
    -
    \ No newline at end of file +
    diff --git a/static/directives/tour-content.html b/static/directives/tour-content.html index a3ccb6647..891d2ee6b 100644 --- a/static/directives/tour-content.html +++ b/static/directives/tour-content.html @@ -38,9 +38,9 @@
    Dockerfile build in the cloud
    - Like to use Dockerfiles to build your images? Simply upload your Dockerfile (and any additional files it needs) and we'll build your Dockerfile into an image and push it to your repository. + Like to use Dockerfiles to build your images? Simply upload your Dockerfile (and any additional files it needs) and we'll build your Dockerfile into an image and push it to your repository.
    -
    +
    If you store your Dockerfile in GitHub, add a Build Trigger to your repository and we'll start a Dockerfile build for every change you make.
    @@ -105,7 +105,7 @@
    - +
    @@ -405,7 +405,7 @@ c0,0.596-0.208,1.102-0.625,1.518c-0.416,0.417-0.923,0.625-1.518,0.625h-21.429c-0.596,0-1.102-0.208-1.518-0.625 C103.708,124.459,103.5,123.953,103.5,123.357z M110.643,108.357h11.429v-4.286c0-1.577-0.558-2.924-1.674-4.04 s-2.463-1.674-4.04-1.674c-1.578,0-2.924,0.558-4.041,1.674c-1.115,1.116-1.674,2.463-1.674,4.04V108.357z"/> - @@ -429,5 +429,5 @@
    Learn more about Enterprise Registry
    - +
    diff --git a/static/directives/trigger-setup-github.html b/static/directives/trigger-setup-github.html index 77981d8f2..0ef1981c9 100644 --- a/static/directives/trigger-setup-github.html +++ b/static/directives/trigger-setup-github.html @@ -33,7 +33,7 @@
    - {{ state.currentLocation || '(Repository Root)' }} + {{ state.currentLocation || '(Repository Root)' }}
    @@ -64,7 +64,7 @@ {{ repo }} - +
    @@ -91,11 +91,11 @@
    + placeholder="(Regular expression. Examples: heads/branchname, tags/tagname)" required>
    +
    • All Branches @@ -116,11 +116,11 @@
      • + ng-class="isMatching('heads', branchName, state.branchTagFilter) ? 'match' : 'not-match'"> {{ branchName }} -
        • +
      ...
    @@ -129,14 +129,14 @@
    • + ng-class="isMatching('tags', tagName, state.branchTagFilter) ? 'match' : 'not-match'"> {{ tagName }} -
      • +
    ... -
    +
    Warning: No branches found @@ -145,7 +145,7 @@
    - +
    @@ -159,7 +159,7 @@ - +
    diff --git a/static/directives/user-setup.html b/static/directives/user-setup.html index cd9778981..b5df70699 100644 --- a/static/directives/user-setup.html +++ b/static/directives/user-setup.html @@ -43,9 +43,9 @@ - +
    {{errorMessage}}
    - +
    Account recovery email was sent.
    diff --git a/static/img/500/background.svg b/static/img/500/background.svg index 711fc05c0..e3bba7bd5 100644 --- a/static/img/500/background.svg +++ b/static/img/500/background.svg @@ -22,7 +22,7 @@ - - - diff --git a/static/js/app.js b/static/js/app.js index ac9cff1c2..26c341daa 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -2,7 +2,7 @@ var TEAM_PATTERN = '^[a-zA-Z][a-zA-Z0-9]+$'; var ROBOT_PATTERN = '^[a-zA-Z][a-zA-Z0-9]{3,29}$'; var USER_PATTERN = '^[a-z0-9_]{4,30}$'; -$.fn.clipboardCopy = function() { +$.fn.clipboardCopy = function() { if (zeroClipboardSupported) { (new ZeroClipboard($(this))); return true; @@ -18,7 +18,7 @@ ZeroClipboard.config({ }); ZeroClipboard.on("error", function(e) { - zeroClipboardSupported = false; + zeroClipboardSupported = false; }); ZeroClipboard.on('aftercopy', function(e) { @@ -68,7 +68,7 @@ function clickElement(el){ function getFirstTextLine(commentString) { if (!commentString) { return ''; } - + var lines = commentString.split('\n'); var MARKDOWN_CHARS = { '#': true, @@ -114,7 +114,7 @@ function createOrganizationTeam(ApiService, orgname, teamname, callback) { 'orgname': orgname, 'teamname': teamname }; - + ApiService.updateOrganizationTeam(data, params) .then(callback, ApiService.errorDisplay('Cannot create team')); } @@ -207,7 +207,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading that.showAdditionalEntries_(); }, 10); }; - + _ViewArray.prototype.stopTimer_ = function() { if (this.timerRef_) { $interval.cancel(this.timerRef_); @@ -287,7 +287,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading that.call_(); }, this.sleeptime_) }; - + var service = { 'create': function(scope, requester, opt_sleeptime) { return new _PollChannel(scope, requester, opt_sleeptime); @@ -308,7 +308,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading dataFileService.tryAsZip_ = function(buf, success, failure) { var zip = null; var zipFiles = null; - try { + try { var zip = new JSZip(buf); zipFiles = zip.files; } catch (e) { @@ -392,7 +392,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading success(processed); break; } - }); + }); }; dataFileService.blobToString = function(blob, callback) { @@ -463,7 +463,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading $provide.factory('UIService', [function() { var uiService = {}; - + uiService.hidePopover = function(elem) { var popover = $(elem).data('bs.popover'); if (popover) { @@ -483,7 +483,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading popover.show(); }, 500); }; - + uiService.showFormError = function(elem, result) { var message = result.data['message'] || result.data['error_description'] || ''; if (message) { @@ -492,7 +492,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading uiService.hidePopover(elem); } }; - + return uiService; }]); @@ -511,14 +511,14 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading .replace(/>/g, ">") .replace(/"/g, """) .replace(/'/g, "'"); - + return adjusted; }; - + utilService.textToSafeHtml = function(text) { return $sanitize(utilService.escapeHtmlString(text)); }; - + return utilService; }]); @@ -579,7 +579,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading }, 1000); } }; - + var pingUrlInternal = function($scope, url, callback) { var path = url + '?cb=' + (Math.random() * 100); var start = new Date(); @@ -606,7 +606,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading pingService.pingUrl = function($scope, url, callback) { if (pingCache[url]) { - invokeCallback($scope, pingCache[url]['pings'], callback); + invokeCallback($scope, pingCache[url]['pings'], callback); return; } @@ -616,12 +616,12 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading pingUrlInternal($scope, url, callback); }, 1000); }; - + return pingService; }]); - $provide.factory('TriggerService', ['UtilService', '$sanitize', 'KeyService', + $provide.factory('TriggerService', ['UtilService', '$sanitize', 'KeyService', function(UtilService, $sanitize, KeyService) { var triggerService = {}; @@ -644,13 +644,13 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading ], 'get_redirect_url': function(namespace, repository) { - var redirect_uri = KeyService['githubRedirectUri'] + '/trigger/' + + var redirect_uri = KeyService['githubRedirectUri'] + '/trigger/' + namespace + '/' + repository; var authorize_url = KeyService['githubTriggerAuthorizeUrl']; var client_id = KeyService['githubTriggerClientId']; - return authorize_url + 'client_id=' + client_id + + return authorize_url + 'client_id=' + client_id + '&scope=repo,user:email&redirect_uri=' + redirect_uri; } } @@ -759,7 +759,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading if (typeof description != 'string') { description = description(metadata); } - + for (var key in metadata) { if (metadata.hasOwnProperty(key)) { var value = metadata[key] != null ? metadata[key] : '(Unknown)'; @@ -808,7 +808,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading if (command.length > 2 && command[0] == '/bin/sh' && command[1] == '-c') { return command[2]; } - + return command.join(' '); }; @@ -839,7 +839,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading features.hasFeature = function(name) { return !!features.getFeature(name); }; - + features.matchesFeatures = function(list) { for (var i = 0; i < list.length; ++i) { var value = features.getFeature(list[i]); @@ -983,7 +983,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading if (userRelatedResource) { var operations = userRelatedResource['operations']; for (var i = 0; i < operations.length; ++i) { - var operation = operations[i]; + var operation = operations[i]; if (operation['method'].toLowerCase() == method) { return operation['nickname']; } @@ -997,7 +997,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading var name = endpointResource['name']; var operations = endpointResource['operations']; for (var i = 0; i < operations.length; ++i) { - var operation = operations[i]; + var operation = operations[i]; buildMethodsForOperation(operation, endpointResource, resourceMap); } }; @@ -1005,7 +1005,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading var freshLoginFailCheck = function(opName, opArgs) { return function(resp) { var deferred = $q.defer(); - + // If the error is a fresh login required, show the dialog. if (resp.status == 401 && resp.data['error_type'] == 'fresh_login_required') { var verifyNow = function() { @@ -1029,12 +1029,12 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading deferred.reject({'data': {'message': 'Invalid verification credentials'}}); }); }; - + var box = bootbox.dialog({ "message": 'It has been more than a few minutes since you last logged in, ' + - 'so please verify your password to perform this sensitive operation:' + + 'so please verify your password to perform this sensitive operation:' + '
    ' + - '' + + '' + '
    ', "title": 'Please Verify', "buttons": { @@ -1057,7 +1057,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading box.find("input").focus(); box.find("form").submit(function() { if (!$('#freshPassword').val()) { return; } - + box.modal('hide'); verifyNow(); }); @@ -1086,7 +1086,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading 'ignoreLoadingBar': true }); } - + var opObj = one['custom' + method.toUpperCase()](opt_options); // If the operation requires_fresh_login, then add a specialized error handler that @@ -1177,7 +1177,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading return apiService; }]); - + $provide.factory('CookieService', ['$cookies', '$cookieStore', function($cookies, $cookieStore) { var cookieService = {}; cookieService.putPermanent = function(name, value) { @@ -1220,7 +1220,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading scope.$watch(function () { return userService.currentUser(); }, function (currentUser) { scope.user = currentUser; if (opt_callback) { - opt_callback(currentUser); + opt_callback(currentUser); } }, true); }; @@ -1274,7 +1274,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading ApiService.getLoggedInUser().then(function(loadedUser) { handleUserResponse(loadedUser); }, function() { - handleUserResponse({'anonymous': true}); + handleUserResponse({'anonymous': true}); }); }; @@ -1311,7 +1311,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading var org = userService.getOrganization(namespace); return !!org; }; - + userService.currentUser = function() { return userResponse; }; @@ -1338,22 +1338,22 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading if (Features.BUILD_SUPPORT) { var buildEvents = [ - { + { 'id': 'build_queued', 'title': 'Dockerfile Build Queued', 'icon': 'fa-tasks' }, - { + { 'id': 'build_start', 'title': 'Dockerfile Build Started', 'icon': 'fa-circle-o-notch' }, - { + { 'id': 'build_success', 'title': 'Dockerfile Build Successfully Completed', 'icon': 'fa-check-circle-o' }, - { + { 'id': 'build_failure', 'title': 'Dockerfile Build Failed', 'icon': 'fa-times-circle-o' @@ -1377,7 +1377,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading } ] }, - { + { 'id': 'email', 'title': 'E-mail', 'icon': 'fa-envelope', @@ -1613,7 +1613,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading var params = { 'uuid': notification.id }; - + ApiService.updateUserNotification(notification, params, function() { notificationService.update(); }, ApiService.errorDisplay('Could not update notification')); @@ -1763,7 +1763,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading return keyService; }]); - + $provide.factory('PlanService', ['KeyService', 'UserService', 'CookieService', 'ApiService', 'Features', 'Config', function(KeyService, UserService, CookieService, ApiService, Features, Config) { var plans = null; @@ -1843,7 +1843,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading CookieService.clear('quay.notedplan'); return planId; }; - + planService.handleCardError = function(resp) { if (!planService.isCardError(resp)) { return; } @@ -1903,14 +1903,14 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading planService.getPlanIncludingDeprecated = function(planId, callback) { planService.verifyLoaded(function() { - if (planDict[planId]) { + if (planDict[planId]) { callback(planDict[planId]); } }); }; planService.getMinimumPlan = function(privateCount, isBusiness, callback) { - planService.getPlans(function(plans) { + planService.getPlans(function(plans) { for (var i = 0; i < plans.length; i++) { var plan = plans[i]; if (plan.privateRepos >= privateCount) { @@ -1976,7 +1976,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading planService.showSubscribeDialog($scope, orgname, planId, callbacks, title, /* async */true); return; } - + previousSubscribeFailure = false; planService.setSubscription(orgname, planId, callbacks['success'], function(resp) { @@ -1999,11 +1999,11 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading var submitToken = function(token) { if (submitted) { return; } submitted = true; - $scope.$apply(function() { + $scope.$apply(function() { if (callbacks['started']) { callbacks['started'](); } - + var cardInfo = { 'token': token.id }; @@ -2070,7 +2070,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading "className": "btn-default" } } - }); + }); return; } @@ -2121,7 +2121,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading return { require: 'ngModel', link: function(scope, elem, attrs, ctrl) { - scope.$watch(function() { + scope.$watch(function() { return $parse(attrs.match)(scope) === ctrl.$modelValue; }, function(currentValue) { ctrl.$setValidity('mismatch', currentValue); @@ -2216,7 +2216,7 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading if (window.__config && window.__config.MIXPANEL_KEY) { quayApp.config(['$analyticsProvider', function($analyticsProvider) { - $analyticsProvider.virtualPageviews(true); + $analyticsProvider.virtualPageviews(true); }]); } @@ -2332,7 +2332,7 @@ quayApp.directive('quayClasses', function(Features, Config) { priority: 580, restrict: 'A', link: function($scope, $element, $attr, ctrl, $transclude) { - + // Borrowed from ngClass. function flattenClasses(classVal) { if(angular.isArray(classVal)) { @@ -2346,10 +2346,10 @@ quayApp.directive('quayClasses', function(Features, Config) { }); return classes.join(' '); } - + return classVal; } - + function removeClass(classVal) { $attr.$removeClass(flattenClasses(classVal)); } @@ -2417,7 +2417,7 @@ quayApp.directive('quayInclude', function($compile, $templateCache, $http, Featu if (!templatePath) { return; } - + var promise = getTemplate(templatePath).success(function(html) { $element.html(html); }).then(function (response) { @@ -2496,7 +2496,7 @@ quayApp.directive('applicationInfo', function () { 'application': '=application' }, controller: function($scope, $element, ApiService) { - + } }; return directiveDefinitionObject; @@ -2573,7 +2573,7 @@ quayApp.directive('repoBreadcrumb', function () { 'subsection': '=subsection', 'subsectionIcon': '=subsectionIcon' }, - controller: function($scope, $element) { + controller: function($scope, $element) { } }; return directiveDefinitionObject; @@ -2587,7 +2587,7 @@ quayApp.directive('focusablePopoverContent', ['$timeout', '$popover', function ( var hide = function() { $body.off('click'); - if (!scope) { return; } + if (!scope) { return; } scope.$apply(function() { if (!scope) { return; } scope.$hide(); @@ -2595,7 +2595,7 @@ quayApp.directive('focusablePopoverContent', ['$timeout', '$popover', function ( }; scope.$on('$destroy', function() { - $body.off('click'); + $body.off('click'); }); $timeout(function() { @@ -2647,7 +2647,7 @@ quayApp.directive('copyBox', function () { var number = $rootScope.__copyBoxIdCounter || 0; $rootScope.__copyBoxIdCounter = number + 1; $scope.inputId = "copy-box-input-" + number; - + var button = $($element).find('.copy-icon'); var input = $($element).find('input'); @@ -2728,7 +2728,7 @@ quayApp.directive('externalLoginButton', function () { $scope.signInStarted({'service': service}); var url = KeyService.getExternalLoginUrl(service, $scope.action || 'login'); - + // Save the redirect URL in a cookie so that we can redirect back after the service returns to us. var redirectURL = $scope.redirectUrl || window.location.toString(); CookieService.putPermanent('quay.redirectAfterLoad', redirectURL); @@ -2826,7 +2826,7 @@ quayApp.directive('signinForm', function () { $scope.cancelInterval(); $scope.tryAgainSoon = result.headers('Retry-After'); - $scope.tryAgainInterval = $interval(function() { + $scope.tryAgainInterval = $interval(function() { $scope.tryAgainSoon--; if ($scope.tryAgainSoon <= 0) { $scope.cancelInterval(); @@ -2856,10 +2856,10 @@ quayApp.directive('signupForm', function () { 'userRegistered': '&userRegistered' }, - controller: function($scope, $location, $timeout, ApiService, KeyService, UserService, Config, UIService) { + controller: function($scope, $location, $timeout, ApiService, KeyService, UserService, Config, UIService) { $('.form-signup').popover(); - $scope.awaitingConfirmation = false; + $scope.awaitingConfirmation = false; $scope.registering = false; $scope.register = function() { @@ -2873,7 +2873,7 @@ quayApp.directive('signupForm', function () { ApiService.createNewUser($scope.newUser).then(function(resp) { $scope.registering = false; $scope.awaitingConfirmation = !!resp['awaiting_verification']; - + if (Config.MIXPANEL_KEY) { mixpanel.alias($scope.newUser.username); } @@ -3017,7 +3017,7 @@ quayApp.directive('dockerAuthDialog', function (Config) { $('#dockerauthmodal').modal('hide'); return; } - + $('#copyClipboard').clipboardCopy(); $('#dockerauthmodal').modal({}); }; @@ -3048,7 +3048,7 @@ quayApp.filter('regex', function() { if (m && m[0].length == input[i].length) { out.push(input[i]); } - } + } return out; }; }); @@ -3077,7 +3077,7 @@ quayApp.filter('visibleLogFilter', function () { if (!allowed) { return logs; } - + var filtered = []; angular.forEach(logs, function (log) { if (allowed[log.kind]) { @@ -3118,7 +3118,7 @@ quayApp.directive('billingInvoices', function () { if (!$scope.makevisible || !isValid) { return; } - + $scope.loading = true; ApiService.listInvoices($scope.organization).then(function(resp) { @@ -3159,7 +3159,7 @@ quayApp.directive('logsView', function () { $scope.kindsAllowed = null; $scope.chartVisible = true; $scope.logsPath = ''; - + var datetime = new Date(); $scope.logStartDate = new Date(datetime.getUTCFullYear(), datetime.getUTCMonth(), datetime.getUTCDate() - 7); $scope.logEndDate = new Date(datetime.getUTCFullYear(), datetime.getUTCMonth(), datetime.getUTCDate()); @@ -3270,7 +3270,7 @@ quayApp.directive('logsView', function () { return 'Create default permission: {role} for {delegate_team}' + defaultPermSuffix(metadata); } }, - 'modify_prototype_permission': function(metadata) { + 'modify_prototype_permission': function(metadata) { if (metadata.delegate_user) { return 'Modify default permission: {role} (from {original_role}) for {delegate_user}' + defaultPermSuffix(metadata); } else if (metadata.delegate_team) { @@ -3443,7 +3443,7 @@ quayApp.directive('logsView', function () { return $scope.chart.getColor(kind); }; - $scope.getDescription = function(log) { + $scope.getDescription = function(log) { log.metadata['_ip'] = log.ip ? log.ip : null; return StringBuilderService.buildString(logDescriptions[log.kind] || log.kind, log.metadata); }; @@ -3473,10 +3473,10 @@ quayApp.directive('applicationManager', function () { 'organization': '=organization', 'makevisible': '=makevisible' }, - controller: function($scope, $element, ApiService) { + controller: function($scope, $element, ApiService) { $scope.loading = false; $scope.applications = []; - + $scope.createApplication = function(appName) { if (!appName) { return; } @@ -3553,7 +3553,7 @@ quayApp.directive('robotsManager', function () { $scope.shownRobot = info; $scope.showRobotCounter++; }; - + $scope.findRobotIndexByName = function(name) { for (var i = 0; i < $scope.robots.length; ++i) { if ($scope.robots[i].name == name) { @@ -3943,13 +3943,13 @@ quayApp.directive('repoSearch', function () { $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) { ++searchToken; }, true); - + var repoHound = new Bloodhound({ name: 'repositories', remote: { url: '/api/v1/find/repository?query=%QUERY', replace: function (url, uriEncodedQuery) { - url = url.replace('%QUERY', uriEncodedQuery); + url = url.replace('%QUERY', uriEncodedQuery); url += '&cb=' + searchToken; return url; }, @@ -3966,8 +3966,8 @@ quayApp.directive('repoSearch', function () { return datums; } }, - datumTokenizer: function(d) { - return Bloodhound.tokenizers.whitespace(d.val); + datumTokenizer: function(d) { + return Bloodhound.tokenizers.whitespace(d.val); }, queryTokenizer: Bloodhound.tokenizers.whitespace }); @@ -3975,7 +3975,7 @@ quayApp.directive('repoSearch', function () { var element = $($element[0].childNodes[0]); element.typeahead({ 'highlight': true }, { - source: repoHound.ttAdapter(), + source: repoHound.ttAdapter(), templates: { 'suggestion': function (datum) { template = '
    '; @@ -4015,23 +4015,23 @@ quayApp.directive('headerBar', function () { }, controller: function($scope, $element, $location, UserService, PlanService, ApiService, NotificationService) { $scope.notificationService = NotificationService; - + // Monitor any user changes and place the current user into the scope. UserService.updateUserIn($scope); - + $scope.signout = function() { ApiService.logout().then(function() { UserService.load(); $location.path('/'); }); }; - + $scope.appLinkTarget = function() { if ($("div[ng-view]").length === 0) { return "_self"; } return ""; - }; + }; } }; return directiveDefinitionObject; @@ -4101,7 +4101,7 @@ quayApp.directive('entitySearch', function () { // Reset the cached teams and robots. $scope.teams = null; $scope.robots = null; - + // Load the organization's teams (if applicable). if ($scope.isOrganization && isSupported('team')) { // Note: We load the org here again so that we always have the fully up-to-date @@ -4129,7 +4129,7 @@ quayApp.directive('entitySearch', function () { bootbox.prompt('Enter the name of the new team', function(teamname) { if (!teamname) { return; } - + var regex = new RegExp(TEAM_PATTERN); if (!regex.test(teamname)) { bootbox.alert('Invalid team name'); @@ -4139,7 +4139,7 @@ quayApp.directive('entitySearch', function () { createOrganizationTeam(ApiService, $scope.namespace, teamname, function(created) { $scope.setEntity(created.name, 'team', false); $scope.teams[teamname] = created; - }); + }); }); }; @@ -4158,7 +4158,7 @@ quayApp.directive('entitySearch', function () { createRobotAccount(ApiService, $scope.isOrganization, $scope.namespace, robotname, function(created) { $scope.setEntity(created.name, 'user', true); $scope.robots.push(created); - }); + }); }); }; @@ -4252,8 +4252,8 @@ quayApp.directive('entitySearch', function () { return datums; } }, - datumTokenizer: function(d) { - return Bloodhound.tokenizers.whitespace(d.val); + datumTokenizer: function(d) { + return Bloodhound.tokenizers.whitespace(d.val); }, queryTokenizer: Bloodhound.tokenizers.whitespace }); @@ -4294,7 +4294,7 @@ quayApp.directive('entitySearch', function () { var class_string = ''; for (var i = 0; i < classes.length; ++i) { - if (i > 0) { + if (i > 0) { if (i == classes.length - 1) { class_string += ' or '; } else { @@ -4309,17 +4309,17 @@ quayApp.directive('entitySearch', function () { } return null; - }, + }, 'suggestion': function (datum) { template = '
    '; if (datum.entity.kind == 'user' && !datum.entity.is_robot) { template += ''; } else if (datum.entity.kind == 'user' && datum.entity.is_robot) { - template += ''; + template += ''; } else if (datum.entity.kind == 'team') { template += ''; } else if (datum.entity.kind == 'org') { - template += ''; } @@ -4361,7 +4361,7 @@ quayApp.directive('entitySearch', function () { if (!input) { return; } $(input).typeahead('val', ''); - $scope.clearEntityInternal(); + $scope.clearEntityInternal(); }); $scope.$watch('placeholder', function(title) { @@ -4411,7 +4411,7 @@ quayApp.directive('roleGroup', function () { controller: function($scope, $element) { $scope.setRole = function(role) { if ($scope.currentRole == role) { return; } - if ($scope.roleChanged) { + if ($scope.roleChanged) { $scope.roleChanged({'role': role}); } else { $scope.currentRole = role; @@ -4490,10 +4490,10 @@ quayApp.directive('billingOptions', function () { 'diners club': 'diners', 'discover': 'discover', 'jcb': 'jcb', - 'mastercard': 'mastercard', + 'mastercard': 'mastercard', 'visa': 'visa' }; - + kind = supported[kind] || 'credit'; return kind + '.png'; }; @@ -4525,7 +4525,7 @@ quayApp.directive('billingOptions', function () { save(); } }; - + $scope.$watch('invoice_email', checkSave); $scope.$watch('organization', update); $scope.$watch('user', update); @@ -4534,7 +4534,7 @@ quayApp.directive('billingOptions', function () { return directiveDefinitionObject; }); - + quayApp.directive('planManager', function () { var directiveDefinitionObject = { priority: 0, @@ -4550,7 +4550,7 @@ quayApp.directive('planManager', function () { }, controller: function($scope, $element, PlanService, ApiService) { $scope.isExistingCustomer = false; - + $scope.parseDate = function(timestamp) { return new Date(timestamp * 1000); }; @@ -4576,7 +4576,7 @@ quayApp.directive('planManager', function () { 'opened': function() { $scope.planChanging = true; }, 'closed': function() { $scope.planChanging = false; }, 'success': subscribedToPlan, - 'failure': function(resp) { + 'failure': function(resp) { $scope.planChanging = false; } }; @@ -4595,7 +4595,7 @@ quayApp.directive('planManager', function () { PlanService.getPlanIncludingDeprecated(sub.plan, function(subscribedPlan) { $scope.subscribedPlan = subscribedPlan; $scope.planUsagePercent = sub.usedPrivateRepos * 100 / $scope.subscribedPlan.privateRepos; - + if ($scope.planChanged) { $scope.planChanged({ 'plan': subscribedPlan }); } @@ -4623,7 +4623,7 @@ quayApp.directive('planManager', function () { PlanService.verifyLoaded(function(plans) { $scope.plans = plans; update(); - + if ($scope.readyForPlan) { var planRequested = $scope.readyForPlan(); if (planRequested && planRequested != PlanService.getFreePlan()) { @@ -4689,7 +4689,7 @@ quayApp.directive('namespaceSelector', function () { namespaceObj = $scope.namespaces[$scope.user.username]; } - var newNamespace = namespaceObj.name || namespaceObj.username; + var newNamespace = namespaceObj.name || namespaceObj.username; $scope.namespaceObj = namespaceObj; $scope.namespace = newNamespace; @@ -4774,7 +4774,7 @@ quayApp.directive('buildLogError', function () { var repo = repo_and_tag.substring(0, tagIndex); localInfo['repo_url'] = repo_url; - localInfo['repo'] = repo; + localInfo['repo'] = repo; localInfo['isLocal'] = repo_url.indexOf(Config.SERVER_HOSTNAME + '/') == 0; } @@ -4953,7 +4953,7 @@ quayApp.directive('dropdownSelect', function ($compile) { // Setup lookahead. var input = $($element).find('.lookahead-input'); - + $scope.$watch('clearValue', function(cv) { if (cv) { $scope.selectedItem = null; @@ -4997,7 +4997,7 @@ quayApp.directive('dropdownSelect', function ($compile) { datumTokenizer: function(d) { return Bloodhound.tokenizers.whitespace(d.val || d.value || ''); }, - queryTokenizer: Bloodhound.tokenizers.whitespace + queryTokenizer: Bloodhound.tokenizers.whitespace }); dropdownHound.initialize(); @@ -5040,7 +5040,7 @@ quayApp.directive('dropdownSelect', function ($compile) { var iconContainer = element.find('div.dropdown-select-icon-transclude'); var menuContainer = element.find('div.dropdown-select-menu-transclude'); - + angular.forEach(transcludedElements, function(elem) { if (angular.element(elem).hasClass('dropdown-select-icon')) { iconContainer.append(elem); @@ -5049,7 +5049,7 @@ quayApp.directive('dropdownSelect', function ($compile) { } }); - transcludedBlock.remove(); + transcludedBlock.remove(); } }; return directiveDefinitionObject; @@ -5213,7 +5213,7 @@ quayApp.directive('setupTriggerDialog', function () { $scope.currentView = 'analyzed'; return; } - + var params = { 'repository': $scope.repository.namespace + '/' + $scope.repository.name, 'trigger_uuid': $scope.trigger.id @@ -5332,7 +5332,7 @@ quayApp.directive('triggerSetupGithub', function () { if ($scope.isMatching(kind, name, $scope.state.branchTagFilter)) { return; } - + var newFilter = kind + '/' + name; var existing = $scope.state.branchTagFilter; if (existing) { @@ -5376,7 +5376,7 @@ quayApp.directive('triggerSetupGithub', function () { if (ref.kind == 'branch') { $scope.branchNames.push(ref.name); } else { - $scope.tagNames.push(ref.name); + $scope.tagNames.push(ref.name); } } @@ -5410,9 +5410,9 @@ quayApp.directive('triggerSetupGithub', function () { } callback(); - }, ApiService.errorDisplay('Cannot load locations')); + }, ApiService.errorDisplay('Cannot load locations')); } - + $scope.handleLocationInput = function(location) { $scope.state.isInvalidLocation = $scope.locations.indexOf(location) < 0; $scope.trigger['config']['subdir'] = location || ''; @@ -5429,7 +5429,7 @@ quayApp.directive('triggerSetupGithub', function () { $scope.trigger['config']['subdir'] = location || ''; $scope.trigger.$ready = true; }; - + $scope.selectRepo = function(repo, org) { $scope.state.currentRepo = { 'repo': repo, @@ -5455,7 +5455,7 @@ quayApp.directive('triggerSetupGithub', function () { }; }; - var setupTypeahead = function() { + var setupTypeahead = function() { var repos = []; for (var i = 0; i < $scope.orgs.length; ++i) { var org = $scope.orgs[i]; @@ -5483,7 +5483,7 @@ quayApp.directive('triggerSetupGithub', function () { }; $scope.$watch('state.currentRepo', function(repo) { - if (repo) { + if (repo) { $scope.selectRepoInternal(repo); } }); @@ -5519,7 +5519,7 @@ quayApp.directive('buildLogCommand', function () { if (colon <= 0) { return ''; } - + return $.trim(fullTitle.substring(colon + 1)); }; } @@ -5543,7 +5543,7 @@ quayApp.directive('dockerfileCommand', function () { 'quay.io': function(pieces) { var rnamespace = pieces[pieces.length - 2]; var rname = pieces[pieces.length - 1].split(':')[0]; - return '/repository/' + rnamespace + '/' + rname + '/'; + return '/repository/' + rnamespace + '/' + rname + '/'; }, '': function(pieces) { @@ -5562,11 +5562,11 @@ quayApp.directive('dockerfileCommand', function () { if (!registryHandlers[registry]) { return title; } - + return ' ' + title + ''; } }; - + $scope.getCommandKind = function(title) { var space = title.indexOf(' '); return title.substring(0, space); @@ -5577,17 +5577,17 @@ quayApp.directive('dockerfileCommand', function () { if (space <= 0) { return UtilService.textToSafeHtml(title); } - + var kind = $scope.getCommandKind(title); var sanitized = UtilService.textToSafeHtml(title.substring(space + 1)); - + var handler = kindHandlers[kind || '']; if (handler) { return handler(sanitized); } else { return sanitized; } - }; + }; } }; return directiveDefinitionObject; @@ -5667,7 +5667,7 @@ quayApp.directive('buildMessage', function () { case 'starting': case 'initializing': return 'Starting Dockerfile build'; - + case 'waiting': return 'Waiting for available build worker'; @@ -5676,16 +5676,16 @@ quayApp.directive('buildMessage', function () { case 'pulling': return 'Pulling base image'; - + case 'building': return 'Building image from Dockerfile'; - + case 'pushing': return 'Pushing image built from Dockerfile'; - + case 'complete': return 'Dockerfile build completed and pushed'; - + case 'error': return 'Dockerfile build failed'; } @@ -5733,7 +5733,7 @@ quayApp.directive('buildProgress', function () { return 0; break; } - + return -1; }; } @@ -5782,7 +5782,7 @@ quayApp.directive('externalNotificationView', function () { "className": "btn-primary" } } - }); + }); }); }; @@ -5821,7 +5821,7 @@ quayApp.directive('createExternalNotificationDialog', function () { $scope.events = ExternalNotificationData.getSupportedEvents(); $scope.methods = ExternalNotificationData.getSupportedMethods(); - + $scope.setEvent = function(event) { $scope.currentEvent = event; }; @@ -5878,7 +5878,7 @@ quayApp.directive('createExternalNotificationDialog', function () { $scope.handleEmailCheck = function(isAuthorized) { if (isAuthorized) { $scope.performCreateNotification(); - return; + return; } if ($scope.status == 'authorizing-email-sent') { @@ -5929,7 +5929,7 @@ quayApp.directive('createExternalNotificationDialog', function () { $scope.unauthorizedEmail = false; $('#createNotificationModal').modal({}); } - }); + }); } }; return directiveDefinitionObject; @@ -6060,7 +6060,7 @@ quayApp.directive('notificationView', function () { } else { var parts = url.split('?') $location.path(parts[0]); - + if (parts.length > 1) { $location.search(parts[1]); } @@ -6123,7 +6123,7 @@ quayApp.directive('dockerfileBuildDialog', function () { $scope.errorMessage = null; $scope.startCounter++; }; - + $scope.$watch('showNow', function(sn) { if (sn && $scope.repository) { $('#dockerfilebuildModal').modal({}); @@ -6281,11 +6281,11 @@ quayApp.directive('dockerfileBuildForm', function () { }; request.send(file); }; - + var startFileUpload = function(repo) { $scope.uploading = true; $scope.uploading_progress = 0; - + var uploader = $('#file-drop')[0]; if (uploader.files.length == 0) { handleMissingFile(); @@ -6295,18 +6295,18 @@ quayApp.directive('dockerfileBuildForm', function () { var file = uploader.files[0]; $scope.upload_file = file.name; - + var mimeType = file.type || 'application/octet-stream'; var data = { 'mimeType': mimeType }; - + var getUploadUrl = ApiService.getFiledropUrl(data).then(function(resp) { conductUpload(file, resp.url, resp.file_id, mimeType); }, function() { handleUploadFailed('Could not retrieve upload URL'); }); - }; + }; $scope.$watch('internal.hasDockerfile', function(d) { $scope.hasDockerfile = d; @@ -6451,12 +6451,12 @@ quayApp.directive('tagSpecificImagesView', function () { if (image.ancestors.length > 1) { classes += 'child '; } - + var currentTag = $scope.repository.tags[$scope.tag]; if (image.id == currentTag.image_id) { classes += 'tag-image '; } - + return classes; }; @@ -6475,7 +6475,7 @@ quayApp.directive('tagSpecificImagesView', function () { if (!tag_image) { return; } - + callback(tag_image); var ancestors = tag_image.ancestors.split('/').reverse(); @@ -6485,7 +6485,7 @@ quayApp.directive('tagSpecificImagesView', function () { if (image == opt_cutoff) { return; } - + callback(image); } } @@ -6502,7 +6502,7 @@ quayApp.directive('tagSpecificImagesView', function () { $scope.tagSpecificImages = []; return; } - + var getIdsForTag = function(currentTag) { var ids = {}; forAllTagImages(currentTag, function(image) { @@ -6530,7 +6530,7 @@ quayApp.directive('tagSpecificImagesView', function () { images.push(image); } } - + images.sort(function(a, b) { var result = new Date(b.created) - new Date(a.created); if (result != 0) { @@ -6600,7 +6600,7 @@ quayApp.directive('ngVisible', function () { quayApp.config( [ '$compileProvider', function( $compileProvider ) - { + { $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|mailto|tel|irc):/); } ]); @@ -6681,11 +6681,11 @@ quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', 'PlanServi if (!description) { description = 'Hosted private docker repositories. Includes full user management and history. Free for public repositories.'; } - + // Note: We set the content of the description tag manually here rather than using Angular binding // because we need the tag to have a default description that is not of the form "{{ description }}", // we read by tools that do not properly invoke the Angular code. - $('#descriptionTag').attr('content', description); + $('#descriptionTag').attr('content', description); }); $rootScope.$on('$routeUpdate', function(){ @@ -6738,8 +6738,8 @@ quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', 'PlanServi $location.search(newSearch); }); - - e.preventDefault(); + + e.preventDefault(); }); if (activeTab) { diff --git a/static/js/controllers.js b/static/js/controllers.js index c8a8cc433..4a5a20622 100644 --- a/static/js/controllers.js +++ b/static/js/controllers.js @@ -59,13 +59,13 @@ function PlansCtrl($scope, $location, UserService, PlanService, $routeParams) { $scope.signedIn = function() { $('#signinModal').modal('hide'); - PlanService.handleNotedPlan(); + PlanService.handleNotedPlan(); }; - + $scope.buyNow = function(plan) { PlanService.notePlan(plan); if ($scope.user && !$scope.user.anonymous) { - PlanService.handleNotedPlan(); + PlanService.handleNotedPlan(); } else { $('#signinModal').modal({}); } @@ -77,7 +77,7 @@ function PlansCtrl($scope, $location, UserService, PlanService, $routeParams) { if ($scope && $routeParams['trial-plan']) { $scope.buyNow($routeParams['trial-plan']); - } + } }, /* include the personal plan */ true); } @@ -94,7 +94,7 @@ function TutorialCtrl($scope, AngularTour, AngularTourSignals, UserService, Conf 'steps': [ { 'title': 'Welcome to the ' + Config.REGISTRY_TITLE_SHORT + ' tutorial!', - 'templateUrl': '/static/tutorial/welcome.html' + 'templateUrl': '/static/tutorial/welcome.html' }, { 'title': 'Sign in to get started', @@ -235,7 +235,7 @@ function RepoListCtrl($scope, $sanitize, Restangular, UserService, ApiService) { $scope.namespace = null; $scope.page = 1; $scope.publicPageCount = null; - + // Monitor changes in the user. UserService.updateUserIn($scope, function() { loadMyRepos($scope.namespace); @@ -269,7 +269,7 @@ function RepoListCtrl($scope, $sanitize, Restangular, UserService, ApiService) { } var options = {'public': false, 'sort': true, 'namespace': namespace}; - + $scope.user_repositories = ApiService.listReposAsResource().withOptions(options).get(function(resp) { return resp.repositories; }); @@ -318,7 +318,7 @@ function LandingCtrl($scope, UserService, ApiService, Features, Config) { if (namespace == $scope.user.username) { return true; } - + if ($scope.user.organizations) { for (var i = 0; i < $scope.user.organizations.length; ++i) { var org = $scope.user.organizations[i]; @@ -483,7 +483,7 @@ function RepoCtrl($scope, $sanitize, Restangular, ImageMetadataService, ApiServi $scope.currentPullCommand = $scope.pullCommands[0]; }; - + $scope.showNewBuildDialog = function() { $scope.buildDialogShowCounter++; }; @@ -655,7 +655,7 @@ function RepoCtrl($scope, $sanitize, Restangular, ImageMetadataService, ApiServi $scope.setImage = function(imageId, opt_updateURL) { if (!$scope.images) { return; } - + var image = null; for (var i = 0; i < $scope.images.length; ++i) { var currentImage = $scope.images[i]; @@ -691,7 +691,7 @@ function RepoCtrl($scope, $sanitize, Restangular, ImageMetadataService, ApiServi // We must find a good default. for (tagName in repo.tags) { if (!proposedTag || tagName == 'latest') { - proposedTag = repo.tags[tagName]; + proposedTag = repo.tags[tagName]; } } } @@ -702,7 +702,7 @@ function RepoCtrl($scope, $sanitize, Restangular, ImageMetadataService, ApiServi if ($scope.tree) { $scope.tree.setTag(proposedTag.name); - } + } if (opt_updateURL) { $location.search('image', null); @@ -871,7 +871,7 @@ function RepoCtrl($scope, $sanitize, Restangular, ImageMetadataService, ApiServi }; var listImages = function() { - var params = {'repository': namespace + '/' + name}; + var params = {'repository': namespace + '/' + name}; $scope.imageHistory = ApiService.listRepositoryImagesAsResource(params).get(function(resp) { $scope.images = resp.images; $scope.specificImages = []; @@ -971,7 +971,7 @@ function BuildPackageCtrl($scope, Restangular, ApiService, DataFileService, $rou return dockerfilePath; }; - var processBuildPack = function(uint8array) { + var processBuildPack = function(uint8array) { var archiveread = function(files) { var getpath = function(file) { return file.path; @@ -1056,7 +1056,7 @@ function BuildPackageCtrl($scope, Restangular, ApiService, DataFileService, $rou $scope.accessDenied = true; return; } - + $rootScope.title = 'Repository Build Pack - ' + resp['display_name']; $scope.repobuild = resp; $scope.repo = { @@ -1115,7 +1115,7 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope $('#confirmRestartBuildModal').modal('hide'); var subdirectory = ''; - if (build['job_config']) { + if (build['job_config']) { subdirectory = build['job_config']['build_subdir'] || ''; } @@ -1159,7 +1159,7 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope $scope.processANSI = function(message, container) { var filter = container.logs._filter = (container.logs._filter || ansi2html.create()); - + // Note: order is important here. var setup = filter.getSetupHtml(); var stream = filter.addInputToStream(message); @@ -1194,7 +1194,7 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope if ($scope.pollChannel) { $scope.pollChannel.stop(); } - + // Create a new channel for polling the build status and logs. var conductStatusAndLogRequest = function(callback) { getBuildStatusAndLogs(build, callback); @@ -1230,7 +1230,7 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope return endIndex; }; - var getBuildStatusAndLogs = function(build, callback) { + var getBuildStatusAndLogs = function(build, callback) { var params = { 'repository': namespace + '/' + name, 'build_uuid': build.id @@ -1238,7 +1238,7 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope ApiService.getRepoBuildStatus(null, params, true).then(function(resp) { if (build != $scope.currentBuild) { callback(false); return; } - + // Note: We use extend here rather than replacing as Angular is depending on the // root build object to remain the same object. var matchingBuilds = $.grep($scope.builds, function(elem) { @@ -1258,9 +1258,9 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope 'start': $scope.logStartIndex }; - ApiService.getRepoBuildLogsAsResource(params, true).withOptions(options).get(function(resp) { + ApiService.getRepoBuildLogsAsResource(params, true).withOptions(options).get(function(resp) { if (build != $scope.currentBuild) { callback(false); return; } - + // Process the logs we've received. $scope.logStartIndex = processLogs(resp['logs'], resp['start'], resp['total']); @@ -1323,7 +1323,7 @@ function RepoBuildCtrl($scope, Restangular, ApiService, $routeParams, $rootScope fetchRepository(); } -function RepoAdminCtrl($scope, Restangular, ApiService, KeyService, TriggerService, $routeParams, +function RepoAdminCtrl($scope, Restangular, ApiService, KeyService, TriggerService, $routeParams, $rootScope, $location, UserService, Config, Features, ExternalNotificationData) { var namespace = $routeParams.namespace; @@ -1335,7 +1335,7 @@ function RepoAdminCtrl($scope, Restangular, ApiService, KeyService, TriggerServi $scope.permissions = {'team': [], 'user': [], 'loading': 2}; $scope.logsShown = 0; $scope.deleting = false; - + $scope.permissionCache = {}; $scope.showTriggerSetupCounter = 0; @@ -1436,7 +1436,7 @@ function RepoAdminCtrl($scope, Restangular, ApiService, KeyService, TriggerServi var permission = $scope.permissions[kind][entityName]; var currentRole = permission.role; permission.role = role; - + var permissionPut = Restangular.one(getRestUrl('repository', namespace, name, 'permissions', kind, entityName)); permissionPut.customPUT(permission).then(function() {}, function(resp) { $scope.permissions[kind][entityName] = {'role': currentRole}; @@ -1534,7 +1534,7 @@ function RepoAdminCtrl($scope, Restangular, ApiService, KeyService, TriggerServi $scope.deleting = true; ApiService.deleteRepository(null, params).then(function() { $scope.repo = null; - + setTimeout(function() { document.location = '/repository/'; }, 1000); @@ -1545,7 +1545,7 @@ function RepoAdminCtrl($scope, Restangular, ApiService, KeyService, TriggerServi }; $scope.showNewNotificationCounter = 0; - + $scope.showNewNotificationDialog = function() { $scope.showNewNotificationCounter++; }; @@ -1629,7 +1629,7 @@ function RepoAdminCtrl($scope, Restangular, ApiService, KeyService, TriggerServi }; $scope.showManualBuildDialog = 0; - + $scope.startTrigger = function(trigger, opt_custom) { var parameters = TriggerService.getRunParameters(trigger.service); if (parameters.length && !opt_custom) { @@ -1767,7 +1767,7 @@ function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, Use $scope.invoicesShown = 0; $scope.USER_PATTERN = USER_PATTERN; - + $scope.loadAuthedApps = function() { if ($scope.authorizedApps) { return; } @@ -1810,7 +1810,7 @@ function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, Use $scope.orgPlans = plans; }); } - + $scope.convertStep = 1; }; @@ -1858,7 +1858,7 @@ function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, Use }, function(result) { $scope.updatingUser = false; UIService.showFormError('#changeUsernameForm', result); - }); + }); }; $scope.changeEmail = function() { @@ -1903,7 +1903,7 @@ function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, Use UserService.load(); }, function(result) { $scope.updatingUser = false; - UIService.showFormError('#changePasswordForm', result); + UIService.showFormError('#changePasswordForm', result); }); }; @@ -1920,7 +1920,7 @@ function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, Use }; } -function ImageViewCtrl($scope, $routeParams, $rootScope, $timeout, ApiService, ImageMetadataService) { +function ImageViewCtrl($scope, $routeParams, $rootScope, $timeout, ApiService, ImageMetadataService) { var namespace = $routeParams.namespace; var name = $routeParams.name; var imageid = $routeParams.image; @@ -1944,7 +1944,7 @@ function ImageViewCtrl($scope, $routeParams, $rootScope, $timeout, ApiService, I if (index < 0) { return ''; } - + return filepath.substr(0, index).split('/'); }; @@ -1967,10 +1967,10 @@ function ImageViewCtrl($scope, $routeParams, $rootScope, $timeout, ApiService, I $scope.search['$'] = filter; document.getElementById('change-filter').value = filter; }; - + $scope.initializeTree = function() { if ($scope.tree) { return; } - + $scope.tree = new ImageFileChangeTree($scope.image, $scope.combinedChanges); $timeout(function() { $scope.tree.draw('changes-tree-container'); @@ -1990,7 +1990,7 @@ function ImageViewCtrl($scope, $routeParams, $rootScope, $timeout, ApiService, I var fetchImage = function() { var params = { 'repository': namespace + '/' + name, - 'image_id': imageid + 'image_id': imageid }; $scope.image = ApiService.getImageAsResource(params).get(function(image) { @@ -2015,14 +2015,14 @@ function ImageViewCtrl($scope, $routeParams, $rootScope, $timeout, ApiService, I var fetchChanges = function() { var params = { 'repository': namespace + '/' + name, - 'image_id': imageid + 'image_id': imageid }; ApiService.getImageChanges(null, params).then(function(changes) { var combinedChanges = []; var addCombinedChanges = function(c, kind) { for (var i = 0; i < c.length; ++i) { - combinedChanges.push({ + combinedChanges.push({ 'kind': kind, 'file': c[i] }); @@ -2066,7 +2066,7 @@ function NewRepoCtrl($scope, $location, $http, $timeout, UserService, ApiService $scope.$watch('repo.namespace', function(namespace) { // Note: Can initially be undefined. if (!namespace) { return; } - + var isUserNamespace = (namespace == $scope.user.username); $scope.planRequired = null; @@ -2103,7 +2103,7 @@ function NewRepoCtrl($scope, $location, $http, $timeout, UserService, ApiService } } }); - + return true; }; @@ -2176,7 +2176,7 @@ function NewRepoCtrl($scope, $location, $http, $timeout, UserService, ApiService var isUserNamespace = $scope.isUserNamespace; ApiService.getPrivateAllowed(isUserNamespace ? null : $scope.repo.namespace).then(function(resp) { $scope.checkingPlan = false; - + if (resp['privateAllowed']) { $scope.planRequired = null; return; @@ -2218,8 +2218,8 @@ function OrgViewCtrl($rootScope, $scope, ApiService, $routeParams) { { 'id': 'creator', 'title': 'Creator', 'kind': 'success' }, { 'id': 'admin', 'title': 'Admin', 'kind': 'primary' } ]; - - $scope.setRole = function(role, teamname) { + + $scope.setRole = function(role, teamname) { var previousRole = $scope.organization.teams[teamname].role; $scope.organization.teams[teamname].role = role; @@ -2231,7 +2231,7 @@ function OrgViewCtrl($rootScope, $scope, ApiService, $routeParams) { var data = $scope.organization.teams[teamname]; ApiService.updateOrganizationTeam(data, params).then(function(resp) { - }, function(resp) { + }, function(resp) { $scope.organization.teams[teamname].role = previousRole; $scope.roleError = resp.data || ''; $('#cannotChangeTeamModal').modal({}); @@ -2306,7 +2306,7 @@ function OrgAdminCtrl($rootScope, $scope, $timeout, Restangular, $routeParams, U PlanService.getPlans(function(plans) { $scope.plans = plans; $scope.plan_map = {}; - + for (var i = 0; i < plans.length; ++i) { $scope.plan_map[plans[i].stripeId] = plans[i]; } @@ -2321,7 +2321,7 @@ function OrgAdminCtrl($rootScope, $scope, $timeout, Restangular, $routeParams, U $scope.invoicesShown = 0; $scope.applicationsShown = 0; $scope.changingOrganization = false; - + $scope.loadLogs = function() { $scope.logsShown++; }; @@ -2444,7 +2444,7 @@ function TeamViewCtrl($rootScope, $scope, $timeout, Features, Restangular, ApiSe $scope.addNewMember = function(member) { if (!member || $scope.memberMap[member.name]) { return; } - + var params = { 'orgname': orgname, 'teamname': teamname, @@ -2539,7 +2539,7 @@ function TeamViewCtrl($rootScope, $scope, $timeout, Features, Restangular, ApiSe $scope.membersResource = ApiService.getOrganizationTeamMembersAsResource(params).get(function(resp) { $scope.members = resp.members; $scope.canEditMembers = resp.can_edit; - + $('.info-icon').popover({ 'trigger': 'hover', 'html': true @@ -2687,7 +2687,7 @@ function OrgMemberLogsCtrl($scope, $routeParams, $rootScope, $timeout, Restangul }); return resp.member; - }); + }); }; // Load the org info and the member info. @@ -2783,7 +2783,7 @@ function ManageApplicationCtrl($scope, $routeParams, $rootScope, $location, $tim ' under organization ' + $scope.orgname; return resp; - }); + }); }; diff --git a/static/js/graphing.js b/static/js/graphing.js index 97459654c..c7f059991 100644 --- a/static/js/graphing.js +++ b/static/js/graphing.js @@ -8,8 +8,8 @@ throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable"); } - var aArgs = Array.prototype.slice.call(arguments, 1), - fToBind = this, + var aArgs = Array.prototype.slice.call(arguments, 1), + fToBind = this, fNOP = function () {}, fBound = function () { return fToBind.apply(this instanceof fNOP && oThis @@ -156,7 +156,7 @@ ImageHistoryTree.prototype.updateDimensions_ = function() { document.getElementById(container).style.maxHeight = (viewportHeight - boundingBox.top - 150) + 'px'; this.setupOverscroll_(); - + // Update the tree. var rootSvg = this.rootSvg_; var tree = this.tree_; @@ -188,7 +188,7 @@ ImageHistoryTree.prototype.draw = function(container) { // Save the container. this.container_ = container; - + if (!$('#' + container)[0]) { this.container_ = null; return; @@ -237,7 +237,7 @@ ImageHistoryTree.prototype.draw = function(container) { if (d.image.command && d.image.command.length) { html += '' + formatCommand(d.image) + ''; } - html += '' + formatTime(d.image.created) + ''; + html += '' + formatTime(d.image.created) + ''; var tags = d.tags || []; html += ''; @@ -438,7 +438,7 @@ ImageHistoryTree.prototype.buildRoot_ = function() { var ancestors = this.getAncestors_(image); var immediateParent = ancestors[ancestors.length - 1]; var parent = imageByDockerId[immediateParent]; - if (parent) { + if (parent) { // Add a reference to the parent. This makes walking the tree later easier. imageNode.parent = parent; parent.children.push(imageNode); @@ -612,12 +612,12 @@ ImageHistoryTree.prototype.setTag_ = function(tagName) { } var imageByDockerId = this.imageByDockerId_; - + // Save the current tag. var previousTagName = this.currentTag_; this.currentTag_ = tagName; this.currentImage_ = null; - + // Update the path. var tagImage = this.findImage_(function(image) { return image.tags.indexOf(tagName || '(no tag specified)') >= 0; @@ -716,7 +716,7 @@ ImageHistoryTree.prototype.update_ = function(source) { .attr("r", 1e-6) .style("fill", function(d) { return d._children ? "lightsteelblue" : "#fff"; }) .on("click", function(d) { that.toggle_(d); that.update_(d); }); - + // Create the group that will contain the node name and its tags. var g = nodeEnter.append("svg:g").style("fill-opacity", 1e-6); @@ -756,7 +756,7 @@ ImageHistoryTree.prototype.update_ = function(source) { .attr("y", 12) .attr("width", 110) .attr("height", DEPTH_HEIGHT - 20); - + // Add the tags container. fo.append('xhtml:div') .attr("class", "tags") @@ -949,7 +949,7 @@ function FileTreeBase() { * Counter for creating unique IDs. */ this.idCounter_ = 0; - + /** * Map from file path to associated tree node. */ @@ -1017,7 +1017,7 @@ FileTreeBase.prototype.updateDimensions_ = function() { this.barWidth_ = dimensions.bw; this.barHeight_ = dimensions.bh; - + return dimensions; }; @@ -1044,11 +1044,11 @@ FileTreeBase.prototype.dispose = function() { * Draws the tree. */ FileTreeBase.prototype.draw = function(container) { - this.container_ = container; - + this.container_ = container; + var dimensions = this.calculateDimensions_(container); if (!dimensions) { return; } - + var w = dimensions.w; var h = dimensions.h; var m = dimensions.m; @@ -1169,7 +1169,7 @@ FileTreeBase.prototype.getContainerHeight_ = function() { if (!dimensions) { return; } var barHeight = this.barHeight_; - var height = (this.getVisibleCount_(this.root_) * (barHeight + 2)); + var height = (this.getVisibleCount_(this.root_) * (barHeight + 2)); return height + dimensions.m[0] + dimensions.m[2]; }; @@ -1206,16 +1206,16 @@ FileTreeBase.prototype.update_ = function(source) { // Compute the flattened node list. var nodes = tree.nodes(this.root_); - + // Compute the "layout". nodes.forEach(function(n, i) { n.x = i * barHeight; }); - + // Update the nodes... var node = vis.selectAll("g.node") .data(nodes, function(d) { return d.id || (d.id = that.idCounter_++); }); - + var nodeEnter = node.enter().append("svg:g") .attr("class", function(d) { return "node " + (d.kind ? d.kind : 'folder'); @@ -1241,7 +1241,7 @@ FileTreeBase.prototype.update_ = function(source) { that.toggle_(d); that.update_(source); }); - + nodeEnter.append("svg:text") .attr("dy", 3.5) .attr("dx", 5.5 + 18) @@ -1261,7 +1261,7 @@ FileTreeBase.prototype.update_ = function(source) { .duration(duration) .attr("transform", function(d) { return "translate(" + d.y + "," + d.x + ")"; }) .style("opacity", 1); - + node.transition() .duration(duration) // TODO: reenable for full animation @@ -1281,7 +1281,7 @@ FileTreeBase.prototype.update_ = function(source) { node.select('.fo') .attr("x", function(d) { return d.kind ? barWidth - 18 : 0; }) .attr("y", -10) - + node.select('.node-icon') .html(function(d) { if (!d.kind) { @@ -1291,7 +1291,7 @@ FileTreeBase.prototype.update_ = function(source) { return that.determineIcon(d); }); - + // Transition exiting nodes to the parent's new position. node.exit().transition() .duration(duration) @@ -1299,11 +1299,11 @@ FileTreeBase.prototype.update_ = function(source) { // .attr("transform", function(d) { return "translate(" + source.y + "," + source.x + ")"; }) .style("opacity", 1e-6) .remove(); - + // Update the links... var link = vis.selectAll("path.link") .data(tree.links(nodes), function(d) { return d.target.id; }); - + // Enter any new links at the parent's previous position. link.enter().insert("svg:path", "g") .attr("class", "link") @@ -1314,7 +1314,7 @@ FileTreeBase.prototype.update_ = function(source) { .transition() .duration(duration) .attr("d", diagonal); - + // Transition links to their new position. link.transition() .duration(duration) @@ -1323,7 +1323,7 @@ FileTreeBase.prototype.update_ = function(source) { var t = d.target; return diagonal({source: s, target: t}); }); - + // Transition exiting nodes to the parent's new position. link.exit().transition() .duration(duration) @@ -1332,7 +1332,7 @@ FileTreeBase.prototype.update_ = function(source) { return diagonal({source: o, target: o}); }) .remove(); - + // Stash the old positions for transition. nodes.forEach(function(d) { d.x0 = d.x; @@ -1363,11 +1363,11 @@ function ImageFileChangeTree(image, changes) { * The parent image. */ this.image_ = image; - + /** * The changes being drawn. */ - this.changes_ = changes; + this.changes_ = changes; } $.extend(ImageFileChangeTree.prototype, FileTreeBase.prototype); @@ -1393,7 +1393,7 @@ ImageFileChangeTree.prototype.determineIcon = function(d) { 'removed': 'minus-square', 'changed': 'pencil-square' }; - + return ''; }; @@ -1526,7 +1526,7 @@ UsageChart.prototype.drawInternal_ = function() { // Update the text. this.text_.text(this.count_ + ' / ' + this.total_); } - + this.drawn_ = true; }; @@ -1610,7 +1610,7 @@ LogUsageChart.prototype.buildData_ = function(logs) { } this.entries_ = map; - + // Build the data itself. We create a single entry for each possible kind of data, and then add (x, y) pairs // for the number of times that kind of event occurred on a particular day. var dataArray = []; @@ -1626,7 +1626,7 @@ LogUsageChart.prototype.buildData_ = function(logs) { dataMap[key] = found; dataArray.push(found); } - + found.values.push({ 'x': entry.adjusted, 'y': entry.count @@ -1666,7 +1666,7 @@ LogUsageChart.prototype.buildData_ = function(logs) { return a['x'].getDate() - b['x'].getDate(); }); } - + return this.data_ = dataArray; }; @@ -1750,7 +1750,7 @@ LogUsageChart.prototype.handleStateChange_ = function(e) { allowed[this.data_[i].kind] = true; } } - + $(this).trigger({ 'type': 'filteringChanged', 'allowed': allowed @@ -1802,7 +1802,7 @@ LogUsageChart.prototype.draw = function(container, logData, startDate, endDate) } chart.xDomain(domain); - + // Finish setting up the chart. chart.xAxis .tickFormat(d3.time.format("%m/%d")); @@ -1822,4 +1822,4 @@ LogUsageChart.prototype.draw = function(container, logData, startDate, endDate) chart.dispatch.on('stateChange', function(e) { that.handleStateChange_(e); }); return that.chart_ = chart; }); -}; \ No newline at end of file +}; diff --git a/static/js/tour.js b/static/js/tour.js index fb1a8189b..c50d45379 100644 --- a/static/js/tour.js +++ b/static/js/tour.js @@ -1,9 +1,9 @@ angular.module("angular-tour", []) .provider('AngularTour', function() { - this.$get = ['$document', '$rootScope', '$compile', '$location', function($document, $rootScope, $compile, $location) { + this.$get = ['$document', '$rootScope', '$compile', '$location', function($document, $rootScope, $compile, $location) { $rootScope.angular_tour_current = null; - function _start(tour, opt_stepIndex, opt_existingScope) { + function _start(tour, opt_stepIndex, opt_existingScope) { tour.initialStep = opt_stepIndex || tour.initialStep || 0; tour.tourScope = opt_existingScope || null; $rootScope.angular_tour_current = tour; @@ -128,7 +128,7 @@ angular.module("angular-tour", []) speed: 400, color: '#333', animate: true, - easing: 'linear', + easing: 'linear', exitEvent: 'mouseenter', exitEventAppliesToElement: true, paddingX: 1, @@ -214,9 +214,9 @@ angular.module("angular-tour", []) // to transition it to an overlay tour. if ($scope.inline) { var counter = 0; - var unbind = $rootScope.$watch(function() { - return $location.path(); - }, function(location) { + var unbind = $rootScope.$watch(function() { + return $location.path(); + }, function(location) { // Since this callback fires for the first page display, we only unbind it // after the second call. if (counter == 1) { @@ -249,7 +249,7 @@ angular.module("angular-tour", []) return $location.path() == tourScope._replaceData(locationPath); }; }; - + // Signal: When an element is found in the page's DOM. signals.elementAvaliable = function(elementPath) { return function(tourScope) { diff --git a/static/js/untar.js b/static/js/untar.js index 02c0f6c07..79f280108 100644 --- a/static/js/untar.js +++ b/static/js/untar.js @@ -387,7 +387,7 @@ if (!Array.prototype.some) { /* * Extract data from an input. - * + * * @param data The data, in Uint8Array form. */ function Untar(data) { @@ -403,7 +403,7 @@ if (!Array.prototype.some) { 'files': [] }); }; - + window.Untar = Untar; - -})(); \ No newline at end of file + +})(); diff --git a/static/partials/about.html b/static/partials/about.html index 7b068e45c..a56ee968a 100644 --- a/static/partials/about.html +++ b/static/partials/about.html @@ -55,7 +55,7 @@

    Jacob Moshenko
    - Co-Founder

    + Co-Founder
    diff --git a/static/partials/confirm-invite.html b/static/partials/confirm-invite.html index e3d883e53..807ca4540 100644 --- a/static/partials/confirm-invite.html +++ b/static/partials/confirm-invite.html @@ -4,7 +4,7 @@
    -
    +
    {{ invalid }} diff --git a/static/partials/contact.html b/static/partials/contact.html index df988f9d8..8a50b0412 100644 --- a/static/partials/contact.html +++ b/static/partials/contact.html @@ -22,4 +22,4 @@

    {{ getTitle(info) }}

    -
    \ No newline at end of file +
    diff --git a/static/partials/guide.html b/static/partials/guide.html index e671b6302..ae429e3b8 100644 --- a/static/partials/guide.html +++ b/static/partials/guide.html @@ -1,5 +1,5 @@

    Redirecting...

    - If this page does not redirect, please click here. + If this page does not redirect, please click here.
    diff --git a/static/partials/image-view.html b/static/partials/image-view.html index 0ad7ce748..da2bd8140 100644 --- a/static/partials/image-view.html +++ b/static/partials/image-view.html @@ -2,7 +2,7 @@
    -

    +

    @@ -49,14 +49,14 @@
    -
    +
    Showing {{(combinedChanges | filter:search | limitTo:50).length}} of {{(combinedChanges | filter:search).length}} results
    -
    +
    -
    +
    @@ -77,6 +77,6 @@
    -
    +
    diff --git a/static/partials/landing-normal.html b/static/partials/landing-normal.html index 6b9b6e42e..6ad95f113 100644 --- a/static/partials/landing-normal.html +++ b/static/partials/landing-normal.html @@ -9,10 +9,10 @@ Quay.io is now part of CoreOS! Read the blog post.
    - +
    -
    +
    @@ -174,7 +174,7 @@
    - Quay.io has become an essential part of our infrastructure as we move to Docker-based deploys. + Quay.io has become an essential part of our infrastructure as we move to Docker-based deploys. The support and service that the Quay.io team provides is phenomenal. We couldn't do it without them!
    @@ -203,7 +203,7 @@ message-date="April 1, 2014"> Pushing Dockerfile changes to Github and having @quayio build the @docker image/container for you is extremely awesome. -
    +
  • @@ -246,7 +246,7 @@ ‹ › - +

    • @@ -269,7 +269,7 @@
    - +
    diff --git a/static/partials/landing.html b/static/partials/landing.html index a03190263..719d1a9cb 100644 --- a/static/partials/landing.html +++ b/static/partials/landing.html @@ -1,3 +1,3 @@
    -
    \ No newline at end of file +
    diff --git a/static/partials/manage-application.html b/static/partials/manage-application.html index aaae745b8..0c6f11427 100644 --- a/static/partials/manage-application.html +++ b/static/partials/manage-application.html @@ -10,7 +10,7 @@

    {{ application.name || '(Untitled)' }}

    - + {{ organization.name }}

    @@ -22,13 +22,13 @@ Warning: There is no OAuth Redirect setup for this application. Please enter it in the Settings tab.
    - +
    diff --git a/static/partials/new-organization.html b/static/partials/new-organization.html index 0de90293f..0450e1ab5 100644 --- a/static/partials/new-organization.html +++ b/static/partials/new-organization.html @@ -3,7 +3,7 @@
    - +

    Create Organization

    @@ -67,9 +67,9 @@
    Choose your organization's plan -
    +
    - +
    -
    +
    - +
    diff --git a/static/partials/org-admin.html b/static/partials/org-admin.html index af9f07a46..464256ab5 100644 --- a/static/partials/org-admin.html +++ b/static/partials/org-admin.html @@ -1,7 +1,7 @@
    - +
    @@ -28,7 +28,7 @@
    -
    +
    @@ -88,14 +88,14 @@
    -
    +
    Showing {{(membersFound | filter:search | limitTo:50).length}} of {{(membersFound | filter:search).length}} matching members
    -
    +
    -
    +
    @@ -103,7 +103,7 @@ - + - +
    Teams
    diff --git a/static/partials/organizations.html b/static/partials/organizations.html index b6310495a..ddf4f8595 100644 --- a/static/partials/organizations.html +++ b/static/partials/organizations.html @@ -1,4 +1,4 @@ -
    +
    diff --git a/static/partials/plans.html b/static/partials/plans.html index 18c7deebb..8313dd6f5 100644 --- a/static/partials/plans.html +++ b/static/partials/plans.html @@ -11,7 +11,7 @@ Public Repositories Public Repos - +
    Free Trial Free Trial - +
    @@ -148,7 +148,7 @@
    - +
    @@ -102,7 +102,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -164,10 +164,10 @@ - + - + {{ token.friendlyName }} @@ -245,7 +245,7 @@ - + @@ -279,7 +279,7 @@
    - +
    @@ -321,7 +321,7 @@
    -
    +
    diff --git a/static/partials/repo-build.html b/static/partials/repo-build.html index c8a352b5f..6b24dc5e8 100644 --- a/static/partials/repo-build.html +++ b/static/partials/repo-build.html @@ -25,7 +25,7 @@
    There are no builds for this repository
    - +
    @@ -40,7 +40,7 @@
    -
    +
    @@ -83,7 +83,7 @@
    - +
    diff --git a/static/partials/repo-list.html b/static/partials/repo-list.html index 28a900bf6..3e69f3d1a 100644 --- a/static/partials/repo-list.html +++ b/static/partials/repo-list.html @@ -8,7 +8,7 @@ Create Repository - +
    - +
    diff --git a/static/partials/security.html b/static/partials/security.html index 73e599aff..cab6194f4 100644 --- a/static/partials/security.html +++ b/static/partials/security.html @@ -41,4 +41,4 @@

    While not related directly to security, many of you are probably worried about whether you can depend on the data you store in Quay.io. All binary data that we store is stored in Amazon S3 at the highest redundancy level, which Amazon claims provides 11-nines of durability. Our service metadata (e.g. logins, tags, teams) is stored in a database which is backed up nightly, and backups are preserved for 7 days.

    -
    \ No newline at end of file +
    diff --git a/static/partials/super-user.html b/static/partials/super-user.html index 1d126b342..9b34cf159 100644 --- a/static/partials/super-user.html +++ b/static/partials/super-user.html @@ -41,7 +41,7 @@ You have deployed more repositories than your plan allows. Please upgrade your subscription by contacting CoreOS Sales.
    - +
    You are at your current plan's number of allowed repositories. It might be time to think about upgrading your subscription by contacting CoreOS Sales. @@ -50,7 +50,7 @@
    You are nearing the number of allowed deployed repositories. It might be time to think about upgrading your subscription by contacting CoreOS Sales. -
    +
    @@ -68,7 +68,7 @@
    - +
    @@ -84,8 +84,8 @@ -
    {{ created_user.email }} {{ created_user.password }}
    -
    + +
    @@ -93,17 +93,17 @@
    {{ usersError }} -
    +
    -
    +
    Showing {{(users | filter:search | limitTo:100).length}} of {{(users | filter:search).length}} matching users
    -
    +
    -
    +
    @@ -111,14 +111,14 @@ - + + @@ -152,7 +152,7 @@ - +
    E-mail address
    {{ current_user.username }} - {{ current_user.email }}
    @@ -42,8 +42,8 @@ - - + + diff --git a/static/partials/user-admin.html b/static/partials/user-admin.html index d7d9b583e..478b9b2d6 100644 --- a/static/partials/user-admin.html +++ b/static/partials/user-admin.html @@ -6,7 +6,7 @@ No matching user found -
    +
    @@ -69,7 +69,7 @@
    - +
    Robot Accounts
    		Authorized Permissions Revoke
    @@ -171,7 +171,7 @@
    - +
    @@ -221,7 +221,7 @@
    - +
    @@ -278,15 +278,15 @@
    Note: Converting a user account into an organization cannot be undone
    - +
    -
    +

    Convert to organization

    - +
    @@ -297,7 +297,7 @@
    - +
    -
    +
    diff --git a/static/partials/view-repo.html b/static/partials/view-repo.html index 3ebe2a36c..df3030803 100644 --- a/static/partials/view-repo.html +++ b/static/partials/view-repo.html @@ -10,12 +10,12 @@

    - -

    - + + +
    -
    @@ -53,7 +53,7 @@ ng-show="repo.can_admin"> - +
    @@ -127,12 +127,12 @@
    -
    +
    -
    +
    @@ -171,7 +171,7 @@
    - +
    @@ -191,7 +191,7 @@ bs-tooltip="tooltip.title" data-container="body">{{ getTotalSize(currentTag) | bytes }} - +
    @@ -238,7 +238,7 @@ (No Tags) - +
    @@ -316,7 +316,7 @@
    @@ -412,7 +412,7 @@ ?
    - The following images and any other images not referenced by a tag will be deleted: + The following images and any other images not referenced by a tag will be deleted:
    diff --git a/static/robots.txt b/static/robots.txt index df9e26b92..d34624918 100644 --- a/static/robots.txt +++ b/static/robots.txt @@ -1,2 +1,2 @@ User-agent: * -Disallow: /api/ \ No newline at end of file +Disallow: /api/ diff --git a/static/sitemap.xml b/static/sitemap.xml index 7136309cf..edd8399ab 100644 --- a/static/sitemap.xml +++ b/static/sitemap.xml @@ -12,7 +12,7 @@ https://quay.io/organizations/ weekly - + https://quay.io/repository/ always @@ -40,4 +40,4 @@ monthly 0.4 - \ No newline at end of file + diff --git a/static/tutorial/create-container.html b/static/tutorial/create-container.html index dcfb0e6b2..28115d255 100644 --- a/static/tutorial/create-container.html +++ b/static/tutorial/create-container.html @@ -10,8 +10,8 @@ 
     sudo docker ps -l
-CONTAINER ID        IMAGE               COMMAND             CREATED 
-07f2065197ef          ubuntu:12.04        echo fun            31 seconds ago   
+CONTAINER ID        IMAGE               COMMAND             CREATED
+07f2065197ef          ubuntu:12.04        echo fun            31 seconds ago
    diff --git a/storage/basestorage.py b/storage/basestorage.py index 675c3a738..332a5d2ca 100644 --- a/storage/basestorage.py +++ b/storage/basestorage.py @@ -7,13 +7,13 @@ class StoragePaths(object): @staticmethod def temp_store_handler(): tmpf = tempfile.TemporaryFile() - + def fn(buf): try: tmpf.write(buf) except IOError: pass - + return tmpf, fn def image_path(self, storage_uuid): @@ -88,4 +88,4 @@ class BaseStorage(StoragePaths): raise NotImplementedError def get_checksum(self, path): - raise NotImplementedError \ No newline at end of file + raise NotImplementedError diff --git a/storage/distributedstorage.py b/storage/distributedstorage.py index 1544d9725..67650225d 100644 --- a/storage/distributedstorage.py +++ b/storage/distributedstorage.py @@ -31,7 +31,7 @@ class DistributedStorage(StoragePaths): self.preferred_locations = list(preferred_locations) get_direct_download_url = _location_aware(BaseStorage.get_direct_download_url) - get_direct_upload_url = _location_aware(BaseStorage.get_direct_upload_url) + get_direct_upload_url = _location_aware(BaseStorage.get_direct_upload_url) get_content = _location_aware(BaseStorage.get_content) put_content = _location_aware(BaseStorage.put_content) stream_read = _location_aware(BaseStorage.stream_read) diff --git a/storage/fakestorage.py b/storage/fakestorage.py index cebed1e80..a0773d0c8 100644 --- a/storage/fakestorage.py +++ b/storage/fakestorage.py @@ -24,4 +24,4 @@ class FakeStorage(BaseStorage): return False def get_checksum(self, path): - return 'abcdefg' \ No newline at end of file + return 'abcdefg' diff --git a/templates/500.html b/templates/500.html index 5c03fcb13..2215a6e0a 100644 --- a/templates/500.html +++ b/templates/500.html @@ -42,7 +42,7 @@ @-webkit-keyframes steaming { 0% { -webkit-transform: translateX(0px) scaleX(1); - } + } 50% { -webkit-transform: translateX(-180%) scaleX(1); } @@ -72,7 +72,7 @@ .information h3 { margin-bottom: 20px; } - +
    -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/index.html b/templates/index.html index 51d687770..e6e698bac 100644 --- a/templates/index.html +++ b/templates/index.html @@ -15,7 +15,7 @@ {% block body_content %} - +
    diff --git a/templates/message.html b/templates/message.html index 169204634..a7754bdcb 100644 --- a/templates/message.html +++ b/templates/message.html @@ -3,7 +3,7 @@ - +
    diff --git a/templates/oauthorize.html b/templates/oauthorize.html index a83055fd4..714d9f6e7 100644 --- a/templates/oauthorize.html +++ b/templates/oauthorize.html @@ -16,7 +16,7 @@

    {{ application.name }}

    - + {{ application.organization.name }}

    @@ -34,7 +34,7 @@ - {{ scope.title }} + {{ scope.title }} {% if scope.dangerous %} diff --git a/templates/privacy.html b/templates/privacy.html index b2d575e17..8b4f66b90 100644 --- a/templates/privacy.html +++ b/templates/privacy.html @@ -73,7 +73,7 @@
    Terms and Conditions
    - Please also visit our Terms and Conditions section establishing the use, disclaimers, and limitations of liability governing the use of our website at https://quay.io/tos + Please also visit our Terms and Conditions section establishing the use, disclaimers, and limitations of liability governing the use of our website at https://quay.io/tos
    Your Consent
    diff --git a/templates/tos.html b/templates/tos.html index 34ec9bbf9..ccb2e11a7 100644 --- a/templates/tos.html +++ b/templates/tos.html @@ -48,13 +48,13 @@ you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by DevTable or otherwise. - +
  • By submitting Content or computer code to DevTable for inclusion in your Repositories, you grant DevTable a world-wide, royalty-free, and non-exclusive license to reproduce, modify, adapt and publish the Content solely for the purpose of providing the services you request. If you delete Content, DevTable will use reasonable efforts to remove it from the Service, but you acknowledge that caching or references to the Content may not be made immediately unavailable. -
    • +
  • Without limiting any of those representations or warranties, DevTable has the right (though not the obligation) to, in DevTable’s sole discretion (i) refuse or remove any content that, in DevTable’s reasonable opinion, violates any DevTable policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in DevTable’s sole discretion. DevTable will have no obligation to provide a refund of any amounts previously paid. -
    • +
  • Payment and Renewal.
    @@ -63,37 +63,37 @@
    Automatic Renewal.
    Unless you notify DevTable before the end of the applicable subscription period that you want to cancel an Account, your Account subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee for such Account (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Accounts can be canceled at any time in the Payment Information section of your User Settings.
    -
    • -
  • - Responsibility of Website Visitors. DevTable has not reviewed, and cannot review, all of the material, including computer software, submitted to the Service, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, DevTable does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. DevTable disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.
    • - -
  • - Content Posted on Other Websites. We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which Quay.io links, and that link to Quay.io. DevTable does not have any control over those non-DevTable websites and webpages, and is not responsible for their contents or their use. By linking to a non-DevTable website or webpage, DevTable does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. DevTable disclaims any responsibility for any harm resulting from your use of non-DevTable websites and webpages.
  • - Copyright Infringement and DMCA Policy. As DevTable asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by Quay.io violates your copyright, you are encouraged to notify DevTable in accordance with the provisions of the Digital Millennium Copyright Act (“DMCA”). DevTable will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. DevTable will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of DevTable or others. In the case of such termination, DevTable will have no obligation to provide a refund of any amounts previously paid to DevTable.
    • - + Responsibility of Website Visitors. DevTable has not reviewed, and cannot review, all of the material, including computer software, submitted to the Service, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, DevTable does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. DevTable disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted. + +
  • + Content Posted on Other Websites. We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which Quay.io links, and that link to Quay.io. DevTable does not have any control over those non-DevTable websites and webpages, and is not responsible for their contents or their use. By linking to a non-DevTable website or webpage, DevTable does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. DevTable disclaims any responsibility for any harm resulting from your use of non-DevTable websites and webpages.
    • + +
  • + Copyright Infringement and DMCA Policy. As DevTable asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by Quay.io violates your copyright, you are encouraged to notify DevTable in accordance with the provisions of the Digital Millennium Copyright Act (“DMCA”). DevTable will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. DevTable will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of DevTable or others. In the case of such termination, DevTable will have no obligation to provide a refund of any amounts previously paid to DevTable.
    • +
  • Intellectual Property. This Agreement does not transfer from DevTable to you any DevTable or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with DevTable. DevTable, Quay.io, the Quay.io logo, and all other trademarks, service marks, graphics and logos used in connection with Quay.io, or the Website are trademarks or registered trademarks of DevTable or DevTable’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any DevTable or third-party trademarks. -
    • +
  • Changes. DevTable reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. DevTable may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement. -
    • +
  • Termination. DevTable may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your Quay.io account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability. -
    • +
  • Disclaimer of Warranties. The Website is provided “as is”. DevTable and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither DevTable nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. -
    • +
  • Limitation of Liability. In no event will DevTable, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to DevTable under this agreement during the twelve (12) month period prior to the cause of action. DevTable shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law. -
    • +
  • General Representation and Warranty. You represent and warrant that (i) your use of the Website will be in strict accordance with the Quay.io Privacy Policy, with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the United States or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party. -
    • +
  • Indemnification. You agree to indemnify and hold harmless DevTable, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement. -
    • +
  • Miscellaneous. This Agreement constitutes the entire agreement between DevTable and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of DevTable, or by the posting by DevTable of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of New York, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in New York County, New York. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; DevTable may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.
    • diff --git a/test/data/test.db b/test/data/test.db index c3c2c33bc3f7c682b6794a3c7824f6cedac6af68..cdaa66e57f768e5e4463ddc644aca0f4add444b4 100644 GIT binary patch delta 8794 zcmeHMdw5jUwV!iN9+Qwjc)tRKWC97{BfxMkzf{2!Xsvf(c@X z1s|xbIF?;37jMO46$+F<00OWw{rWr18 z*Td!Y-ot6$DB^?Ogp6bg|7|yw7To~1Ukm%Pmf%+@%F%lwYyEnMC9s;Qu!t5#3(Wa~+^+w5_6yVDRk z)nYV(R#efV1w}?Qk~Kt|3S%Oq!>|y3ZSSORuUuRh3>KBRD)<`YE2s$te6@0|R4RmO z^IgS!ZEaCmsGzPUzlw88p29k}r=X1G%8HA9g`U!o+siSmK(j1;B_aVKmX&+vL;<21 zJ<$u}Y#-J6w8Y#49nU=uFtih|Y)oQL<*1pPYb#SVKXvt!Q1!_{@@3no#BmAOFeB z?kf?o3@=EiXBGvBCig_oA4J5+29jmTq%GE9XaN}_0yykL2sR%e5E7Y6a1ZgmdG1sN1Ljx zFtd!d)+Vi~t+c{j>n(7F#NwLDTFG1M=Y5DT^^~(>O@7c9l*Bs0@2m0^b)$TyG{|r= z@AS!jvBJ$r?qId#${)6XfKNgq!?HaR0r;l%M2m6ko|!N& zT)aONHzz%I;`s5zZE|?m{u+vxGJ8iJxDanAJE@r@Pd(I|^i&4f?ePXt$QLXt;R{i< zTwCWW^gD~B$_f;a%LFOlE%23Acmlpcv08S)9lx`Z%SQ-R%1oix83?cmuBe_wLMg0v z=lglFLUvdAOPB(#990P(h^McnDnC$OQ&;0;o#iDSPDY}~=~A3EH6_U9sS{(xs@l>Z z%Z3jhsV}_FKakY9F{@X3R~|#e={N>Hj`>0U!xB7 z&P;fb#Eb7GW3M}aQJ!cB9`S#O-R01A*NKC%qXrFKZ`eq81W??yBKD<#P4N|7D`NZp z^y!3*(%K;BWm&1H4iy!Z2Z~Ap99vr$kZWtX;vx^j@lM(A@hD>W$&b^+MITpW1lfvw zUrC@O%@heP1VGGj_{fQ`!C&2bW+`d!Gn7NPD@h&s>2Jg*1E+2&oD)W zHGn;-B1Ptqb{kO>2PG-q;8t`u}+su`R=aG#1`gkZH@%fK(_f5FAO=XjWtx z!%{5X(m4Foej?9dAX73G5dv=rutyn#r8SjPXdtcz%OGCjc?G8&AZQ1}TasX~Ce2wW zLR55>MnIrwM&US#<9Gzr5Vss4LJIC4vZ3buOKNVuwYTbzdk_Z zI&_2t-q0;t6aXDWjiVLt3TdKCnk>i$Yy_OqN2EGr1yBpBL~|0Pk$_ad$?yiv85XNb zIJew zBBrX?Sr=d>uBcq_adLqy`%$^OfT?zIVn_m(s)#Ou<3%~Yq%h>EEhw%E1en4KAJ3KA zhcAqn%|q7kQvapd-Eq#mwaG^L((}zf#Z-i3>hjP9LF?tTMW&sIuCt20|n9S zKP;2w)34b1fJ6~lj>FSy$yY{yzOy3tSy9Gu0rJ!rr^^bw zKjCf?M-y-KKfH;YF=eu=*yXDVI(@tdA#;|ZEF#86h;$qoVZuogTOO1=)nx^hk|)2S zsH$%ld5TK^@-yUEijEsLbuam3a_Yak@F6osmP6d? z_(YJGY&muoXo?|1Z_(7=wyNGRn_8C+iXB}y zVk(Y316F3!^BhMPN1T0K3bpd1} zuGLhH|IyOewvJAtgzGNP*Fs8BjncxDmhf`+ih>n-wl~28CwEChiUK#6Q` z>@ZvFt$NcK3}S0`0pG4=vnb%Qv_{KZ>OvC0DwoTO+LtZU1MZym!m+Edusf|tIS7Kzc5hEy!(vuQ1($;(D;A2I!AUt_s*iwzI_9)>b&LVf5DZ<^ToGU>IW>6h{= z&U2Y~^UEZ*Pu%e6=#+P>CSvgwvco>%o!E;h<67>=y|0iD+SBeHbvJu-{81b_MQ*c; zvGKnxnLlb)->c-wB>TLZZt1PcFS&pR&cGO5`?Iozoh$wWZ#WD7s2{$(JbJ2rKYsfx z_@mC<=a0V2mVoo#1%Fx3egD4sRSB2ysdvHO_$h~)r``2JJr2GH{@B%vpK>kgTh;eI zIp6Lu7*)4a3uuEC+4~m!LZYdGaL#Fh$>}l>1+1P2E6KTSd9ydfrQm_{xe@pp9Z#d9wJFsA2+odtj1-+{k<0f6N$U3t3lsBJzzeSyT|Vjr)W z7XQ-fjGHHXCi5==nLpf};lTSoCEW{V-S`7i-2YmAJm`}XY-?=r|FG>j+egFf|Qp)No5C?dOpug5Vx$b0EQ>$CKzt`$|I- zs6!Ey73iP3GN>AYGbK=up&wMCFN3;fLDOrA25sojGs0&F9SLYnWFr2+PdN@8qY|jT zDC(r$&J4sHENp0c9uFi?9d^gzn^*8H<1k*FNIhuJbRK^e9oaAeM~$Sm*(bmJy%-1c zgNN{ABdL&m;r(gBAc;@ogi(~&&eOjd;n~ssDpp5P*q$?kIO;qv?&?dTEV~01Ol3q1 zN*ALTP;H@-X%Yj{i6tw71}Tap6>ppbR^~j^+Awb~`XwHi1XiNrZgWKMc=r;%WilXJ zxRE?s_u+CEzBn0>QQPjUj2=DfVZ40`Ae&Hn&*>RbxEU8u1!QRpSN@W%JN^dVIh87p zvtt%Fz~zG_WE_37XD=P{4>HbniMVTLxb1fSH1^D^wgjJP{8# z09X2ts^W!%ZB8tt1Fqc1-ujb2wPOW7kq)?0rQ^GD-l}{8SIz=lqYq_IpY%fFVtjrU z;F{hQaL?K4{uFPU4K}$sCl0#jofG;psHlW17Cf>~Dq+E~^$m)~e@&nqI8UOozk3Un z8Qz_h-hWP@UMKq$>SUBX{bg&9@Q=(J@IW4QL+n3}+~>OZ2M#;u1ID?w^e3lWgxi`iwgi_bmGpBW5=fb9rrE(j6|9H0`Vd<2Zt5{#?+t0Xw0Uj+P*~* z2Z`$!rHnZf`~@B;gt45%#kTyDybW(~0sh=~-Z%X>PYdCQC`n)~Av*FWzK*oNOIMVfzs|(*+1vZ(#Fa!TVZPf*!d z4O1C-(-z7>EDfh+Wky}j%8e_b9!y(I{ffXFm%#X&-=H4u-?xN%d_)?jfD!@uqALt+ zTEm3zGVs9&ej%i22oxBZ!J8VW@uBPe_A#8DMC4JRL}>F0%5untsA(FAQy_oA$}ym~ z0s?`yRK(~Es7tJ%PcY>f@S^9UYT0V^=>-q5|tzn-MyTUJ7p)6O52xf@+? z;fpIF$}`XAZ_4Rj%;N2h5aqE)HkMC)^urUlxCvG@de59?vFGM}1Mh4Co6^pk=9Jy} zqujn`Drk2w@Wo8iq1>6EeMU4s6+Wv;h~^auR47veQfT6}H-VJ}8J9i`#PF$j;3lw= zD_yv?a$VM~Sm*>~=}*UeS2z_X;}e~LY^>@$G z$ClzLeQ|i(8n8L?)$j1*p4Z0hxS5LDEKm%VE|SS%CSe`ku!N%fKe?BRr8cjF>YDoC zF&EQW@hl!#2ak>0=)WiV=^a1E&K`i07ykQu)xSwC$D4ZqN@BV^Z_HA!AB(pFl*D~E zemHjSpYOoEw*nNUszz%z%H;d{exHLW%=3H8B%59&x zpm2T4#wBNV?4=SmKLwG_WA-#v7iK^No&pTBUO#?FYCb68#ZLnU;^!Z|My|R0B^-4G zFid?uZ}F_Nw;#Zd9f@FAcuNs_vc$j%&j5zZ#KXC$bNf43eI}C2a@Le7Z~fN?kz5{4 zcx-s2KqdD(9;bW+{%ajTdFKhL4!1u+W#at9lpk+N*AgO6P{q{M0#&=CL%jY7$AY1=27S9TSY=k605JSqM z(qffSKCvzIR%;az(Lmxt0jYLTt0MNI(i+rTZL3(cT2Z<6z7v9g0k6IMb)Tm^JoCW$ zzVp7n@7=!l{hhUYhOgZ-d`~pf!LkCUo03jys;HBk%1ESa(kiLZBBP7C#>pBRUy~WL zjhp+x^Hal5tdI9+`fPari@&!fXMY;!vhGUx)z0+kZ+$Q#el)AY##%O)mo3WU;=$}4 zw#=f!T~U7H7}G`R>dldi`~J>2py^P`Q%!Pp=gezY4T!3495!HGp&GVN_WycyTt~7 zoQxo;s-Q|FrI`lF(WXpFaxJftra{vzBg&e@D`u;)d~y47qt(GE4w`Ye#g%QvW~ZyT zp;dH6S8-BZhrqPAl{2QN&c}vai%UAf;Sd{YZqQ0rty)wdwME;O#h-s9tLs8UJSFim z+dZ8CMB}=X<_sdDY1LFrg&}!U;Yp5x5K$pENM6zzlcRZB;iZ;#wV_@cL{qDmY7+nbCavHEkIMARfc~>OsJ_^&efJyw8(y{wS5KC;Yw{-Sy@xx*0g9T6YqF5^CCDj zO$!p+JrM^un7!K8ydaFZ0nym~6y{@iur&wMQakHGKiskrFMZm*R z{y>@UQVygkju*vl0Rw!Kx|4W2J>Wo=p(s&RO;QsK7R)8_BtQ~LR+1@E=4jo7v>U`X zXs}f^9m`hwS2V@)mU!8g#cfOL{j18F+pDXV*VV@gn3YtlsUT1prW*{EZKIc)1+JxR zNlpAvPyWnv{)0@}mj*w3lQQ5p+4571<)?TQ@4?RymBfRVN{c6+l}^WN_Qveow3KVE zz8c$D5%1j_LWgYFh@O%AK25a|S@A}Nr@bA zR#4H>y7G`ae>t`E+s4A>LIJ;q;O$`h(T_fTEcJ@bw0cbikz&EH?u?OX#J_H> zu0eARS_`D%gVK@+_Z6BAgkgiiaN;sn%N>$Jmor<>KVM8sPgzFf5|86=_GG0W!O?ZM z;VD;aKxYP2*LDtcpmQ=758t*v>f(R4vMWavVgD`cd6nieI7@3monNO61{vArX({i=h~ z6dk${fu!IXAvv99N!1iol9nWe(q)>_H4~j^#i*{Zq32~nxvOgK$V})zceityBn5x6 z^D?vBniuLyn~`0ZnLTv3JkSZ8+r8$3Bhc*GrF>2nX;JRBVs=Xivv(&sZJeR&yv_=w zG)~kRXb|8!R%MkYHBON=isdAOLiaDn+@lhO_`DoWqPgBS?8V{q#m^J+@kxZ!erfds zudT;=h{|tc7kma0vY$tIS%7_C-h{0px-^YZbxxE>lT#G9nBWwu0ZpGyNt!A%3M1(T zffwL53l_3NNlF!<9in)OfgQXFjTXz162vW7^S60e#p1gIqPD03f1It)spc$I-@hDatkk>N>| zF$|KXbOy9>rm6{O**=VS7&@Fpk_D31IcOp{=p+o@ z)YOX=Er3MfM1@HNeWLSb!MZA?=&&8On5wR8(3@LREcPtS5?Z9RE>fD>+Lb2U)I?|} zWH^w-CHfz5qryYqDzS{rnzUgU3XPKcu=x(?hfQ8hq_oT>TxURDi|`J}WuQTpB$-yw zl0HDKnWku(fI!k1*eR>kbZ8&wQ#hX*{S?Ht8bcNqiB9GLx-XokZnaZskmb#6qbQJKEDg(S6|}sd#QNMNOs6> z!0Woi<9pI@dFbQ5lWF*_F#~Py#Y)pB6HaVMk@yNz+BYw!e)F>ZYs+0t9<= zxoCNaRg*7T9%9aqYBB>`Q#}^2Nn<$lJXR{9fW(f2~|uC00jECC(G6 z3phQV%3?86>@0B!HC|67t|8IfoD{sGUYV*l0m@@iZjfxXq2{(T%J zVQ=@{dpka5{5UyO7AU5j6_r&~G!pW0v#?|f#*=nD(Fu>>eK9c@ig?6YHteaYqMTney*Ki^8Y=C|Gyi<2lDAG)kNnDq9jPn)|c=mhsklW zl;|sHMusbs(IrxnfV5I2m19+tVmR512cNvE>tCPzE*|_YEJ$Z@K)QngmiwQ#9cJbj3i-5uCe#i%FCe9+;KxOgnHL zS=~vw=cpmYqT&?cI11i+DltPosErx(;o>bA#YbxX`qdZ2n8{JY2YE5eFzf=y@oS)fibfjaEa^zarD3 zOWB&0?ZK|%l2%RaXj#GN~N?VU9OS1uVV3L1UEQgw;OEva1kWO-h%ItBCR$m~*VNS3>+O|`mNhm?%cua|S?di~ zcPwja=KmLrEGAHM8vw zwDmO{*$Q7i`BrsoZ4u&M$AJf*aAHl_=El{i=XHFCjr#SSzbYx;z8b}j2$u%!LaSBEM2Kq80J;JDmm5Sa|_#B&q*8~v; z0X7j^FlZ=1bW19v0*oav+X2li%OX-vgOo|%yK!3Xg13K%`cLCONohFwYSD8&3flM? z0F(C|Umtkd+<@{v2Vf&-o!mS&wQ>u(^>YB0dlPZEaO%N9wE-?ab6N8#wb{e%PSKoL!PK)IpWLp3PQ>Uf#cIO22@J(2fLlzWW9jLe*O>(>d6JcT|gE>v)If*kw(d20IgE(egt1@RD)!$s7o`s;d^T>%3k9CfYK|jiIDu@o zu=l;RhZfz?JAyE64%1{4#YiP3!2}0UCJb|$F2c;n2qN(AFp24C(^!x);{|G#_=Kw& z^^XN9v)(c~=d{e&iEbPR$a0wx`{Z3~o<(QI0kY}q*46Xx1>@+R@qjFU%Q~BrT|XCj zCjheP?-XAxwEv(FJvf1=O8IjhmiJ)G3%wIzWh$!}v;<6tt_v_W@{~v_hAEK@BXYVb zXz&R@Lu(wclZ@=O&%2>u9_n`huDQRUHimz{GlaNlfQ#9&Ip*$Pcq2MG4RB?B^3IWh z?{$Pxa5~_U+HO1Ox1(j~^mM>Auk^G0$ep?Oq3tsgxb|*-Qz-cCmEIh}nvSe%iM-^q zjt57^f0sj|xIk1-6FHToXFTEuKR4m^AKzb?H2l5wsAn#mVVJu+c-5Jzdr@p2oPmAik9T@*t6$PPKcPT; z1bKa@f3gkrmn7C^?S7{0o?FY%hEh16CRSAFfRu zON7zQ=(rp76&5dC7rbps5Jk&CUzV@BJ%7jYmR=75=}g1y&aonVOJHFP=M4A~qpK|nUOGHnaJq+=V(s|I96 z_KAKE1E28RD& zf;;)0kG??Z*Mhp_R;JFL>|TkKYeAjtdE==7bEIwSS|W1{u>tZwb)W(al)q!Pz8(RwP~Ec?KA= zO$}hiVF$ejNB?ZmT-4tHW}NxwM<*4H+VTmyu@O8oJEy*>`el+uXBxpXlNRi!b0;*u zf$nJn&ydZ}3-f-oz5;ohArj_3pzaAje(E;#U^B=pIwmxQ$V#@ig^1c5I*g9c>j@-7 zNl-^Q1z^y$Ny<>IRE^OSbrh{x2~tLsK6ZM{Z}5*%|4NWzuNL3WNZ-2$ajO8?q$%VB zInT^{A01r<$O@L+`j=wm3pWaO0>?*_uUbv;z(j4_4jqpE`?sDC{y=RI)mALiaP-h!MPK;`6HZ<#am*Wdpe+PVQ$ z=DqsZk-5Lc4m0=%M6~YCl3f8$qS*4R?0>614!uZUU9|)=dQ&^2hi0-aJ@> zX2KVN4|m@y{RkD^4H)tlKan~AGiw|jzZ)=Qel+W^`BRRKM$sPvhEcaX+cfUu31;t) zh&dyGz%+p4Z?4iA=e-}teiX2#* za>JZ=(8h-VS+cnDHQV0dTT$L_K$f}rnU~49XF9rdHz2d@EqKy$rub#__U;6-E$K&{ z%o|Uk?>-DN9e?jEW1lSf?R|TQbhyDSmXTPQ1v`wrhmXcu61Ot8t#8aB;yW06nv*7NkoSFF>&3Chb6lt&3KaVdj&juBg?e;bA>d(Hm<>&@jn diff --git a/test/fulldbtest.sh b/test/fulldbtest.sh index 2ab4d2c5b..49ad1f999 100755 --- a/test/fulldbtest.sh +++ b/test/fulldbtest.sh @@ -1,4 +1,4 @@ -set -e +set -e up_mysql() { # Run a SQL database on port 3306 inside of Docker. diff --git a/test/test_api_usage.py b/test/test_api_usage.py index ab3a4a239..24469d36d 100644 --- a/test/test_api_usage.py +++ b/test/test_api_usage.py @@ -90,7 +90,7 @@ class ApiTestCase(unittest.TestCase): url = api.url_for(resource_name, **params) url = ApiTestCase._add_csrf(url) return url - + def setUp(self): setup_database_for_testing(self) self.app = app.test_client() @@ -186,11 +186,11 @@ class TestCSRFFailure(ApiTestCase): # Make sure a simple post call succeeds. self.putJsonResponse(User, - data=dict(password='newpasswordiscool')) + data=dict(password='newpasswordiscool')) # Change the session's CSRF token. self.setCsrfToken('someinvalidtoken') - + # Verify that the call now fails. self.putJsonResponse(User, data=dict(password='newpasswordiscool'), @@ -237,10 +237,10 @@ class TestUserNotification(ApiTestCase): # Update a notification. assert json['notifications'] assert not json['notifications'][0]['dismissed'] - + pjson = self.putJsonResponse(UserNotification, params=dict(uuid=notification['id']), data=dict(dismissed=True)) - + self.assertEquals(True, pjson['dismissed']) @@ -303,7 +303,7 @@ class TestConvertToOrganization(ApiTestCase): # Verify the organization exists. organization = model.get_organization(READ_ACCESS_USER) assert organization is not None - + # Verify the admin user is the org's admin. self.login(ADMIN_ACCESS_USER) json = self.getJsonResponse(Organization, @@ -325,7 +325,7 @@ class TestConvertToOrganization(ApiTestCase): # Verify the organization exists. organization = model.get_organization(READ_ACCESS_USER) assert organization is not None - + # Verify the admin user is the org's admin. self.login(ADMIN_ACCESS_USER) json = self.getJsonResponse(Organization, @@ -393,7 +393,7 @@ class TestCreateNewUser(ApiTestCase): expected_code=400) self.assertEquals('Invalid username auserName: Username must match expression [a-z0-9_]+', json['error_description']) - + def test_createuser(self): data = self.postJsonResponse(User, data=NEW_USER_DETAILS, @@ -404,7 +404,7 @@ class TestCreateNewUser(ApiTestCase): inviter = model.get_user(ADMIN_ACCESS_USER) team = model.get_organization_team(ORGANIZATION, 'owners') invite = model.add_or_invite_to_team(inviter, team, None, 'foo@example.com') - + details = { 'invite_code': invite.invite_token } @@ -424,7 +424,7 @@ class TestCreateNewUser(ApiTestCase): class TestSignout(ApiTestCase): def test_signout(self): self.login(READ_ACCESS_USER) - + json = self.getJsonResponse(User) assert json['username'] == READ_ACCESS_USER @@ -437,7 +437,7 @@ class TestSignout(ApiTestCase): class TestGetMatchingEntities(ApiTestCase): def test_notinorg(self): self.login(NO_ACCESS_USER) - + json = self.getJsonResponse(EntitySearch, params=dict(prefix='o', namespace=ORGANIZATION, includeTeams='true')) @@ -448,7 +448,7 @@ class TestGetMatchingEntities(ApiTestCase): def test_inorg(self): self.login(ADMIN_ACCESS_USER) - + json = self.getJsonResponse(EntitySearch, params=dict(prefix='o', namespace=ORGANIZATION, includeTeams='true')) @@ -459,7 +459,7 @@ class TestGetMatchingEntities(ApiTestCase): def test_inorg_withorgs(self): self.login(ADMIN_ACCESS_USER) - + json = self.getJsonResponse(EntitySearch, params=dict(prefix=ORGANIZATION[0], namespace=ORGANIZATION, includeOrgs='true')) @@ -471,7 +471,7 @@ class TestGetMatchingEntities(ApiTestCase): class TestCreateOrganization(ApiTestCase): def test_existinguser(self): self.login(ADMIN_ACCESS_USER) - + json = self.postJsonResponse(OrganizationList, data=dict(name=ADMIN_ACCESS_USER, email='testorg@example.com'), expected_code=400) @@ -481,28 +481,28 @@ class TestCreateOrganization(ApiTestCase): def test_existingorg(self): self.login(ADMIN_ACCESS_USER) - + json = self.postJsonResponse(OrganizationList, data=dict(name=ORGANIZATION, email='testorg@example.com'), expected_code=400) - + self.assertEquals('A user or organization with this name already exists', json['message']) def test_createorg(self): self.login(ADMIN_ACCESS_USER) - + data = self.postResponse(OrganizationList, data=dict(name='neworg', email='testorg@example.com'), expected_code=201) self.assertEquals('"Created"', data) - + # Ensure the org was created. organization = model.get_organization('neworg') assert organization is not None - + # Verify the admin user is the org's admin. json = self.getJsonResponse(Organization, params=dict(orgname='neworg')) @@ -675,10 +675,10 @@ class TestGetOrganiaztionMembers(ApiTestCase): json = self.getJsonResponse(OrganizationMember, params=dict(orgname=ORGANIZATION, membername=ADMIN_ACCESS_USER)) - + self.assertEquals(ADMIN_ACCESS_USER, json['member']['name']) self.assertEquals('user', json['member']['kind']) - + assert 'owners' in json['member']['teams'] @@ -793,7 +793,7 @@ class TestUpdateOrganizationTeamMember(ApiTestCase): params=dict(orgname=ORGANIZATION, teamname='readers', membername=membername), expected_code=400) - + def test_addmember_orgmember(self): self.login(ADMIN_ACCESS_USER) @@ -802,7 +802,7 @@ class TestUpdateOrganizationTeamMember(ApiTestCase): self.putJsonResponse(TeamMember, params=dict(orgname=ORGANIZATION, teamname='owners', membername=membername)) - + # Verify the user was added to the team. json = self.getJsonResponse(TeamMemberList, params=dict(orgname=ORGANIZATION, @@ -818,7 +818,7 @@ class TestUpdateOrganizationTeamMember(ApiTestCase): self.putJsonResponse(TeamMember, params=dict(orgname=ORGANIZATION, teamname='readers', membername=membername)) - + # Verify the user was added to the team. json = self.getJsonResponse(TeamMemberList, @@ -836,8 +836,8 @@ class TestUpdateOrganizationTeamMember(ApiTestCase): params=dict(orgname=ORGANIZATION, teamname='readers', membername=membername), expected_code=400) - - + + def test_addmember_nonorgmember(self): self.login(ADMIN_ACCESS_USER) @@ -845,7 +845,7 @@ class TestUpdateOrganizationTeamMember(ApiTestCase): response = self.putJsonResponse(TeamMember, params=dict(orgname=ORGANIZATION, teamname='owners', membername=membername)) - + self.assertEquals(True, response['invited']) @@ -874,7 +874,7 @@ class TestAcceptTeamMemberInvite(ApiTestCase): response = self.putJsonResponse(TeamMember, params=dict(orgname=ORGANIZATION, teamname='owners', membername=membername)) - + self.assertEquals(True, response['invited']) # Login as the user. @@ -894,7 +894,7 @@ class TestAcceptTeamMemberInvite(ApiTestCase): teamname='owners')) self.assertInTeam(json, membername) - + # Verify the accept now fails. self.putResponse(TeamMemberInvite, params=dict(code=invites[0].invite_token), @@ -911,7 +911,7 @@ class TestDeclineTeamMemberInvite(ApiTestCase): response = self.putJsonResponse(TeamMember, params=dict(orgname=ORGANIZATION, teamname='owners', membername=membername)) - + self.assertEquals(True, response['invited']) # Try to decline the invite. @@ -932,7 +932,7 @@ class TestDeclineTeamMemberInvite(ApiTestCase): response = self.putJsonResponse(TeamMember, params=dict(orgname=ORGANIZATION, teamname='owners', membername=membername)) - + self.assertEquals(True, response['invited']) # Login as the user. @@ -960,7 +960,7 @@ class TestDeleteOrganizationTeamMember(ApiTestCase): response = self.putJsonResponse(TeamMember, params=dict(orgname=ORGANIZATION, teamname='readers', membername=membername)) - + self.assertEquals(True, response['invited']) @@ -976,7 +976,7 @@ class TestDeleteOrganizationTeamMember(ApiTestCase): self.deleteResponse(TeamMember, params=dict(orgname=ORGANIZATION, teamname='readers', membername=membername)) - + # Verify the user was removed from the team. json = self.getJsonResponse(TeamMemberList, @@ -993,7 +993,7 @@ class TestDeleteOrganizationTeamMember(ApiTestCase): self.deleteResponse(TeamMember, params=dict(orgname=ORGANIZATION, teamname='readers', membername=READ_ACCESS_USER)) - + # Verify the user was removed from the team. json = self.getJsonResponse(TeamMemberList, @@ -1034,7 +1034,7 @@ class TestCreateRepo(ApiTestCase): self.login(ADMIN_ACCESS_USER) json = self.postJsonResponse(RepositoryList, - data=dict(namespace=ORGANIZATION, + data=dict(namespace=ORGANIZATION, repository='newrepo', visibility='private', description=''), @@ -1210,7 +1210,7 @@ class TestDeleteRepository(ApiTestCase): self.getResponse(Repository, params=dict(repository=self.COMPLEX_REPO), expected_code=404) - + class TestGetRepository(ApiTestCase): PUBLIC_REPO = PUBLIC_USER + '/publicrepo' @@ -1233,12 +1233,12 @@ class TestGetRepository(ApiTestCase): self.assertEquals(ADMIN_ACCESS_USER, json['namespace']) self.assertEquals(bad_name, json['name']) self.assertEquals(True, json['is_public']) - + def test_getrepo_public_asguest(self): json = self.getJsonResponse(Repository, params=dict(repository=self.PUBLIC_REPO)) - + self.assertEquals(PUBLIC_USER, json['namespace']) self.assertEquals('publicrepo', json['name']) @@ -1256,7 +1256,7 @@ class TestGetRepository(ApiTestCase): json = self.getJsonResponse(Repository, params=dict(repository=self.PUBLIC_REPO)) - + self.assertEquals(False, json['is_organization']) self.assertEquals(True, json['can_write']) self.assertEquals(True, json['can_admin']) @@ -1266,7 +1266,7 @@ class TestGetRepository(ApiTestCase): json = self.getJsonResponse(Repository, params=dict(repository=ADMIN_ACCESS_USER + '/building')) - + self.assertEquals(True, json['can_write']) self.assertEquals(True, json['can_admin']) self.assertEquals(True, json['is_building']) @@ -1282,7 +1282,7 @@ class TestGetRepository(ApiTestCase): json = self.getJsonResponse(Repository, params=dict(repository=ORGANIZATION + '/' + ORG_REPO)) - + self.assertEquals(ORGANIZATION, json['namespace']) self.assertEquals(ORG_REPO, json['name']) @@ -1296,7 +1296,7 @@ class TestGetRepository(ApiTestCase): json = self.getJsonResponse(Repository, params=dict(repository=ORGANIZATION + '/' + ORG_REPO)) - + self.assertEquals(True, json['can_write']) self.assertEquals(True, json['can_admin']) @@ -1309,7 +1309,7 @@ class TestRepoBuilds(ApiTestCase): json = self.getJsonResponse(RepositoryBuildList, params=dict(repository=ADMIN_ACCESS_USER + '/simple')) - + assert len(json['builds']) == 0 def test_getrepobuilds(self): @@ -1317,7 +1317,7 @@ class TestRepoBuilds(ApiTestCase): json = self.getJsonResponse(RepositoryBuildList, params=dict(repository=ADMIN_ACCESS_USER + '/building')) - + assert len(json['builds']) > 0 build = json['builds'][-1] @@ -1339,7 +1339,7 @@ class TestRequestRepoBuild(ApiTestCase): # Ensure we are not yet building. json = self.getJsonResponse(RepositoryBuildList, params=dict(repository=ADMIN_ACCESS_USER + '/simple')) - + assert len(json['builds']) == 0 # Request a (fake) build. @@ -1351,16 +1351,16 @@ class TestRequestRepoBuild(ApiTestCase): # Check for the build. json = self.getJsonResponse(RepositoryBuildList, params=dict(repository=ADMIN_ACCESS_USER + '/building')) - + assert len(json['builds']) > 0 - + def test_requestrepobuild_with_robot(self): self.login(ADMIN_ACCESS_USER) # Ensure we are not yet building. json = self.getJsonResponse(RepositoryBuildList, params=dict(repository=ADMIN_ACCESS_USER + '/simple')) - + assert len(json['builds']) == 0 # Request a (fake) build. @@ -1373,7 +1373,7 @@ class TestRequestRepoBuild(ApiTestCase): # Check for the build. json = self.getJsonResponse(RepositoryBuildList, params=dict(repository=ADMIN_ACCESS_USER + '/building')) - + assert len(json['builds']) > 0 @@ -1401,7 +1401,7 @@ class TestRequestRepoBuild(ApiTestCase): class TestRepositoryEmail(ApiTestCase): def test_emailnotauthorized(self): self.login(ADMIN_ACCESS_USER) - + # Verify the e-mail address is not authorized. json = self.getResponse(RepositoryAuthorizedEmail, params=dict(repository=ADMIN_ACCESS_USER + '/simple', email='test@example.com'), @@ -1409,7 +1409,7 @@ class TestRepositoryEmail(ApiTestCase): def test_emailnotauthorized_butsent(self): self.login(ADMIN_ACCESS_USER) - + # Verify the e-mail address is not authorized. json = self.getJsonResponse(RepositoryAuthorizedEmail, params=dict(repository=ADMIN_ACCESS_USER + '/simple', email='jschorr+other@devtable.com')) @@ -1417,11 +1417,11 @@ class TestRepositoryEmail(ApiTestCase): self.assertEquals(False, json['confirmed']) self.assertEquals(ADMIN_ACCESS_USER, json['namespace']) self.assertEquals('simple', json['repository']) - + def test_emailauthorized(self): self.login(ADMIN_ACCESS_USER) - + # Verify the e-mail address is authorized. json = self.getJsonResponse(RepositoryAuthorizedEmail, params=dict(repository=ADMIN_ACCESS_USER + '/simple', email='jschorr@devtable.com')) @@ -1433,7 +1433,7 @@ class TestRepositoryEmail(ApiTestCase): def test_send_email_authorization(self): self.login(ADMIN_ACCESS_USER) - + # Send the email. json = self.postJsonResponse(RepositoryAuthorizedEmail, params=dict(repository=ADMIN_ACCESS_USER + '/simple', email='jschorr+foo@devtable.com')) @@ -1800,7 +1800,7 @@ class TestUserCard(ApiTestCase): def test_setusercard_error(self): self.login(ADMIN_ACCESS_USER) - json = self.postJsonResponse(UserCard, + json = self.postJsonResponse(UserCard, data=dict(token='sometoken'), expected_code=402) assert 'carderror' in json @@ -1868,7 +1868,7 @@ class TestOrgSubscription(ApiTestCase): class TestUserRobots(ApiTestCase): def getRobotNames(self): - return [r['name'] for r in self.getJsonResponse(UserRobotList)['robots']] + return [r['name'] for r in self.getJsonResponse(UserRobotList)['robots']] def test_robots(self): self.login(NO_ACCESS_USER) @@ -1975,7 +1975,7 @@ class TestOrgRobots(ApiTestCase): # Check the team. team = model.get_organization_team(ORGANIZATION, 'readers') members = [member.username for member in model.get_organization_team_members(team.id)] - self.assertFalse(membername in members) + self.assertFalse(membername in members) # Check the robot itself. self.assertIsNone(model.get_user(membername)) @@ -2126,7 +2126,7 @@ class TestOrganizationApplicationResource(ApiTestCase): # Retrieve the application again. json = self.getJsonResponse(OrganizationApplicationResource, params=dict(orgname=ORGANIZATION, client_id=FAKE_APPLICATION_CLIENT_ID)) - + self.assertEquals(json, edit_json) # Delete the application. @@ -2160,7 +2160,7 @@ class TestOrganizationApplicationResetClientSecret(ApiTestCase): json = self.getJsonResponse(OrganizationApplicationResource, params=dict(orgname=ORGANIZATION, client_id=FAKE_APPLICATION_CLIENT_ID)) self.assertEquals(reset_json['client_secret'], json['client_secret']) - + class FakeBuildTrigger(BuildTriggerBase): @@ -2186,7 +2186,7 @@ class FakeBuildTrigger(BuildTriggerBase): def deactivate(self, auth_token, config): config['active'] = False - return config + return config def manual_start(self, auth_token, config, run_parameters=None): return ('foo', ['bar'], 'build-name', 'subdir') @@ -2281,7 +2281,7 @@ class TestBuildTriggers(ApiTestCase): self.assertEquals('warning', analyze_json['status']) self.assertEquals('No FROM line found in the Dockerfile', analyze_json['message']) - + # Analyze the trigger's dockerfile: Third, dockerfile with public repo. trigger_config = {'dockerfile': 'FROM somerepo'} analyze_json = self.postJsonResponse(BuildTriggerAnalyze, @@ -2349,7 +2349,7 @@ class TestBuildTriggers(ApiTestCase): # List the trigger's sources. source_json = self.getJsonResponse(BuildTriggerSources, params=dict(repository=ADMIN_ACCESS_USER + '/simple', - trigger_uuid=trigger.uuid)) + trigger_uuid=trigger.uuid)) self.assertEquals([{'first': 'source'}, {'second': 'sometoken'}], source_json['sources']) # List the trigger's subdirs. @@ -2380,13 +2380,13 @@ class TestBuildTriggers(ApiTestCase): # Retrieve values for a field. result = self.postJsonResponse(BuildTriggerFieldValues, - params=dict(repository=ADMIN_ACCESS_USER + '/simple', + params=dict(repository=ADMIN_ACCESS_USER + '/simple', trigger_uuid=trigger.uuid, field_name="test_field")) self.assertEquals(result['values'], [1, 2, 3]) self.postResponse(BuildTriggerFieldValues, - params=dict(repository=ADMIN_ACCESS_USER + '/simple', + params=dict(repository=ADMIN_ACCESS_USER + '/simple', trigger_uuid=trigger.uuid, field_name="another_field"), expected_code = 404) @@ -2471,7 +2471,7 @@ class TestUserAuthorizations(ApiTestCase): self.login(ADMIN_ACCESS_USER) json = self.getJsonResponse(UserAuthorizationList) - + self.assertEquals(1, len(json['authorizations'])) authorization = json['authorizations'][0] @@ -2528,7 +2528,7 @@ class TestSuperUserManagement(ApiTestCase): json = self.getJsonResponse(SuperUserManagement, params=dict(username = 'freshuser')) self.assertEquals('freshuser', json['username']) self.assertEquals('jschorr+test@devtable.com', json['email']) - self.assertEquals(False, json['super_user']) + self.assertEquals(False, json['super_user']) def test_delete_user(self): self.login(ADMIN_ACCESS_USER) @@ -2539,10 +2539,10 @@ class TestSuperUserManagement(ApiTestCase): # Delete the user. self.deleteResponse(SuperUserManagement, params=dict(username = 'freshuser'), expected_code=204) - + # Verify the user no longer exists. self.getResponse(SuperUserManagement, params=dict(username = 'freshuser'), expected_code=404) - + def test_update_user(self): self.login(ADMIN_ACCESS_USER) @@ -2554,7 +2554,7 @@ class TestSuperUserManagement(ApiTestCase): # Update the user. self.putJsonResponse(SuperUserManagement, params=dict(username='freshuser'), data=dict(email='foo@bar.com')) - + # Verify the user was updated. json = self.getJsonResponse(SuperUserManagement, params=dict(username = 'freshuser')) self.assertEquals('freshuser', json['username']) diff --git a/test/test_endpoint_security.py b/test/test_endpoint_security.py index 724629f3a..0423b28dc 100644 --- a/test/test_endpoint_security.py +++ b/test/test_endpoint_security.py @@ -49,7 +49,7 @@ class _SpecTestBuilder(type): rv = c.open(url, **open_kwargs) msg = '%s %s: %s expected: %s' % (open_kwargs['method'], url, rv.status_code, expected_status) - self.assertEqual(rv.status_code, expected_status, msg) + self.assertEqual(rv.status_code, expected_status, msg) return test diff --git a/test/test_gc.py b/test/test_gc.py index 1f0e46634..0ad8ce7bb 100644 --- a/test/test_gc.py +++ b/test/test_gc.py @@ -42,7 +42,7 @@ class TestGarbageColection(unittest.TestCase): database.ImageStoragePlacement.get(location=location, storage=image.storage) except: continue - + database.ImageStoragePlacement.create(location=location, storage=image.storage) return image.storage @@ -62,7 +62,7 @@ class TestGarbageColection(unittest.TestCase): image_map[image_id] = self.createImage(image_id, repo, namespace) # Set the ancestors for the image. - parent = model.set_image_metadata(image_id, namespace, name, '', '', '', parent=parent) + parent = model.set_image_metadata(image_id, namespace, name, '', '', '', parent=parent) # Set the tag for the image. model.create_or_update_tag(namespace, name, tag_name, image_ids[-1]) @@ -159,7 +159,7 @@ class TestGarbageColection(unittest.TestCase): verifying at each step. """ repository = self.createRepository( - latest = ['i1', 'i2', 'i3'], + latest = ['i1', 'i2', 'i3'], other = ['i1', 'f1', 'f2'], third = ['t1', 't2', 't3'], fourth = ['i1', 'f1']) @@ -198,7 +198,7 @@ class TestGarbageColection(unittest.TestCase): def test_empty_gc(self): repository = self.createRepository( - latest = ['i1', 'i2', 'i3'], + latest = ['i1', 'i2', 'i3'], other = ['i1', 'f1', 'f2'], third = ['t1', 't2', 't3'], fourth = ['i1', 'f1']) diff --git a/test/test_image_sharing.py b/test/test_image_sharing.py index ef2458ccc..7c372a49a 100644 --- a/test/test_image_sharing.py +++ b/test/test_image_sharing.py @@ -67,7 +67,7 @@ class TestImageSharing(unittest.TestCase): # Create a reference to a new docker ID => new image. first_storage = self.createStorage('first-image') - + # Create a reference to the same docker ID => same image. self.assertSameStorage('first-image', first_storage) diff --git a/test/test_streamlayerformat.py b/test/test_streamlayerformat.py index 051f72ff1..093bbaee4 100644 --- a/test/test_streamlayerformat.py +++ b/test/test_streamlayerformat.py @@ -83,7 +83,7 @@ class TestStreamLayerMerger(unittest.TestCase): self.assertHasFile(squashed, 'another_file', 'bar') self.assertHasFile(squashed, 'third_file', 'meh') self.assertHasFile(squashed, 'top_file', 'top') - + def test_multiple_layers_dot(self): second_layer = self.create_layer( foo = './some_file', @@ -227,7 +227,7 @@ class TestStreamLayerMerger(unittest.TestCase): first_layer = self.create_layer( top = 'foo/some_file') - squashed = self.squash_layers([first_layer, second_layer]) + squashed = self.squash_layers([first_layer, second_layer]) self.assertHasFile(squashed, 'foo/some_file', 'top') self.assertHasFile(squashed, 'foo/another_file', 'bar') @@ -240,7 +240,7 @@ class TestStreamLayerMerger(unittest.TestCase): first_layer = self.create_layer( top = 'foo/some_file') - squashed = self.squash_layers([first_layer, second_layer]) + squashed = self.squash_layers([first_layer, second_layer]) self.assertHasFile(squashed, 'foo/some_file', 'top') self.assertHasFile(squashed, 'foo/bar/another_file', 'bar') diff --git a/test/testconfig.py b/test/testconfig.py index cc76ad91e..9613f76d2 100644 --- a/test/testconfig.py +++ b/test/testconfig.py @@ -44,5 +44,5 @@ class TestConfig(DefaultConfig): LICENSE_USER_LIMIT = 500 LICENSE_EXPIRATION = datetime.now() + timedelta(weeks=520) LICENSE_EXPIRATION_WARNING = datetime.now() + timedelta(weeks=520) - + FEATURE_GITHUB_BUILD = True diff --git a/test/testlogs.py b/test/testlogs.py index a6574e331..49dcf3c7c 100644 --- a/test/testlogs.py +++ b/test/testlogs.py @@ -36,7 +36,7 @@ def maybe_advance_script(is_get_status=False): class TestBuildLogs(RedisBuildLogs): - COMMAND_TYPES = ['FROM', 'MAINTAINER', 'RUN', 'CMD', 'EXPOSE', 'ENV', 'ADD', + COMMAND_TYPES = ['FROM', 'MAINTAINER', 'RUN', 'CMD', 'EXPOSE', 'ENV', 'ADD', 'ENTRYPOINT', 'VOLUME', 'USER', 'WORKDIR'] STATUS_TEMPLATE = { 'total_commands': None, diff --git a/tools/emailinvoice.py b/tools/emailinvoice.py index e9c9d0861..7f0efbc8d 100644 --- a/tools/emailinvoice.py +++ b/tools/emailinvoice.py @@ -24,7 +24,7 @@ def sendInvoice(invoice_id): return - with app.app_context(): + with app.app_context(): invoice_html = renderInvoiceToHtml(invoice, user) send_invoice_email(user.email, invoice_html) print 'Invoice sent to %s' % (user.email) diff --git a/tools/migratebranchregex.py b/tools/migratebranchregex.py index 3bfeab6a1..832cf2bf2 100644 --- a/tools/migratebranchregex.py +++ b/tools/migratebranchregex.py @@ -47,4 +47,4 @@ if __name__ == "__main__": logging.basicConfig(level=logging.DEBUG) logging.getLogger('boto').setLevel(logging.CRITICAL) - run_branchregex_migration() \ No newline at end of file + run_branchregex_migration() diff --git a/tools/migrateimage.py b/tools/migrateimage.py index d3b08a018..4298959ba 100644 --- a/tools/migrateimage.py +++ b/tools/migrateimage.py @@ -64,4 +64,4 @@ if __name__ == "__main__": images = model.get_repository_images(args.namespace, args.repository) for img in images: - migrate_image(img, location) \ No newline at end of file + migrate_image(img, location) diff --git a/tools/parsebuildpack.py b/tools/parsebuildpack.py index d253c02fb..fe722dc90 100644 --- a/tools/parsebuildpack.py +++ b/tools/parsebuildpack.py @@ -16,4 +16,4 @@ if ';' in c_type: c_type = c_type.split(';')[0] build_dir = w._mime_processors[c_type](docker_resource) -print build_dir \ No newline at end of file +print build_dir diff --git a/tools/renderinvoice.py b/tools/renderinvoice.py index a7fd1382c..6a038dbc4 100644 --- a/tools/renderinvoice.py +++ b/tools/renderinvoice.py @@ -23,7 +23,7 @@ def sendInvoice(invoice_id): return - with app.app_context(): + with app.app_context(): file_data = renderInvoiceToPdf(invoice, user) with open('invoice.pdf', 'wb') as f: f.write(file_data) diff --git a/util/changes.py b/util/changes.py index a6d20041f..585178195 100644 --- a/util/changes.py +++ b/util/changes.py @@ -11,7 +11,7 @@ def files_and_dirs_from_tar(source_stream, removed_prefix_collector): except tarfile.ReadError: # Empty tar file return - + for tar_info in tar_stream: absolute = os.path.relpath(tar_info.name.decode('utf-8'), './') diff --git a/util/checksums.py b/util/checksums.py index 5e77b7ac8..154907823 100644 --- a/util/checksums.py +++ b/util/checksums.py @@ -88,4 +88,4 @@ if __name__ == '__main__': json_data = file(sys.argv[1]).read() fp = open(sys.argv[2]) print compute_simple(fp, json_data) - print compute_tarsum(fp, json_data) \ No newline at end of file + print compute_tarsum(fp, json_data) diff --git a/util/dockerfileparse.py b/util/dockerfileparse.py index 398673a5d..f8e8631f8 100644 --- a/util/dockerfileparse.py +++ b/util/dockerfileparse.py @@ -46,8 +46,8 @@ class ParsedDockerfile(object): # Remaining cases: # server/some/path:tag - # server:port/some/path:tag - return (':'.join(parts[0:-1]), parts[-1]) + # server:port/some/path:tag + return (':'.join(parts[0:-1]), parts[-1]) def get_base_image(self): """ Return the base image without the tag name. """ diff --git a/util/dockerloadformat.py b/util/dockerloadformat.py index 71f9b4d00..b4a8393c3 100644 --- a/util/dockerloadformat.py +++ b/util/dockerloadformat.py @@ -33,7 +33,7 @@ def _import_format_generator(namespace, repository, tag, synthetic_image_id, # layer.tar - The TARed contents of the layer # VERSION - The docker import version: '1.0' layer_merger = StreamLayerMerger(get_layer_iterator) - + # Yield the repositories file: synthetic_layer_info = {} synthetic_layer_info[tag + '.squash'] = synthetic_image_id @@ -68,7 +68,7 @@ def _import_format_generator(namespace, repository, tag, synthetic_image_id, yielded_size += len(entry) # If the yielded size is more than the estimated size (which is unlikely but possible), then - # raise an exception since the tar header will be wrong. + # raise an exception since the tar header will be wrong. if yielded_size > estimated_file_size: raise FileEstimationException() @@ -95,7 +95,7 @@ def _build_layer_json(layer_json, synthetic_image_id): if 'parent' in updated_json: del updated_json['parent'] - + if 'config' in updated_json and 'Image' in updated_json['config']: updated_json['config']['Image'] = synthetic_image_id @@ -129,4 +129,4 @@ def _tar_file_header(name, file_size): def _tar_folder(name): info = tarfile.TarInfo(name=name) info.type = tarfile.DIRTYPE - return info.tobuf() + return info.tobuf() diff --git a/util/gzipstream.py b/util/gzipstream.py index 739d0cd8c..e4f39c6da 100644 --- a/util/gzipstream.py +++ b/util/gzipstream.py @@ -30,7 +30,7 @@ def calculate_size_handler(): # memory. As a result, we have to loop until the unconsumed tail is empty. current_data = buf size_info.compressed_size += len(current_data) - + while len(current_data) > 0: size_info.uncompressed_size += len(decompressor.decompress(current_data, CHUNK_SIZE)) current_data = decompressor.unconsumed_tail diff --git a/util/gzipwrap.py b/util/gzipwrap.py index e34fa5745..604fa343d 100644 --- a/util/gzipwrap.py +++ b/util/gzipwrap.py @@ -9,7 +9,7 @@ class GzipWrap(object): self.buffer = '' self.zipper = GzipFile(filename, mode='wb', fileobj=self, compresslevel=compresslevel) self.is_done = False - + def read(self, size=-1): # If the buffer already has enough bytes, then simply pop them off of # the beginning and return them. @@ -33,7 +33,7 @@ class GzipWrap(object): except StopIteration: is_done = True break - + self.zipper.write(input_buffer) if is_done: @@ -48,7 +48,7 @@ class GzipWrap(object): def flush(self): pass - + def write(self, data): self.buffer += data diff --git a/util/invoice.py b/util/invoice.py index 86dd2eea4..1c0650e18 100644 --- a/util/invoice.py +++ b/util/invoice.py @@ -17,7 +17,7 @@ def renderInvoiceToPdf(invoice, user): pisaStatus = pisa.CreatePDF(sourceHtml, dest=output) if pisaStatus.err: return None - + value = output.getvalue() output.close() return value @@ -33,7 +33,7 @@ def renderInvoiceToHtml(invoice, user): def get_range(line): if line.period and line.period.start and line.period.end: - return ': ' + format_date(line.period.start) + ' - ' + format_date(line.period.end) + return ': ' + format_date(line.period.start) + ' - ' + format_date(line.period.end) return '' def format_date(timestamp): @@ -45,8 +45,8 @@ def renderInvoiceToHtml(invoice, user): 'invoice_date': format_date(invoice.date), 'getPrice': get_price, 'getRange': get_range - } - + } + template = env.get_template('invoice.tmpl') rendered = template.render(data) return rendered diff --git a/util/morecollections.py b/util/morecollections.py index b34dc00ed..6d05c4d25 100644 --- a/util/morecollections.py +++ b/util/morecollections.py @@ -9,4 +9,4 @@ class AttrDict(dict): for key, value in copy.items(): if isinstance(value, AttrDict): copy[key] = cls.deep_copy(value) - return copy \ No newline at end of file + return copy diff --git a/util/queuefile.py b/util/queuefile.py index 95615af93..731fb9a34 100644 --- a/util/queuefile.py +++ b/util/queuefile.py @@ -38,7 +38,7 @@ class QueueFile(object): for handler in self._exception_handlers: handler(result) handled = True - + if handled: return @@ -46,7 +46,7 @@ class QueueFile(object): self._buffer += result self._total_size += len(result) - + buf = self._buffer[0:size] self._buffer = self._buffer[size:] return buf diff --git a/util/queuemetrics.py b/util/queuemetrics.py index 5d969e9bb..ec1444c16 100644 --- a/util/queuemetrics.py +++ b/util/queuemetrics.py @@ -24,7 +24,7 @@ class QueueingCloudWatchReporter(object): def report(self, currently_processing, running_count, total_count): logger.debug('Worker indicated %s running count and %s total count', running_count, total_count) - + need_capacity_count = total_count - running_count self._send_to_queue(self._namespace, self._need_capacity_name, need_capacity_count, unit='Count') diff --git a/util/queueprocess.py b/util/queueprocess.py index f39fc26f6..ebf786796 100644 --- a/util/queueprocess.py +++ b/util/queueprocess.py @@ -61,11 +61,11 @@ def _run(get_producer, queues, chunk_size, args): except Exception as ex: logger.exception('Exception writing to queue.') return - + if data is None or isinstance(data, Exception): break # Important! This allows the thread that writes the queue data to the pipe # to do so. Otherwise, this hangs. time.sleep(0) - + diff --git a/util/streamingjsonencoder.py b/util/streamingjsonencoder.py index f51a4ec9b..bcff1db6e 100644 --- a/util/streamingjsonencoder.py +++ b/util/streamingjsonencoder.py @@ -2,21 +2,21 @@ # Copyright (c) Django Software Foundation and individual contributors. # All rights reserved. - + # Redistribution and use in source and binary forms, with or without modification, # are permitted provided that the following conditions are met: - -# 1. Redistributions of source code must retain the above copyright notice, + +# 1. Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. - -# 2. Redistributions in binary form must reproduce the above copyright + +# 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. - + # 3. Neither the name of Django nor the names of its contributors may be used # to endorse or promote products derived from this software without # specific prior written permission. - + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -264,4 +264,4 @@ def _make_iterencode(markers, _default, _encoder, _indent, _floatstr, _key_separ if markers is not None: del markers[markerid] - return _iterencode \ No newline at end of file + return _iterencode diff --git a/util/streamlayerformat.py b/util/streamlayerformat.py index fde9d04ad..914dea4a2 100644 --- a/util/streamlayerformat.py +++ b/util/streamlayerformat.py @@ -24,7 +24,7 @@ class StreamLayerMerger(TarLayerFormat): # Update the tries. self.path_trie = marisa_trie.Trie(self.path_encountered) self.prefix_trie = marisa_trie.Trie(self.prefix_encountered) - + def check_tar_info(self, tar_info): absolute = os.path.relpath(tar_info.name.decode('utf-8'), './') @@ -33,7 +33,7 @@ class StreamLayerMerger(TarLayerFormat): return False # Add any prefix of deleted paths to the prefix list. - deleted_prefix = get_deleted_prefix(absolute) + deleted_prefix = get_deleted_prefix(absolute) if deleted_prefix is not None: self.prefix_encountered.append(deleted_prefix) return False diff --git a/util/tarfileappender.py b/util/tarfileappender.py index 68cf1f0c6..d552f268c 100644 --- a/util/tarfileappender.py +++ b/util/tarfileappender.py @@ -10,7 +10,7 @@ class TarfileAppender(TarLayerFormat): in a streaming manner. """ def __init__(self, base_tar_file, entries): - super(TarfileAppender, self).__init__(self._get_tar_iterator) + super(TarfileAppender, self).__init__(self._get_tar_iterator) self.entries = entries self.base_tar_file = base_tar_file self.first_info = None @@ -20,7 +20,7 @@ class TarfileAppender(TarLayerFormat): def after_tar_layer(self, current_layer): pass - + def check_tar_info(self, tar_info): if not self.first_info: self.first_info = tar_info @@ -53,4 +53,4 @@ class TarfileAppender(TarLayerFormat): # To make tarfile happy. append_tarball.seek(0) - yield append_tarball \ No newline at end of file + yield append_tarball diff --git a/util/tarlayerformat.py b/util/tarlayerformat.py index aab41b155..3468678c5 100644 --- a/util/tarlayerformat.py +++ b/util/tarlayerformat.py @@ -4,7 +4,7 @@ import tarfile class TarLayerReadException(Exception): """ Exception raised when reading a layer has failed. """ pass - + class TarLayerFormat(object): """ Class which creates a generator of the combined TAR data. """ @@ -62,7 +62,7 @@ class TarLayerFormat(object): # Conduct any post-tar work. self.after_tar_layer(current_tar) - + # Last two records are empty in TAR spec. yield '\0' * 512 yield '\0' * 512 diff --git a/util/useremails.py b/util/useremails.py index 8dbbc5216..9dfa802fb 100644 --- a/util/useremails.py +++ b/util/useremails.py @@ -25,7 +25,7 @@ def send_email(recipient, subject, template_file, parameters): return '%s' % (real_url, title) - parameters.update({ + parameters.update({ 'subject': subject, 'app_logo': 'https://quay.io/static/img/quay-logo.png', # TODO: make this pull from config 'app_url': app_url, @@ -53,7 +53,7 @@ def send_email_changed(username, old_email, new_email): send_email(old_email, 'Account e-mail address changed', 'emailchanged', { 'username': username, 'new_email': new_email - }) + }) def send_change_email(username, email, token): send_email(email, 'E-mail address change requested', 'changeemail', { @@ -114,7 +114,7 @@ def send_subscription_change(change_description, customer_id, customer_email, qu Customer email: {2}
    Quay user or org name: {3}
    """ - + title = SUBSCRIPTION_CHANGE_TITLE.format(quay_username, change_description) msg = Message(title, recipients=['stripe@quay.io']) msg.html = SUBSCRIPTION_CHANGE.format(change_description, customer_id, customer_email, diff --git a/workers/diffsworker.py b/workers/diffsworker.py index 3a6a8459a..a02bd7301 100644 --- a/workers/diffsworker.py +++ b/workers/diffsworker.py @@ -32,7 +32,7 @@ class DiffsWorker(Worker): return True if __name__ == "__main__": - logging.config.fileConfig('conf/logging.conf', disable_existing_loggers=False) + logging.config.fileConfig('conf/logging.conf', disable_existing_loggers=False) worker = DiffsWorker(image_diff_queue) worker.start() diff --git a/workers/dockerfilebuild.py b/workers/dockerfilebuild.py index b88f44d81..4e42c3066 100644 --- a/workers/dockerfilebuild.py +++ b/workers/dockerfilebuild.py @@ -1,7 +1,7 @@ import logging.config if __name__ == "__main__": - logging.config.fileConfig('conf/logging.conf', disable_existing_loggers=False) + logging.config.fileConfig('conf/logging.conf', disable_existing_loggers=False) import logging import argparse @@ -50,7 +50,7 @@ def matches_system_error(status_str): for match in KNOWN_MATCHES: # 10 because we might have a Unix control code at the start. found = status_str.find(match[0:len(match) + 10]) - if found >= 0 and found <= 10: + if found >= 0 and found <= 10: return True return False diff --git a/workers/notificationworker.py b/workers/notificationworker.py index e88428c5e..1bd528796 100644 --- a/workers/notificationworker.py +++ b/workers/notificationworker.py @@ -16,7 +16,7 @@ logger = logging.getLogger(__name__) class NotificationWorker(Worker): def process_queue_item(self, job_details): notification_uuid = job_details['notification_uuid']; - + notification = model.get_repo_notification(notification_uuid) if not notification: # Probably deleted. @@ -39,7 +39,7 @@ class NotificationWorker(Worker): if __name__ == "__main__": - logging.config.fileConfig('conf/logging.conf', disable_existing_loggers=False) + logging.config.fileConfig('conf/logging.conf', disable_existing_loggers=False) worker = NotificationWorker(notification_queue, poll_period_seconds=10, reservation_seconds=30, retry_after_seconds=30)