tencentcloud-sdk-python 3.0.1445__py2.py3-none-any.whl → 3.0.1447__py2.py3-none-any.whl

tencentcloud/common/credential.py

@@ -16,6 +16,7 @@
 import json
 import os
 import time
+import threading
 
 try:
     # py3
@@ -70,6 +71,9 @@ class Credential(object):
     @property
     def secretKey(self):
         return self.secret_key
+    
+    def get_credential_info(self):
+        return self.secret_id, self.secret_key, self.token
 
 
 class CVMRoleCredential(object):
@@ -91,6 +95,7 @@ class CVMRoleCredential(object):
         self._secret_key = None
         self._token = None
         self._expired_ts = 0
+        self._lock = threading.Lock()
 
     @property
     def secretId(self):
@@ -98,8 +103,9 @@ class CVMRoleCredential(object):
 
     @property
     def secret_id(self):
-        self.update_credential()
-        return self._secret_id
+        with self._lock:
+            self.update_credential()
+            return self._secret_id
 
     @property
     def secretKey(self):
@@ -107,13 +113,15 @@ class CVMRoleCredential(object):
 
     @property
     def secret_key(self):
-        self.update_credential()
-        return self._secret_key
+        with self._lock:
+            self.update_credential()
+            return self._secret_key
 
     @property
     def token(self):
-        self.update_credential()
-        return self._token
+        with self._lock:
+            self.update_credential()
+            return self._token
 
     def get_role_name(self):
         if self.role:
@@ -159,6 +167,11 @@ class CVMRoleCredential(object):
             return None
         return self
 
+    def get_credential_info(self):
+        with self._lock:
+            self.update_credential()
+            return self._secret_id, self._secret_key, self._token
+
 
 class STSAssumeRoleCredential(object):
     """Tencent Cloud Credential via STS service
@@ -200,31 +213,42 @@ class STSAssumeRoleCredential(object):
         self._tmp_credential = None
         if endpoint:
             self._endpoint = endpoint
+        self._lock = threading.Lock()
 
     @property
     def secretId(self):
-        self._need_refresh()
-        return self._tmp_secret_id
+        with self._lock:
+            self._need_refresh()
+            return self._tmp_secret_id
 
     @property
     def secretKey(self):
-        self._need_refresh()
-        return self._tmp_secret_key
+        with self._lock:
+            self._need_refresh()
+            return self._tmp_secret_key
 
     @property
     def secret_id(self):
-        self._need_refresh()
-        return self._tmp_secret_id
+        with self._lock:
+            self._need_refresh()
+            return self._tmp_secret_id
 
     @property
     def secret_key(self):
-        self._need_refresh()
-        return self._tmp_secret_key
+        with self._lock:
+            self._need_refresh()
+            return self._tmp_secret_key
 
     @property
     def token(self):
-        self._need_refresh()
-        return self._token
+        with self._lock:
+            self._need_refresh()
+            return self._token
+    
+    def get_credential_info(self):
+        with self._lock:
+            self._need_refresh()
+            return self._tmp_secret_id, self._tmp_secret_key, self._token
 
     def _need_refresh(self):
         if None in [self._token, self._tmp_secret_key, self._tmp_secret_id] or self._expired_time < int(time.time()):
@@ -405,31 +429,42 @@ class OIDCRoleArnCredential(object):
         self._tmp_secret_key = None
         self._expired_time = 0
         self._is_tke = False
+        self._lock = threading.Lock()
 
     @property
     def secretId(self):
-        self._keep_fresh()
-        return self._tmp_secret_id
+        with self._lock:
+            self._keep_fresh()
+            return self._tmp_secret_id
 
     @property
     def secretKey(self):
-        self._keep_fresh()
-        return self._tmp_secret_key
+        with self._lock:
+            self._keep_fresh()
+            return self._tmp_secret_key
 
     @property
     def secret_id(self):
-        self._keep_fresh()
-        return self._tmp_secret_id
+        with self._lock:
+            self._keep_fresh()
+            return self._tmp_secret_id
 
     @property
     def secret_key(self):
-        self._keep_fresh()
-        return self._tmp_secret_key
+        with self._lock:
+            self._keep_fresh()
+            return self._tmp_secret_key
 
     @property
     def token(self):
-        self._keep_fresh()
-        return self._token
+        with self._lock:
+            self._keep_fresh()
+            return self._token
+        
+    def get_credential_info(self):
+        with self._lock:
+            self._keep_fresh()
+            return self._tmp_secret_id, self._tmp_secret_key, self._token
 
     @property
     def endpoint(self):

tencentcloud/csip/v20221121/models.py

@@ -27,7 +27,7 @@ class AKInfo(AbstractModel):
         r"""
         :param _ID: ak对应id
         :type ID: int
