Fix S3 Storage documentation, Validator and Serializer.

DenisBY · jobselko · commit ed451c66ae7e · 2025-06-27T10:02:43.000+02:00
closes #6630
diff --git a/CHANGES/6630.bugfix b/CHANGES/6630.bugfix
@@ -0,0 +1 @@
+Fixed S3 Storage configuration.
diff --git a/docs/admin/guides/configure-pulp/configure-storages.md b/docs/admin/guides/configure-pulp/configure-storages.md
@@ -73,6 +73,9 @@ STORAGES = {
             "region_name": "eu-central-1",
         },
     },
+    "staticfiles": {
+        "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",
+    },
 }
 ```
 
diff --git a/pulpcore/app/serializers/domain.py b/pulpcore/app/serializers/domain.py
@@ -342,6 +342,7 @@ class StorageSettingsSerializer(serializers.Serializer):
     STORAGE_MAPPING = {
         "pulpcore.app.models.storage.FileSystem": FileSystemSettingsSerializer,
         "pulpcore.app.models.storage.PulpSFTPStorage": SFTPSettingsSerializer,
+        "storages.backends.s3.S3Storage": AmazonS3SettingsSerializer,
         "storages.backends.s3boto3.S3Boto3Storage": AmazonS3SettingsSerializer,
         "storages.backends.azure_storage.AzureStorage": AzureSettingsSerializer,
         "storages.backends.gcloud.GoogleCloudStorage": GoogleSettingsSerializer,
diff --git a/pulpcore/app/settings.py b/pulpcore/app/settings.py
@@ -436,6 +436,7 @@
     Validator("REDIRECT_TO_OBJECT_STORAGE", eq=False)
     | Validator(*storage_keys, eq="pulpcore.app.models.storage.FileSystem")
     | Validator(*storage_keys, eq="storages.backends.azure_storage.AzureStorage")
+    | Validator(*storage_keys, eq="storages.backends.s3.S3Storage")
     | Validator(*storage_keys, eq="storages.backends.s3boto3.S3Boto3Storage")
     | Validator(*storage_keys, eq="storages.backends.gcloud.GoogleCloudStorage")
 )

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,9 @@ STORAGES = {`
`73`	`73`	`"region_name": "eu-central-1",`
`74`	`74`	`},`
`75`	`75`	`},`
	`76`	`+ "staticfiles": {`
	`77`	`+ "BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage",`
	`78`	`+ },`
`76`	`79`	`}`
`77`	`80`	```
`78`	`81`
Original file line number	Diff line number	Diff line change
`@@ -436,6 +436,7 @@`
`436`	`436`	`Validator("REDIRECT_TO_OBJECT_STORAGE", eq=False)`
`437`	`437`	`\| Validator(*storage_keys, eq="pulpcore.app.models.storage.FileSystem")`
`438`	`438`	`\| Validator(*storage_keys, eq="storages.backends.azure_storage.AzureStorage")`
	`439`	`+ \| Validator(*storage_keys, eq="storages.backends.s3.S3Storage")`
`439`	`440`	`\| Validator(*storage_keys, eq="storages.backends.s3boto3.S3Boto3Storage")`
`440`	`441`	`\| Validator(*storage_keys, eq="storages.backends.gcloud.GoogleCloudStorage")`
`441`	`442`	`)`