pulpcore 3.63.29__tar.gz → 3.63.31__tar.gz

{pulpcore-3.63.29 → pulpcore-3.63.31}/CHANGES.md

@@ -8,6 +8,57 @@
 
 [//]: # (towncrier release notes start)
 
+## 3.63.31 (2026-02-25) {: #3.63.31 }
+
+### REST API {: #3.63.31-rest-api }
+
+No significant changes.
+
+### Plugin API {: #3.63.31-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.63.31-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.63.31-pulp-cert-guard }
+
+No significant changes.
+
+---
+
+## 3.63.30 (2026-02-10) {: #3.63.30 }
+
+### REST API {: #3.63.30-rest-api }
+
+#### Features {: #3.63.30-rest-api-feature }
+
+- Adapted PulpImport/Export to allow update django-import-export==4.x.
+  [#5324](https://github.com/pulp/pulpcore/issues/5324)
+- Allow use of Django 5 as well as Django 4. Note the following breaking changes if upgrading to
+  Django 5: storage configuration must use the new ``STORAGES`` format instead of
+  ``DEFAULT_FILE_STORAGE``, Python >= 3.10 is required, and PostgreSQL >= 14 is required.
+  [#6988](https://github.com/pulp/pulpcore/issues/6988)
+
+#### Bugfixes {: #3.63.30-rest-api-bugfix }
+
+- Fixed PRNField slowing down the generic list endpoints with extra database queries.
+
+### Plugin API {: #3.63.30-plugin-api }
+
+No significant changes.
+
+### Pulp File {: #3.63.30-pulp-file }
+
+No significant changes.
+
+### Pulp Cert Guard {: #3.63.30-pulp-cert-guard }
+
+No significant changes.
+
+---
+
 ## 3.63.29 (2026-01-27) {: #3.63.29 }
 
 ### REST API {: #3.63.29-rest-api }

{pulpcore-3.63.29 → pulpcore-3.63.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pulpcore
-Version: 3.63.29
+Version: 3.63.31
 Summary: Pulp Django Application and Related Modules
 Home-page: https://pulpproject.org
 Author: Pulp Team
@@ -21,16 +21,16 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiodns<=3.2.0,>=3.0
 Requires-Dist: aiofiles<24.2.0,>=22.1
-Requires-Dist: aiohttp<3.10.12,>=3.9.0
+Requires-Dist: aiohttp<3.14,>=3.9.0
 Requires-Dist: asyncio-throttle<=1.0.2,>=1.0
 Requires-Dist: async-timeout<4.0.4,>=4.0.3; python_version < "3.11"
 Requires-Dist: backoff<2.2.2,>=2.1.2
 Requires-Dist: click<=8.1.7,>=8.1.0
-Requires-Dist: cryptography<45.0.4,>=44.0.2
-Requires-Dist: Django~=4.2.0
+Requires-Dist: cryptography<47.0,>=38.0.1
+Requires-Dist: Django!=5.0,!=5.1,<5.3,>=4.2.24
 Requires-Dist: django-filter<=24.3,>=23.1
 Requires-Dist: django-guid<=3.5.0,>=3.3
-Requires-Dist: django-import-export<3.4.0,>=2.9
+Requires-Dist: django-import-export<5.0,>=2.9
 Requires-Dist: django-lifecycle<=1.2.4,>=1.0
 Requires-Dist: djangorestframework<=3.15.2,>=3.14.0
 Requires-Dist: djangorestframework-queryfields<=1.1.0,>=1.0
@@ -45,10 +45,10 @@ Requires-Dist: json_stream<2.4,>=2.3.2
 Requires-Dist: jq<1.9.0,>=1.6.0
 Requires-Dist: pycares<4.9; python_version < "3.12"
 Requires-Dist: PyOpenSSL<26.0
-Requires-Dist: opentelemetry-distro[otlp]<=0.48b0,>=0.45b0
-Requires-Dist: opentelemetry-exporter-otlp-proto-http<=1.27.0,>=1.24.0
-Requires-Dist: opentelemetry-instrumentation-wsgi<=0.48b0,>=0.45b
-Requires-Dist: protobuf<5.0,>=4.21.1
+Requires-Dist: opentelemetry-distro[otlp]<=0.49b0,>=0.45b0
+Requires-Dist: opentelemetry-exporter-otlp-proto-http<1.29,>=1.24.0
+Requires-Dist: opentelemetry-instrumentation-wsgi<=0.49b0,>=0.45b
+Requires-Dist: protobuf<6.0,>=4.21.1
 Requires-Dist: pulp-glue<0.32,>=0.18.0
 Requires-Dist: pygtrie<=2.5.0,>=2.5
 Requires-Dist: psycopg[binary]<3.3,>=3.1.8
@@ -56,11 +56,11 @@ Requires-Dist: pyparsing<=3.1.4,>=3.1.0
 Requires-Dist: python-gnupg<=0.5.3,>=0.5
 Requires-Dist: PyYAML<=6.0.2,>=5.1.1
 Requires-Dist: redis<5.0.9,>=4.3
-Requires-Dist: tablib<3.6.0
+Requires-Dist: tablib!=3.6,<4.0,>=3.5.0
 Requires-Dist: url-normalize<=1.4.3,>=1.4.3
 Requires-Dist: uuid6<=2024.7.10,>=2023.5.2
 Requires-Dist: whitenoise<6.8.0,>=5.0
-Requires-Dist: yarl<1.15.3,>=1.9.1
+Requires-Dist: yarl<1.18.4,>=1.9.1
 Provides-Extra: sftp
 Requires-Dist: django-storages[sftp]==1.14.4; extra == "sftp"
 Provides-Extra: s3

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulp_certguard/app/__init__.py

@@ -6,6 +6,6 @@ class PulpCertGuardPluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_certguard.app"
     label = "certguard"
-    version = "3.63.29"
+    version = "3.63.31"
     python_package_name = "pulpcore"
     domain_compatible = True

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulp_file/app/__init__.py

@@ -8,6 +8,6 @@ class PulpFilePluginAppConfig(PulpPluginAppConfig):
 
     name = "pulp_file.app"
     label = "file"
-    version = "3.63.29"
+    version = "3.63.31"
     python_package_name = "pulpcore"
     domain_compatible = True

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulp_file/tests/functional/api/test_download_policies.py

@@ -11,7 +11,6 @@ from urllib.parse import urljoin
 
 from pulpcore.tests.functional.utils import get_files_in_manifest, download_file
 
-from pulpcore.app import settings
 from pulpcore.client.pulp_file import FileFilePublication, RepositorySyncURL
 
 
@@ -54,7 +53,7 @@ def test_download_policy(
     download_policy,
 ):
     """Test that "on_demand" and "streamed" download policies work as expected."""
-    if download_policy == "on_demand" and "SFTP" in pulp_settings.DEFAULT_FILE_STORAGE:
+    if download_policy == "on_demand" and "SFTP" in pulp_settings.STORAGES["default"]["BACKEND"]:
         pytest.skip("This storage technology is not properly supported.")
 
     remote = file_remote_ssl_factory(
@@ -148,8 +147,8 @@ def test_download_policy(
     assert expected_checksum == actual_checksum
     if (
         download_policy == "immediate"
-        and settings.DEFAULT_FILE_STORAGE != "pulpcore.app.models.storage.FileSystem"
-        and settings.REDIRECT_TO_OBJECT_STORAGE
+        and pulp_settings.STORAGES["default"]["BACKEND"] != "pulpcore.app.models.storage.FileSystem"
+        and pulp_settings.REDIRECT_TO_OBJECT_STORAGE
     ):
         content_disposition = downloaded_file.response_obj.headers.get("Content-Disposition")
         assert content_disposition is not None
@@ -187,7 +186,7 @@ def test_download_policy(
     content_unit = expected_files_list[4]
     content_unit_url = urljoin(distribution.base_url, content_unit[0])
     # The S3 test API project doesn't handle invalid Range values correctly
-    if settings.DEFAULT_FILE_STORAGE == "pulpcore.app.models.storage.FileSystem":
+    if pulp_settings.STORAGES["default"]["BACKEND"] == "pulpcore.app.models.storage.FileSystem":
         with pytest.raises(ClientResponseError) as exc:
             range_header = {"Range": "bytes=-1-11"}
             download_file(content_unit_url, headers=range_header)

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulpcore/app/apps.py

@@ -5,7 +5,6 @@ from gettext import gettext as _
 from importlib import import_module
 
 from django import apps
-from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.db import connection, transaction
 from django.db.models.signals import post_migrate, pre_migrate
@@ -68,6 +67,12 @@ class PulpPluginAppConfig(apps.AppConfig):
 
     def __init__(self, app_name, app_module):
         super().__init__(app_name, app_module)
+        # begin compatibility layer for DEFAULT_FILE_STORAGE deprecation
+        # Workaround for getting the up-to-date settings instance
+        from django.conf import settings
+
+        self.settings = settings
+        # end
 
         try:
             self.version
@@ -239,7 +244,7 @@ class PulpAppConfig(PulpPluginAppConfig):
     label = "core"
 
     # The version of this app
-    version = "3.63.29"
+    version = "3.63.31"
 
     # The python package name providing this app
     python_package_name = "pulpcore"
@@ -268,6 +273,8 @@ def _clean_app_status(sender, apps, verbosity, **kwargs):
     from django.contrib.postgres.functions import TransactionNow
     from django.utils import timezone
 
+    settings = sender.settings
+
     app_ttl_map = [
         ("ApiAppStatus", settings.API_APP_TTL),
         ("ContentAppStatus", settings.CONTENT_APP_TTL),
@@ -340,6 +347,7 @@ def _populate_system_id(sender, apps, verbosity, **kwargs):
 
 
 def _ensure_default_domain(sender, **kwargs):
+    settings = sender.settings
     table_names = connection.introspection.table_names()
     if "core_domain" in table_names:
         from pulpcore.app.util import get_default_domain
@@ -349,11 +357,11 @@ def _ensure_default_domain(sender, **kwargs):
         if (
             settings.HIDE_GUARDED_DISTRIBUTIONS != default.hide_guarded_distributions
             or settings.REDIRECT_TO_OBJECT_STORAGE != default.redirect_to_object_storage
-            or settings.DEFAULT_FILE_STORAGE != default.storage_class
+            or settings.STORAGES["default"]["BACKEND"] != default.storage_class
         ):
             default.hide_guarded_distributions = settings.HIDE_GUARDED_DISTRIBUTIONS
             default.redirect_to_object_storage = settings.REDIRECT_TO_OBJECT_STORAGE
-            default.storage_class = settings.DEFAULT_FILE_STORAGE
+            default.storage_class = settings.STORAGES["default"]["BACKEND"]
             default.save(skip_hooks=True)
 
 
@@ -419,8 +427,9 @@ def adjust_roles(apps, role_prefix, desired_roles, verbosity=1):
 
 
 def _populate_artifact_serving_distribution(sender, apps, verbosity, **kwargs):
+    settings = sender.settings
     if (
-        settings.DEFAULT_FILE_STORAGE == "pulpcore.app.models.storage.FileSystem"
+        settings.STORAGES["default"]["BACKEND"] == "pulpcore.app.models.storage.FileSystem"
         or not settings.REDIRECT_TO_OBJECT_STORAGE
     ):
         try:

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulpcore/app/checks.py

@@ -38,7 +38,7 @@ def secret_key_check(app_configs, **kwargs):
 def storage_paths(app_configs, **kwargs):
     warnings = []
 
-    if settings.DEFAULT_FILE_STORAGE == "pulpcore.app.models.storage.FileSystem":
+    if settings.STORAGES["default"]["BACKEND"] == "pulpcore.app.models.storage.FileSystem":
         try:
             media_root_dev = Path(settings.MEDIA_ROOT).stat().st_dev
         except OSError:

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulpcore/app/importexport.py

@@ -48,6 +48,10 @@ def _write_export(the_tarfile, resource, dest_dir=None):
     # the data in batches to memory and concatenate the json lists via string manipulation.
     with tempfile.NamedTemporaryFile(dir=".", mode="w", encoding="utf8") as temp_file:
         if isinstance(resource.queryset, QuerySet):
+            # If we don't have any of "these" - skip writing
+            if resource.queryset.count() == 0:
+                return
+
             temp_file.write("[")
 
             def process_batch(batch):
@@ -114,7 +118,7 @@ def export_artifacts(export, artifact_pks):
     with ProgressReport(**data) as pb:
         pb.BATCH_INTERVAL = 5000
 
-        if settings.DEFAULT_FILE_STORAGE != "pulpcore.app.models.storage.FileSystem":
+        if settings.STORAGES["default"]["BACKEND"] != "pulpcore.app.models.storage.FileSystem":
             with tempfile.TemporaryDirectory(dir=".") as temp_dir:
                 for offset in range(0, len(artifact_pks), EXPORT_BATCH_SIZE):
                     batch = artifact_pks[offset : offset + EXPORT_BATCH_SIZE]

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulpcore/app/modelresource.py

@@ -1,3 +1,4 @@
+from django.conf import settings
 from import_export import fields
 from import_export.widgets import ForeignKeyWidget
 from logging import getLogger
@@ -36,8 +37,8 @@ class ArtifactResource(QueryModelResource):
         # the export converts None to blank strings but sha384 and sha512 have unique constraints
         # that get triggered if they are blank. convert checksums back into None if they are blank.
         for checksum in ALL_KNOWN_CONTENT_CHECKSUMS:
-            if row[checksum] == "":
-                row[checksum] = None
+            if row[checksum] == "" or checksum not in settings.ALLOWED_CONTENT_CHECKSUMS:
+                del row[checksum]
 
     class Meta:
         model = Artifact

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulpcore/app/serializers/base.py

@@ -169,6 +169,10 @@ class PRNField(serializers.StringRelatedField):
         super().__init__(**kwargs)
 
     def to_representation(self, value):
+        if isinstance(value, MasterModel):
+            # Cast optimization to avoid performing a database query
+            model = value.get_model_for_pulp_type(value.pulp_type)
+            value = model(pk=value.pk)
         return get_prn(instance=value)
 
 

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulpcore/app/serializers/domain.py

@@ -43,7 +43,10 @@ class BaseSettingsClass(HiddenFieldsMixin, serializers.Serializer):
         # Should I convert back the saved settings to their Setting names for to_representation?
         if getattr(self.context.get("domain", None), "name", None) == "default":
             for setting_name, field in self.SETTING_MAPPING.items():
-                if value := getattr(settings, setting_name.upper(), None):
+                value = getattr(settings, setting_name, None) or settings.STORAGES["default"].get(
+                    "OPTIONS", {}
+                ).get(field)
+                if value:
                     instance[field] = value
         return super().to_representation(instance)
 

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulpcore/app/settings.py

@@ -16,6 +16,8 @@ from logging import getLogger
 from pathlib import Path
 
 from cryptography.fernet import Fernet
+from django.conf import global_settings
+from django.core.files.storage import storages  # noqa: F401
 from django.core.exceptions import ImproperlyConfigured
 from django.db import connection
 
@@ -56,7 +58,23 @@ MEDIA_ROOT = str(DEPLOY_ROOT / "media")  # Django 3.1 adds support for pathlib.P
 STATIC_URL = "/assets/"
 STATIC_ROOT = DEPLOY_ROOT / STATIC_URL.strip("/")
 
-DEFAULT_FILE_STORAGE = "pulpcore.app.models.storage.FileSystem"
+# begin compatibility layer for DEFAULT_FILE_STORAGE
+# Django does not allow STORAGES and DEFAULT_FILE_STORAGE in the same settings module
+# (they are mutually exclusive). We set both on global_settings as defaults so that
+# users can override either one via dynaconf, and Django picks the right one for its version.
+_DEFAULT_FILE_STORAGE = "pulpcore.app.models.storage.FileSystem"
+_STORAGES = {
+    "default": {
+        "BACKEND": "pulpcore.app.models.storage.FileSystem",
+    },
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
+    },
+}
+setattr(global_settings, "DEFAULT_FILE_STORAGE", _DEFAULT_FILE_STORAGE)
+setattr(global_settings, "STORAGES", _STORAGES)
+# end DEFAULT_FILE_STORAGE compatibility layer
+
 REDIRECT_TO_OBJECT_STORAGE = True
 
 WORKING_DIRECTORY = DEPLOY_ROOT / "tmp"
@@ -363,16 +381,18 @@ KAFKA_SASL_PASSWORD = None
 from dynaconf import DjangoDynaconf, Validator  # noqa
 
 # Validators
+storage_keys = ("STORAGES.default.BACKEND", "DEFAULT_FILE_STORAGE")
 storage_validator = (
     Validator("REDIRECT_TO_OBJECT_STORAGE", eq=False)
-    | Validator("DEFAULT_FILE_STORAGE", eq="pulpcore.app.models.storage.FileSystem")
-    | Validator("DEFAULT_FILE_STORAGE", eq="storages.backends.azure_storage.AzureStorage")
-    | Validator("DEFAULT_FILE_STORAGE", eq="storages.backends.s3boto3.S3Boto3Storage")
-    | Validator("DEFAULT_FILE_STORAGE", eq="storages.backends.gcloud.GoogleCloudStorage")
+    | Validator(*storage_keys, eq="pulpcore.app.models.storage.FileSystem")
+    | Validator(*storage_keys, eq="storages.backends.azure_storage.AzureStorage")
+    | Validator(*storage_keys, eq="storages.backends.s3boto3.S3Boto3Storage")
+    | Validator(*storage_keys, eq="storages.backends.gcloud.GoogleCloudStorage")
 )
 storage_validator.messages["combined"] = (
-    "'REDIRECT_TO_OBJECT_STORAGE=True' is only supported with the local file, S3, GCP or Azure"
-    "storage backend configured in DEFAULT_FILE_STORAGE."
+    "'REDIRECT_TO_OBJECT_STORAGE=True' is only supported with the local file, S3, GCP or Azure "
+    "storage backend configured in STORAGES['default']['BACKEND'] "
+    "(deprecated DEFAULT_FILE_STORAGE)."
 )
 
 cache_enabled_validator = Validator("CACHE_ENABLED", eq=True)
@@ -555,6 +575,10 @@ if not (len(sys.argv) >= 2 and sys.argv[1] in _SKIPPED_COMMANDS_FOR_CONTENT_CHEC
     finally:
         connection.close()
 
+# Ensures the cached property storage.backends uses the right value after dynaconf init
+storages._backends = settings.STORAGES.copy()
+storages.backends
+
 if settings.API_ROOT_REWRITE_HEADER:
     api_root = "/<path:api_root>/"
 else:

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulpcore/app/tasks/export.py

@@ -70,7 +70,7 @@ def _export_to_file_system(path, relative_paths_to_artifacts, method=FS_EXPORT_M
         ValidationError: When path is not in the ALLOWED_EXPORT_PATHS setting
     """
     using_filesystem_storage = (
-        settings.DEFAULT_FILE_STORAGE == "pulpcore.app.models.storage.FileSystem"
+        settings.STORAGES["default"]["BACKEND"] == "pulpcore.app.models.storage.FileSystem"
     )
 
     if method != FS_EXPORT_METHODS.WRITE and not using_filesystem_storage:

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulpcore/app/tasks/importer.py

@@ -228,6 +228,9 @@ def _import_file(fpath, resource_class, retry=False):
     """
     try:
         log.info(f"Importing file {fpath}.")
+        if not os.path.isfile(fpath):
+            log.info("...empty - skipping.")
+            return []
         with open(fpath, "r") as json_file:
             resource = resource_class()
             log.info(f"...Importing resource {resource.__class__.__name__}.")
@@ -236,6 +239,8 @@ def _import_file(fpath, resource_class, retry=False):
             # overlapping content.
             for batch_str in _impfile_iterator(json_file):
                 data = Dataset().load(StringIO(batch_str))
+                if not data:
+                    return []
                 if retry:
                     curr_attempt = 1
 
@@ -267,6 +272,7 @@ def _import_file(fpath, resource_class, retry=False):
                         try:
                             a_result = resource.import_data(data, raise_errors=True)
                         except Exception as e:  # noqa log on ANY exception and then re-raise
+                            log.error(e)
                             log.error(f"FATAL import-failure importing {fpath}")
                             raise
                 else:

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulpcore/app/util.py

@@ -528,7 +528,7 @@ def get_artifact_url(artifact, headers=None, http_method=None):
         if settings.DOMAIN_ENABLED:
             loc = f"domain {artifact_domain.name}.storage_class"
         else:
-            loc = "settings.DEFAULT_FILE_STORAGE"
+            loc = "settings.STORAGES['default']['BACKEND']"
 
         raise NotImplementedError(
             f"The value {loc}={artifact_domain.storage_class} does not allow redirecting."
@@ -574,7 +574,9 @@ def get_default_domain():
         try:
             default_domain = Domain.objects.get(name="default")
         except Domain.DoesNotExist:
-            default_domain = Domain(name="default", storage_class=settings.DEFAULT_FILE_STORAGE)
+            default_domain = Domain(
+                name="default", storage_class=settings.STORAGES["default"]["BACKEND"]
+            )
             default_domain.save(skip_hooks=True)
 
     return default_domain

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulpcore/plugin/importexport.py

@@ -41,6 +41,9 @@ class QueryModelResource(resources.ModelResource):
     def dehydrate_pulp_domain(self, content):
         return str(content.pulp_domain_id)
 
+    def render(self, value, obj=None, **kwargs):
+        return super().render(value, obj, coerce_to_string=False, **kwargs)
+
     def __init__(self, repo_version=None):
         self.repo_version = repo_version
         if repo_version:

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulpcore/pytest_plugin.py

@@ -597,28 +597,36 @@ def backend_settings_factory(pulp_settings):
         keys = dict()
         keys["pulpcore.app.models.storage.FileSystem"] = ["MEDIA_ROOT", "MEDIA_URL"]
         keys["storages.backends.s3boto3.S3Boto3Storage"] = [
-            "AWS_ACCESS_KEY_ID",
-            "AWS_SECRET_ACCESS_KEY",
-            "AWS_S3_ENDPOINT_URL",
-            "AWS_S3_ADDRESSING_STYLE",
-            "AWS_S3_SIGNATURE_VERSION",
-            "AWS_S3_REGION_NAME",
-            "AWS_STORAGE_BUCKET_NAME",
+            "access_key",
+            "secret_key",
+            "endpoint_url",
+            "addressing_style",
+            "signature_version",
+            "region_name",
+            "bucket_name",
         ]
         keys["storages.backends.s3.S3Storage"] = keys["storages.backends.s3boto3.S3Boto3Storage"]
         keys["storages.backends.azure_storage.AzureStorage"] = [
-            "AZURE_ACCOUNT_NAME",
-            "AZURE_CONTAINER",
-            "AZURE_ACCOUNT_KEY",
-            "AZURE_URL_EXPIRATION_SECS",
-            "AZURE_OVERWRITE_FILES",
-            "AZURE_LOCATION",
-            "AZURE_CONNECTION_STRING",
+            "account_name",
+            "azure_container",
+            "account_key",
+            "expiration_secs",
+            "overwrite_files",
+            "location",
+            "connection_string",
         ]
         settings = storage_settings or dict()
-        backend = storage_class or pulp_settings.DEFAULT_FILE_STORAGE
-        for key in keys[backend]:
-            if key not in settings:
+        backend = storage_class or pulp_settings.STORAGES["default"]["BACKEND"]
+        not_defined_settings = (k for k in keys[backend] if k not in settings)
+        # Read storage settings from STORAGES.default.OPTIONS when using the default backend
+        default_backend = pulp_settings.STORAGES["default"]["BACKEND"]
+        storages_dict = getattr(pulp_settings, "STORAGES", {})
+        storage_options = storages_dict.get("default", {}).get("OPTIONS", {})
+        if storage_options and backend == default_backend:
+            for key in not_defined_settings:
+                settings[key] = storage_options.get(key)
+        else:
+            for key in not_defined_settings:
                 settings[key] = getattr(pulp_settings, key, None)
         return backend, settings
 

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulpcore/tests/functional/api/test_artifact_distribution.py

@@ -2,8 +2,6 @@ import requests
 import subprocess
 from hashlib import sha256
 
-from django.conf import settings
-
 
 OBJECT_STORAGES = (
     "storages.backends.s3boto3.S3Boto3Storage",
@@ -13,7 +11,7 @@ OBJECT_STORAGES = (
 )
 
 
-def test_artifact_distribution(random_artifact):
+def test_artifact_distribution(random_artifact, pulp_settings):
     artifact_uuid = random_artifact.pulp_href.split("/")[-2]
 
     commands = (
@@ -30,7 +28,7 @@ def test_artifact_distribution(random_artifact):
     hasher = sha256()
     hasher.update(response.content)
     assert hasher.hexdigest() == random_artifact.sha256
-    if settings.DEFAULT_FILE_STORAGE in OBJECT_STORAGES:
+    if pulp_settings.STORAGES["default"]["BACKEND"] in OBJECT_STORAGES:
         content_disposition = response.headers.get("Content-Disposition")
         assert content_disposition is not None
         filename = artifact_uuid

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulpcore/tests/functional/api/test_crd_artifacts.py

@@ -6,7 +6,6 @@ import os
 import uuid
 import pytest
 
-from django.conf import settings
 from pulpcore.client.pulpcore import ApiException
 
 
@@ -145,12 +144,12 @@ def test_upload_mixed_attrs(pulpcore_bindings, pulpcore_random_file):
 
 
 @pytest.mark.parallel
-def test_delete_artifact(pulpcore_bindings, pulpcore_random_file, gen_user):
+def test_delete_artifact(pulpcore_bindings, pulpcore_random_file, gen_user, pulp_settings):
     """Verify that the deletion of artifacts is prohibited for both regular users and
     administrators."""
-    if settings.DEFAULT_FILE_STORAGE != "pulpcore.app.models.storage.FileSystem":
+    if pulp_settings.STORAGES["default"]["BACKEND"] != "pulpcore.app.models.storage.FileSystem":
         pytest.skip("this test only works for filesystem storage")
-    media_root = settings.MEDIA_ROOT
+    media_root = pulp_settings.MEDIA_ROOT
 
     artifact = pulpcore_bindings.ArtifactsApi.create(pulpcore_random_file["name"])
     path_to_file = os.path.join(media_root, artifact.file)

{pulpcore-3.63.29 → pulpcore-3.63.31}/pulpcore/tests/functional/api/test_crud_domains.py

@@ -5,7 +5,6 @@ import random
 import string
 import json
 from pulpcore.client.pulpcore import ApiException
-from pulpcore.app import settings
 
 from pulpcore.tests.functional.utils import PulpTaskError
 
@@ -51,7 +50,7 @@ def test_crud_domains(pulpcore_bindings, monitor_task):
 
 
 @pytest.mark.parallel
-def test_default_domain(pulpcore_bindings):
+def test_default_domain(pulpcore_bindings, pulp_settings):
     """Test properties around the default domain."""
     domains = pulpcore_bindings.DomainsApi.list(name="default")
     assert domains.count == 1
@@ -59,9 +58,9 @@ def test_default_domain(pulpcore_bindings):
     # Read the default domain, ensure storage is set to default
     default_domain = domains.results[0]
     assert default_domain.name == "default"
-    assert default_domain.storage_class == settings.DEFAULT_FILE_STORAGE
-    assert default_domain.redirect_to_object_storage == settings.REDIRECT_TO_OBJECT_STORAGE
-    assert default_domain.hide_guarded_distributions == settings.HIDE_GUARDED_DISTRIBUTIONS
+    assert default_domain.storage_class == pulp_settings.STORAGES["default"]["BACKEND"]
+    assert default_domain.redirect_to_object_storage == pulp_settings.REDIRECT_TO_OBJECT_STORAGE
+    assert default_domain.hide_guarded_distributions == pulp_settings.HIDE_GUARDED_DISTRIBUTIONS
 
     # Try to create another default domain
     body = {
@@ -92,9 +91,9 @@ def test_default_domain(pulpcore_bindings):
 
 
 @pytest.mark.parallel
-def test_active_domain_deletion(pulpcore_bindings, monitor_task):
+def test_active_domain_deletion(pulpcore_bindings, monitor_task, pulp_settings):
     """Test trying to delete a domain that is in use, has objects in it."""
-    if not settings.DOMAIN_ENABLED:
+    if not pulp_settings.DOMAIN_ENABLED:
         pytest.skip("Domains not enabled")
     name = str(uuid.uuid4())
     body = {
@@ -133,9 +132,10 @@ def test_orphan_domain_deletion(
     gen_object_with_cleanup,
     monitor_task,
     tmp_path,
+    pulp_settings,
 ):
     """Test trying to delete a domain that is in use, has objects in it."""
-    if not settings.DOMAIN_ENABLED:
+    if not pulp_settings.DOMAIN_ENABLED:
         pytest.skip("Domains not enabled")
     body = {
         "name": str(uuid.uuid4()),
@@ -177,9 +177,9 @@ def test_orphan_domain_deletion(
 
 
 @pytest.mark.parallel
-def test_special_domain_creation(pulpcore_bindings, gen_object_with_cleanup):
+def test_special_domain_creation(pulpcore_bindings, gen_object_with_cleanup, pulp_settings):
     """Test many possible domain creation scenarios."""
-    if not settings.DOMAIN_ENABLED:
+    if not pulp_settings.DOMAIN_ENABLED:
         pytest.skip("Domains not enabled")
     # This test needs to account for which environment it is running in
     storage_types = {