Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[21.01] Initial fix for quay.io repo query issue #13468

Merged
merged 3 commits into from Mar 2, 2022
Merged

[21.01] Initial fix for quay.io repo query issue #13468

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2511b64
Initial fix for quay.io repo query issue
nuwang Feb 22, 2022
831a077
Move header definition out of while loop
mvdbeek Mar 2, 2022
16cb094
Fix trailing whitespace
mvdbeek Mar 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 13 additions & 7 deletions lib/galaxy/tool_util/deps/mulled/util.py
View file
Open in desktop
Expand Up @@ -64,13 +64,19 @@ def _namespace_has_repo_name(namespace, repo_name, resolution_cache):
if resolution_cache is not None and cache_key in resolution_cache:
repo_names = resolution_cache.get(cache_key)
Comment on lines 64 to 65
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't the cache have different repo_names for different namespaces?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so, this would be a problem if we we're using more than one namespace, but so far it's only biocontainers.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, added to #13460 for tracking.

else:
repos_parameters = {'public': 'true', 'namespace': namespace}
repos_headers = {'Accept-encoding': 'gzip', 'Accept': 'application/json'}
repos_response = requests.get(
QUAY_REPOSITORY_API_ENDPOINT, headers=repos_headers, params=repos_parameters, timeout=QUAY_IO_TIMEOUT)

repos = repos_response.json()['repositories']
repo_names = [r["name"] for r in repos]
next_page = None
repo_names = []
repos_headers = {"Accept-encoding": "gzip", "Accept": "application/json"}
while True:
repos_parameters = {"public": "true", "namespace": namespace, "next_page": next_page}
mvdbeek marked this conversation as resolved.
Show resolved Hide resolved
repos_response = requests.get(
QUAY_REPOSITORY_API_ENDPOINT, headers=repos_headers, params=repos_parameters, timeout=QUAY_IO_TIMEOUT)
repos_response_json = repos_response.json()
repos = repos_response_json["repositories"]
repo_names += [r["name"] for r in repos]
next_page = repos_response_json.get("next_page")
if not next_page:
break
if resolution_cache is not None:
resolution_cache[cache_key] = repo_names
return repo_name in repo_names
Expand Down