Commit 98dd8642 authored by Tom Prince's avatar Tom Prince
Browse files

No bug: Don't use proxy for accessing taskcluster index; r=Callek

The index is not protected by scopes, so don't use the proxy to access it

Differential Revision: https://phabricator.services.mozilla.com/D77537
parent 85d3e9e1
......@@ -5,7 +5,6 @@
from __future__ import absolute_import, print_function, unicode_literals
import logging
import os
import mozpack.path as mozpath
from mozbuild.base import MozbuildObject
......@@ -35,9 +34,7 @@ class IndexSearch(OptimizationStrategy):
"Look for a task with one of the given index paths"
for index_path in index_paths:
try:
task_id = find_task_id(
index_path,
use_proxy=bool(os.environ.get('TASK_ID')))
task_id = find_task_id(index_path)
return task_id
except KeyError:
# 404 will end up here and go on to the next index path
......
......@@ -176,9 +176,9 @@ def get_index_url(index_path, use_proxy=False, multiple=False):
return index_tmpl.format('s' if multiple else '', index_path)
def find_task_id(index_path, use_proxy=False):
def find_task_id(index_path):
try:
response = _do_request(get_index_url(index_path, use_proxy))
response = _do_request(get_index_url(index_path))
except requests.exceptions.HTTPError as e:
if e.response.status_code == 404:
raise KeyError("index path {} not found".format(index_path))
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment