From 50ac0480719686eadffc5074a8aca5095318860f Mon Sep 17 00:00:00 2001
From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com>
Date: Fri, 24 Sep 2021 16:32:43 -0400
Subject: [PATCH] Fix container pull error to make compatible with
 drf-access-policy (#989) (#990)

drf-access-policy>=1.0.0 requires use of condition_expression when
using boolean logic in access statements

Issue: AAH-940
(cherry picked from commit 880bba6d5a5a9e737bfee64c18d822d155793392)

Co-authored-by: Andrew Crosby <acrosby@redhat.com>
---
 CHANGES/940.bugfix                                        | 1 +
 galaxy_ng/app/access_control/statements/pulp_container.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 CHANGES/940.bugfix

diff --git a/CHANGES/940.bugfix b/CHANGES/940.bugfix
new file mode 100644
index 0000000000..cf5b3cc000
--- /dev/null
+++ b/CHANGES/940.bugfix
@@ -0,0 +1 @@
+Fix container pull error to make compatible with drf-access-policy update
diff --git a/galaxy_ng/app/access_control/statements/pulp_container.py b/galaxy_ng/app/access_control/statements/pulp_container.py
index 2ec57e74a8..79b9373777 100644
--- a/galaxy_ng/app/access_control/statements/pulp_container.py
+++ b/galaxy_ng/app/access_control/statements/pulp_container.py
@@ -36,7 +36,7 @@
                 # "principal": "*",
                 "principal": "authenticated",
                 "effect": "allow",
-                "condition": [
+                "condition_expression": [
                     "not is_private",
                 ],
             },