Skip to content

[PR #793/58653afd backport][3.13] Ensure compatibility with CONTENT_ORIGIN=None #796

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

Merged
gerrod3 merged 1 commit into from
Feb 11, 2025
Merged

[PR #793/58653afd backport][3.13] Ensure compatibility with CONTENT_ORIGIN=None #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/scripts/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ if [ "$TEST" = "azure" ]; then
- ./azurite:/etc/pulp\
command: "azurite-blob --blobHost 0.0.0.0"' vars/main.yaml
sed -i -e '$a azure_test: true\
pulp_scenario_settings: {"domain_enabled": true}\
pulp_scenario_settings: {"content_origin": null, "domain_enabled": true}\
pulp_scenario_env: {}\
' vars/main.yaml
fi
Expand Down
3 changes: 2 additions & 1 deletion pulp_python/app/pypi/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@

log = logging.getLogger(__name__)

BASE_CONTENT_URL = urljoin(settings.CONTENT_ORIGIN, settings.CONTENT_PATH_PREFIX)
ORIGIN_HOST = settings.CONTENT_ORIGIN if settings.CONTENT_ORIGIN else settings.PYPI_API_HOSTNAME
BASE_CONTENT_URL = urljoin(ORIGIN_HOST, settings.CONTENT_PATH_PREFIX)


class PyPIMixin:
Expand Down
3 changes: 2 additions & 1 deletion pulp_python/app/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,8 @@ def find_artifact():

content_artifact = content.contentartifact_set.first()
artifact = find_artifact()
origin = settings.CONTENT_ORIGIN.strip("/")
origin = settings.CONTENT_ORIGIN or settings.PYPI_API_HOSTNAME or ""
origin = origin.strip("/")
prefix = settings.CONTENT_PATH_PREFIX.strip("/")
base_path = base_path.strip("/")
components = [origin, prefix, base_path, content.filename]
Expand Down
1 change: 1 addition & 0 deletions template_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ pulp_settings:
pypi_api_hostname: https://pulp:443
pulp_settings_azure:
domain_enabled: true
content_origin: null
pulp_settings_gcp: null
pulp_settings_s3:
domain_enabled: true
Expand Down