From 46600f2b0d83963473913a696c309d9a20841466 Mon Sep 17 00:00:00 2001 From: libertyzhu Date: Mon, 29 Jul 2024 15:28:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0SDK=E9=87=8D=E8=AF=95?= =?UTF-8?q?=E6=A0=87=E8=AE=B0=E8=AF=B7=E6=B1=82=E5=A4=B4x-cos-sdk-retry?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qcloud_cos/cos_client.py | 1 + 1 file changed, 1 insertion(+) diff --git a/qcloud_cos/cos_client.py b/qcloud_cos/cos_client.py index 5d058324..7b15c0e5 100644 --- a/qcloud_cos/cos_client.py +++ b/qcloud_cos/cos_client.py @@ -392,6 +392,7 @@ def send_request(self, method, url, bucket=None, timeout=30, cos_request=True, c try: if j != 0: if client_can_retry(file_position, **kwargs): + kwargs['headers']['x-cos-sdk-retry'] = 'true' # SDK重试标记 time.sleep(j) else: break From cf7e537a08f7cb2b4f03f3936295dd2e8e594bea Mon Sep 17 00:00:00 2001 From: libertyzhu Date: Mon, 29 Jul 2024 16:05:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?HTTPS=E8=AF=81=E4=B9=A6=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qcloud_cos/cos_client.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/qcloud_cos/cos_client.py b/qcloud_cos/cos_client.py index 7b15c0e5..5048c851 100644 --- a/qcloud_cos/cos_client.py +++ b/qcloud_cos/cos_client.py @@ -44,7 +44,7 @@ def __init__(self, Appid=None, Region=None, SecretId=None, SecretKey=None, Token Access_id=None, Access_key=None, Secret_id=None, Secret_key=None, Endpoint=None, IP=None, Port=None, Anonymous=None, UA=None, Proxies=None, Domain=None, ServiceDomain=None, KeepAlive=True, PoolConnections=10, PoolMaxSize=10, AllowRedirects=False, SignHost=True, EndpointCi=None, EndpointPic=None, EnableOldDomain=True, EnableInternalDomain=True, SignParams=True, - AutoSwitchDomainOnRetry=False): + AutoSwitchDomainOnRetry=False, VerifySSL=None): """初始化，保存用户的信息 :param Appid(string): 用户APPID. @@ -75,6 +75,8 @@ def __init__(self, Appid=None, Region=None, SecretId=None, SecretKey=None, Token :param EnableOldDomain(bool): 是否使用旧的myqcloud.com域名访问COS :param EnableInternalDomain(bool): 是否使用内网域名访问COS :param SignParams(bool): 是否将请求参数算入签名 + :param AutoSwitchDomainOnRetry(bool): 重试请求时是否将myqcloud.com域名切换为tencentcos.cn + :param VerifySSL(bool): 是否开启SSL证书校验 """ self._appid = to_unicode(Appid) self._token = to_unicode(Token) @@ -100,6 +102,7 @@ def __init__(self, Appid=None, Region=None, SecretId=None, SecretKey=None, Token self._enable_internal_domain = EnableInternalDomain self._sign_params = SignParams self._auto_switch_domain_on_retry = AutoSwitchDomainOnRetry + self._verify_ssl = VerifySSL if self._domain is None: self._endpoint = format_endpoint(Endpoint, Region, u'cos.', EnableOldDomain, EnableInternalDomain) @@ -379,7 +382,7 @@ def send_request(self, method, url, bucket=None, timeout=30, cos_request=True, c except Exception as ioe: file_position = None kwargs['data'] = to_bytes(kwargs['data']) - if self._conf._ip is not None and self._conf._scheme == 'https': + if self._conf._ip is not None and self._conf._scheme == 'https' or self._conf._verify_ssl is False: kwargs['verify'] = False if self._conf._allow_redirects is not None: kwargs['allow_redirects'] = self._conf._allow_redirects From 12a525928d42880291f87dacfab345437f203ab1 Mon Sep 17 00:00:00 2001 From: libertyzhu Date: Mon, 29 Jul 2024 16:44:47 +0800 Subject: [PATCH 3/4] fix ut --- ut/test.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ut/test.py b/ut/test.py index 39cf7796..0dcfa4b0 100644 --- a/ut/test.py +++ b/ut/test.py @@ -1962,7 +1962,7 @@ def test_put_get_delete_bucket_referer(): response = client.get_bucket_referer( Bucket=test_bucket, ) - assert len(response) == 0 + assert response['RefererConfiguration'] is None def test_put_get_traffic_limit(): @@ -5807,7 +5807,6 @@ def test_ci_asr_bucket(): if __name__ == "__main__": setUp() - test_post_bucket_inventory_configurations() """ test_config_invalid_scheme() test_config_credential_inst() From 9057c878269c45fb922d9cd439e9ef37aa0eef75 Mon Sep 17 00:00:00 2001 From: libertyzhu Date: Mon, 29 Jul 2024 18:06:36 +0800 Subject: [PATCH 4/4] fix ut --- ut/test.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ut/test.py b/ut/test.py index 0dcfa4b0..6cab656b 100644 --- a/ut/test.py +++ b/ut/test.py @@ -1831,9 +1831,14 @@ def test_post_bucket_inventory_configurations(): ] }, } + inventory_id = 'list1' + response = client.delete_bucket_inventory( + Bucket=test_bucket, + Id=inventory_id, + ) response = client.post_bucket_inventory( Bucket=test_bucket, - Id='list1', + Id=inventory_id, InventoryConfiguration=inventory_config, )