From df560e178369a6d03140e412a25af6ec7444f5a1 Mon Sep 17 00:00:00 2001
From: Gurov Ilya <ilya.faer@mail.ru>
Date: Thu, 2 Apr 2020 00:36:44 +0300
Subject: [PATCH] fix(storage): use OrderedDict while encoding POST policy
 (#95)

* use OrderedDict() while encoding POST policy

* fix(storage): use OrderedDict() while encoding POST policy
---
 google/cloud/storage/client.py | 10 +++++++++-
 tests/unit/test_client.py      |  7 ++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/google/cloud/storage/client.py b/google/cloud/storage/client.py
index 6d25f9e43..d72149fc7 100644
--- a/google/cloud/storage/client.py
+++ b/google/cloud/storage/client.py
@@ -16,6 +16,7 @@
 
 import base64
 import binascii
+import collections
 import datetime
 import functools
 import json
@@ -972,7 +973,14 @@ def generate_signed_post_policy_v4(
 
         # encode policy for signing
         policy = json.dumps(
-            {"conditions": conditions, "expiration": policy_expires.isoformat() + "Z"},
+            collections.OrderedDict(
+                sorted(
+                    {
+                        "conditions": conditions,
+                        "expiration": policy_expires.isoformat() + "Z",
+                    }.items()
+                )
+            ),
             separators=(",", ":"),
         )
         str_to_sign = base64.b64encode(policy.encode("utf-8"))
diff --git a/tests/unit/test_client.py b/tests/unit/test_client.py
index 4d1149382..8673bcfd0 100644
--- a/tests/unit/test_client.py
+++ b/tests/unit/test_client.py
@@ -1762,6 +1762,10 @@ def test_conformance_post_policy(test_data):
                     scheme=in_data.get("scheme"),
                 )
     fields = policy["fields"]
+    out_data = test_data["policyOutput"]
+
+    decoded_policy = base64.b64decode(fields["policy"]).decode("unicode_escape")
+    assert decoded_policy == out_data["expectedDecodedPolicy"]
 
     for field in (
         "x-goog-algorithm",
@@ -1771,9 +1775,6 @@ def test_conformance_post_policy(test_data):
     ):
         assert fields[field] == test_data["policyOutput"]["fields"][field]
 
-    out_data = test_data["policyOutput"]
-    decoded_policy = base64.b64decode(fields["policy"]).decode("unicode_escape")
-    assert decoded_policy == out_data["expectedDecodedPolicy"]
     assert policy["url"] == out_data["url"]