-        :param _Name: ak具体值
+        :param _Name: ak具体值\n
 临时密钥时返回临时密钥
         :type Name: str
         :param _User: 所属账号
@@ -53,7 +53,7 @@ class AKInfo(AbstractModel):
 
     @property
     def Name(self):
-        """ak具体值
+        """ak具体值\n
 临时密钥时返回临时密钥
         :rtype: str
         """
@@ -32876,7 +32876,7 @@ class SubUserInfo(AbstractModel):
         :type ConfigRiskCount: int
         :param _ActionRiskCount: 危险行为告警
         :type ActionRiskCount: int
-        :param _IsAccessCloudAudit: 是否接入云审计日志
+        :param _IsAccessCloudAudit: 是否接入操作审计日志
         :type IsAccessCloudAudit: bool
         :param _IsAccessCheck: 是否配置风险的安全体检
         :type IsAccessCheck: bool
@@ -33069,7 +33069,7 @@ class SubUserInfo(AbstractModel):
 
     @property
     def IsAccessCloudAudit(self):
-        """是否接入云审计日志
+        """是否接入操作审计日志
         :rtype: bool
         """
         return self._IsAccessCloudAudit

tencentcloud/ctem/v20231128/models.py

@@ -1432,6 +1432,8 @@ class DescribeConfigsRequest(AbstractModel):
         :type Filters: list of Filter
         :param _Ignored: 是否显示被忽略的数据
         :type Ignored: bool
+        :param _OrderBy: 支持按照响应长度排序，例如：+ContentLength或-ContentLength，+是递增，-是递减
+        :type OrderBy: str
         """
         self._CustomerIdList = None
         self._IsAggregation = None
@@ -1447,6 +1449,7 @@ class DescribeConfigsRequest(AbstractModel):
         self._UpdateAtEnd = None
         self._Filters = None
         self._Ignored = None
+        self._OrderBy = None
 
     @property
     def CustomerIdList(self):
@@ -1602,6 +1605,17 @@ class DescribeConfigsRequest(AbstractModel):
     def Ignored(self, Ignored):
         self._Ignored = Ignored
 
+    @property
+    def OrderBy(self):
+        """支持按照响应长度排序，例如：+ContentLength或-ContentLength，+是递增，-是递减
+        :rtype: str
+        """
+        return self._OrderBy
+
+    @OrderBy.setter
+    def OrderBy(self, OrderBy):
+        self._OrderBy = OrderBy
+
 
     def _deserialize(self, params):
         self._CustomerIdList = params.get("CustomerIdList")
@@ -1623,6 +1637,7 @@ class DescribeConfigsRequest(AbstractModel):
                 obj._deserialize(item)
                 self._Filters.append(obj)
         self._Ignored = params.get("Ignored")
+        self._OrderBy = params.get("OrderBy")
         memeber_set = set(params.keys())
         for name, value in vars(self).items():
             property_name = name[1:]
@@ -9101,12 +9116,15 @@ class DisplayDarkWeb(AbstractModel):
         :type Url: str
         :param _DisplayToolCommon: 公共字段
         :type DisplayToolCommon: :class:`tencentcloud.ctem.v20231128.models.DisplayToolCommon`
+        :param _Status: 状态：unrepaired:未修复，repaired:已修复，ignore:已忽略
+        :type Status: str
         """
         self._Id = None
         self._Content = None
         self._MatchedKeywords = None
         self._Url = None
         self._DisplayToolCommon = None
