Accept sha256 hash for swift tempurl

Since swiftclient 4.0.1, sha256 is used when generating tempurl
signature[1].
This change extends the regex pattern to assert signatues so that it
can accept both sha1(old) and sha256(current).

[1] https://review.opendev.org/c/openstack/python-swiftclient/+/845157

Change-Id: I063fb5faf3546e306f41821f14fc14a7b28c9743

2 files changed, 6 insertions, 5 deletions

diff --git a/heat/tests/clients/test_swift_client.py b/heat/tests/clients/test_swift_client.py
index eb3146d98..ae04ae42c 100644
--- a/heat/tests/clients/test_swift_client.py
+++ b/heat/tests/clients/test_swift_client.py
@@ -76,7 +76,7 @@ class SwiftUtilsTest(SwiftClientPluginTestCase):
         url = self.swift_plugin.get_temp_url(container_name, obj_name)
         self.assertFalse(self.swift_client.post_account.called)
         regexp = ("http://fake-host.com:8080/v1/AUTH_demo/%s"
-                  r"/%s\?temp_url_sig=[0-9a-f]{40}&"
+                  r"/%s\?temp_url_sig=[0-9a-f]{40,64}&"
                   "temp_url_expires=[0-9]{10}" %
                   (container_name, obj_name))
         self.assertThat(url, matchers.MatchesRegex(regexp))
@@ -119,7 +119,7 @@ class SwiftUtilsTest(SwiftClientPluginTestCase):
         self.assertTrue(self.swift_client.put_container.called)
         self.assertTrue(self.swift_client.put_object.called)
         regexp = ("http://fake-host.com:8080/v1/AUTH_demo/%s"
-                  r"/%s\?temp_url_sig=[0-9a-f]{40}&"
+                  r"/%s\?temp_url_sig=[0-9a-f]{40,64}&"
                   "temp_url_expires=[0-9]{10}" %
                   (container_name, obj_name))
         self.assertThat(url, matchers.MatchesRegex(regexp))
diff --git a/heat/tests/openstack/heat/test_swiftsignal.py b/heat/tests/openstack/heat/test_swiftsignal.py
index c3d2db0d6..64a15df1b 100644
--- a/heat/tests/openstack/heat/test_swiftsignal.py
+++ b/heat/tests/openstack/heat/test_swiftsignal.py
@@ -136,7 +136,7 @@ class SwiftSignalHandleTest(common.HeatTestCase):
         obj_name = "%s-%s-abcdefghijkl" % (st.name, handle.name)
         regexp = ("http://fake-host.com:8080/v1/AUTH_test_tenant/%s/test_st-"
                   "test_wait_condition_handle-abcdefghijkl"
-                  r"\?temp_url_sig=[0-9a-f]{40}&temp_url_expires=[0-9]{10}"
+                  r"\?temp_url_sig=[0-9a-f]{40,64}&temp_url_expires=[0-9]{10}"
                   % st.id)
         res_id = st.resources['test_wait_condition_handle'].resource_id
         self.assertEqual(res_id, handle.physical_resource_name())
@@ -718,7 +718,8 @@ class SwiftSignalTest(common.HeatTestCase):
         self.assertEqual(('CREATE', 'COMPLETE'), st.state)
         expected = ('http://fake-host.com:8080/v1/AUTH_test_tenant/%s/'
                     r'test_st-test_wait_condition_handle-abcdefghijkl\?temp_'
-                    'url_sig=[0-9a-f]{40}&temp_url_expires=[0-9]{10}') % st.id
+                    'url_sig=[0-9a-f]{40,64}&'
+                    'temp_url_expires=[0-9]{10}') % st.id
         self.assertThat(handle.FnGetAtt('endpoint'),
                         matchers.MatchesRegex(expected))
 
@@ -748,7 +749,7 @@ class SwiftSignalTest(common.HeatTestCase):
         self.assertEqual(('CREATE', 'COMPLETE'), st.state)
         expected = ("curl -i -X PUT 'http://fake-host.com:8080/v1/"
                     "AUTH_test_tenant/%s/test_st-test_wait_condition_"
-                    r"handle-abcdefghijkl\?temp_url_sig=[0-9a-f]{40}&"
+                    r"handle-abcdefghijkl\?temp_url_sig=[0-9a-f]{40,64}&"
                     "temp_url_expires=[0-9]{10}'") % st.id
         self.assertThat(handle.FnGetAtt('curl_cli'),
                         matchers.MatchesRegex(expected))