Fields in remote from Bandersnatch config are correctly set

gerrod3 · gerrod3 · commit fe7e7802f675 · 2020-08-25T18:15:44.000-04:00
fixes: #7392 https://pulp.plan.io/issues/7392
diff --git a/CHANGES/7392.bugfix b/CHANGES/7392.bugfix
@@ -0,0 +1 @@
+Includes/excludes/prereleases fields are now properly set in a remote from Bandersnatch config
diff --git a/pulp_python/app/viewsets.py b/pulp_python/app/viewsets.py
@@ -156,13 +156,13 @@ def from_bandersnatch(self, request):
                 }
         enabled = bander_config.get("plugins", "enabled")
         enabled_all = "all" in enabled
-        data["prereleases"] = enabled_all or "prerelease_release" in enabled
-        if bander_config.has_option("whitelist", "packages") and \
-                (enabled_all or "whitelist_project" in enabled):
-            data["includes"] = bander_config.get("whitelist", "packages").split()
-        if bander_config.has_option("blacklist", "packages") and \
-                (enabled_all or "blacklist_project" in enabled):
-            data["excludes"] = bander_config.get("blacklist", "packages").split()
+        data["prereleases"] = not (enabled_all or "prerelease_release" in enabled)
+        if bander_config.has_option("allowlist", "packages") and \
+                (enabled_all or "allowlist_project" in enabled):
+            data["includes"] = bander_config.get("allowlist", "packages").split()
+        if bander_config.has_option("blocklist", "packages") and \
+                (enabled_all or "blocklist_project" in enabled):
+            data["excludes"] = bander_config.get("blocklist", "packages").split()
         remote = python_serializers.PythonRemoteSerializer(data=data, context={"request": request})
         remote.is_valid(raise_exception=True)
         remote.save()
diff --git a/pulp_python/tests/functional/constants.py b/pulp_python/tests/functional/constants.py
@@ -183,7 +183,7 @@
     "url": "https://pypi.org",
     "download_concurrency": 3,
     "policy": "immediate",
-    "prereleases": True,
+    "prereleases": False,
     "excludes": ["example1", "example2"]
 }
 
@@ -222,10 +222,10 @@
 
 ; Enable filtering plugins
 [plugins]
-; Enable all or specific plugins - e.g. whitelist_project
+; Enable all or specific plugins - e.g. allowlist_project
 enabled = all
 
-[blacklist]
+[blocklist]
 ; List of PyPI packages not to sync - Useful if malicious packages are mirrored
 packages =
     example1

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Includes/excludes/prereleases fields are now properly set in a remote from Bandersnatch config`