+        self._Status = None
 
     @property
     def Id(self):
@@ -9163,6 +9181,17 @@ class DisplayDarkWeb(AbstractModel):
     def DisplayToolCommon(self, DisplayToolCommon):
         self._DisplayToolCommon = DisplayToolCommon
 
+    @property
+    def Status(self):
+        """状态：unrepaired:未修复，repaired:已修复，ignore:已忽略
+        :rtype: str
+        """
+        return self._Status
+
+    @Status.setter
+    def Status(self, Status):
+        self._Status = Status
+
 
     def _deserialize(self, params):
         self._Id = params.get("Id")
@@ -9172,6 +9201,7 @@ class DisplayDarkWeb(AbstractModel):
         if params.get("DisplayToolCommon") is not None:
             self._DisplayToolCommon = DisplayToolCommon()
             self._DisplayToolCommon._deserialize(params.get("DisplayToolCommon"))
+        self._Status = params.get("Status")
         memeber_set = set(params.keys())
         for name, value in vars(self).items():
             property_name = name[1:]

tencentcloud/cwp/v20180228/models.py

@@ -30698,29 +30698,32 @@ class DescribeBanStatusResponse(AbstractModel):
 
     def __init__(self):
         r"""
-        :param _Status: 阻断开关状态:
- 0 -- 关闭 
- 1 -- 高级阻断
- 2 -- 基础阻断(只阻断情报库黑ip)
+        :param _Status: (已废弃) 阻断开关状态: 0 -- 关闭  1 -- 高级阻断 2 -- 基础阻断(只阻断情报库黑ip)
         :type Status: int
         :param _ShowTips: 是否弹窗提示信息 false: 关闭，true: 开启
         :type ShowTips: bool
         :param _OpenSmartMode: 是否开启智能过白模式
         :type OpenSmartMode: bool
+        :param _BanBlackIp: 是否开启情报IP阻断
+        :type BanBlackIp: bool
+        :param _BanVulIp: 是否开启漏洞IP阻断
+        :type BanVulIp: bool
+        :param _BanByRule: 是否开启规则阻断
+        :type BanByRule: bool
         :param _RequestId: 唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。
         :type RequestId: str
         """
         self._Status = None
         self._ShowTips = None
         self._OpenSmartMode = None
+        self._BanBlackIp = None
+        self._BanVulIp = None
+        self._BanByRule = None
         self._RequestId = None
 
     @property
     def Status(self):
-        """阻断开关状态:
- 0 -- 关闭 
- 1 -- 高级阻断
- 2 -- 基础阻断(只阻断情报库黑ip)
+        """(已废弃) 阻断开关状态: 0 -- 关闭  1 -- 高级阻断 2 -- 基础阻断(只阻断情报库黑ip)
         :rtype: int
         """
         return self._Status
@@ -30751,6 +30754,39 @@ class DescribeBanStatusResponse(AbstractModel):
     def OpenSmartMode(self, OpenSmartMode):
         self._OpenSmartMode = OpenSmartMode
 
+    @property
+    def BanBlackIp(self):
+        """是否开启情报IP阻断
+        :rtype: bool
+        """
+        return self._BanBlackIp
+
+    @BanBlackIp.setter
+    def BanBlackIp(self, BanBlackIp):
+        self._BanBlackIp = BanBlackIp
+
+    @property
+    def BanVulIp(self):
+        """是否开启漏洞IP阻断
+        :rtype: bool
+        """
+        return self._BanVulIp
+
+    @BanVulIp.setter
+    def BanVulIp(self, BanVulIp):
+        self._BanVulIp = BanVulIp
+
+    @property
+    def BanByRule(self):
+        """是否开启规则阻断
+        :rtype: bool
+        """
+        return self._BanByRule
+
+    @BanByRule.setter
+    def BanByRule(self, BanByRule):
+        self._BanByRule = BanByRule
+
     @property
     def RequestId(self):
         """唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。
