From 11e3b7781122a5b629c60a68c9d72ca8e7336202 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.com>
Date: Wed, 25 Sep 2024 13:18:21 +0200
Subject: [PATCH] Add v2 signature presigned get_object tests

This adds tests for get_object presigned URLs
using signature v2.

Also code formatting.

Signed-off-by: Tobias Urdin <tobias.urdin@binero.com>
(cherry picked from commit ac71900ffb47793638317116d16d1baf75a95a98)
---
 s3tests_boto3/functional/__init__.py | 11 +++++++++++
 s3tests_boto3/functional/test_s3.py  | 13 +++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/s3tests_boto3/functional/__init__.py b/s3tests_boto3/functional/__init__.py
index 093faad..e564315 100644
--- a/s3tests_boto3/functional/__init__.py
+++ b/s3tests_boto3/functional/__init__.py
@@ -510,6 +510,17 @@ def get_tenant_client(client_config=None):
                         config=client_config)
     return client
 
+def get_v2_tenant_client():
+    client_config = Config(signature_version='s3')
+    client = boto3.client(service_name='s3',
+                          aws_access_key_id=config.tenant_access_key,
+                          aws_secret_access_key=config.tenant_secret_key,
+                          endpoint_url=config.default_endpoint,
+                          use_ssl=config.default_is_secure,
+                          verify=config.default_ssl_verify,
+                          config=client_config)
+    return client
+
 def get_tenant_iam_client():
 
     client = boto3.client(service_name='iam',
diff --git a/s3tests_boto3/functional/test_s3.py b/s3tests_boto3/functional/test_s3.py
index b99deee..8698273 100644
--- a/s3tests_boto3/functional/test_s3.py
+++ b/s3tests_boto3/functional/test_s3.py
@@ -67,6 +67,7 @@ from . import (
     get_alt_email,
     get_alt_client,
     get_tenant_client,
+    get_v2_tenant_client,
     get_tenant_iam_client,
     get_tenant_name,
     get_tenant_user_id,
@@ -6870,6 +6871,18 @@ def test_cors_presigned_get_object_tenant():
         method='get_object',
     )
 
+def test_cors_presigned_get_object_v2():
+    _test_cors_options_presigned_method(
+        client=get_v2_client(),
+        method='get_object',
+    )
+
+def test_cors_presigned_get_object_tenant_v2():
+    _test_cors_options_presigned_method(
+        client=get_v2_tenant_client(),
+        method='get_object',
+    )
+
 def test_cors_presigned_put_object():
     _test_cors_options_presigned_method(
         client=get_client(),