Merge pull request #793 from gerrod3/370-co-none

Ensure compatibility with CONTENT_ORIGIN=None

Author: gerrod3

.github/workflows/scripts/install.sh

@@ -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

pulp_python/app/pypi/views.py

@@ -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:

pulp_python/app/utils.py

@@ -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]

template_config.yml

@@ -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