@@ -30767,6 +30803,9 @@ class DescribeBanStatusResponse(AbstractModel):
         self._Status = params.get("Status")
         self._ShowTips = params.get("ShowTips")
         self._OpenSmartMode = params.get("OpenSmartMode")
+        self._BanBlackIp = params.get("BanBlackIp")
+        self._BanVulIp = params.get("BanVulIp")
+        self._BanByRule = params.get("BanByRule")
         self._RequestId = params.get("RequestId")
 
 
@@ -73391,7 +73430,7 @@ class HostLoginList(AbstractModel):
         :param _Quuid: 主机quuid
         :type Quuid: str
         :param _Desc: 高危信息说明：
-ABROAD - 海外IP；
+ABROAD - 境外IP；
 XTI - 威胁情报
         :type Desc: str
         :param _MachineExtraInfo: 附加信息
@@ -73636,7 +73675,7 @@ XTI - 威胁情报
     @property
     def Desc(self):
         """高危信息说明：
-ABROAD - 海外IP；
+ABROAD - 境外IP；
 XTI - 威胁情报
         :rtype: str
         """
@@ -76670,7 +76709,7 @@ class LoginWhiteCombinedInfo(AbstractModel):
         :type ModifyTime: str
         :param _Uuid: 服务器Uuid
         :type Uuid: str
-        :param _Locations: 登陆地
+        :param _Locations: 登录地
         :type Locations: str
         """
         self._Places = None
@@ -76845,7 +76884,7 @@ class LoginWhiteCombinedInfo(AbstractModel):
 
     @property
     def Locations(self):
-        """登陆地
+        """登录地
         :rtype: str
         """
         return self._Locations
@@ -88178,7 +88217,7 @@ class Place(AbstractModel):
         :type CityId: int
         :param _ProvinceId: 省份 ID。
         :type ProvinceId: int
-        :param _CountryId: 国家ID，暂只支持国内：1。
+        :param _CountryId: 国家ID，暂只支持境内：1。
         :type CountryId: int
         :param _Location: 位置名称
         :type Location: str
@@ -88212,7 +88251,7 @@ class Place(AbstractModel):
 
     @property
     def CountryId(self):
-        """国家ID，暂只支持国内：1。
+        """国家ID，暂只支持境内：1。
         :rtype: int
         """
         return self._CountryId

tencentcloud/cynosdb/v20190107/models.py

@@ -27810,6 +27810,7 @@ class ModifyDBInstanceSecurityGroupsRequest(AbstractModel):
         :param _InstanceId: 网络组id(cynosdbmysql-grp-前缀开头)或集群id
         :type InstanceId: str
         :param _SecurityGroupIds: 要修改的安全组ID列表，一个或者多个安全组ID组成的数组。
+注意：该入参会全量替换存量已有集合，非增量更新。修改需传入预期的全量集合。
         :type SecurityGroupIds: list of str
         :param _Zone: 可用区
         :type Zone: str
@@ -27832,6 +27833,7 @@ class ModifyDBInstanceSecurityGroupsRequest(AbstractModel):
     @property
     def SecurityGroupIds(self):
         """要修改的安全组ID列表，一个或者多个安全组ID组成的数组。
+注意：该入参会全量替换存量已有集合，非增量更新。修改需传入预期的全量集合。
         :rtype: list of str
         """
         return self._SecurityGroupIds

tencentcloud/dc/v20180410/models.py

@@ -1255,6 +1255,8 @@ ChinaOther：中国其他；
         :type FaultReportContactPerson: str
         :param _FaultReportContactNumber: 报障联系电话。
         :type FaultReportContactNumber: str
+        :param _FaultReportContactEmail: 报障联系邮箱。
+        :type FaultReportContactEmail: str
         :param _SignLaw: 物理专线申请者是否签署了用户使用协议。默认已签署。
         :type SignLaw: bool
         :param _Tags: 标签键值对
@@ -1278,6 +1280,7 @@ ChinaOther：中国其他；
         self._CustomerContactNumber = None
         self._FaultReportContactPerson = None
         self._FaultReportContactNumber = None
+        self._FaultReportContactEmail = None
         self._SignLaw = None
         self._Tags = None
         self._IsMacSec = None
@@ -1470,6 +1473,17 @@ ChinaOther：中国其他；
     def FaultReportContactNumber(self, FaultReportContactNumber):
         self._FaultReportContactNumber = FaultReportContactNumber
 
+    @property
+    def FaultReportContactEmail(self):
+        """报障联系邮箱。
+        :rtype: str
+        """
+        return self._FaultReportContactEmail
+
+    @FaultReportContactEmail.setter
+    def FaultReportContactEmail(self, FaultReportContactEmail):
+        self._FaultReportContactEmail = FaultReportContactEmail
+
     @property
     def SignLaw(self):
         """物理专线申请者是否签署了用户使用协议。默认已签署。
@@ -1521,6 +1535,7 @@ ChinaOther：中国其他；
         self._CustomerContactNumber = params.get("CustomerContactNumber")
         self._FaultReportContactPerson = params.get("FaultReportContactPerson")
         self._FaultReportContactNumber = params.get("FaultReportContactNumber")
+        self._FaultReportContactEmail = params.get("FaultReportContactEmail")
         self._SignLaw = params.get("SignLaw")
         if params.get("Tags") is not None:
             self._Tags = []
@@ -5512,6 +5527,8 @@ class ModifyDirectConnectAttributeRequest(AbstractModel):
         :type FaultReportContactPerson: str
         :param _FaultReportContactNumber: 报障联系电话。
         :type FaultReportContactNumber: str
+        :param _FaultReportContactEmail: 报障联系邮箱。
+        :type FaultReportContactEmail: str
         :param _SignLaw: 物理专线申请者补签用户使用协议。
         :type SignLaw: bool
         :param _Bandwidth: 物理专线带宽。
@@ -5528,6 +5545,7 @@ class ModifyDirectConnectAttributeRequest(AbstractModel):
         self._CustomerContactNumber = None
         self._FaultReportContactPerson = None
         self._FaultReportContactNumber = None
+        self._FaultReportContactEmail = None
         self._SignLaw = None
         self._Bandwidth = None
 
@@ -5652,6 +5670,17 @@ class ModifyDirectConnectAttributeRequest(AbstractModel):
     def FaultReportContactNumber(self, FaultReportContactNumber):
         self._FaultReportContactNumber = FaultReportContactNumber
 
+    @property
+    def FaultReportContactEmail(self):
+        """报障联系邮箱。
+        :rtype: str
+        """
+        return self._FaultReportContactEmail
+
+    @FaultReportContactEmail.setter
+    def FaultReportContactEmail(self, FaultReportContactEmail):
+        self._FaultReportContactEmail = FaultReportContactEmail
+
     @property
     def SignLaw(self):
         """物理专线申请者补签用户使用协议。
@@ -5687,6 +5716,7 @@ class ModifyDirectConnectAttributeRequest(AbstractModel):
         self._CustomerContactNumber = params.get("CustomerContactNumber")
         self._FaultReportContactPerson = params.get("FaultReportContactPerson")
         self._FaultReportContactNumber = params.get("FaultReportContactNumber")
+        self._FaultReportContactEmail = params.get("FaultReportContactEmail")
         self._SignLaw = params.get("SignLaw")
         self._Bandwidth = params.get("Bandwidth")
         memeber_set = set(params.keys())