diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87d0c19a66..e177166df9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,268 @@
+# Release 3.0.1156.1
+
+## 弹性伸缩(as) 版本:2018-04-19
+
+### 第 71 次发布
+
+发布时间:2024-07-23 01:04:47
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+修改数据结构:
+
+* [DataDisk](https://cloud.tencent.com/document/api/377/20453#DataDisk)
+
+ * 新增成员:BurstPerformance
+
+* [InstanceNameSettings](https://cloud.tencent.com/document/api/377/20453#InstanceNameSettings)
+
+ * 新增成员:InstanceNameSuffix
+
+
+
+
+## 云联络中心(ccc) 版本:2020-02-10
+
+### 第 70 次发布
+
+发布时间:2024-07-23 01:10:10
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+修改数据结构:
+
+* [SkillGroupInfoItem](https://cloud.tencent.com/document/api/679/47715#SkillGroupInfoItem)
+
+ * 新增成员:Alias
+
+
+
+
+## 云数据库 MySQL(cdb) 版本:2017-03-20
+
+### 第 161 次发布
+
+发布时间:2024-07-23 01:10:42
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+修改接口:
+
+* [UpgradeDBInstanceEngineVersion](https://cloud.tencent.com/document/api/236/15870)
+
+ * 新增入参:ParamList
+
+
+新增数据结构:
+
+* [UpgradeEngineVersionParams](https://cloud.tencent.com/document/api/236/15878#UpgradeEngineVersionParams)
+
+
+
+## 腾讯电子签企业版(ess) 版本:2020-11-11
+
+### 第 180 次发布
+
+发布时间:2024-07-23 01:33:50
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+新增接口:
+
+* [CreatePartnerAutoSignAuthUrl](https://cloud.tencent.com/document/api/1323/109065)
+
+
+
+## 腾讯混元大模型(hunyuan) 版本:2023-09-01
+
+### 第 13 次发布
+
+发布时间:2024-07-23 01:37:38
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+修改数据结构:
+
+* [SearchResult](https://cloud.tencent.com/document/api/1729/101838#SearchResult)
+
+ * **修改成员**:Index
+
+
+
+
+## 流计算 Oceanus(oceanus) 版本:2019-04-22
+
+### 第 60 次发布
+
+发布时间:2024-07-23 01:53:12
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+修改数据结构:
+
+* [RunJobDescription](https://cloud.tencent.com/document/api/849/52010#RunJobDescription)
+
+ * 新增成员:KafkaScanMode
+
+
+
+
+## 云数据库 PostgreSQL(postgres) 版本:2017-03-12
+
+### 第 44 次发布
+
+发布时间:2024-07-23 01:55:36
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+新增接口:
+
+* [CreateAccount](https://cloud.tencent.com/document/api/409/109071)
+* [DeleteAccount](https://cloud.tencent.com/document/api/409/109070)
+* [DescribeAccountPrivileges](https://cloud.tencent.com/document/api/409/109069)
+* [DescribeDatabaseObjects](https://cloud.tencent.com/document/api/409/109072)
+* [LockAccount](https://cloud.tencent.com/document/api/409/109068)
+* [ModifyAccountPrivileges](https://cloud.tencent.com/document/api/409/109067)
+* [UnlockAccount](https://cloud.tencent.com/document/api/409/109066)
+
+新增数据结构:
+
+* [DatabaseObject](https://cloud.tencent.com/document/api/409/16778#DatabaseObject)
+* [DatabasePrivilege](https://cloud.tencent.com/document/api/409/16778#DatabasePrivilege)
+* [ModifyPrivilege](https://cloud.tencent.com/document/api/409/16778#ModifyPrivilege)
+
+
+
+## 全栈式风控引擎(rce) 版本:2020-11-03
+
+### 第 11 次发布
+
+发布时间:2024-07-23 01:57:03
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+新增数据结构:
+
+* [DataAuthorizationInfo](https://cloud.tencent.com/document/api/1343/52566#DataAuthorizationInfo)
+
+修改数据结构:
+
+* [InputManageMarketingRisk](https://cloud.tencent.com/document/api/1343/52566#InputManageMarketingRisk)
+
+ * 新增成员:DataAuthorization
+
+
+
+
+## 容器镜像服务(tcr) 版本:2019-09-24
+
+### 第 67 次发布
+
+发布时间:2024-07-23 02:04:12
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+修改接口:
+
+* [DescribeImageManifests](https://cloud.tencent.com/document/api/1141/43525)
+
+ * 新增出参:Labels, Size
+
+
+
+
+## Web 应用防火墙(waf) 版本:2018-01-25
+
+### 第 94 次发布
+
+发布时间:2024-07-23 02:21:00
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+修改接口:
+
+* [AddAttackWhiteRule](https://cloud.tencent.com/document/api/627/100203)
+
+ * 新增入参:TypeIds, Mode, Name
+
+* [CreateIpAccessControl](https://cloud.tencent.com/document/api/627/105915)
+
+ * 新增入参:JobType, JobDateTime
+
+* [DescribeInstances](https://cloud.tencent.com/document/api/627/75922)
+
+ * 新增入参:FreeDelayFlag
+
+* [DescribeIpAccessControl](https://cloud.tencent.com/document/api/627/72645)
+
+ * 新增入参:TimerType
+
+* [ModifyAttackWhiteRule](https://cloud.tencent.com/document/api/627/100200)
+
+ * 新增入参:TypeIds, Mode, Name
+
+* [ModifyIpAccessControl](https://cloud.tencent.com/document/api/627/105912)
+
+ * 新增入参:JobType, JobDateTime
+
+* [UpsertCCRule](https://cloud.tencent.com/document/api/627/97646)
+
+ * 新增入参:Length
+
+
+修改数据结构:
+
+* [BatchIpAccessControlItem](https://cloud.tencent.com/document/api/627/53609#BatchIpAccessControlItem)
+
+ * 新增成员:JobType, CronType, JobDateTime, ValidStatus
+
+* [CCRuleItem](https://cloud.tencent.com/document/api/627/53609#CCRuleItem)
+
+ * 新增成员:Length, RuleId, EventId, SessionApplied, CreateTime
+
+* [InstanceInfo](https://cloud.tencent.com/document/api/627/53609#InstanceInfo)
+
+ * 新增成员:FreeDelayFlag
+
+* [IpAccessControlItem](https://cloud.tencent.com/document/api/627/53609#IpAccessControlItem)
+
+ * 新增成员:JobType, CronType, JobDateTime
+
+* [UserSignatureRule](https://cloud.tencent.com/document/api/627/53609#UserSignatureRule)
+
+ * 新增成员:RiskLevel
+
+* [UserWhiteRule](https://cloud.tencent.com/document/api/627/53609#UserWhiteRule)
+
+ * 新增成员:MatchParams, SignatureIds, TypeIds, TypeId, Mode, Name, MatchInfo, MatchInfoStr
+
+* [UserWhiteRuleItem](https://cloud.tencent.com/document/api/627/53609#UserWhiteRuleItem)
+
+ * 新增成员:MatchParams
+
+
+
+
# Release 3.0.1155.1
## 消息队列 CKafka 版(ckafka) 版本:2019-08-19
diff --git a/SERVICE_CHANGELOG.md b/SERVICE_CHANGELOG.md
index 25bb9a7803..ac1bc76c90 100644
--- a/SERVICE_CHANGELOG.md
+++ b/SERVICE_CHANGELOG.md
@@ -1,148 +1,264 @@
# 本版本更新包含以下内容:
-## 消息队列 CKafka 版(ckafka) 版本:2019-08-19
+## 弹性伸缩(as) 版本:2018-04-19
-### 第 106 次发布
+### 第 71 次发布
-发布时间:2024-07-22 01:20:34
+发布时间:2024-07-23 01:04:47
本次发布包含了以下内容:
改善已有的文档。
-新增接口:
+修改数据结构:
-* [ModifyRoutineMaintenanceTask](https://cloud.tencent.com/document/api/597/109042)
+* [DataDisk](https://cloud.tencent.com/document/api/377/20453#DataDisk)
+ * 新增成员:BurstPerformance
+* [InstanceNameSettings](https://cloud.tencent.com/document/api/377/20453#InstanceNameSettings)
-## 云服务器(cvm) 版本:2017-03-12
+ * 新增成员:InstanceNameSuffix
-### 第 128 次发布
-发布时间:2024-07-22 01:24:41
+
+
+## 云联络中心(ccc) 版本:2020-02-10
+
+### 第 70 次发布
+
+发布时间:2024-07-23 01:10:10
本次发布包含了以下内容:
改善已有的文档。
-新增接口:
+修改数据结构:
-* [EnterRescueMode](https://cloud.tencent.com/document/api/213/109044)
-* [ExitRescueMode](https://cloud.tencent.com/document/api/213/109043)
+* [SkillGroupInfoItem](https://cloud.tencent.com/document/api/679/47715#SkillGroupInfoItem)
+ * 新增成员:Alias
-## TDSQL-C MySQL 版(cynosdb) 版本:2019-01-07
-### 第 97 次发布
-发布时间:2024-07-22 01:29:16
+## 云数据库 MySQL(cdb) 版本:2017-03-20
+
+### 第 161 次发布
+
+发布时间:2024-07-23 01:10:42
本次发布包含了以下内容:
改善已有的文档。
-新增接口:
+修改接口:
+
+* [UpgradeDBInstanceEngineVersion](https://cloud.tencent.com/document/api/236/15870)
+
+ * 新增入参:ParamList
-* [ExportResourcePackageDeductDetails](https://cloud.tencent.com/document/api/1003/109046)
-* [ModifyResourcePackagesDeductionPriority](https://cloud.tencent.com/document/api/1003/109045)
新增数据结构:
-* [PackagePriority](https://cloud.tencent.com/document/api/1003/48097#PackagePriority)
+* [UpgradeEngineVersionParams](https://cloud.tencent.com/document/api/236/15878#UpgradeEngineVersionParams)
-## Elasticsearch Service(es) 版本:2018-04-16
+## 腾讯电子签企业版(ess) 版本:2020-11-11
-### 第 63 次发布
+### 第 180 次发布
-发布时间:2024-07-22 01:39:08
+发布时间:2024-07-23 01:33:50
本次发布包含了以下内容:
改善已有的文档。
-修改接口:
+新增接口:
-* [RestartNodes](https://cloud.tencent.com/document/api/845/48473)
+* [CreatePartnerAutoSignAuthUrl](https://cloud.tencent.com/document/api/1323/109065)
- * 新增入参:ShardAllocationConcurrents, ShardAllocationBytes
-* [UpgradeInstance](https://cloud.tencent.com/document/api/845/36270)
- * 新增入参:ShardAllocationConcurrents, ShardAllocationBytes
+## 腾讯混元大模型(hunyuan) 版本:2023-09-01
+### 第 13 次发布
+发布时间:2024-07-23 01:37:38
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+修改数据结构:
+
+* [SearchResult](https://cloud.tencent.com/document/api/1729/101838#SearchResult)
+
+ * **修改成员**:Index
-## 腾讯混元大模型(hunyuan) 版本:2023-09-01
-### 第 12 次发布
-发布时间:2024-07-22 01:43:41
+
+## 流计算 Oceanus(oceanus) 版本:2019-04-22
+
+### 第 60 次发布
+
+发布时间:2024-07-23 01:53:12
本次发布包含了以下内容:
改善已有的文档。
-修改接口:
+修改数据结构:
-* [ChatCompletions](https://cloud.tencent.com/document/api/1729/105701)
+* [RunJobDescription](https://cloud.tencent.com/document/api/849/52010#RunJobDescription)
+
+ * 新增成员:KafkaScanMode
- * 新增入参:SearchInfo
- * 新增出参:SearchInfo
+## 云数据库 PostgreSQL(postgres) 版本:2017-03-12
+
+### 第 44 次发布
+
+发布时间:2024-07-23 01:55:36
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+新增接口:
+
+* [CreateAccount](https://cloud.tencent.com/document/api/409/109071)
+* [DeleteAccount](https://cloud.tencent.com/document/api/409/109070)
+* [DescribeAccountPrivileges](https://cloud.tencent.com/document/api/409/109069)
+* [DescribeDatabaseObjects](https://cloud.tencent.com/document/api/409/109072)
+* [LockAccount](https://cloud.tencent.com/document/api/409/109068)
+* [ModifyAccountPrivileges](https://cloud.tencent.com/document/api/409/109067)
+* [UnlockAccount](https://cloud.tencent.com/document/api/409/109066)
+
新增数据结构:
-* [SearchInfo](https://cloud.tencent.com/document/api/1729/101838#SearchInfo)
-* [SearchResult](https://cloud.tencent.com/document/api/1729/101838#SearchResult)
+* [DatabaseObject](https://cloud.tencent.com/document/api/409/16778#DatabaseObject)
+* [DatabasePrivilege](https://cloud.tencent.com/document/api/409/16778#DatabasePrivilege)
+* [ModifyPrivilege](https://cloud.tencent.com/document/api/409/16778#ModifyPrivilege)
-## 多网聚合加速(mna) 版本:2021-01-19
+## 全栈式风控引擎(rce) 版本:2020-11-03
-### 第 21 次发布
+### 第 11 次发布
-发布时间:2024-07-22 01:55:24
+发布时间:2024-07-23 01:57:03
本次发布包含了以下内容:
改善已有的文档。
-新增接口:
+新增数据结构:
-* [AddL3Conn](https://cloud.tencent.com/document/api/1385/109052)
-* [DeleteL3Conn](https://cloud.tencent.com/document/api/1385/109051)
-* [GetL3ConnList](https://cloud.tencent.com/document/api/1385/109050)
-* [UpdateL3Cidr](https://cloud.tencent.com/document/api/1385/109049)
-* [UpdateL3Conn](https://cloud.tencent.com/document/api/1385/109048)
-* [UpdateL3Switch](https://cloud.tencent.com/document/api/1385/109047)
+* [DataAuthorizationInfo](https://cloud.tencent.com/document/api/1343/52566#DataAuthorizationInfo)
-新增数据结构:
+修改数据结构:
-* [L3ConnInfo](https://cloud.tencent.com/document/api/1385/55846#L3ConnInfo)
+* [InputManageMarketingRisk](https://cloud.tencent.com/document/api/1343/52566#InputManageMarketingRisk)
+ * 新增成员:DataAuthorization
-## 私有网络(vpc) 版本:2017-03-12
-### 第 196 次发布
-发布时间:2024-07-22 02:25:36
+## 容器镜像服务(tcr) 版本:2019-09-24
+
+### 第 67 次发布
+
+发布时间:2024-07-23 02:04:12
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+修改接口:
+
+* [DescribeImageManifests](https://cloud.tencent.com/document/api/1141/43525)
+
+ * 新增出参:Labels, Size
+
+
+
+
+## Web 应用防火墙(waf) 版本:2018-01-25
+
+### 第 94 次发布
+
+发布时间:2024-07-23 02:21:00
本次发布包含了以下内容:
改善已有的文档。
+修改接口:
+
+* [AddAttackWhiteRule](https://cloud.tencent.com/document/api/627/100203)
+
+ * 新增入参:TypeIds, Mode, Name
+
+* [CreateIpAccessControl](https://cloud.tencent.com/document/api/627/105915)
+
+ * 新增入参:JobType, JobDateTime
+
+* [DescribeInstances](https://cloud.tencent.com/document/api/627/75922)
+
+ * 新增入参:FreeDelayFlag
+
+* [DescribeIpAccessControl](https://cloud.tencent.com/document/api/627/72645)
+
+ * 新增入参:TimerType
+
+* [ModifyAttackWhiteRule](https://cloud.tencent.com/document/api/627/100200)
+
+ * 新增入参:TypeIds, Mode, Name
+
+* [ModifyIpAccessControl](https://cloud.tencent.com/document/api/627/105912)
+
+ * 新增入参:JobType, JobDateTime
+
+* [UpsertCCRule](https://cloud.tencent.com/document/api/627/97646)
+
+ * 新增入参:Length
+
+
修改数据结构:
-* [InstanceBind](https://cloud.tencent.com/document/api/215/15824#InstanceBind)
+* [BatchIpAccessControlItem](https://cloud.tencent.com/document/api/627/53609#BatchIpAccessControlItem)
- * **修改成员**:InstanceRegion
+ * 新增成员:JobType, CronType, JobDateTime, ValidStatus
+
+* [CCRuleItem](https://cloud.tencent.com/document/api/627/53609#CCRuleItem)
+
+ * 新增成员:Length, RuleId, EventId, SessionApplied, CreateTime
+
+* [InstanceInfo](https://cloud.tencent.com/document/api/627/53609#InstanceInfo)
+
+ * 新增成员:FreeDelayFlag
+
+* [IpAccessControlItem](https://cloud.tencent.com/document/api/627/53609#IpAccessControlItem)
+
+ * 新增成员:JobType, CronType, JobDateTime
+
+* [UserSignatureRule](https://cloud.tencent.com/document/api/627/53609#UserSignatureRule)
+
+ * 新增成员:RiskLevel
+
+* [UserWhiteRule](https://cloud.tencent.com/document/api/627/53609#UserWhiteRule)
+
+ * 新增成员:MatchParams, SignatureIds, TypeIds, TypeId, Mode, Name, MatchInfo, MatchInfoStr
+
+* [UserWhiteRuleItem](https://cloud.tencent.com/document/api/627/53609#UserWhiteRuleItem)
+
+ * 新增成员:MatchParams
@@ -5128,6 +5244,25 @@
## 弹性伸缩(as) 版本:2018-04-19
+### 第 71 次发布
+
+发布时间:2024-07-23 01:04:47
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+修改数据结构:
+
+* [DataDisk](https://cloud.tencent.com/document/api/377/20453#DataDisk)
+
+ * 新增成员:BurstPerformance
+
+* [InstanceNameSettings](https://cloud.tencent.com/document/api/377/20453#InstanceNameSettings)
+
+ * 新增成员:InstanceNameSuffix
+
+
### 第 70 次发布
发布时间:2024-01-31 01:06:41
@@ -15418,6 +15553,21 @@
## 云联络中心(ccc) 版本:2020-02-10
+### 第 70 次发布
+
+发布时间:2024-07-23 01:10:10
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+修改数据结构:
+
+* [SkillGroupInfoItem](https://cloud.tencent.com/document/api/679/47715#SkillGroupInfoItem)
+
+ * 新增成员:Alias
+
+
### 第 69 次发布
发布时间:2024-06-06 01:17:16
@@ -16673,6 +16823,25 @@
## 云数据库 MySQL(cdb) 版本:2017-03-20
+### 第 161 次发布
+
+发布时间:2024-07-23 01:10:42
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+修改接口:
+
+* [UpgradeDBInstanceEngineVersion](https://cloud.tencent.com/document/api/236/15870)
+
+ * 新增入参:ParamList
+
+
+新增数据结构:
+
+* [[UpgradeEngineVersionParams](https://cloud.tencent.com/document/api/236/15878#UpgradeEngineVersionParams)](https://cloud.tencent.com/document/api/236/15878#[UpgradeEngineVersionParams](https://cloud.tencent.com/document/api/236/15878#UpgradeEngineVersionParams))
+
### 第 160 次发布
发布时间:2024-07-08 01:09:08
@@ -26712,7 +26881,7 @@
新增接口:
-* [[ModifyRoutineMaintenanceTask](https://cloud.tencent.com/document/api/597/109042)](https://cloud.tencent.com/document/api/#/#)
+* [ModifyRoutineMaintenanceTask](https://cloud.tencent.com/document/api/597/109042)
### 第 105 次发布
@@ -39269,8 +39438,8 @@
新增接口:
-* [[EnterRescueMode](https://cloud.tencent.com/document/api/213/109044)](https://cloud.tencent.com/document/api/#/#)
-* [[ExitRescueMode](https://cloud.tencent.com/document/api/213/109043)](https://cloud.tencent.com/document/api/#/#)
+* [EnterRescueMode](https://cloud.tencent.com/document/api/213/109044)
+* [ExitRescueMode](https://cloud.tencent.com/document/api/213/109043)
### 第 127 次发布
@@ -45287,12 +45456,12 @@
新增接口:
-* [[ExportResourcePackageDeductDetails](https://cloud.tencent.com/document/api/1003/109046)](https://cloud.tencent.com/document/api/#/#)
-* [[ModifyResourcePackagesDeductionPriority](https://cloud.tencent.com/document/api/1003/109045)](https://cloud.tencent.com/document/api/#/#)
+* [ExportResourcePackageDeductDetails](https://cloud.tencent.com/document/api/1003/109046)
+* [ModifyResourcePackagesDeductionPriority](https://cloud.tencent.com/document/api/1003/109045)
新增数据结构:
-* [[PackagePriority](https://cloud.tencent.com/document/api/1003/48097#PackagePriority)](https://cloud.tencent.com/document/api/1003/48097#[PackagePriority](https://cloud.tencent.com/document/api/1003/48097#PackagePriority))
+* [PackagePriority](https://cloud.tencent.com/document/api/1003/48097#PackagePriority)
### 第 96 次发布
@@ -62890,6 +63059,18 @@
## 腾讯电子签企业版(ess) 版本:2020-11-11
+### 第 180 次发布
+
+发布时间:2024-07-23 01:33:50
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+新增接口:
+
+* [[CreatePartnerAutoSignAuthUrl](https://cloud.tencent.com/document/api/1323/109065)](https://cloud.tencent.com/document/api/#/#)
+
### 第 179 次发布
发布时间:2024-07-12 01:16:02
@@ -74910,6 +75091,21 @@
## 腾讯混元大模型(hunyuan) 版本:2023-09-01
+### 第 13 次发布
+
+发布时间:2024-07-23 01:37:38
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+修改数据结构:
+
+* [SearchResult](https://cloud.tencent.com/document/api/1729/101838#SearchResult)
+
+ * **修改成员**:Index
+
+
### 第 12 次发布
发布时间:2024-07-22 01:43:41
@@ -74929,8 +75125,8 @@
新增数据结构:
-* [[SearchInfo](https://cloud.tencent.com/document/api/1729/101838#SearchInfo)](https://cloud.tencent.com/document/api/1729/101838#[SearchInfo](https://cloud.tencent.com/document/api/1729/101838#SearchInfo))
-* [[SearchResult](https://cloud.tencent.com/document/api/1729/101838#SearchResult)](https://cloud.tencent.com/document/api/1729/101838#[SearchResult](https://cloud.tencent.com/document/api/1729/101838#SearchResult))
+* [SearchInfo](https://cloud.tencent.com/document/api/1729/101838#SearchInfo)
+* [SearchResult](https://cloud.tencent.com/document/api/1729/101838#SearchResult)
### 第 11 次发布
@@ -90606,16 +90802,16 @@
新增接口:
-* [[AddL3Conn](https://cloud.tencent.com/document/api/1385/109052)](https://cloud.tencent.com/document/api/#/#)
-* [[DeleteL3Conn](https://cloud.tencent.com/document/api/1385/109051)](https://cloud.tencent.com/document/api/#/#)
-* [[GetL3ConnList](https://cloud.tencent.com/document/api/1385/109050)](https://cloud.tencent.com/document/api/#/#)
-* [[UpdateL3Cidr](https://cloud.tencent.com/document/api/1385/109049)](https://cloud.tencent.com/document/api/#/#)
-* [[UpdateL3Conn](https://cloud.tencent.com/document/api/1385/109048)](https://cloud.tencent.com/document/api/#/#)
-* [[UpdateL3Switch](https://cloud.tencent.com/document/api/1385/109047)](https://cloud.tencent.com/document/api/#/#)
+* [AddL3Conn](https://cloud.tencent.com/document/api/1385/109052)
+* [DeleteL3Conn](https://cloud.tencent.com/document/api/1385/109051)
+* [GetL3ConnList](https://cloud.tencent.com/document/api/1385/109050)
+* [UpdateL3Cidr](https://cloud.tencent.com/document/api/1385/109049)
+* [UpdateL3Conn](https://cloud.tencent.com/document/api/1385/109048)
+* [UpdateL3Switch](https://cloud.tencent.com/document/api/1385/109047)
新增数据结构:
-* [[L3ConnInfo](https://cloud.tencent.com/document/api/1385/55846#L3ConnInfo)](https://cloud.tencent.com/document/api/1385/55846#[L3ConnInfo](https://cloud.tencent.com/document/api/1385/55846#L3ConnInfo))
+* [L3ConnInfo](https://cloud.tencent.com/document/api/1385/55846#L3ConnInfo)
### 第 20 次发布
@@ -99166,6 +99362,21 @@
## 流计算 Oceanus(oceanus) 版本:2019-04-22
+### 第 60 次发布
+
+发布时间:2024-07-23 01:53:12
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+修改数据结构:
+
+* [RunJobDescription](https://cloud.tencent.com/document/api/849/52010#RunJobDescription)
+
+ * 新增成员:KafkaScanMode
+
+
### 第 59 次发布
发布时间:2024-07-19 02:08:08
@@ -104723,6 +104934,30 @@
## 云数据库 PostgreSQL(postgres) 版本:2017-03-12
+### 第 44 次发布
+
+发布时间:2024-07-23 01:55:36
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+新增接口:
+
+* [[CreateAccount](https://cloud.tencent.com/document/api/409/109071)](https://cloud.tencent.com/document/api/#/#)
+* [[DeleteAccount](https://cloud.tencent.com/document/api/409/109070)](https://cloud.tencent.com/document/api/#/#)
+* [[DescribeAccountPrivileges](https://cloud.tencent.com/document/api/409/109069)](https://cloud.tencent.com/document/api/#/#)
+* [[DescribeDatabaseObjects](https://cloud.tencent.com/document/api/409/109072)](https://cloud.tencent.com/document/api/#/#)
+* [[LockAccount](https://cloud.tencent.com/document/api/409/109068)](https://cloud.tencent.com/document/api/#/#)
+* [[ModifyAccountPrivileges](https://cloud.tencent.com/document/api/409/109067)](https://cloud.tencent.com/document/api/#/#)
+* [[UnlockAccount](https://cloud.tencent.com/document/api/409/109066)](https://cloud.tencent.com/document/api/#/#)
+
+新增数据结构:
+
+* [[DatabaseObject](https://cloud.tencent.com/document/api/409/16778#DatabaseObject)](https://cloud.tencent.com/document/api/409/16778#[DatabaseObject](https://cloud.tencent.com/document/api/409/16778#DatabaseObject))
+* [[DatabasePrivilege](https://cloud.tencent.com/document/api/409/16778#DatabasePrivilege)](https://cloud.tencent.com/document/api/409/16778#[DatabasePrivilege](https://cloud.tencent.com/document/api/409/16778#DatabasePrivilege))
+* [[ModifyPrivilege](https://cloud.tencent.com/document/api/409/16778#ModifyPrivilege)](https://cloud.tencent.com/document/api/409/16778#[ModifyPrivilege](https://cloud.tencent.com/document/api/409/16778#ModifyPrivilege))
+
### 第 43 次发布
发布时间:2024-07-05 01:15:16
@@ -106397,6 +106632,25 @@
## 全栈式风控引擎(rce) 版本:2020-11-03
+### 第 11 次发布
+
+发布时间:2024-07-23 01:57:03
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+新增数据结构:
+
+* [[DataAuthorizationInfo](https://cloud.tencent.com/document/api/1343/52566#DataAuthorizationInfo)](https://cloud.tencent.com/document/api/1343/52566#[DataAuthorizationInfo](https://cloud.tencent.com/document/api/1343/52566#DataAuthorizationInfo))
+
+修改数据结构:
+
+* [InputManageMarketingRisk](https://cloud.tencent.com/document/api/1343/52566#InputManageMarketingRisk)
+
+ * 新增成员:DataAuthorization
+
+
### 第 10 次发布
发布时间:2024-05-17 02:07:15
@@ -120322,6 +120576,21 @@
## 容器镜像服务(tcr) 版本:2019-09-24
+### 第 67 次发布
+
+发布时间:2024-07-23 02:04:12
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+修改接口:
+
+* [DescribeImageManifests](https://cloud.tencent.com/document/api/1141/43525)
+
+ * 新增出参:Labels, Size
+
+
### 第 66 次发布
发布时间:2024-06-26 01:23:42
@@ -157526,6 +157795,76 @@
## Web 应用防火墙(waf) 版本:2018-01-25
+### 第 94 次发布
+
+发布时间:2024-07-23 02:21:00
+
+本次发布包含了以下内容:
+
+改善已有的文档。
+
+修改接口:
+
+* [AddAttackWhiteRule](https://cloud.tencent.com/document/api/627/100203)
+
+ * 新增入参:TypeIds, Mode, Name
+
+* [CreateIpAccessControl](https://cloud.tencent.com/document/api/627/105915)
+
+ * 新增入参:JobType, JobDateTime
+
+* [DescribeInstances](https://cloud.tencent.com/document/api/627/75922)
+
+ * 新增入参:FreeDelayFlag
+
+* [DescribeIpAccessControl](https://cloud.tencent.com/document/api/627/72645)
+
+ * 新增入参:TimerType
+
+* [ModifyAttackWhiteRule](https://cloud.tencent.com/document/api/627/100200)
+
+ * 新增入参:TypeIds, Mode, Name
+
+* [ModifyIpAccessControl](https://cloud.tencent.com/document/api/627/105912)
+
+ * 新增入参:JobType, JobDateTime
+
+* [UpsertCCRule](https://cloud.tencent.com/document/api/627/97646)
+
+ * 新增入参:Length
+
+
+修改数据结构:
+
+* [BatchIpAccessControlItem](https://cloud.tencent.com/document/api/627/53609#BatchIpAccessControlItem)
+
+ * 新增成员:JobType, CronType, JobDateTime, ValidStatus
+
+* [CCRuleItem](https://cloud.tencent.com/document/api/627/53609#CCRuleItem)
+
+ * 新增成员:Length, RuleId, EventId, SessionApplied, CreateTime
+
+* [InstanceInfo](https://cloud.tencent.com/document/api/627/53609#InstanceInfo)
+
+ * 新增成员:FreeDelayFlag
+
+* [IpAccessControlItem](https://cloud.tencent.com/document/api/627/53609#IpAccessControlItem)
+
+ * 新增成员:JobType, CronType, JobDateTime
+
+* [UserSignatureRule](https://cloud.tencent.com/document/api/627/53609#UserSignatureRule)
+
+ * 新增成员:RiskLevel
+
+* [UserWhiteRule](https://cloud.tencent.com/document/api/627/53609#UserWhiteRule)
+
+ * 新增成员:MatchParams, SignatureIds, TypeIds, TypeId, Mode, Name, MatchInfo, MatchInfoStr
+
+* [UserWhiteRuleItem](https://cloud.tencent.com/document/api/627/53609#UserWhiteRuleItem)
+
+ * 新增成员:MatchParams
+
+
### 第 93 次发布
发布时间:2024-07-04 01:27:42
diff --git a/products.md b/products.md
index f0e672cdc4..0656eb1bfb 100644
--- a/products.md
+++ b/products.md
@@ -16,7 +16,7 @@
| api | [云 API](https://cloud.tencent.com/document/product/1278) | 2023-01-05 01:02:52 |
| apigateway | [API 网关](https://cloud.tencent.com/document/product/628) | 2024-06-17 01:08:48 |
| apm | [应用性能监控](https://cloud.tencent.com/document/product/1463) | 2024-06-26 01:09:03 |
-| as | [弹性伸缩](https://cloud.tencent.com/document/product/377) | 2024-05-17 01:06:16 |
+| as | [弹性伸缩](https://cloud.tencent.com/document/product/377) | 2024-07-23 01:04:47 |
| asr | [语音识别](https://cloud.tencent.com/document/product/1093) | 2024-07-16 01:08:08 |
| asw | [应用与服务编排工作流](https://cloud.tencent.com/document/product/1272) | 2023-05-18 01:04:02 |
| ba | [ICP备案](https://cloud.tencent.com/document/product/243) | 2024-04-22 01:08:02 |
@@ -39,8 +39,8 @@
| car | [应用云渲染](https://cloud.tencent.com/document/product/1547) | 2024-06-19 01:14:59 |
| cat | [云拨测](https://cloud.tencent.com/document/product/280) | 2024-06-14 01:17:35 |
| cbs | [云硬盘](https://cloud.tencent.com/document/product/362) | 2024-07-22 01:14:47 |
-| ccc | [云联络中心](https://cloud.tencent.com/document/product/679) | 2024-07-22 01:15:08 |
-| cdb | [云数据库 MySQL](https://cloud.tencent.com/document/product/236) | 2024-07-22 01:15:40 |
+| ccc | [云联络中心](https://cloud.tencent.com/document/product/679) | 2024-07-23 01:10:10 |
+| cdb | [云数据库 MySQL](https://cloud.tencent.com/document/product/236) | 2024-07-23 01:10:42 |
| cdc | [本地专用集群](https://cloud.tencent.com/document/product/1346) | 2024-07-17 01:09:51 |
| cdn | [内容分发网络 CDN](https://cloud.tencent.com/document/product/228) | 2024-07-10 01:10:02 |
| cds | [T-Sec-数据安全审计(DSA)](https://cloud.tencent.com/document/product/856) | 2024-06-18 01:18:51 |
@@ -98,13 +98,13 @@
| eis | [数据连接器](https://cloud.tencent.com/document/product/1270) | 2023-08-10 01:17:44 |
| emr | [弹性 MapReduce](https://cloud.tencent.com/document/product/589) | 2024-07-09 01:14:34 |
| es | [Elasticsearch Service](https://cloud.tencent.com/document/product/845) | 2024-07-22 01:39:08 |
-| ess | [腾讯电子签企业版](https://cloud.tencent.com/document/product/1323) | 2024-07-22 01:39:43 |
+| ess | [腾讯电子签企业版](https://cloud.tencent.com/document/product/1323) | 2024-07-23 01:33:50 |
| essbasic | [腾讯电子签(基础版)](https://cloud.tencent.com/document/product/1420) | 2024-07-22 01:40:42 |
| facefusion | [人脸融合](https://cloud.tencent.com/document/product/670) | 2024-07-16 01:16:45 |
| faceid | [人脸核身](https://cloud.tencent.com/document/product/1007) | 2024-07-19 01:47:20 |
| fmu | [人脸试妆](https://cloud.tencent.com/document/product/1172) | 2024-07-05 01:10:44 |
| ft | [人像变换](https://cloud.tencent.com/document/product/1202) | 2024-03-20 01:17:13 |
-| gaap | [全球应用加速](https://cloud.tencent.com/document/product/608) | 2024-07-17 01:16:44 |
+| gaap | [全球应用加速](https://cloud.tencent.com/document/product/608) | 2024-07-23 01:36:12 |
| gme | [游戏多媒体引擎](https://cloud.tencent.com/document/product/607) | 2024-06-27 01:13:06 |
| goosefs | [数据加速器 GooseFS](https://cloud.tencent.com/document/product/1424) | 2024-07-10 01:17:00 |
| gpm | [游戏玩家匹配](https://cloud.tencent.com/document/product/1294) | 2022-07-11 06:12:36 |
@@ -114,7 +114,7 @@
| hai | [高性能应用服务](https://cloud.tencent.com/document/product/1721) | 2024-05-29 01:43:09 |
| hasim | [高可用物联网卡](https://cloud.tencent.com/document/product/1482) | 2023-05-18 01:29:47 |
| hcm | [数学作业批改](https://cloud.tencent.com/document/product/1004) | 2024-05-09 01:16:27 |
-| hunyuan | [腾讯混元大模型](https://cloud.tencent.com/document/product/1729) | 2024-07-22 01:43:41 |
+| hunyuan | [腾讯混元大模型](https://cloud.tencent.com/document/product/1729) | 2024-07-23 01:37:38 |
| iai | [人脸识别](https://cloud.tencent.com/document/product/867) | 2024-03-20 01:17:43 |
| ic | [图片瘦身](https://cloud.tencent.com/document/product/636) | 2023-03-02 01:23:21 |
| icr | [对话机器人](https://cloud.tencent.com/document/product/1268) | 2024-04-22 01:17:48 |
@@ -130,7 +130,7 @@
| iotvideo | [物联网智能视频服务](https://cloud.tencent.com/document/product/1131) | 2024-07-08 01:16:48 |
| iotvideoindustry | [物联网智能视频服务(行业版)](https://cloud.tencent.com/document/product/1361) | 2024-03-20 01:18:54 |
| irp | [智能推荐平台](https://cloud.tencent.com/document/product/1541) | 2024-03-20 01:19:05 |
-| iss | [智能视图计算平台](https://cloud.tencent.com/document/product/1344) | 2024-06-28 15:23:39 |
+| iss | [智能视图计算平台](https://cloud.tencent.com/document/product/1344) | 2024-07-23 01:43:27 |
| ivld | [媒体智能标签](https://cloud.tencent.com/document/product/1509) | 2024-07-09 14:27:21 |
| keewidb | [云数据库 KeeWiDB](https://cloud.tencent.com/document/product/1520) | 2024-03-20 01:19:20 |
| kms | [密钥管理系统](https://cloud.tencent.com/document/product/573) | 2024-04-17 01:17:16 |
@@ -147,8 +147,8 @@
| mgobe | [游戏联机对战引擎](https://cloud.tencent.com/document/product/1038) | 2022-07-08 06:11:32 |
| mmps | [小程序安全](https://cloud.tencent.com/document/product/1223) | 2024-07-02 01:19:41 |
| mna | [多网聚合加速](https://cloud.tencent.com/document/product/1385) | 2024-07-22 01:55:24 |
-| mongodb | [云数据库 MongoDB](https://cloud.tencent.com/document/product/240) | 2024-07-18 01:15:51 |
-| monitor | [腾讯云可观测平台](https://cloud.tencent.com/document/product/248) | 2024-07-18 01:15:58 |
+| mongodb | [云数据库 MongoDB](https://cloud.tencent.com/document/product/240) | 2024-07-23 01:49:27 |
+| monitor | [腾讯云可观测平台](https://cloud.tencent.com/document/product/248) | 2024-07-23 01:49:52 |
| mps | [媒体处理](https://cloud.tencent.com/document/product/862) | 2024-07-16 01:21:13 |
| mrs | [医疗报告结构化](https://cloud.tencent.com/document/product/1314) | 2024-06-14 02:16:42 |
| ms | [移动应用安全](https://cloud.tencent.com/document/product/283) | 2024-06-05 02:02:03 |
@@ -156,16 +156,16 @@
| mvj | [营销价值判断](https://cloud.tencent.com/document/product) | 2020-03-19 08:11:44 |
| nlp | [NLP 服务](https://cloud.tencent.com/document/product/271) | 2024-05-07 01:22:11 |
| npp | [号码保护](https://cloud.tencent.com/document/product) | 2020-04-22 08:00:22 |
-| oceanus | [流计算 Oceanus](https://cloud.tencent.com/document/product/849) | 2024-07-19 02:08:08 |
+| oceanus | [流计算 Oceanus](https://cloud.tencent.com/document/product/849) | 2024-07-23 01:53:12 |
| ocr | [文字识别](https://cloud.tencent.com/document/product/866) | 2024-07-09 01:19:41 |
| omics | [腾讯健康组学平台](https://cloud.tencent.com/document/product/1643) | 2024-06-13 02:11:33 |
| organization | [集团账号管理](https://cloud.tencent.com/document/product/850) | 2024-07-12 01:22:08 |
| partners | [渠道合作伙伴](https://cloud.tencent.com/document/product/563) | 2024-06-26 01:21:35 |
| pds | [私域安全](https://cloud.tencent.com/document/product/1473) | 2023-05-18 01:44:14 |
-| postgres | [云数据库 PostgreSQL](https://cloud.tencent.com/document/product/409) | 2024-07-10 01:22:15 |
+| postgres | [云数据库 PostgreSQL](https://cloud.tencent.com/document/product/409) | 2024-07-23 01:55:36 |
| privatedns | [私有域解析 Private DNS](https://cloud.tencent.com/document/product/1338) | 2024-06-18 02:05:02 |
| pts | [云压测](https://cloud.tencent.com/document/product/1484) | 2024-06-20 02:06:03 |
-| rce | [全栈式风控引擎](https://cloud.tencent.com/document/product/1343) | 2024-06-14 02:22:55 |
+| rce | [全栈式风控引擎](https://cloud.tencent.com/document/product/1343) | 2024-07-23 01:57:03 |
| redis | [云数据库Redis](https://cloud.tencent.com/document/product/239) | 2024-07-04 01:21:28 |
| region | [地域管理系统](https://cloud.tencent.com/document/product/1596) | 2024-04-22 01:23:34 |
| rkp | [风险探针](https://cloud.tencent.com/document/product/1169) | 2023-12-25 00:16:39 |
@@ -201,7 +201,7 @@
| tchd | [腾讯云健康看板](https://cloud.tencent.com/document/product/1688) | 2024-03-20 01:24:49 |
| tci | [腾讯智学课堂分析](https://cloud.tencent.com/document/product) | 2020-08-24 08:06:03 |
| tcm | [服务网格](https://cloud.tencent.com/document/product/1261) | 2024-06-18 02:13:19 |
-| tcr | [容器镜像服务](https://cloud.tencent.com/document/product/1141) | 2024-07-18 01:20:10 |
+| tcr | [容器镜像服务](https://cloud.tencent.com/document/product/1141) | 2024-07-23 02:04:12 |
| tcss | [容器安全服务](https://cloud.tencent.com/document/product/1285) | 2024-06-26 01:23:56 |
| tdcpg | [TDSQL-C PostgreSQL 版](https://cloud.tencent.com/document/product/1556) | 2024-07-10 01:25:35 |
| tdid | [分布式身份](https://cloud.tencent.com/document/product/1439) | 2024-06-04 02:17:43 |
@@ -243,7 +243,7 @@
| vpc | [私有网络](https://cloud.tencent.com/document/product/215) | 2024-07-22 02:25:36 |
| vrs | [声音复刻](https://cloud.tencent.com/document/product/1283) | 2024-04-02 01:27:45 |
| vtc | [视频转译](https://cloud.tencent.com/document/product/1769) | 2024-06-07 02:52:58 |
-| waf | [Web 应用防火墙](https://cloud.tencent.com/document/product/627) | 2024-07-10 01:30:00 |
+| waf | [Web 应用防火墙](https://cloud.tencent.com/document/product/627) | 2024-07-23 02:21:00 |
| wav | [企业微信汽车行业版](https://cloud.tencent.com/document/product/1318) | 2024-03-20 01:32:09 |
| wedata | [数据开发治理平台 WeData](https://cloud.tencent.com/document/product/1267) | 2024-07-02 01:28:21 |
| weilingwith | [微瓴同业开放平台](https://cloud.tencent.com/document/product/1693) | 2024-05-15 01:38:36 |
diff --git a/pyproject.toml b/pyproject.toml
index 50a3411b11..fed049e701 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ exclude = ["tccli/examples"]
[project]
name = "tccli"
-version = "3.0.1155.1"
+version = "3.0.1156.1"
authors = [
{ name="tencentcloudapi", email="tencentcloudapi@tencent.com" },
]
@@ -24,7 +24,7 @@ classifiers = [
dependencies = [
"jmespath==0.10.0",
"six==1.16.0",
- "tencentcloud-sdk-python>=3.0.1155",
+ "tencentcloud-sdk-python>=3.0.1156",
]
[project.urls]
diff --git a/tccli/__init__.py b/tccli/__init__.py
index e51ab18ee4..1ee8fdbf40 100644
--- a/tccli/__init__.py
+++ b/tccli/__init__.py
@@ -1 +1 @@
-__version__ = '3.0.1155.1'
+__version__ = '3.0.1156.1'
diff --git a/tccli/examples/ccc/v20200210/DescribeSkillGroupInfoList.md b/tccli/examples/ccc/v20200210/DescribeSkillGroupInfoList.md
index 77b896cd92..f36d4203bb 100644
--- a/tccli/examples/ccc/v20200210/DescribeSkillGroupInfoList.md
+++ b/tccli/examples/ccc/v20200210/DescribeSkillGroupInfoList.md
@@ -28,7 +28,8 @@ Output:
"RoutePolicy": "firstCreate",
"UsingLastSeat": 0,
"MaxConcurrency": 1,
- "LastModifyTimestamp": 1613976392
+ "LastModifyTimestamp": 1613976392,
+ "Alias": "6666"
}
]
}
diff --git a/tccli/examples/ess/v20201111/CreatePartnerAutoSignAuthUrl.md b/tccli/examples/ess/v20201111/CreatePartnerAutoSignAuthUrl.md
new file mode 100644
index 0000000000..42553d2500
--- /dev/null
+++ b/tccli/examples/ess/v20201111/CreatePartnerAutoSignAuthUrl.md
@@ -0,0 +1,26 @@
+**Example 1: 创建他方自动签授权链接**
+
+创建他方自动签授权链接
+
+
+Input:
+
+```
+tccli ess CreatePartnerAutoSignAuthUrl --cli-unfold-argument \
+ --Operator.UserId yDSxxxxxxxxxOnHtH51 \
+ --AuthorizedOrganizationId yDRt2UUgygqxuvlqUuO4zjEySqVWqO9J \
+ --SealTypes OFFICIAL
+```
+
+Output:
+```
+{
+ "Response": {
+ "ExpireTime": 1721984586,
+ "MiniAppPath": "/pages/guide/index?shortKey=yDCpEUNqf8CyuealGCfc",
+ "RequestId": "s1721379786690441960",
+ "Url": "https://test.essurl.cn/g4sjUBHlHx"
+ }
+}
+```
+
diff --git a/tccli/examples/gaap/v20180529/DescribeAccessRegions.md b/tccli/examples/gaap/v20180529/DescribeAccessRegions.md
index 6fb37b5032..dcbc2a4117 100644
--- a/tccli/examples/gaap/v20180529/DescribeAccessRegions.md
+++ b/tccli/examples/gaap/v20180529/DescribeAccessRegions.md
@@ -1,4 +1,4 @@
-**Example 1: 查询加速区域**
+**Example 1: 示例**
@@ -14,15 +14,20 @@ Output:
"TotalCount": 1,
"AccessRegionSet": [
{
- "RegionId": "xx",
- "RegionAreaName": "xx",
- "IDCType": "xx",
+ "RegionId": "abc",
+ "RegionName": "abc",
+ "RegionArea": "abc",
+ "RegionAreaName": "abc",
+ "IDCType": "abc",
"FeatureBitmap": 1,
- "RegionArea": "xx",
- "RegionName": "xx"
+ "SupportFeature": {
+ "NetworkType": [
+ "abc"
+ ]
+ }
}
],
- "RequestId": "xx"
+ "RequestId": "abc"
}
}
```
diff --git a/tccli/examples/gaap/v20180529/DescribeRegionAndPrice.md b/tccli/examples/gaap/v20180529/DescribeRegionAndPrice.md
index 5475c96c75..5e8de7cbdd 100644
--- a/tccli/examples/gaap/v20180529/DescribeRegionAndPrice.md
+++ b/tccli/examples/gaap/v20180529/DescribeRegionAndPrice.md
@@ -1,83 +1,14 @@
-**Example 1: 获取源站区域和带宽梯度价格**
-
-获取源站区域和带宽梯度价格
-
-Input:
-
-```
-tccli gaap DescribeRegionAndPrice --cli-unfold-argument ```
-
-Output:
-```
-{
- "Response": {
- "TotalCount": 1,
- "DestRegionSet": [
- {
- "RegionId": "xx",
- "RegionAreaName": "xx",
- "IDCType": "xx",
- "FeatureBitmap": 1,
- "RegionArea": "xx",
- "RegionName": "xx"
- }
- ],
- "RequestId": "xx",
- "BandwidthUnitPrice": [
- {
- "BandwidthRange": [
- 0,
- 20
- ],
- "BandwidthUnitPrice": 0.0,
- "DiscountBandwidthUnitPrice": 0.0
- },
- {
- "BandwidthRange": [
- 20,
- 100
- ],
- "BandwidthUnitPrice": 0.0,
- "DiscountBandwidthUnitPrice": 0.0
- },
- {
- "BandwidthRange": [
- 100,
- 500
- ],
- "BandwidthUnitPrice": 0.0,
- "DiscountBandwidthUnitPrice": 0.0
- },
- {
- "BandwidthRange": [
- 500,
- 2000
- ],
- "BandwidthUnitPrice": 0.0,
- "DiscountBandwidthUnitPrice": 0.0
- },
- {
- "BandwidthRange": [
- 2000,
- 0
- ],
- "BandwidthUnitPrice": 0.0,
- "DiscountBandwidthUnitPrice": 0.0
- }
- ],
- "Currency": "xx"
- }
-}
-```
-
-**Example 2: 获取源站区域和带宽梯度价格2**
+**Example 1: 示例**
Input:
```
-tccli gaap DescribeRegionAndPrice --cli-unfold-argument ```
+tccli gaap DescribeRegionAndPrice --cli-unfold-argument \
+ --IPAddressVersion abc \
+ --PackageType abc
+```
Output:
```
@@ -86,146 +17,30 @@ Output:
"TotalCount": 1,
"DestRegionSet": [
{
- "RegionId": "xx",
- "RegionAreaName": "xx",
- "IDCType": "xx",
- "FeatureBitmap": 1,
- "RegionArea": "xx",
- "RegionName": "xx"
- },
- {
- "RegionId": "xx",
- "RegionAreaName": "xx",
- "IDCType": "xx",
- "FeatureBitmap": 1,
- "RegionArea": "xx",
- "RegionName": "xx"
- },
- {
- "RegionId": "xx",
- "RegionAreaName": "xx",
- "IDCType": "xx",
- "FeatureBitmap": 1,
- "RegionArea": "xx",
- "RegionName": "xx"
- },
- {
- "RegionId": "xx",
- "RegionAreaName": "xx",
- "IDCType": "xx",
- "FeatureBitmap": 1,
- "RegionArea": "xx",
- "RegionName": "xx"
- },
- {
- "RegionId": "xx",
- "RegionAreaName": "xx",
- "IDCType": "xx",
- "FeatureBitmap": 1,
- "RegionArea": "xx",
- "RegionName": "xx"
- },
- {
- "RegionId": "xx",
- "RegionAreaName": "xx",
- "IDCType": "xx",
- "FeatureBitmap": 1,
- "RegionArea": "xx",
- "RegionName": "xx"
- },
- {
- "RegionId": "xx",
- "RegionAreaName": "xx",
- "IDCType": "xx",
- "FeatureBitmap": 1,
- "RegionArea": "xx",
- "RegionName": "xx"
- },
- {
- "RegionId": "xx",
- "RegionAreaName": "xx",
- "IDCType": "xx",
- "FeatureBitmap": 1,
- "RegionArea": "xx",
- "RegionName": "xx"
- },
- {
- "RegionId": "xx",
- "RegionAreaName": "xx",
- "IDCType": "xx",
- "FeatureBitmap": 1,
- "RegionArea": "xx",
- "RegionName": "xx"
- },
- {
- "RegionId": "xx",
- "RegionAreaName": "xx",
- "IDCType": "xx",
- "FeatureBitmap": 1,
- "RegionArea": "xx",
- "RegionName": "xx"
- },
- {
- "RegionId": "xx",
- "RegionAreaName": "xx",
- "IDCType": "xx",
- "FeatureBitmap": 1,
- "RegionArea": "xx",
- "RegionName": "xx"
- },
- {
- "RegionId": "xx",
- "RegionAreaName": "xx",
- "IDCType": "xx",
- "FeatureBitmap": 1,
- "RegionArea": "xx",
- "RegionName": "xx"
+ "RegionId": "abc",
+ "RegionName": "abc",
+ "RegionArea": "abc",
+ "RegionAreaName": "abc",
+ "IDCType": "abc",
+ "FeatureBitmap": 1,
+ "SupportFeature": {
+ "NetworkType": [
+ "abc"
+ ]
+ }
}
],
- "RequestId": "xx",
"BandwidthUnitPrice": [
{
"BandwidthRange": [
- 0,
- 20
- ],
- "BandwidthUnitPrice": 0.0,
- "DiscountBandwidthUnitPrice": 0.0
- },
- {
- "BandwidthRange": [
- 20,
- 100
- ],
- "BandwidthUnitPrice": 0.0,
- "DiscountBandwidthUnitPrice": 0.0
- },
- {
- "BandwidthRange": [
- 100,
- 500
- ],
- "BandwidthUnitPrice": 0.0,
- "DiscountBandwidthUnitPrice": 0.0
- },
- {
- "BandwidthRange": [
- 500,
- 2000
- ],
- "BandwidthUnitPrice": 0.0,
- "DiscountBandwidthUnitPrice": 0.0
- },
- {
- "BandwidthRange": [
- 2000,
0
],
- "BandwidthUnitPrice": 0.0,
- "DiscountBandwidthUnitPrice": 0.0
+ "BandwidthUnitPrice": 0,
+ "DiscountBandwidthUnitPrice": 0
}
],
- "Currency": "xx"
+ "Currency": "abc",
+ "RequestId": "abc"
}
}
```
diff --git a/tccli/examples/gaap/v20180529/InquiryPriceCreateProxy.md b/tccli/examples/gaap/v20180529/InquiryPriceCreateProxy.md
index 8feda6b3b1..4c158afcc6 100644
--- a/tccli/examples/gaap/v20180529/InquiryPriceCreateProxy.md
+++ b/tccli/examples/gaap/v20180529/InquiryPriceCreateProxy.md
@@ -1,6 +1,6 @@
**Example 1: 创建加速通道询价**
-
+创建加速通道询价
Input:
@@ -16,56 +16,23 @@ Output:
```
{
"Response": {
- "Cn2BandwidthPrice": 0.0,
- "Cn2BandwidthPriceWithDiscount": 0.0,
- "ProxyDailyPrice": 80.64,
- "FlowUnitPrice": 0.0,
- "Currency": "xx",
- "DiscountProxyDailyPrice": 56.84,
- "RequestId": "xx",
- "DiscountFlowUnitPrice": 0.0,
+ "ProxyDailyPrice": 0,
"BandwidthUnitPrice": [
{
"BandwidthRange": [
- 0,
- 20
- ],
- "BandwidthUnitPrice": 0.0,
- "DiscountBandwidthUnitPrice": 0.0
- },
- {
- "BandwidthRange": [
- 20,
- 100
- ],
- "BandwidthUnitPrice": 0.0,
- "DiscountBandwidthUnitPrice": 0.0
- },
- {
- "BandwidthRange": [
- 100,
- 500
- ],
- "BandwidthUnitPrice": 0.0,
- "DiscountBandwidthUnitPrice": 0.0
- },
- {
- "BandwidthRange": [
- 500,
- 2000
- ],
- "BandwidthUnitPrice": 0.0,
- "DiscountBandwidthUnitPrice": 0.0
- },
- {
- "BandwidthRange": [
- 2000,
0
],
- "BandwidthUnitPrice": 0.0,
- "DiscountBandwidthUnitPrice": 0.0
+ "BandwidthUnitPrice": 0,
+ "DiscountBandwidthUnitPrice": 0
}
- ]
+ ],
+ "DiscountProxyDailyPrice": 0,
+ "Currency": "abc",
+ "FlowUnitPrice": 0,
+ "DiscountFlowUnitPrice": 0,
+ "Cn2BandwidthPrice": 0,
+ "Cn2BandwidthPriceWithDiscount": 0,
+ "RequestId": "abc"
}
}
```
diff --git a/tccli/examples/monitor/v20180724/CreatePrometheusAlertPolicy.md b/tccli/examples/monitor/v20180724/CreatePrometheusAlertPolicy.md
index 0f2b39c341..cfc87d3f71 100644
--- a/tccli/examples/monitor/v20180724/CreatePrometheusAlertPolicy.md
+++ b/tccli/examples/monitor/v20180724/CreatePrometheusAlertPolicy.md
@@ -6,46 +6,46 @@ Input:
```
tccli monitor CreatePrometheusAlertPolicy --cli-unfold-argument \
- --InstanceId abc \
- --AlertRule.Id abc \
- --AlertRule.Name abc \
- --AlertRule.TemplateId abc \
+ --InstanceId prom-kshrsdf \
+ --AlertRule.Id alert-odhjeg \
+ --AlertRule.Name 资源告警 \
+ --AlertRule.TemplateId temp-cjhger \
--AlertRule.Notification.Enabled True \
- --AlertRule.Notification.Type abc \
- --AlertRule.Notification.WebHook abc \
- --AlertRule.Notification.AlertManager.ClusterType abc \
- --AlertRule.Notification.AlertManager.ClusterId abc \
- --AlertRule.Notification.AlertManager.Url abc \
- --AlertRule.Notification.RepeatInterval abc \
- --AlertRule.Notification.TimeRangeStart abc \
- --AlertRule.Notification.TimeRangeEnd abc \
- --AlertRule.Notification.NotifyWay abc \
- --AlertRule.Notification.ReceiverGroups abc \
+ --AlertRule.Notification.Type amp \
+ --AlertRule.Notification.WebHook \
+ --AlertRule.Notification.AlertManager.ClusterType eks \
+ --AlertRule.Notification.AlertManager.ClusterId cls-ojeg \
+ --AlertRule.Notification.AlertManager.Url http://10.0.0.1:9000 \
+ --AlertRule.Notification.RepeatInterval 5m \
+ --AlertRule.Notification.TimeRangeStart 00:00:00 \
+ --AlertRule.Notification.TimeRangeEnd 23:59:59 \
+ --AlertRule.Notification.NotifyWay wechat \
+ --AlertRule.Notification.ReceiverGroups skjehrsheb \
--AlertRule.Notification.PhoneNotifyOrder 1 \
--AlertRule.Notification.PhoneCircleTimes 0 \
--AlertRule.Notification.PhoneInnerInterval 0 \
--AlertRule.Notification.PhoneCircleInterval 0 \
--AlertRule.Notification.PhoneArriveNotice True \
- --AlertRule.Rules.0.Name abc \
- --AlertRule.Rules.0.Rule abc \
- --AlertRule.Rules.0.Labels.0.Name abc \
- --AlertRule.Rules.0.Labels.0.Value abc \
- --AlertRule.Rules.0.Template abc \
- --AlertRule.Rules.0.For abc \
- --AlertRule.Rules.0.Describe abc \
- --AlertRule.Rules.0.Annotations.0.Name abc \
- --AlertRule.Rules.0.Annotations.0.Value abc \
+ --AlertRule.Rules.0.Annotations.0.Name summary \
+ --AlertRule.Rules.0.Annotations.0.Value 磁盘使用率过高 \
+ --AlertRule.Rules.0.Describe \
+ --AlertRule.Rules.0.For 2m \
+ --AlertRule.Rules.0.Labels.0.Name severity \
+ --AlertRule.Rules.0.Labels.0.Value warning \
+ --AlertRule.Rules.0.Name 磁盘使用率过高 \
+ --AlertRule.Rules.0.Rule 1- node_filesystem_avail_bytes / node_filesystem_size_bytes > 0.85 \
--AlertRule.Rules.0.RuleState 0 \
- --AlertRule.UpdatedAt abc \
- --AlertRule.ClusterId abc
+ --AlertRule.Rules.0.Template 磁盘使用率过高,实例: {{$labels.instance}},ID: {{$labels.instance_id}},当前值: {{ $value | humanizePercentage }}。 \
+ --AlertRule.UpdatedAt 2024-07-15T16:46:42+08:00 \
+ --AlertRule.ClusterId cls-iehgr
```
Output:
```
{
"Response": {
- "Id": "ac",
- "RequestId": "ac"
+ "Id": "alert-ojnfb",
+ "RequestId": "ac-khgr-iohvr"
}
}
```
@@ -58,38 +58,37 @@ Input:
```
tccli monitor CreatePrometheusAlertPolicy --cli-unfold-argument \
- --InstanceId abc \
- --AlertRule.Id abc \
- --AlertRule.Name abc \
- --AlertRule.TemplateId abc \
+ --InstanceId prom-kshrsdf \
+ --AlertRule.Id alert-odhjeg \
+ --AlertRule.Name 资源告警 \
+ --AlertRule.TemplateId temp-cjhger \
+ --AlertRule.Notification.AlertManager.ClusterId cls-ksjbr \
+ --AlertRule.Notification.AlertManager.ClusterType eks \
+ --AlertRule.Notification.AlertManager.Url http://10.0.0.1:9000/api/v1/alerts \
--AlertRule.Notification.Enabled True \
- --AlertRule.Notification.Type abc \
- --AlertRule.Notification.WebHook abc \
- --AlertRule.Notification.AlertManager.ClusterType abc \
- --AlertRule.Notification.AlertManager.ClusterId abc \
- --AlertRule.Notification.AlertManager.Url abc \
- --AlertRule.Notification.RepeatInterval abc \
- --AlertRule.Notification.TimeRangeStart abc \
- --AlertRule.Notification.TimeRangeEnd abc \
- --AlertRule.Notification.NotifyWay abc \
- --AlertRule.Notification.ReceiverGroups abc \
- --AlertRule.Notification.PhoneNotifyOrder 1 \
+ --AlertRule.Notification.NotifyWay None \
+ --AlertRule.Notification.PhoneArriveNotice False \
+ --AlertRule.Notification.PhoneCircleInterval 0 \
--AlertRule.Notification.PhoneCircleTimes 0 \
--AlertRule.Notification.PhoneInnerInterval 0 \
- --AlertRule.Notification.PhoneCircleInterval 0 \
- --AlertRule.Notification.PhoneArriveNotice True \
- --AlertRule.Rules.0.Name abc \
- --AlertRule.Rules.0.Rule abc \
- --AlertRule.Rules.0.Labels.0.Name abc \
- --AlertRule.Rules.0.Labels.0.Value abc \
- --AlertRule.Rules.0.Template abc \
- --AlertRule.Rules.0.For abc \
- --AlertRule.Rules.0.Describe abc \
- --AlertRule.Rules.0.Annotations.0.Name abc \
- --AlertRule.Rules.0.Annotations.0.Value abc \
+ --AlertRule.Notification.PhoneNotifyOrder None \
+ --AlertRule.Notification.ReceiverGroups None \
+ --AlertRule.Notification.RepeatInterval 5m \
+ --AlertRule.Notification.TimeRangeEnd 23:59:59 \
+ --AlertRule.Notification.TimeRangeStart 00:00:00 \
+ --AlertRule.Notification.Type alertmanager \
+ --AlertRule.Notification.WebHook \
+ --AlertRule.Rules.0.Annotations.0.Name summary \
+ --AlertRule.Rules.0.Annotations.0.Value MySQL High CPU Usage \
+ --AlertRule.Rules.0.Describe \
+ --AlertRule.Rules.0.For 5m \
+ --AlertRule.Rules.0.Labels.0.Name severity \
+ --AlertRule.Rules.0.Labels.0.Value warning \
+ --AlertRule.Rules.0.Name MySQL High CPU Usage \
+ --AlertRule.Rules.0.Rule avg by (instance_id,cluster_id,instance_region) (qce_cynosdb_mysql_cpuuserate_max) > 85 \
--AlertRule.Rules.0.RuleState 0 \
- --AlertRule.UpdatedAt abc \
- --AlertRule.ClusterId abc
+ --AlertRule.Rules.0.Template MySQL cpu usage is higher than 85%. Instance ID: {{ $labels.instance_id }}, cluster ID: {{ $labels.cluster_id }}, region: {{ $labels.instance_region }} \
+ --AlertRule.ClusterId cls-iehgr
```
Output:
diff --git a/tccli/examples/monitor/v20180724/DeletePrometheusAlertPolicy.md b/tccli/examples/monitor/v20180724/DeletePrometheusAlertPolicy.md
index 6d2d0c299d..e70b551b7b 100644
--- a/tccli/examples/monitor/v20180724/DeletePrometheusAlertPolicy.md
+++ b/tccli/examples/monitor/v20180724/DeletePrometheusAlertPolicy.md
@@ -6,9 +6,9 @@ Input:
```
tccli monitor DeletePrometheusAlertPolicy --cli-unfold-argument \
- --InstanceId abc \
- --AlertIds abc \
- --Names abc
+ --InstanceId prom-kjshgr \
+ --AlertIds alert-jsbgvr \
+ --Names test
```
Output:
diff --git a/tccli/examples/monitor/v20180724/DescribePrometheusAlertPolicy.md b/tccli/examples/monitor/v20180724/DescribePrometheusAlertPolicy.md
index 50097d7f49..b1cab03ff9 100644
--- a/tccli/examples/monitor/v20180724/DescribePrometheusAlertPolicy.md
+++ b/tccli/examples/monitor/v20180724/DescribePrometheusAlertPolicy.md
@@ -1,16 +1,16 @@
-**Example 1: 告警列表**
+**Example 1: 查询实例告警列表**
-告警列表
+查询实例告警列表
Input:
```
tccli monitor DescribePrometheusAlertPolicy --cli-unfold-argument \
- --InstanceId xxx \
+ --InstanceId prom-as3d2s1a \
--Limit 1 \
--Filters.0.Name Name \
--Filters.0.Values alert-test \
- --Offset 1
+ --Offset 0
```
Output:
@@ -19,63 +19,63 @@ Output:
"Response": {
"AlertRules": [
{
- "Id": "abc",
- "Name": "abc",
- "TemplateId": "abc",
+ "Id": "alert-23a6d2ga",
+ "Name": "alert-test",
+ "TemplateId": "temp-as12sf12",
+ "ClusterId": "",
"Notification": {
"Enabled": true,
- "Type": "abc",
- "WebHook": "abc",
- "AlertManager": {
- "ClusterType": "abc",
- "ClusterId": "abc",
- "Url": "abc"
- },
- "RepeatInterval": "abc",
- "TimeRangeStart": "abc",
- "TimeRangeEnd": "abc",
- "NotifyWay": [
- "abc"
- ],
+ "Type": "amp",
+ "RepeatInterval": "5m",
+ "TimeRangeStart": "0:00:00",
+ "TimeRangeEnd": "23:59:59",
"ReceiverGroups": [
- "abc"
+ "notice-13hs61s2"
],
+ "WebHook": "http://127.0.0.1:9090/alert",
+ "AlertManager": {
+ "ClusterType": "tke",
+ "ClusterId": "cls-a2df21xa",
+ "Url": "http://127.0.0.1:9090"
+ },
"PhoneNotifyOrder": [
1
],
"PhoneCircleTimes": 0,
"PhoneInnerInterval": 0,
"PhoneCircleInterval": 0,
- "PhoneArriveNotice": true
+ "PhoneArriveNotice": true,
+ "NotifyWay": [
+ "abc"
+ ]
},
"Rules": [
{
- "Name": "abc",
- "Rule": "abc",
+ "Name": "rule-1",
+ "Rule": "up{} != 1",
"Labels": [
{
- "Name": "abc",
- "Value": "abc"
+ "Name": "level",
+ "Value": "warnning"
}
],
- "Template": "abc",
- "For": "abc",
- "Describe": "abc",
+ "Template": "test alert",
+ "For": "5m",
+ "Describe": "test alert",
"Annotations": [
{
- "Name": "abc",
- "Value": "abc"
+ "Name": "creator",
+ "Value": "programer"
}
],
- "RuleState": 0
+ "RuleState": 1
}
],
- "UpdatedAt": "abc",
- "ClusterId": "abc"
+ "UpdatedAt": "2024-07-21 18:10:14"
}
],
"Total": 1,
- "RequestId": "abc"
+ "RequestId": "3f04883c-eda1-4498-b024-d266baec6040"
}
}
```
diff --git a/tccli/examples/monitor/v20180724/DescribePrometheusRecordRules.md b/tccli/examples/monitor/v20180724/DescribePrometheusRecordRules.md
index 337310fc6d..21f6da267c 100644
--- a/tccli/examples/monitor/v20180724/DescribePrometheusRecordRules.md
+++ b/tccli/examples/monitor/v20180724/DescribePrometheusRecordRules.md
@@ -6,7 +6,7 @@ Input:
```
tccli monitor DescribePrometheusRecordRules --cli-unfold-argument \
- --InstanceId xxx
+ --InstanceId prom-22kxd343
```
Output:
diff --git a/tccli/examples/monitor/v20180724/DescribeRecordingRules.md b/tccli/examples/monitor/v20180724/DescribeRecordingRules.md
index 61d4c0e1af..37c82dc537 100644
--- a/tccli/examples/monitor/v20180724/DescribeRecordingRules.md
+++ b/tccli/examples/monitor/v20180724/DescribeRecordingRules.md
@@ -7,7 +7,7 @@ Input:
```
tccli monitor DescribeRecordingRules --cli-unfold-argument \
--InstanceId prom-sdf342 \
- --RuleState 2 \
+ --RuleState 1 \
--Limit 10
```
@@ -20,6 +20,7 @@ Output:
"RuleId": "rrule-45hkgiyc",
"RuleState": 2,
"Name": "example6",
+ "RuleName": "example6",
"Group": "LS0tDQpuYW1lOiBleGFtcGxlDQpydWxlczoNCiAgLSByZWNvcmQ6IGpvYjpodHRwX2lucHJvZ3Jlc3NfcmVxdWVzdHM6c3VtDQogICAgZXhwcjogc3VtIGJ5IChqb2IpIChodHRwX2lucHJvZ3Jlc3NfcmVxdWVzdHMp",
"Total": 1,
"UpdatedAt": "2020-08-10T17:50:06Z",
diff --git a/tccli/examples/monitor/v20180724/ModifyPrometheusAlertPolicy.md b/tccli/examples/monitor/v20180724/ModifyPrometheusAlertPolicy.md
index 0498b543c5..47bc075006 100644
--- a/tccli/examples/monitor/v20180724/ModifyPrometheusAlertPolicy.md
+++ b/tccli/examples/monitor/v20180724/ModifyPrometheusAlertPolicy.md
@@ -6,38 +6,38 @@ Input:
```
tccli monitor ModifyPrometheusAlertPolicy --cli-unfold-argument \
- --InstanceId abc \
- --AlertRule.Id abc \
- --AlertRule.Name abc \
- --AlertRule.TemplateId abc \
+ --InstanceId prom-jsgref \
+ --AlertRule.Id alert-odhjeg \
+ --AlertRule.Name 资源告警 \
+ --AlertRule.TemplateId temp-cjhger \
--AlertRule.Notification.Enabled True \
- --AlertRule.Notification.Type abc \
- --AlertRule.Notification.WebHook abc \
- --AlertRule.Notification.AlertManager.ClusterType abc \
- --AlertRule.Notification.AlertManager.ClusterId abc \
- --AlertRule.Notification.AlertManager.Url abc \
- --AlertRule.Notification.RepeatInterval abc \
- --AlertRule.Notification.TimeRangeStart abc \
- --AlertRule.Notification.TimeRangeEnd abc \
- --AlertRule.Notification.NotifyWay abc \
- --AlertRule.Notification.ReceiverGroups abc \
+ --AlertRule.Notification.Type amp \
+ --AlertRule.Notification.WebHook \
+ --AlertRule.Notification.AlertManager.ClusterType eks \
+ --AlertRule.Notification.AlertManager.ClusterId cls-ojeg \
+ --AlertRule.Notification.AlertManager.Url http://10.0.0.1:9000 \
+ --AlertRule.Notification.RepeatInterval 5m \
+ --AlertRule.Notification.TimeRangeStart 00:00:00 \
+ --AlertRule.Notification.TimeRangeEnd 23:59:59 \
+ --AlertRule.Notification.NotifyWay wechat \
+ --AlertRule.Notification.ReceiverGroups skjehrsheb \
--AlertRule.Notification.PhoneNotifyOrder 1 \
--AlertRule.Notification.PhoneCircleTimes 0 \
--AlertRule.Notification.PhoneInnerInterval 0 \
--AlertRule.Notification.PhoneCircleInterval 0 \
--AlertRule.Notification.PhoneArriveNotice True \
- --AlertRule.Rules.0.Name abc \
- --AlertRule.Rules.0.Rule abc \
- --AlertRule.Rules.0.Labels.0.Name abc \
- --AlertRule.Rules.0.Labels.0.Value abc \
- --AlertRule.Rules.0.Template abc \
- --AlertRule.Rules.0.For abc \
- --AlertRule.Rules.0.Describe abc \
- --AlertRule.Rules.0.Annotations.0.Name abc \
- --AlertRule.Rules.0.Annotations.0.Value abc \
+ --AlertRule.Rules.0.Annotations.0.Name summary \
+ --AlertRule.Rules.0.Annotations.0.Value 磁盘使用率过高 \
+ --AlertRule.Rules.0.Describe \
+ --AlertRule.Rules.0.For 2m \
+ --AlertRule.Rules.0.Labels.0.Name severity \
+ --AlertRule.Rules.0.Labels.0.Value warning \
+ --AlertRule.Rules.0.Name 磁盘使用率过高 \
+ --AlertRule.Rules.0.Rule 1- node_filesystem_avail_bytes / node_filesystem_size_bytes > 0.85 \
--AlertRule.Rules.0.RuleState 0 \
- --AlertRule.UpdatedAt abc \
- --AlertRule.ClusterId abc
+ --AlertRule.Rules.0.Template 磁盘使用率过高,实例: {{$labels.instance}},ID: {{$labels.instance_id}},当前值: {{ $value | humanizePercentage }}。 \
+ --AlertRule.UpdatedAt 2024-07-15T16:46:42+08:00 \
+ --AlertRule.ClusterId cls-iehgr
```
Output:
diff --git a/tccli/examples/postgres/v20170312/CreateAccount.md b/tccli/examples/postgres/v20170312/CreateAccount.md
new file mode 100644
index 0000000000..82bf4a1bdc
--- /dev/null
+++ b/tccli/examples/postgres/v20170312/CreateAccount.md
@@ -0,0 +1,49 @@
+**Example 1: 创建数据库普通账号**
+
+创建数据库普通账号
+
+Input:
+
+```
+tccli postgres CreateAccount --cli-unfold-argument \
+ --DBInstanceId postgres-5cz25tr5 \
+ --UserName user_normal \
+ --Password Test_password1 \
+ --Type normal \
+ --Remark
+```
+
+Output:
+```
+{
+ "Response": {
+ "RequestId": "5d19322f-50fe-4084-a5d3-b0bc680fd3a1"
+ }
+}
+```
+
+**Example 2: 创建数据库超级账号**
+
+创建数据库超级账号
+
+
+Input:
+
+```
+tccli postgres CreateAccount --cli-unfold-argument \
+ --DBInstanceId postgres-5cz25tr5 \
+ --UserName user_Super \
+ --Password Test_password1 \
+ --Type tencentDBSuper \
+ --Remark 超级用户
+```
+
+Output:
+```
+{
+ "Response": {
+ "RequestId": "fad9ac43-c906-4494-bbb5-88d154d2829c"
+ }
+}
+```
+
diff --git a/tccli/examples/postgres/v20170312/DeleteAccount.md b/tccli/examples/postgres/v20170312/DeleteAccount.md
new file mode 100644
index 0000000000..ec50afd6c2
--- /dev/null
+++ b/tccli/examples/postgres/v20170312/DeleteAccount.md
@@ -0,0 +1,21 @@
+**Example 1: 删除数据库账号**
+
+删除数据库账号
+
+Input:
+
+```
+tccli postgres DeleteAccount --cli-unfold-argument \
+ --DBInstanceId postgres-5cz25tr5 \
+ --UserName asdfghjkl
+```
+
+Output:
+```
+{
+ "Response": {
+ "RequestId": "eac6a620-d337-4c7e-a4cc-8b7c082de489"
+ }
+}
+```
+
diff --git a/tccli/examples/postgres/v20170312/DescribeAccountPrivileges.md b/tccli/examples/postgres/v20170312/DescribeAccountPrivileges.md
new file mode 100644
index 0000000000..e6b58193c9
--- /dev/null
+++ b/tccli/examples/postgres/v20170312/DescribeAccountPrivileges.md
@@ -0,0 +1,176 @@
+**Example 1: 查看账号类型**
+
+查看账号类型
+
+Input:
+
+```
+tccli postgres DescribeAccountPrivileges --cli-unfold-argument \
+ --DBInstanceId postgres-5cz25tr5 \
+ --UserName user_without_permission \
+ --DatabaseObjectSet.0.ObjectType account \
+ --DatabaseObjectSet.0.ObjectName user_without_permission
+```
+
+Output:
+```
+{
+ "Response": {
+ "PrivilegeSet": [
+ {
+ "Object": {
+ "DatabaseName": "",
+ "ObjectName": "without_per",
+ "ObjectType": "account",
+ "SchemaName": "",
+ "TableName": ""
+ },
+ "PrivilegeSet": [
+ "tencentDBSuper"
+ ]
+ }
+ ],
+ "RequestId": "dc43ec52-efbe-4bde-b588-bfa427a8c29b"
+ }
+}
+```
+
+**Example 2: 查询数据库权限**
+
+查询账号without_per对数据库user_database的权限
+
+Input:
+
+```
+tccli postgres DescribeAccountPrivileges --cli-unfold-argument \
+ --DBInstanceId postgres-5cz25tr5 \
+ --UserName without_per \
+ --DatabaseObjectSet.0.ObjectType database \
+ --DatabaseObjectSet.0.ObjectName user_database
+```
+
+Output:
+```
+{
+ "Response": {
+ "PrivilegeSet": [
+ {
+ "Object": {
+ "DatabaseName": "",
+ "ObjectName": "user_database",
+ "ObjectType": "database",
+ "SchemaName": "",
+ "TableName": ""
+ },
+ "PrivilegeSet": [
+ "CREATE",
+ "CONNECT",
+ "TEMPORARY"
+ ]
+ }
+ ],
+ "RequestId": "fc891ba1-8943-4116-8eb6-4696873d90c8"
+ }
+}
+```
+
+**Example 3: 查询模式权限**
+
+查询账号without_per对user_database数据库下,user_schema的权限
+
+Input:
+
+```
+tccli postgres DescribeAccountPrivileges --cli-unfold-argument \
+ --DBInstanceId postgres-5cz25tr5 \
+ --UserName without_per \
+ --DatabaseObjectSet.0.ObjectType schema \
+ --DatabaseObjectSet.0.ObjectName user_schema \
+ --DatabaseObjectSet.0.DatabaseName user_database
+```
+
+Output:
+```
+{
+ "Response": {
+ "PrivilegeSet": [
+ {
+ "Object": {
+ "DatabaseName": "user_database",
+ "ObjectName": "user_schema",
+ "ObjectType": "schema",
+ "SchemaName": "",
+ "TableName": ""
+ },
+ "PrivilegeSet": [
+ "USAGE",
+ "CREATE"
+ ]
+ }
+ ],
+ "RequestId": "410f0673-c35c-401e-97c8-d4e196d1f33c"
+ }
+}
+```
+
+**Example 4: 批量查询**
+
+批量查询
+
+Input:
+
+```
+tccli postgres DescribeAccountPrivileges --cli-unfold-argument \
+ --DBInstanceId postgres-5cz25tr5 \
+ --UserName without_per \
+ --DatabaseObjectSet.0.ObjectType table \
+ --DatabaseObjectSet.0.ObjectName users \
+ --DatabaseObjectSet.0.DatabaseName user_database \
+ --DatabaseObjectSet.0.SchemaName user_schema \
+ --DatabaseObjectSet.1.ObjectType schema \
+ --DatabaseObjectSet.1.ObjectName user_schema \
+ --DatabaseObjectSet.1.DatabaseName user_database
+```
+
+Output:
+```
+{
+ "Response": {
+ "PrivilegeSet": [
+ {
+ "Object": {
+ "DatabaseName": "user_database",
+ "ObjectName": "users",
+ "ObjectType": "table",
+ "SchemaName": "user_schema",
+ "TableName": ""
+ },
+ "PrivilegeSet": [
+ "DELETE",
+ "TRUNCATE",
+ "REFERENCES",
+ "TRIGGER",
+ "SELECT",
+ "INSERT",
+ "UPDATE"
+ ]
+ },
+ {
+ "Object": {
+ "DatabaseName": "user_database",
+ "ObjectName": "user_schema",
+ "ObjectType": "schema",
+ "SchemaName": "",
+ "TableName": ""
+ },
+ "PrivilegeSet": [
+ "CREATE",
+ "USAGE"
+ ]
+ }
+ ],
+ "RequestId": "41d71515-447d-4557-a799-3b60ad86323d"
+ }
+}
+```
+
diff --git a/tccli/examples/postgres/v20170312/DescribeDatabaseObjects.md b/tccli/examples/postgres/v20170312/DescribeDatabaseObjects.md
new file mode 100644
index 0000000000..ad24b37e06
--- /dev/null
+++ b/tccli/examples/postgres/v20170312/DescribeDatabaseObjects.md
@@ -0,0 +1,85 @@
+**Example 1: 查询对象为database**
+
+查询数据库列表
+
+Input:
+
+```
+tccli postgres DescribeDatabaseObjects --cli-unfold-argument \
+ --DBInstanceId postgres-5cz25tr5 \
+ --ObjectType database
+```
+
+Output:
+```
+{
+ "Response": {
+ "ObjectSet": [
+ "postgres",
+ "postgres_bak_1715170243",
+ "user_database"
+ ],
+ "TotalCount": 3,
+ "RequestId": "c90f7a9d-f519-4d2f-bb2f-e3966cd102b6"
+ }
+}
+```
+
+**Example 2: 查询对象为schema**
+
+查询user_database下的模式
+
+Input:
+
+```
+tccli postgres DescribeDatabaseObjects --cli-unfold-argument \
+ --DBInstanceId postgres-5cz25tr5 \
+ --ObjectType schema \
+ --Limit 2 \
+ --Offset 1 \
+ --DatabaseName user_database
+```
+
+Output:
+```
+{
+ "Response": {
+ "ObjectSet": [
+ "information_schema",
+ "pg_catalog"
+ ],
+ "TotalCount": 2,
+ "RequestId": "bb6146b9-0c63-40ea-b89a-d83944805b79"
+ }
+}
+```
+
+**Example 3: 查询对象为table**
+
+查询user_database数据库下,属于user_schema模式的表
+
+Input:
+
+```
+tccli postgres DescribeDatabaseObjects --cli-unfold-argument \
+ --DBInstanceId postgres-5cz25tr5 \
+ --ObjectType table \
+ --DatabaseName user_database \
+ --SchemaName user_schema
+```
+
+Output:
+```
+{
+ "Response": {
+ "ObjectSet": [
+ "users",
+ "users1",
+ "users2"
+ ],
+ "TotalCount": 3,
+ "RequestId": "80530420-d73e-4a60-8149-93cf800220b9"
+ }
+}
+```
+
diff --git a/tccli/examples/postgres/v20170312/LockAccount.md b/tccli/examples/postgres/v20170312/LockAccount.md
new file mode 100644
index 0000000000..35e9b2dec7
--- /dev/null
+++ b/tccli/examples/postgres/v20170312/LockAccount.md
@@ -0,0 +1,21 @@
+**Example 1: 锁定数据库账号**
+
+锁定数据库账号
+
+Input:
+
+```
+tccli postgres LockAccount --cli-unfold-argument \
+ --DBInstanceId postgres-4sfuv15b \
+ --UserName test
+```
+
+Output:
+```
+{
+ "Response": {
+ "RequestId": "6ace8140-6b9e-4e81-a8ad-ef3f92b2aa90"
+ }
+}
+```
+
diff --git a/tccli/examples/postgres/v20170312/ModifyAccountPrivileges.md b/tccli/examples/postgres/v20170312/ModifyAccountPrivileges.md
new file mode 100644
index 0000000000..9c873cb5ba
--- /dev/null
+++ b/tccli/examples/postgres/v20170312/ModifyAccountPrivileges.md
@@ -0,0 +1,42 @@
+**Example 1: 批量修改权限**
+
+批量修改without_per账号的权限:授予user_database库下user_schema模式的CREATE权限,并撤销对应USAGE权限;授予user_database库下,属于user_schema模式的users表的SELECT权限。修改without_per账号的类型为tencentDBSuper。
+
+Input:
+
+```
+tccli postgres ModifyAccountPrivileges --cli-unfold-argument \
+ --DBInstanceId postgres-5cz25tr5 \
+ --UserName without_per \
+ --ModifyPrivilegeSet.0.DatabasePrivilege.Object.ObjectType schema \
+ --ModifyPrivilegeSet.0.DatabasePrivilege.Object.ObjectName user_schema \
+ --ModifyPrivilegeSet.0.DatabasePrivilege.Object.DatabaseName user_database \
+ --ModifyPrivilegeSet.0.DatabasePrivilege.PrivilegeSet USAGE \
+ --ModifyPrivilegeSet.0.ModifyType revokeObject \
+ --ModifyPrivilegeSet.0.IsCascade False \
+ --ModifyPrivilegeSet.1.DatabasePrivilege.Object.ObjectType schema \
+ --ModifyPrivilegeSet.1.DatabasePrivilege.Object.ObjectName user_schema \
+ --ModifyPrivilegeSet.1.DatabasePrivilege.Object.DatabaseName user_database \
+ --ModifyPrivilegeSet.1.DatabasePrivilege.PrivilegeSet CREATE \
+ --ModifyPrivilegeSet.1.ModifyType grantObject \
+ --ModifyPrivilegeSet.2.DatabasePrivilege.Object.ObjectType table \
+ --ModifyPrivilegeSet.2.DatabasePrivilege.Object.ObjectName users \
+ --ModifyPrivilegeSet.2.DatabasePrivilege.Object.DatabaseName user_database \
+ --ModifyPrivilegeSet.2.DatabasePrivilege.Object.SchemaName user_schema \
+ --ModifyPrivilegeSet.2.DatabasePrivilege.PrivilegeSet SELECT \
+ --ModifyPrivilegeSet.2.ModifyType grantObject \
+ --ModifyPrivilegeSet.3.DatabasePrivilege.Object.ObjectType account \
+ --ModifyPrivilegeSet.3.DatabasePrivilege.Object.ObjectName without_per \
+ --ModifyPrivilegeSet.3.DatabasePrivilege.PrivilegeSet tencentDBSuper \
+ --ModifyPrivilegeSet.3.ModifyType alterRole
+```
+
+Output:
+```
+{
+ "Response": {
+ "RequestId": "73086328-bdfa-4bf9-8206-8a3d6b2438b1"
+ }
+}
+```
+
diff --git a/tccli/examples/postgres/v20170312/UnlockAccount.md b/tccli/examples/postgres/v20170312/UnlockAccount.md
new file mode 100644
index 0000000000..34ffcd07b5
--- /dev/null
+++ b/tccli/examples/postgres/v20170312/UnlockAccount.md
@@ -0,0 +1,21 @@
+**Example 1: 解除数据库账号锁定**
+
+账号锁定之后,通过此操作解锁。
+
+Input:
+
+```
+tccli postgres UnlockAccount --cli-unfold-argument \
+ --DBInstanceId postgres-4sfuv15b \
+ --UserName test
+```
+
+Output:
+```
+{
+ "Response": {
+ "RequestId": "6ace8140-6b9e-4e81-a8ad-ef3f92b2aa90"
+ }
+}
+```
+
diff --git a/tccli/examples/tcr/v20190924/DescribeImageManifests.md b/tccli/examples/tcr/v20190924/DescribeImageManifests.md
index 0279ee586a..d09555e3e1 100644
--- a/tccli/examples/tcr/v20190924/DescribeImageManifests.md
+++ b/tccli/examples/tcr/v20190924/DescribeImageManifests.md
@@ -1,6 +1,6 @@
**Example 1: 查询容器镜像Manifest信息**
-
+查询容器镜像Manifest、Config和Labels信息
Input:
@@ -16,9 +16,15 @@ Output:
```
{
"Response": {
- "RequestId": "6ef83620-c92e-496c-b206-25b0b638f409",
"Manifest": "{\"config\":{\"digest\":\"sha256:72f6114b119f1423a2713aca1e15cb9aeadf835a714d36f7a2cf88d10e4bb6be\",\"mediaType\":\"application/vnd.docker.container.image.v1+json\",\"size\":2396},\"layers\":[{\"digest\":\"sha256:9123ac7c32f74759e6283f04dbf571f18246abe5bb2c779efcb32cd50f3ff13c\",\"mediaType\":\"application/vnd.docker.image.rootfs.diff.tar.gzip\",\"size\":2764173},{\"digest\":\"sha256:8673ef3ff8fc5ede7363cbe74d295b013ef7959ba002af607314d8ee77b58a5a\",\"mediaType\":\"application/vnd.docker.image.rootfs.diff.tar.gzip\",\"size\":1616975},{\"digest\":\"sha256:a8e22d4a83517ee59537183a2f7ca35fa7b81d36176a9d5d42ca2ab0486af779\",\"mediaType\":\"application/vnd.docker.image.rootfs.diff.tar.gzip\",\"size\":8446306}],\"mediaType\":\"application/vnd.docker.distribution.manifest.v2+json\",\"schemaVersion\":2}",
- "Config": ""
+ "Config": "abc",
+ "Labels": [
+ {
+ "Key": "abc",
+ "Value": "abc"
+ }
+ ],
+ "RequestId": "6ef83620-c92e-496c-b206-25b0b638f409"
}
}
```
diff --git a/tccli/examples/tcr/v20190924/DescribeTagRetentionExecutionTask.md b/tccli/examples/tcr/v20190924/DescribeTagRetentionExecutionTask.md
index 8f6ad1d643..bdb949cfbb 100644
--- a/tccli/examples/tcr/v20190924/DescribeTagRetentionExecutionTask.md
+++ b/tccli/examples/tcr/v20190924/DescribeTagRetentionExecutionTask.md
@@ -20,17 +20,17 @@ Output:
"TotalCount": 1,
"RetentionTaskList": [
{
- "Status": "xx",
+ "Status": "success",
"Total": 0,
"Retained": 0,
"TaskId": 0,
- "Repository": "xx",
+ "Repository": "repo",
"ExecutionId": 0,
- "StartTime": "xx",
- "EndTime": "xx"
+ "StartTime": "2024-06-01",
+ "EndTime": "2024-06-01"
}
],
- "RequestId": "xx"
+ "RequestId": "1234-666"
}
}
```
diff --git a/tccli/examples/tcr/v20190924/DescribeTagRetentionRules.md b/tccli/examples/tcr/v20190924/DescribeTagRetentionRules.md
index e81fb2489e..c029195400 100644
--- a/tccli/examples/tcr/v20190924/DescribeTagRetentionRules.md
+++ b/tccli/examples/tcr/v20190924/DescribeTagRetentionRules.md
@@ -1,4 +1,4 @@
-**Example 1: 查询版本保留规则**
+**Example 1: 查询镜像版本保留规则**
@@ -19,7 +19,7 @@ Output:
"RequestId": "c7abb9f2-9440-43ea-a12f-ae58875acf3d",
"RetentionPolicyList": [
{
- "NextExecutionTime": "xx",
+ "NextExecutionTime": "2024-06-24",
"RetentionId": 1,
"NamespaceName": "aaaa",
"RetentionRuleList": [
diff --git a/tccli/examples/tcr/v20190924/DescribeWebhookTriggerLog.md b/tccli/examples/tcr/v20190924/DescribeWebhookTriggerLog.md
index 28029bb7a1..d1da897be3 100644
--- a/tccli/examples/tcr/v20190924/DescribeWebhookTriggerLog.md
+++ b/tccli/examples/tcr/v20190924/DescribeWebhookTriggerLog.md
@@ -1,12 +1,12 @@
**Example 1: 查询触发器日志**
-
+用于查询触发器日志
Input:
```
tccli tcr DescribeWebhookTriggerLog --cli-unfold-argument \
- --RegistryId tcr-ak9876 \
+ --RegistryId tcr-ab12345 \
--Namespace someNs \
--Id 9
```
@@ -15,7 +15,7 @@ Output:
```
{
"Response": {
- "RequestId": "be17f554-32fd-451c-a1cd-64f9bd164e3f",
+ "RequestId": "e8cbb3a5-ae7a-41f3-ba79-950d39ea653b",
"TotalCount": 3,
"Logs": [
{
diff --git a/tccli/examples/waf/v20180125/DescribeAttackWhiteRule.md b/tccli/examples/waf/v20180125/DescribeAttackWhiteRule.md
index 3132e94dc1..00a9b0ac9a 100644
--- a/tccli/examples/waf/v20180125/DescribeAttackWhiteRule.md
+++ b/tccli/examples/waf/v20180125/DescribeAttackWhiteRule.md
@@ -6,11 +6,11 @@ Input:
```
tccli waf DescribeAttackWhiteRule --cli-unfold-argument \
- --Domain xx \
+ --Domain \
--Offset 1 \
--Limit 1 \
- --Order xx \
- --By xx
+ --Order \
+ --By
```
Output:
@@ -20,27 +20,36 @@ Output:
"Total": 1,
"List": [
{
- "Status": 0,
- "MatchField": "xx",
- "MatchMethod": "xx",
- "MatchContent": "xx",
- "SignatureId": "xx",
- "ModifyTime": "2020-09-22T00:00:00+00:00",
"WhiteRuleId": 1,
- "CreateTime": "2020-09-22T00:00:00+00:00"
- },
- {
- "Status": 1,
- "MatchField": "xx",
- "MatchMethod": "xx",
- "MatchContent": "xx",
- "SignatureId": "xx",
+ "SignatureId": "abc",
+ "Status": 0,
+ "MatchField": "abc",
+ "MatchParams": "abc",
+ "MatchMethod": "abc",
+ "MatchContent": "abc",
+ "CreateTime": "2020-09-22T00:00:00+00:00",
"ModifyTime": "2020-09-22T00:00:00+00:00",
- "WhiteRuleId": 1,
- "CreateTime": "2020-09-22T00:00:00+00:00"
+ "SignatureIds": [
+ "abc"
+ ],
+ "TypeIds": [
+ "abc"
+ ],
+ "TypeId": "abc",
+ "Mode": 0,
+ "Name": "abc",
+ "MatchInfo": [
+ {
+ "MatchField": "abc",
+ "MatchMethod": "abc",
+ "MatchContent": "abc",
+ "MatchParams": "abc"
+ }
+ ],
+ "MatchInfoStr": "abc"
}
],
- "RequestId": "xx"
+ "RequestId": "abc"
}
}
```
diff --git a/tccli/examples/waf/v20180125/DescribeInstances.md b/tccli/examples/waf/v20180125/DescribeInstances.md
index fa56fa2cc7..24f6cc5cb6 100644
--- a/tccli/examples/waf/v20180125/DescribeInstances.md
+++ b/tccli/examples/waf/v20180125/DescribeInstances.md
@@ -25,520 +25,144 @@ Output:
```
{
"Response": {
- "RequestId": "b7984267-1b60-4979-accb-8f1ca497f827",
- "Total": 11,
+ "Total": 1,
"Instances": [
{
- "AppId": 251197211,
- "InstanceId": "waf_2kuj4t1k00awo4gp",
- "InstanceName": "gz-Default",
- "ResourceIds": "waf_2kuj4t1k00awo4gp",
- "Edition": "sparta-waf",
- "Region": "gz",
+ "InstanceId": "abc",
+ "InstanceName": "abc",
+ "ResourceIds": "abc",
+ "Region": "abc",
"PayMode": 1,
"RenewFlag": 1,
- "Level": 4,
- "ValidTime": "2021-11-09 10:37:20",
- "BeginTime": "0001-01-01 00:00:00",
- "SubDomainLimit": 40,
- "MainDomainLimit": 4,
- "Mode": 0,
- "DomainCount": 6,
- "MainDomainCount": 2,
- "MaxQPS": 0,
- "QPS": {
- "ResourceIds": "",
- "ValidTime": "",
- "RenewFlag": 0,
- "Count": 0,
- "Region": ""
- },
- "DomainPkg": {
- "ResourceIds": "",
- "ValidTime": "",
- "RenewFlag": 0,
- "Count": 0,
- "Region": ""
- },
- "BotPkg": {
- "ResourceIds": "",
- "Status": 0,
- "Region": 0,
- "BeginTime": "",
- "EndTime": "",
- "InquireNum": 0,
- "UsedNum": 0
- },
- "FraudPkg": {
- "ResourceIds": "",
- "Status": 1,
- "Region": 0,
- "BeginTime": "",
- "EndTime": "",
- "InquireNum": 0,
- "UsedNum": 0
- }
- },
- {
- "AppId": 251197211,
- "InstanceId": "waf_2kui15ko00a19t0r",
- "InstanceName": "cd-Default",
- "ResourceIds": "waf_2kui15ko00a19t0r",
- "Edition": "sparta-waf",
- "Region": "cd",
- "PayMode": 1,
- "RenewFlag": 1,
- "Level": 4,
- "ValidTime": "2021-09-24 15:34:09",
- "BeginTime": "0001-01-01 00:00:00",
- "SubDomainLimit": 40,
- "MainDomainLimit": 4,
- "Mode": 0,
- "DomainCount": 7,
- "MainDomainCount": 1,
- "MaxQPS": 0,
- "QPS": {
- "ResourceIds": "",
- "ValidTime": "",
- "RenewFlag": 0,
- "Count": 0,
- "Region": ""
- },
- "DomainPkg": {
- "ResourceIds": "",
- "ValidTime": "",
- "RenewFlag": 0,
- "Count": 0,
- "Region": ""
- },
- "BotPkg": {
- "ResourceIds": "",
- "Status": 0,
- "Region": 0,
- "BeginTime": "",
- "EndTime": "",
- "InquireNum": 0,
- "UsedNum": 0
- },
- "FraudPkg": {
- "ResourceIds": "",
- "Status": 0,
- "Region": 0,
- "BeginTime": "",
- "EndTime": "",
- "InquireNum": 0,
- "UsedNum": 0
- }
- },
- {
- "AppId": 251197211,
- "InstanceId": "waf_2kui15ko00a19pwt",
- "InstanceName": "gz-Default",
- "ResourceIds": "waf_2kui15ko00a19pwt",
- "Edition": "sparta-waf",
- "Region": "gz",
- "PayMode": 1,
- "RenewFlag": 1,
- "Level": 4,
- "ValidTime": "2021-09-24 15:30:15",
- "BeginTime": "0001-01-01 00:00:00",
- "SubDomainLimit": 40,
- "MainDomainLimit": 4,
- "Mode": 0,
+ "Mode": 1,
+ "Level": 1,
+ "ValidTime": "abc",
+ "BeginTime": "abc",
"DomainCount": 1,
+ "SubDomainLimit": 1,
"MainDomainCount": 1,
- "MaxQPS": 0,
+ "MainDomainLimit": 1,
+ "MaxQPS": 1,
"QPS": {
- "ResourceIds": "",
- "ValidTime": "",
+ "ResourceIds": "abc",
+ "ValidTime": "abc",
"RenewFlag": 0,
"Count": 0,
- "Region": ""
+ "Region": "abc",
+ "BillingItem": "abc"
},
"DomainPkg": {
- "ResourceIds": "",
- "ValidTime": "",
- "RenewFlag": 0,
- "Count": 0,
- "Region": ""
- },
- "BotPkg": {
- "ResourceIds": "",
- "Status": 0,
- "Region": 0,
- "BeginTime": "",
- "EndTime": "",
- "InquireNum": 0,
- "UsedNum": 0
+ "ResourceIds": "abc",
+ "ValidTime": "abc",
+ "RenewFlag": 1,
+ "Count": 1,
+ "Region": "abc"
},
+ "AppId": 1,
+ "Edition": "abc",
"FraudPkg": {
- "ResourceIds": "",
- "Status": 1,
- "Region": 0,
- "BeginTime": "",
- "EndTime": "",
- "InquireNum": 0,
- "UsedNum": 0
- }
- },
- {
- "AppId": 251197211,
- "InstanceId": "waf_2kui15ko00a19p7j",
- "InstanceName": "测试删除域名",
- "ResourceIds": "waf_2kui15ko00a19p7j",
- "Edition": "sparta-waf",
- "Region": "cd",
- "PayMode": 1,
- "RenewFlag": 1,
- "Level": 4,
- "ValidTime": "2022-09-24 15:28:34",
- "BeginTime": "0001-01-01 00:00:00",
- "SubDomainLimit": 40,
- "MainDomainLimit": 4,
- "Mode": 0,
- "DomainCount": 2,
- "MainDomainCount": 2,
- "MaxQPS": 0,
- "QPS": {
- "ResourceIds": "",
- "ValidTime": "",
- "RenewFlag": 0,
- "Count": 0,
- "Region": ""
- },
- "DomainPkg": {
- "ResourceIds": "",
- "ValidTime": "",
- "RenewFlag": 0,
- "Count": 0,
- "Region": ""
- },
- "BotPkg": {
- "ResourceIds": "",
+ "ResourceIds": "abc",
"Status": 0,
"Region": 0,
- "BeginTime": "",
- "EndTime": "",
- "InquireNum": 0,
- "UsedNum": 0
- },
- "FraudPkg": {
- "ResourceIds": "",
- "Status": 1,
- "Region": 0,
- "BeginTime": "",
- "EndTime": "",
+ "BeginTime": "abc",
+ "EndTime": "abc",
"InquireNum": 0,
- "UsedNum": 0
- }
- },
- {
- "AppId": 251197211,
- "InstanceId": "waf_2kuhdsiw008rwhxt",
- "InstanceName": "gz-Defaultssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss",
- "ResourceIds": "waf_2kuhdsiw008rwhxt",
- "Edition": "clb-waf",
- "Region": "",
- "PayMode": 1,
- "RenewFlag": 1,
- "Level": 4,
- "ValidTime": "2021-08-15 14:21:58",
- "BeginTime": "0001-01-01 00:00:00",
- "SubDomainLimit": 40,
- "MainDomainLimit": 4,
- "Mode": 0,
- "DomainCount": 0,
- "MainDomainCount": 0,
- "MaxQPS": 0,
- "QPS": {
- "ResourceIds": "",
- "ValidTime": "",
- "RenewFlag": 0,
- "Count": 0,
- "Region": ""
- },
- "DomainPkg": {
- "ResourceIds": "",
- "ValidTime": "",
- "RenewFlag": 0,
- "Count": 0,
- "Region": ""
+ "UsedNum": 0,
+ "RenewFlag": 1
},
"BotPkg": {
- "ResourceIds": "",
+ "ResourceIds": "abc",
"Status": 0,
"Region": 0,
- "BeginTime": "",
- "EndTime": "",
+ "BeginTime": "abc",
+ "EndTime": "abc",
"InquireNum": 0,
- "UsedNum": 0
- },
- "FraudPkg": {
- "ResourceIds": "",
- "Status": 0,
- "Region": 0,
- "BeginTime": "",
- "EndTime": "",
- "InquireNum": 0,
- "UsedNum": 0
- }
- },
- {
- "AppId": 251197211,
- "InstanceId": "waf_2kuhdkt4008qolw5",
- "InstanceName": "带服务实例",
- "ResourceIds": "waf_2kuhdkt4008qolw5",
- "Edition": "sparta-waf",
- "Region": "gz",
- "PayMode": 1,
- "RenewFlag": 1,
- "Level": 4,
- "ValidTime": "2021-08-14 15:14:55",
- "BeginTime": "0001-01-01 00:00:00",
- "SubDomainLimit": 40,
- "MainDomainLimit": 4,
- "Mode": 0,
- "DomainCount": 12,
- "MainDomainCount": 1,
- "MaxQPS": 0,
- "QPS": {
- "ResourceIds": "waf_2kuhdkt4008qolw5_qps",
- "ValidTime": "2021-08-14 15:15:01",
+ "UsedNum": 0,
+ "Type": "abc",
"RenewFlag": 1,
- "Count": 1000,
- "Region": "gz"
+ "BotCPWaf": 0,
+ "BotNPWaf": 0,
+ "IsBotTrial": 0
},
- "DomainPkg": {
- "ResourceIds": "waf_2kuhdkt4008qolw5_dmn",
- "ValidTime": "2021-08-14 15:15:10",
- "RenewFlag": 1,
+ "BotQPS": {
+ "ResourceIds": "abc",
+ "ValidTime": "abc",
"Count": 1,
- "Region": "gz"
+ "Region": "abc",
+ "MaxBotQPS": 1,
+ "RenewFlag": 1
+ },
+ "ElasticBilling": 1,
+ "AttackLogPost": 0,
+ "MaxBandwidth": 1,
+ "APISecurity": 1,
+ "QpsStandard": 1,
+ "BandwidthStandard": 1,
+ "Status": 1,
+ "SandboxQps": 1,
+ "IsAPISecurityTrial": 1,
+ "MajorEventsPkg": {
+ "ResourceIds": "abc",
+ "Status": 0,
+ "Region": 0,
+ "BeginTime": "abc",
+ "EndTime": "abc",
+ "InquireNum": 0,
+ "UsedNum": 0,
+ "RenewFlag": 1,
+ "BillingItem": "abc",
+ "HWState": 0
},
- "BotPkg": {
- "ResourceIds": "",
+ "HybridPkg": {
+ "ResourceIds": "abc",
"Status": 0,
"Region": 0,
- "BeginTime": "",
- "EndTime": "",
+ "BeginTime": "abc",
+ "EndTime": "abc",
"InquireNum": 0,
- "UsedNum": 0
+ "UsedNum": 0,
+ "RenewFlag": 1
},
- "FraudPkg": {
- "ResourceIds": "",
+ "ApiPkg": {
+ "ResourceIds": "abc",
"Status": 0,
"Region": 0,
- "BeginTime": "",
- "EndTime": "",
+ "BeginTime": "abc",
+ "EndTime": "abc",
"InquireNum": 0,
- "UsedNum": 0
- }
- },
- {
- "AppId": 251197211,
- "InstanceId": "waf_2kuhdkt4008qnip1",
- "InstanceName": "gz-Default",
- "ResourceIds": "waf_2kuhdkt4008qnip1",
- "Edition": "clb-waf",
- "Region": "",
- "PayMode": 1,
- "RenewFlag": 1,
- "Level": 4,
- "ValidTime": "2021-08-14 15:10:38",
- "BeginTime": "0001-01-01 00:00:00",
- "SubDomainLimit": 40,
- "MainDomainLimit": 4,
- "Mode": 0,
- "DomainCount": 0,
- "MainDomainCount": 0,
- "MaxQPS": 0,
- "QPS": {
- "ResourceIds": "waf_2kuhdkt4008qnip1_qps",
- "ValidTime": "2021-08-14 15:10:38",
+ "UsedNum": 0,
"RenewFlag": 1,
- "Count": 1000,
- "Region": "gz"
- },
- "DomainPkg": {
- "ResourceIds": "",
- "ValidTime": "",
- "RenewFlag": 0,
- "Count": 0,
- "Region": ""
+ "BillingItem": "abc",
+ "IsAPISecurityTrial": 0
},
- "BotPkg": {
- "ResourceIds": "",
+ "MiniPkg": {
+ "ResourceIds": "abc",
"Status": 0,
"Region": 0,
- "BeginTime": "",
- "EndTime": "",
- "InquireNum": 0,
- "UsedNum": 0
- },
- "FraudPkg": {
- "ResourceIds": "",
- "Status": 0,
- "Region": 0,
- "BeginTime": "",
- "EndTime": "",
- "InquireNum": 0,
- "UsedNum": 0
- }
- },
- {
- "AppId": 251197211,
- "InstanceId": "waf_2kuhdkt4008qnsr9",
- "InstanceName": "测试实例",
- "ResourceIds": "waf_2kuhdkt4008qnsr9",
- "Edition": "sparta-waf",
- "Region": "gz",
- "PayMode": 1,
- "RenewFlag": 1,
- "Level": 4,
- "ValidTime": "2022-09-14 14:24:02",
- "BeginTime": "2021-10-09 15:10:55",
- "SubDomainLimit": 40,
- "MainDomainLimit": 4,
- "Mode": 0,
- "DomainCount": 7,
- "MainDomainCount": 2,
- "MaxQPS": 5,
- "QPS": {
- "ResourceIds": "",
- "ValidTime": "",
- "RenewFlag": 0,
+ "BeginTime": "abc",
+ "EndTime": "abc",
"Count": 0,
- "Region": ""
- },
- "DomainPkg": {
- "ResourceIds": "",
- "ValidTime": "",
- "RenewFlag": 0,
- "Count": 0,
- "Region": ""
- },
- "BotPkg": {
- "ResourceIds": "",
- "Status": 0,
- "Region": 0,
- "BeginTime": "",
- "EndTime": "",
- "InquireNum": 0,
- "UsedNum": 0
- },
- "FraudPkg": {
- "ResourceIds": "",
- "Status": 1,
- "Region": 0,
- "BeginTime": "",
- "EndTime": "",
- "InquireNum": 0,
- "UsedNum": 0
- }
- },
- {
- "AppId": 251197211,
- "InstanceId": "yuyuyuyuyu",
- "InstanceName": "ModifyNamessssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss",
- "ResourceIds": "waf_2kuf279k004v9eb7",
- "Edition": "sparta-waf",
- "Region": "cd",
- "PayMode": 1,
- "RenewFlag": 0,
- "Level": 4,
- "ValidTime": "2021-07-01 20:27:54",
- "BeginTime": "0001-01-01 00:00:00",
- "SubDomainLimit": 40,
- "MainDomainLimit": 4,
- "Mode": 0,
- "DomainCount": 38,
- "MainDomainCount": 4,
- "MaxQPS": 2,
- "QPS": {
- "ResourceIds": "",
- "ValidTime": "",
- "RenewFlag": 0,
- "Count": 0,
- "Region": ""
- },
- "DomainPkg": {
- "ResourceIds": "",
- "ValidTime": "",
- "RenewFlag": 0,
- "Count": 0,
- "Region": ""
- },
- "BotPkg": {
- "ResourceIds": "",
- "Status": 0,
- "Region": 0,
- "BeginTime": "",
- "EndTime": "",
- "InquireNum": 0,
- "UsedNum": 0
+ "RenewFlag": 1,
+ "BillingItem": "abc"
},
- "FraudPkg": {
- "ResourceIds": "",
+ "MiniQpsStandard": 1,
+ "MiniMaxQPS": 1,
+ "LastQpsExceedTime": "abc",
+ "MiniExtendPkg": {
+ "ResourceIds": "abc",
"Status": 0,
"Region": 0,
- "BeginTime": "",
- "EndTime": "",
- "InquireNum": 0,
- "UsedNum": 0
- }
- },
- {
- "AppId": 251197211,
- "InstanceId": "waf_2kugqn6w007lhqhd",
- "InstanceName": "gz-Default",
- "ResourceIds": "waf_2kugqn6w007lhqhd",
- "Edition": "clb-waf",
- "Region": "gz",
- "PayMode": 1,
- "RenewFlag": 1,
- "Level": 4,
- "ValidTime": "2021-07-07 16:45:33",
- "BeginTime": "0001-01-01 00:00:00",
- "SubDomainLimit": 40,
- "MainDomainLimit": 4,
- "Mode": 1,
- "DomainCount": 2,
- "MainDomainCount": 2,
- "MaxQPS": 0,
- "QPS": {
- "ResourceIds": "",
- "ValidTime": "",
- "RenewFlag": 0,
- "Count": 0,
- "Region": ""
- },
- "DomainPkg": {
- "ResourceIds": "",
- "ValidTime": "",
- "RenewFlag": 0,
+ "BeginTime": "abc",
+ "EndTime": "abc",
"Count": 0,
- "Region": ""
- },
- "BotPkg": {
- "ResourceIds": "",
- "Status": 0,
- "Region": 0,
- "BeginTime": "",
- "EndTime": "",
- "InquireNum": 0,
- "UsedNum": 0
+ "RenewFlag": 1,
+ "BillingItem": "abc"
},
- "FraudPkg": {
- "ResourceIds": "",
- "Status": 0,
- "Region": 0,
- "BeginTime": "",
- "EndTime": "",
- "InquireNum": 0,
- "UsedNum": 0
- }
+ "BillingItem": "abc",
+ "FreeDelayFlag": 1
}
- ]
+ ],
+ "RequestId": "abc"
}
}
```
diff --git a/tccli/examples/waf/v20180125/DescribeUserSignatureRule.md b/tccli/examples/waf/v20180125/DescribeUserSignatureRule.md
index fd4bb32ffb..c0f648bd76 100644
--- a/tccli/examples/waf/v20180125/DescribeUserSignatureRule.md
+++ b/tccli/examples/waf/v20180125/DescribeUserSignatureRule.md
@@ -1,12 +1,12 @@
**Example 1: 查询示例**
-
+查询示例
Input:
```
tccli waf DescribeUserSignatureRule --cli-unfold-argument \
- --Domain xx \
+ --Domain \
--Offset 1 \
--Limit 20 \
--Order asc \
@@ -20,34 +20,24 @@ Output:
```
{
"Response": {
- "RequestId": "xx",
- "Total": 8,
+ "Total": 1,
"Rules": [
{
- "ID": "010000002",
- "Description": "xx",
+ "ID": "abc",
"Status": 0,
- "MainClassID": "010000000",
- "MainClassName": "Cross Site Scripting",
- "SubClassID": "000000000",
- "SubClassName": "",
- "CveID": "",
- "CreateTime": "2020-09-22T00:00:00+00:00",
- "ModifyTime": "2021-11-22T16:16:52+08:00"
- },
- {
- "ID": "050000022",
- "Description": "xx",
- "Status": 1,
- "MainClassID": "050000000",
- "MainClassName": "Cross Site Scripting",
- "SubClassID": "050030000",
- "SubClassName": "data",
- "CveID": "",
+ "MainClassID": "abc",
+ "SubClassID": "abc",
+ "CveID": "abc",
"CreateTime": "2020-09-22T00:00:00+00:00",
- "ModifyTime": "2021-11-22T16:16:52+08:00"
+ "ModifyTime": "2020-09-22T00:00:00+00:00",
+ "MainClassName": "abc",
+ "SubClassName": "abc",
+ "Description": "abc",
+ "Reason": 0,
+ "RiskLevel": 0
}
- ]
+ ],
+ "RequestId": "abc"
}
}
```
diff --git a/tccli/services/autoscaling/v20180419/api.json b/tccli/services/autoscaling/v20180419/api.json
index bc400c96ee..b0c4714d68 100644
--- a/tccli/services/autoscaling/v20180419/api.json
+++ b/tccli/services/autoscaling/v20180419/api.json
@@ -2381,10 +2381,11 @@
"members": [
{
"disabled": false,
- "document": "数据盘类型。数据盘类型限制详见[云硬盘类型](https://cloud.tencent.com/document/product/362/2353)。取值范围:
LOCAL_BASIC:本地硬盘
LOCAL_SSD:本地SSD硬盘
CLOUD_BASIC:普通云硬盘
CLOUD_PREMIUM:高性能云硬盘
CLOUD_SSD:SSD云硬盘
CLOUD_HSSD:增强型SSD云硬盘
CLOUD_TSSD:极速型SSD云硬盘
默认取值与系统盘类型(SystemDisk.DiskType)保持一致。\n注意:此字段可能返回 null,表示取不到有效值。",
+ "document": "数据盘类型。数据盘类型限制详见[云硬盘类型](https://cloud.tencent.com/document/product/362/2353)。取值范围:\nLOCAL_BASIC:本地硬盘\nLOCAL_SSD:本地SSD硬盘\nCLOUD_BASIC:普通云硬盘\nCLOUD_PREMIUM:高性能云硬盘\nCLOUD_SSD:SSD云硬盘\nCLOUD_HSSD:增强型SSD云硬盘\nCLOUD_TSSD:极速型SSD云硬盘\n默认取值与系统盘类型(SystemDisk.DiskType)保持一致。\n注意:此字段可能返回 null,表示取不到有效值。",
"example": "CLOUD_PREMIUM",
"member": "string",
"name": "DiskType",
+ "output_required": true,
"required": false,
"type": "string",
"value_allowed_null": true
@@ -2395,6 +2396,7 @@
"example": "0",
"member": "uint64",
"name": "DiskSize",
+ "output_required": true,
"required": false,
"type": "int",
"value_allowed_null": true
@@ -2405,26 +2407,29 @@
"example": "snap-l8psqwnt",
"member": "string",
"name": "SnapshotId",
+ "output_required": true,
"required": false,
"type": "string",
"value_allowed_null": true
},
{
"disabled": false,
- "document": "数据盘是否随子机销毁。取值范围:
TRUE:子机销毁时,销毁数据盘,只支持按小时后付费云盘
FALSE:子机销毁时,保留数据盘\n注意:此字段可能返回 null,表示取不到有效值。",
+ "document": "数据盘是否随子机销毁。取值范围:\nTRUE:子机销毁时,销毁数据盘,只支持按小时后付费云盘\nFALSE:子机销毁时,保留数据盘\n注意:此字段可能返回 null,表示取不到有效值。",
"example": "false",
"member": "bool",
"name": "DeleteWithInstance",
+ "output_required": true,
"required": false,
"type": "bool",
"value_allowed_null": true
},
{
"disabled": false,
- "document": "数据盘是否加密。取值范围:
TRUE:加密
FALSE:不加密\n注意:此字段可能返回 null,表示取不到有效值。",
+ "document": "数据盘是否加密。取值范围:\nTRUE:加密\nFALSE:不加密\n注意:此字段可能返回 null,表示取不到有效值。",
"example": "true",
"member": "bool",
"name": "Encrypt",
+ "output_required": true,
"required": false,
"type": "bool",
"value_allowed_null": true
@@ -2435,9 +2440,21 @@
"example": "100",
"member": "uint64",
"name": "ThroughputPerformance",
+ "output_required": true,
"required": false,
"type": "int",
"value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "突发性能。是否开启突发性能,默认取值为 false。\n\n注:内测中,需提单申请后使用。\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "false",
+ "member": "bool",
+ "name": "BurstPerformance",
+ "output_required": true,
+ "required": false,
+ "type": "bool",
+ "value_allowed_null": true
}
],
"usage": "both"
@@ -4236,6 +4253,17 @@
"required": false,
"type": "string",
"value_allowed_null": false
+ },
+ {
+ "disabled": false,
+ "document": "云服务器实例名后缀。字符长度为[1,105],且与 InstanceName 的长度和不能超过107。\n\n假设后缀名称为 suffix,原实例名为 test.0,最终实例名为 test.0.suffix。\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "testsuffix",
+ "member": "string",
+ "name": "InstanceNameSuffix",
+ "output_required": true,
+ "required": false,
+ "type": "string",
+ "value_allowed_null": true
}
],
"usage": "both"
@@ -4384,7 +4412,7 @@
{
"disabled": false,
"document": "实例所属项目ID。",
- "example": "无",
+ "example": "0",
"member": "int64",
"name": "ProjectId",
"output_required": true,
@@ -4394,7 +4422,7 @@
{
"disabled": false,
"document": "启动配置ID。",
- "example": "无",
+ "example": "asc-abcd0123",
"member": "string",
"name": "LaunchConfigurationId",
"output_required": true,
@@ -4404,7 +4432,7 @@
{
"disabled": false,
"document": "启动配置名称。",
- "example": "无",
+ "example": "TestLauchConfig0_0",
"member": "string",
"name": "LaunchConfigurationName",
"output_required": true,
@@ -4414,7 +4442,7 @@
{
"disabled": false,
"document": "实例机型。",
- "example": "无",
+ "example": "SA2.MEDIUM2",
"member": "string",
"name": "InstanceType",
"output_required": true,
@@ -4464,7 +4492,7 @@
{
"disabled": false,
"document": "实例所属安全组。",
- "example": "无",
+ "example": "[\"sg-brwzhm6d\"]",
"member": "string",
"name": "SecurityGroupIds",
"output_required": true,
@@ -4484,7 +4512,7 @@
{
"disabled": false,
"document": "自定义数据。\n注意:此字段可能返回 null,表示取不到有效值。",
- "example": "无",
+ "example": "dGVzdA==",
"member": "string",
"name": "UserData",
"output_required": true,
@@ -4494,7 +4522,7 @@
{
"disabled": false,
"document": "启动配置创建时间。",
- "example": "无",
+ "example": "2021-05-31T12:38:35Z",
"member": "datetime_iso",
"name": "CreatedTime",
"output_required": true,
@@ -4514,7 +4542,7 @@
{
"disabled": false,
"document": "镜像ID。",
- "example": "无",
+ "example": "img-abcd0123",
"member": "string",
"name": "ImageId",
"output_required": true,
@@ -4524,7 +4552,7 @@
{
"disabled": false,
"document": "启动配置当前状态。取值范围:NORMAL:正常IMAGE_ABNORMAL:启动配置镜像异常CBS_SNAP_ABNORMAL:启动配置数据盘快照异常SECURITY_GROUP_ABNORMAL:启动配置安全组异常",
- "example": "无",
+ "example": "NORMAL",
"member": "string",
"name": "LaunchConfigurationStatus",
"output_required": true,
@@ -4534,7 +4562,7 @@
{
"disabled": false,
"document": "实例计费类型,CVM默认值按照POSTPAID_BY_HOUR处理。POSTPAID_BY_HOUR:按小时后付费SPOTPAID:竞价付费",
- "example": "无",
+ "example": "POSTPAID_BY_HOUR",
"member": "string",
"name": "InstanceChargeType",
"output_required": true,
@@ -4554,7 +4582,7 @@
{
"disabled": false,
"document": "实例机型列表。",
- "example": "无",
+ "example": "[\"SA2.MEDIUM2\"]",
"member": "string",
"name": "InstanceTypes",
"output_required": true,
@@ -4584,7 +4612,7 @@
{
"disabled": false,
"document": "版本号。",
- "example": "无",
+ "example": "1",
"member": "int64",
"name": "VersionNumber",
"output_required": true,
@@ -4594,7 +4622,7 @@
{
"disabled": false,
"document": "更新时间。",
- "example": "无",
+ "example": "2023-09-04T11:42:46Z",
"member": "datetime_iso",
"name": "UpdatedTime",
"output_required": true,
@@ -4604,7 +4632,7 @@
{
"disabled": false,
"document": "CAM角色名称。可通过DescribeRoleList接口返回值中的roleName获取。",
- "example": "无",
+ "example": "TestRole",
"member": "string",
"name": "CamRoleName",
"output_required": true,
@@ -4614,7 +4642,7 @@
{
"disabled": false,
"document": "上次操作时,InstanceTypesCheckPolicy 取值。",
- "example": "无",
+ "example": "ANY",
"member": "string",
"name": "LastOperationInstanceTypesCheckPolicy",
"output_required": true,
@@ -4654,7 +4682,7 @@
{
"disabled": false,
"document": "云盘类型选择策略。取值范围:ORIGINAL:使用设置的云盘类型AUTOMATIC:自动选择当前可用区下可用的云盘类型",
- "example": "无",
+ "example": "ORIGINAL",
"member": "string",
"name": "DiskTypePolicy",
"output_required": true,
@@ -4664,7 +4692,7 @@
{
"disabled": false,
"document": "高性能计算集群ID。
\n注意:此字段默认为空。",
- "example": "无",
+ "example": "hpc-abcd0123",
"member": "string",
"name": "HpcClusterId",
"output_required": true,
diff --git a/tccli/services/ccc/v20200210/api.json b/tccli/services/ccc/v20200210/api.json
index 70e30f471d..2f9f65efbb 100644
--- a/tccli/services/ccc/v20200210/api.json
+++ b/tccli/services/ccc/v20200210/api.json
@@ -6507,6 +6507,16 @@
"output_required": true,
"type": "int",
"value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "技能组内线号码\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "6666",
+ "member": "string",
+ "name": "Alias",
+ "output_required": true,
+ "type": "string",
+ "value_allowed_null": true
}
],
"usage": "out"
diff --git a/tccli/services/ccc/v20200210/examples.json b/tccli/services/ccc/v20200210/examples.json
index 76a6181f4a..13d0ce6465 100644
--- a/tccli/services/ccc/v20200210/examples.json
+++ b/tccli/services/ccc/v20200210/examples.json
@@ -300,7 +300,7 @@
{
"document": "获取技能组列表示例",
"input": "POST / HTTP/1.1\nHost: ccc.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeSkillGroupInfoList\n<公共请求参数>\n\n{\n \"PageSize\": 10,\n \"PageNumber\": 0,\n \"ModifiedTime\": 1590147606,\n \"SdkAppId\": 1400000000,\n \"SkillGroupId\": 12\n}",
- "output": "{\n \"Response\": {\n \"RequestId\": \"5ac74e13-ef15-41a6-9639-f1bc8c9896bd\",\n \"TotalCount\": 2,\n \"SkillGroupList\": [\n {\n \"SkillGroupId\": 1115,\n \"SkillGroupName\": \"luluttt\",\n \"SkillGroupType\": 1,\n \"Type\": \"TEL\",\n \"RoutePolicy\": \"firstCreate\",\n \"UsingLastSeat\": 0,\n \"MaxConcurrency\": 1,\n \"LastModifyTimestamp\": 1613976392\n }\n ]\n }\n}",
+ "output": "{\n \"Response\": {\n \"RequestId\": \"5ac74e13-ef15-41a6-9639-f1bc8c9896bd\",\n \"TotalCount\": 2,\n \"SkillGroupList\": [\n {\n \"SkillGroupId\": 1115,\n \"SkillGroupName\": \"luluttt\",\n \"SkillGroupType\": 1,\n \"Type\": \"TEL\",\n \"RoutePolicy\": \"firstCreate\",\n \"UsingLastSeat\": 0,\n \"MaxConcurrency\": 1,\n \"LastModifyTimestamp\": 1613976392,\n \"Alias\": \"6666\"\n }\n ]\n }\n}",
"title": "获取技能组列表示例"
}
],
diff --git a/tccli/services/cdb/v20170320/api.json b/tccli/services/cdb/v20170320/api.json
index 262fdffbce..3f8b248145 100644
--- a/tccli/services/cdb/v20170320/api.json
+++ b/tccli/services/cdb/v20170320/api.json
@@ -1163,7 +1163,7 @@
"status": "online"
},
"UpgradeDBInstanceEngineVersion": {
- "document": "本接口(UpgradeDBInstanceEngineVersion)用于升级云数据库实例版本,实例类型支持主实例、灾备实例和只读实例。",
+ "document": "本接口(UpgradeDBInstanceEngineVersion)用于升级云数据库实例版本,实例类型支持主实例、灾备实例和只读实例等。",
"input": "UpgradeDBInstanceEngineVersionRequest",
"name": "升级实例版本",
"output": "UpgradeDBInstanceEngineVersionResponse",
@@ -20316,6 +20316,15 @@
"name": "MaxDelayTime",
"required": false,
"type": "int"
+ },
+ {
+ "disabled": false,
+ "document": "版本升级支持指定参数",
+ "example": "无",
+ "member": "UpgradeEngineVersionParams",
+ "name": "ParamList",
+ "required": false,
+ "type": "list"
}
],
"type": "object"
@@ -20533,6 +20542,34 @@
],
"type": "object"
},
+ "UpgradeEngineVersionParams": {
+ "document": "5.7升级8.0指定参数的结构",
+ "members": [
+ {
+ "disabled": false,
+ "document": "参数名称\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "default_collation_for_utf8mb4",
+ "member": "string",
+ "name": "Name",
+ "output_required": false,
+ "required": false,
+ "type": "string",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "参数值\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "utf8mb4_0900_ai_ci",
+ "member": "string",
+ "name": "Value",
+ "output_required": false,
+ "required": false,
+ "type": "string",
+ "value_allowed_null": true
+ }
+ ],
+ "usage": "both"
+ },
"UploadInfo": {
"document": "文件上传描述",
"members": [
diff --git a/tccli/services/ess/ess_client.py b/tccli/services/ess/ess_client.py
index 5ba25f32a3..e048af7ae3 100644
--- a/tccli/services/ess/ess_client.py
+++ b/tccli/services/ess/ess_client.py
@@ -693,6 +693,58 @@ def doCreateFlowGroupByTemplates(args, parsed_globals):
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+def doCreatePartnerAutoSignAuthUrl(args, parsed_globals):
+ g_param = parse_global_arg(parsed_globals)
+
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
+ cred = credential.CVMRoleCredential()
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
+ cred = credential.STSAssumeRoleCredential(
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
+ )
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
+ else:
+ cred = credential.Credential(
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
+ )
+ http_profile = HttpProfile(
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
+ reqMethod="POST",
+ endpoint=g_param[OptionsDefine.Endpoint],
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
+ )
+ profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+ if g_param[OptionsDefine.Language]:
+ profile.language = g_param[OptionsDefine.Language]
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+ client = mod.EssClient(cred, g_param[OptionsDefine.Region], profile)
+ client._sdkVersion += ("_CLI_" + __version__)
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
+ model = models.CreatePartnerAutoSignAuthUrlRequest()
+ model.from_json_string(json.dumps(args))
+ start_time = time.time()
+ while True:
+ rsp = client.CreatePartnerAutoSignAuthUrl(model)
+ result = rsp.to_json_string()
+ try:
+ json_obj = json.loads(result)
+ except TypeError as e:
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
+ break
+ cur_time = time.time()
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
+ else:
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+
+
def doCreateFlowByFiles(args, parsed_globals):
g_param = parse_global_arg(parsed_globals)
@@ -4565,6 +4617,7 @@ def doDeleteExtendedServiceAuthInfos(args, parsed_globals):
"CreateReleaseFlow": doCreateReleaseFlow,
"DescribeUserAutoSignStatus": doDescribeUserAutoSignStatus,
"CreateFlowGroupByTemplates": doCreateFlowGroupByTemplates,
+ "CreatePartnerAutoSignAuthUrl": doCreatePartnerAutoSignAuthUrl,
"CreateFlowByFiles": doCreateFlowByFiles,
"DescribeIntegrationRoles": doDescribeIntegrationRoles,
"DescribeIntegrationEmployees": doDescribeIntegrationEmployees,
diff --git a/tccli/services/ess/v20201111/api.json b/tccli/services/ess/v20201111/api.json
index 3d64ecbf4c..252f4b0fe0 100644
--- a/tccli/services/ess/v20201111/api.json
+++ b/tccli/services/ess/v20201111/api.json
@@ -245,6 +245,13 @@
"output": "CreateOrganizationInfoChangeUrlResponse",
"status": "online"
},
+ "CreatePartnerAutoSignAuthUrl": {
+ "document": "创建他方自动签授权链接,通过该链接可进入小程序进行合作方企业的自动签授权,若当前企业未开通企业自动签,通过该链接会先引导开通本企业自动签。\n该接口效果同控制台: 企业设置-> 扩展服务 -> 企业自动签署 -> 合作企业方授权\n\n\n\n注: \n1. 所在企业的超管、法人才有权限调用此接口(Operator.UserId 需要传递超管或者法人的UserId)\n2. 已经在授权中或者授权成功的企业,无法重复授权",
+ "input": "CreatePartnerAutoSignAuthUrlRequest",
+ "name": "创建他方企业自动签授权链接",
+ "output": "CreatePartnerAutoSignAuthUrlResponse",
+ "status": "online"
+ },
"CreatePersonAuthCertificateImage": {
"document": "获取个人用户认证证书图片下载URL\n\n个人用户认证证书图片样式如下图\n\n\n\n注: \n\n- 只能获取个人用户证明图片, 企业员工的暂不支持
\n- 处方单等特殊场景专用,此接口为白名单功能,使用前请联系对接的客户经理沟通。
\n
",
"input": "CreatePersonAuthCertificateImageRequest",
@@ -5183,6 +5190,90 @@
],
"type": "object"
},
+ "CreatePartnerAutoSignAuthUrlRequest": {
+ "document": "CreatePartnerAutoSignAuthUrl请求参数结构体",
+ "members": [
+ {
+ "disabled": false,
+ "document": "被授企业id",
+ "example": "无",
+ "member": "string",
+ "name": "AuthorizedOrganizationId",
+ "required": false,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "指定印章类型,指定后只能选择该类型的印章进行授权支持以下印章类型:- OFFICIAL : 企业公章- CONTRACT : 合同专用章- FINANCE : 财务专用章- PERSONNEL : 人事专用章",
+ "example": "无",
+ "member": "string",
+ "name": "SealTypes",
+ "required": false,
+ "type": "list"
+ },
+ {
+ "disabled": false,
+ "document": "代理企业和员工的信息。
在集团企业代理子企业操作的场景中,需设置此参数。在此情境下,ProxyOrganizationId(子企业的组织ID)为必填项。",
+ "example": "无",
+ "member": "Agent",
+ "name": "Agent",
+ "required": false,
+ "type": "object"
+ },
+ {
+ "disabled": false,
+ "document": "执行本接口操作的员工信息。
注: `在调用此接口时,请确保指定的员工已获得所需的接口调用权限,并具备接口传入的相应资源的数据权限。`",
+ "example": "无",
+ "member": "UserInfo",
+ "name": "Operator",
+ "required": false,
+ "type": "object"
+ }
+ ],
+ "type": "object"
+ },
+ "CreatePartnerAutoSignAuthUrlResponse": {
+ "document": "CreatePartnerAutoSignAuthUrl返回参数结构体",
+ "members": [
+ {
+ "disabled": false,
+ "document": "授权链接,以短链形式返回,短链的有效期参考回参中的 ExpiredTime。",
+ "example": "无",
+ "member": "string",
+ "name": "Url",
+ "output_required": false,
+ "type": "string",
+ "value_allowed_null": false
+ },
+ {
+ "disabled": false,
+ "document": "从客户小程序或者客户APP跳转至腾讯电子签小程序进行批量签署的跳转路径",
+ "example": "无",
+ "member": "string",
+ "name": "MiniAppPath",
+ "output_required": false,
+ "type": "string",
+ "value_allowed_null": false
+ },
+ {
+ "disabled": false,
+ "document": "链接过期时间以 Unix 时间戳格式表示,从生成链接时间起,往后7天有效期。过期后短链将失效,无法打开。",
+ "example": "无",
+ "member": "int64",
+ "name": "ExpireTime",
+ "output_required": false,
+ "type": "int",
+ "value_allowed_null": false
+ },
+ {
+ "document": "唯一请求 ID,由服务端生成,每次请求都会返回(若请求因其他原因未能抵达服务端,则该次请求不会获得 RequestId)。定位问题时需要提供该次请求的 RequestId。",
+ "member": "string",
+ "name": "RequestId",
+ "type": "string"
+ }
+ ],
+ "type": "object"
+ },
"CreatePersonAuthCertificateImageRequest": {
"document": "CreatePersonAuthCertificateImage请求参数结构体",
"members": [
diff --git a/tccli/services/ess/v20201111/examples.json b/tccli/services/ess/v20201111/examples.json
index 0b074184fd..bd0cff75bf 100644
--- a/tccli/services/ess/v20201111/examples.json
+++ b/tccli/services/ess/v20201111/examples.json
@@ -826,6 +826,14 @@
"title": "错误示例-变更类型不合法"
}
],
+ "CreatePartnerAutoSignAuthUrl": [
+ {
+ "document": "创建他方自动签授权链接\n",
+ "input": "POST / HTTP/1.1\nHost: ess.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreatePartnerAutoSignAuthUrl\n<公共请求参数>\n\n{\n \"Operator\": {\n \"UserId\": \"yDSxxxxxxxxxOnHtH51\"\n },\n \"AuthorizedOrganizationId\": \"yDRt2UUgygqxuvlqUuO4zjEySqVWqO9J\",\n \"SealTypes\": [\n \"OFFICIAL\"\n ]\n}",
+ "output": "{\n \"Response\": {\n \"ExpireTime\": 1721984586,\n \"MiniAppPath\": \"/pages/guide/index?shortKey=yDCpEUNqf8CyuealGCfc\",\n \"RequestId\": \"s1721379786690441960\",\n \"Url\": \"https://test.essurl.cn/g4sjUBHlHx\"\n }\n}",
+ "title": "创建他方自动签授权链接"
+ }
+ ],
"CreatePersonAuthCertificateImage": [
{
"document": "创建个人用户证明证书图片",
diff --git a/tccli/services/gaap/v20180529/api.json b/tccli/services/gaap/v20180529/api.json
index d6db66e410..342e42f15f 100644
--- a/tccli/services/gaap/v20180529/api.json
+++ b/tccli/services/gaap/v20180529/api.json
@@ -1572,7 +1572,7 @@
"example": "1",
"member": "uint64",
"name": "CheckFlag",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
@@ -3832,7 +3832,7 @@
"example": "1",
"member": "uint64",
"name": "TotalCount",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
@@ -3842,7 +3842,7 @@
"example": "无",
"member": "RegionDetail",
"name": "AccessRegionSet",
- "required": true,
+ "output_required": true,
"type": "list",
"value_allowed_null": false
},
@@ -3886,7 +3886,7 @@
"example": "[{\"X-REAL_IP\",\"remote_addr\"}]",
"member": "string",
"name": "BlackHeaders",
- "required": true,
+ "output_required": true,
"type": "list",
"value_allowed_null": true
},
@@ -4015,7 +4015,7 @@
"example": "无",
"member": "CountryAreaMap",
"name": "CountryAreaMappingList",
- "required": true,
+ "output_required": true,
"type": "list",
"value_allowed_null": false
},
@@ -5699,7 +5699,7 @@
"example": "26",
"member": "uint64",
"name": "TotalCount",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
@@ -5709,7 +5709,7 @@
"example": "无",
"member": "RegionDetail",
"name": "DestRegionSet",
- "required": true,
+ "output_required": true,
"type": "list",
"value_allowed_null": false
},
@@ -5719,7 +5719,7 @@
"example": "无",
"member": "BandwidthPriceGradient",
"name": "BandwidthUnitPrice",
- "required": true,
+ "output_required": true,
"type": "list",
"value_allowed_null": false
},
@@ -5729,7 +5729,7 @@
"example": "CNY",
"member": "string",
"name": "Currency",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
@@ -7667,7 +7667,7 @@
"example": "80.64",
"member": "float",
"name": "ProxyDailyPrice",
- "required": true,
+ "output_required": true,
"type": "float",
"value_allowed_null": false
},
@@ -7677,7 +7677,7 @@
"example": "无",
"member": "BandwidthPriceGradient",
"name": "BandwidthUnitPrice",
- "required": true,
+ "output_required": true,
"type": "list",
"value_allowed_null": true
},
@@ -7687,7 +7687,7 @@
"example": "56.84",
"member": "float",
"name": "DiscountProxyDailyPrice",
- "required": true,
+ "output_required": true,
"type": "float",
"value_allowed_null": false
},
@@ -7697,7 +7697,7 @@
"example": "xx",
"member": "string",
"name": "Currency",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
@@ -7707,7 +7707,7 @@
"example": "0",
"member": "float",
"name": "FlowUnitPrice",
- "required": true,
+ "output_required": true,
"type": "float",
"value_allowed_null": true
},
@@ -7717,7 +7717,7 @@
"example": "0",
"member": "float",
"name": "DiscountFlowUnitPrice",
- "required": true,
+ "output_required": true,
"type": "float",
"value_allowed_null": true
},
@@ -7727,7 +7727,7 @@
"example": "0",
"member": "float",
"name": "Cn2BandwidthPrice",
- "required": true,
+ "output_required": true,
"type": "float",
"value_allowed_null": true
},
@@ -7737,7 +7737,7 @@
"example": "0",
"member": "float",
"name": "Cn2BandwidthPriceWithDiscount",
- "required": true,
+ "output_required": true,
"type": "float",
"value_allowed_null": true
},
diff --git a/tccli/services/gaap/v20180529/examples.json b/tccli/services/gaap/v20180529/examples.json
index 0a042109db..3d671bd3af 100644
--- a/tccli/services/gaap/v20180529/examples.json
+++ b/tccli/services/gaap/v20180529/examples.json
@@ -322,8 +322,8 @@
{
"document": "",
"input": "POST / HTTP/1.1\nHost: gaap.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeAccessRegions\n<公共请求参数>\n\n{}",
- "output": "{\n \"Response\": {\n \"TotalCount\": 1,\n \"AccessRegionSet\": [\n {\n \"RegionId\": \"xx\",\n \"RegionAreaName\": \"xx\",\n \"IDCType\": \"xx\",\n \"FeatureBitmap\": 1,\n \"RegionArea\": \"xx\",\n \"RegionName\": \"xx\"\n }\n ],\n \"RequestId\": \"xx\"\n }\n}",
- "title": "查询加速区域"
+ "output": "{\n \"Response\": {\n \"TotalCount\": 1,\n \"AccessRegionSet\": [\n {\n \"RegionId\": \"abc\",\n \"RegionName\": \"abc\",\n \"RegionArea\": \"abc\",\n \"RegionAreaName\": \"abc\",\n \"IDCType\": \"abc\",\n \"FeatureBitmap\": 1,\n \"SupportFeature\": {\n \"NetworkType\": [\n \"abc\"\n ]\n }\n }\n ],\n \"RequestId\": \"abc\"\n }\n}",
+ "title": "示例"
}
],
"DescribeAccessRegionsByDestRegion": [
@@ -587,17 +587,11 @@
}
],
"DescribeRegionAndPrice": [
- {
- "document": "获取源站区域和带宽梯度价格",
- "input": "POST / HTTP/1.1\nHost: gaap.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeRegionAndPrice\n<公共请求参数>\n\n{}",
- "output": "{\n \"Response\": {\n \"TotalCount\": 1,\n \"DestRegionSet\": [\n {\n \"RegionId\": \"xx\",\n \"RegionAreaName\": \"xx\",\n \"IDCType\": \"xx\",\n \"FeatureBitmap\": 1,\n \"RegionArea\": \"xx\",\n \"RegionName\": \"xx\"\n }\n ],\n \"RequestId\": \"xx\",\n \"BandwidthUnitPrice\": [\n {\n \"BandwidthRange\": [\n 0,\n 20\n ],\n \"BandwidthUnitPrice\": 0.0,\n \"DiscountBandwidthUnitPrice\": 0.0\n },\n {\n \"BandwidthRange\": [\n 20,\n 100\n ],\n \"BandwidthUnitPrice\": 0.0,\n \"DiscountBandwidthUnitPrice\": 0.0\n },\n {\n \"BandwidthRange\": [\n 100,\n 500\n ],\n \"BandwidthUnitPrice\": 0.0,\n \"DiscountBandwidthUnitPrice\": 0.0\n },\n {\n \"BandwidthRange\": [\n 500,\n 2000\n ],\n \"BandwidthUnitPrice\": 0.0,\n \"DiscountBandwidthUnitPrice\": 0.0\n },\n {\n \"BandwidthRange\": [\n 2000,\n 0\n ],\n \"BandwidthUnitPrice\": 0.0,\n \"DiscountBandwidthUnitPrice\": 0.0\n }\n ],\n \"Currency\": \"xx\"\n }\n}",
- "title": "获取源站区域和带宽梯度价格"
- },
{
"document": "",
- "input": "POST / HTTP/1.1\nHost: gaap.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeRegionAndPrice\n<公共请求参数>\n\n{}",
- "output": "{\n \"Response\": {\n \"TotalCount\": 1,\n \"DestRegionSet\": [\n {\n \"RegionId\": \"xx\",\n \"RegionAreaName\": \"xx\",\n \"IDCType\": \"xx\",\n \"FeatureBitmap\": 1,\n \"RegionArea\": \"xx\",\n \"RegionName\": \"xx\"\n },\n {\n \"RegionId\": \"xx\",\n \"RegionAreaName\": \"xx\",\n \"IDCType\": \"xx\",\n \"FeatureBitmap\": 1,\n \"RegionArea\": \"xx\",\n \"RegionName\": \"xx\"\n },\n {\n \"RegionId\": \"xx\",\n \"RegionAreaName\": \"xx\",\n \"IDCType\": \"xx\",\n \"FeatureBitmap\": 1,\n \"RegionArea\": \"xx\",\n \"RegionName\": \"xx\"\n },\n {\n \"RegionId\": \"xx\",\n \"RegionAreaName\": \"xx\",\n \"IDCType\": \"xx\",\n \"FeatureBitmap\": 1,\n \"RegionArea\": \"xx\",\n \"RegionName\": \"xx\"\n },\n {\n \"RegionId\": \"xx\",\n \"RegionAreaName\": \"xx\",\n \"IDCType\": \"xx\",\n \"FeatureBitmap\": 1,\n \"RegionArea\": \"xx\",\n \"RegionName\": \"xx\"\n },\n {\n \"RegionId\": \"xx\",\n \"RegionAreaName\": \"xx\",\n \"IDCType\": \"xx\",\n \"FeatureBitmap\": 1,\n \"RegionArea\": \"xx\",\n \"RegionName\": \"xx\"\n },\n {\n \"RegionId\": \"xx\",\n \"RegionAreaName\": \"xx\",\n \"IDCType\": \"xx\",\n \"FeatureBitmap\": 1,\n \"RegionArea\": \"xx\",\n \"RegionName\": \"xx\"\n },\n {\n \"RegionId\": \"xx\",\n \"RegionAreaName\": \"xx\",\n \"IDCType\": \"xx\",\n \"FeatureBitmap\": 1,\n \"RegionArea\": \"xx\",\n \"RegionName\": \"xx\"\n },\n {\n \"RegionId\": \"xx\",\n \"RegionAreaName\": \"xx\",\n \"IDCType\": \"xx\",\n \"FeatureBitmap\": 1,\n \"RegionArea\": \"xx\",\n \"RegionName\": \"xx\"\n },\n {\n \"RegionId\": \"xx\",\n \"RegionAreaName\": \"xx\",\n \"IDCType\": \"xx\",\n \"FeatureBitmap\": 1,\n \"RegionArea\": \"xx\",\n \"RegionName\": \"xx\"\n },\n {\n \"RegionId\": \"xx\",\n \"RegionAreaName\": \"xx\",\n \"IDCType\": \"xx\",\n \"FeatureBitmap\": 1,\n \"RegionArea\": \"xx\",\n \"RegionName\": \"xx\"\n },\n {\n \"RegionId\": \"xx\",\n \"RegionAreaName\": \"xx\",\n \"IDCType\": \"xx\",\n \"FeatureBitmap\": 1,\n \"RegionArea\": \"xx\",\n \"RegionName\": \"xx\"\n }\n ],\n \"RequestId\": \"xx\",\n \"BandwidthUnitPrice\": [\n {\n \"BandwidthRange\": [\n 0,\n 20\n ],\n \"BandwidthUnitPrice\": 0.0,\n \"DiscountBandwidthUnitPrice\": 0.0\n },\n {\n \"BandwidthRange\": [\n 20,\n 100\n ],\n \"BandwidthUnitPrice\": 0.0,\n \"DiscountBandwidthUnitPrice\": 0.0\n },\n {\n \"BandwidthRange\": [\n 100,\n 500\n ],\n \"BandwidthUnitPrice\": 0.0,\n \"DiscountBandwidthUnitPrice\": 0.0\n },\n {\n \"BandwidthRange\": [\n 500,\n 2000\n ],\n \"BandwidthUnitPrice\": 0.0,\n \"DiscountBandwidthUnitPrice\": 0.0\n },\n {\n \"BandwidthRange\": [\n 2000,\n 0\n ],\n \"BandwidthUnitPrice\": 0.0,\n \"DiscountBandwidthUnitPrice\": 0.0\n }\n ],\n \"Currency\": \"xx\"\n }\n}",
- "title": "获取源站区域和带宽梯度价格2"
+ "input": "POST / HTTP/1.1\nHost: gaap.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeRegionAndPrice\n<公共请求参数>\n\n{\n \"IPAddressVersion\": \"abc\",\n \"PackageType\": \"abc\"\n}",
+ "output": "{\n \"Response\": {\n \"TotalCount\": 1,\n \"DestRegionSet\": [\n {\n \"RegionId\": \"abc\",\n \"RegionName\": \"abc\",\n \"RegionArea\": \"abc\",\n \"RegionAreaName\": \"abc\",\n \"IDCType\": \"abc\",\n \"FeatureBitmap\": 1,\n \"SupportFeature\": {\n \"NetworkType\": [\n \"abc\"\n ]\n }\n }\n ],\n \"BandwidthUnitPrice\": [\n {\n \"BandwidthRange\": [\n 0\n ],\n \"BandwidthUnitPrice\": 0,\n \"DiscountBandwidthUnitPrice\": 0\n }\n ],\n \"Currency\": \"abc\",\n \"RequestId\": \"abc\"\n }\n}",
+ "title": "示例"
}
],
"DescribeResourcesByTag": [
@@ -698,9 +692,9 @@
],
"InquiryPriceCreateProxy": [
{
- "document": "",
+ "document": "创建加速通道询价",
"input": "POST / HTTP/1.1\nHost: gaap.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: InquiryPriceCreateProxy\n<公共请求参数>\n\n{\n \"Concurrency\": \"2\",\n \"Bandwidth\": \"10\",\n \"RealServerRegion\": \"SouthChina\",\n \"AccessRegion\": \"EastChina\"\n}",
- "output": "{\n \"Response\": {\n \"Cn2BandwidthPrice\": 0.0,\n \"Cn2BandwidthPriceWithDiscount\": 0.0,\n \"ProxyDailyPrice\": 80.64,\n \"FlowUnitPrice\": 0.0,\n \"Currency\": \"xx\",\n \"DiscountProxyDailyPrice\": 56.84,\n \"RequestId\": \"xx\",\n \"DiscountFlowUnitPrice\": 0.0,\n \"BandwidthUnitPrice\": [\n {\n \"BandwidthRange\": [\n 0,\n 20\n ],\n \"BandwidthUnitPrice\": 0.0,\n \"DiscountBandwidthUnitPrice\": 0.0\n },\n {\n \"BandwidthRange\": [\n 20,\n 100\n ],\n \"BandwidthUnitPrice\": 0.0,\n \"DiscountBandwidthUnitPrice\": 0.0\n },\n {\n \"BandwidthRange\": [\n 100,\n 500\n ],\n \"BandwidthUnitPrice\": 0.0,\n \"DiscountBandwidthUnitPrice\": 0.0\n },\n {\n \"BandwidthRange\": [\n 500,\n 2000\n ],\n \"BandwidthUnitPrice\": 0.0,\n \"DiscountBandwidthUnitPrice\": 0.0\n },\n {\n \"BandwidthRange\": [\n 2000,\n 0\n ],\n \"BandwidthUnitPrice\": 0.0,\n \"DiscountBandwidthUnitPrice\": 0.0\n }\n ]\n }\n}",
+ "output": "{\n \"Response\": {\n \"ProxyDailyPrice\": 0,\n \"BandwidthUnitPrice\": [\n {\n \"BandwidthRange\": [\n 0\n ],\n \"BandwidthUnitPrice\": 0,\n \"DiscountBandwidthUnitPrice\": 0\n }\n ],\n \"DiscountProxyDailyPrice\": 0,\n \"Currency\": \"abc\",\n \"FlowUnitPrice\": 0,\n \"DiscountFlowUnitPrice\": 0,\n \"Cn2BandwidthPrice\": 0,\n \"Cn2BandwidthPriceWithDiscount\": 0,\n \"RequestId\": \"abc\"\n }\n}",
"title": "创建加速通道询价"
}
],
diff --git a/tccli/services/hunyuan/v20230901/api.json b/tccli/services/hunyuan/v20230901/api.json
index 7526d26a33..9979cf59ff 100644
--- a/tccli/services/hunyuan/v20230901/api.json
+++ b/tccli/services/hunyuan/v20230901/api.json
@@ -749,11 +749,11 @@
"disabled": false,
"document": "搜索引文序号\n注意:此字段可能返回 null,表示取不到有效值。",
"example": "无",
- "member": "string",
+ "member": "int64",
"name": "Index",
"output_required": false,
"required": false,
- "type": "string",
+ "type": "int",
"value_allowed_null": true
},
{
diff --git a/tccli/services/iss/v20230517/api.json b/tccli/services/iss/v20230517/api.json
index 3779ee6cd5..ada2aaf559 100644
--- a/tccli/services/iss/v20230517/api.json
+++ b/tccli/services/iss/v20230517/api.json
@@ -3417,7 +3417,7 @@
{
"disabled": false,
"document": "AI识别结果数量",
- "example": "无",
+ "example": "10",
"member": "uint64",
"name": "TotalCount",
"output_required": true,
@@ -6166,7 +6166,7 @@
{
"disabled": false,
"document": "AI 任务数量",
- "example": "无",
+ "example": "10",
"member": "uint64",
"name": "TotalCount",
"output_required": true,
@@ -6449,7 +6449,7 @@
{
"disabled": false,
"document": "设备总数",
- "example": "无",
+ "example": "10",
"member": "uint64",
"name": "TotalCount",
"output_required": true,
@@ -7618,8 +7618,8 @@
},
{
"disabled": false,
- "document": "默认不根据该字段进行筛选,否则根据设备操作类型进行筛选,目前值有:BatchDeleteUserDevice,BatchDisableDevice,BatchEnableDevice,\nBatchUpgradeDevice,\nBatchResetDevice,\nBatchRebootDevice",
- "example": "无",
+ "document": "默认不根据该字段进行筛选,否则根据设备操作类型进行筛选,目前值有:BatchDeleteUserDevice,BatchDisableDevice,BatchEnableDevice,\nBatchUpgradeDevice,\nBatchResetDevice,\nBatchRebootDevice,\nBatchRefreshDeviceChannel",
+ "example": "BatchDisableDevice",
"member": "string",
"name": "Operation",
"required": false,
@@ -10143,7 +10143,7 @@
{
"disabled": false,
"document": "模板ID(从查询录像上云模板列表接口ListRecordBackupTemplates中获取)",
- "example": "无",
+ "example": "584fd9d0-569c-4153-aff7-************",
"member": "string",
"name": "TemplateId",
"required": true,
diff --git a/tccli/services/mongodb/v20190725/api.json b/tccli/services/mongodb/v20190725/api.json
index af0b8dd116..4c2162ac26 100644
--- a/tccli/services/mongodb/v20190725/api.json
+++ b/tccli/services/mongodb/v20190725/api.json
@@ -2381,7 +2381,7 @@
},
{
"disabled": false,
- "document": "实例类型。取值范围如下:- 0:所有实例。
- 1:正式实例。
- 2:临时实例。
- 3:只读实例。
- -1:正式实例、只读、灾备实例。
",
+ "document": "指定查询的实例类型。取值范围如下:- 0:所有实例。
- 1:正式实例。
- 3:只读实例。
- 4:灾备实例。
",
"example": "0",
"member": "int64",
"name": "InstanceType",
@@ -2390,7 +2390,7 @@
},
{
"disabled": false,
- "document": "集群类型,取值范围如下:",
+ "document": "指定所查询实例的集群类型,取值范围如下:- 0:副本集实例。
- 1:分片实例。
- -1:副本集与分片实例。
",
"example": "0",
"member": "int64",
"name": "ClusterType",
@@ -2399,7 +2399,7 @@
},
{
"disabled": false,
- "document": "实例状态,取值范围如下所示:- 0:待初始化。
- 1:流程执行中。
- 2:实例有效。
- -2:已隔离(包年包月实例)。
- -3:已隔离(按量计费实例)。
",
+ "document": "指定所查询实例的当前状态,取值范围如下所示:- 0:待初始化。
- 1:流程处理中,例如:变更规格、参数修改等。
- 2:实例正常运行中。
- -2:实例已过期。
",
"example": "2",
"member": "int64",
"name": "Status",
@@ -2426,7 +2426,7 @@
},
{
"disabled": false,
- "document": "付费类型,取值范围如下:- 0:查询按量计费实例。
- 1:查询包年包月实例。
- -1:查询按量计费与包年包月实例。
",
+ "document": "指定所查询实例的付费类型,取值范围如下:- 0:查询按量计费实例。
- 1:查询包年包月实例。
- -1:查询按量计费与包年包月实例。
",
"example": "1",
"member": "int64",
"name": "PayMode",
@@ -2480,7 +2480,7 @@
},
{
"disabled": false,
- "document": "配置查询搜索的关键词。支持配置为实例ID、实例名称或者内网 IP 地址。",
+ "document": "指定查询搜索的关键词。支持设置为具体的实例ID、实例名称或者内网 IP 地址。",
"example": "无",
"member": "string",
"name": "SearchKey",
@@ -3594,7 +3594,7 @@
},
{
"disabled": false,
- "document": "实例状态,可能的返回值:0-待初始化,1-流程处理中,2-运行中,-2-实例已过期。",
+ "document": "实例状态,可能的返回值:0-创建中,1-流程处理中,2-运行中,-2-实例已过期。",
"example": "2",
"member": "int64",
"name": "Status",
diff --git a/tccli/services/monitor/v20180724/api.json b/tccli/services/monitor/v20180724/api.json
index 9cc6018809..7c6ce274d8 100644
--- a/tccli/services/monitor/v20180724/api.json
+++ b/tccli/services/monitor/v20180724/api.json
@@ -4326,7 +4326,7 @@
{
"disabled": false,
"document": "实例id",
- "example": "prom-xxx",
+ "example": "prom-ksnrbv",
"member": "string",
"name": "InstanceId",
"required": true,
@@ -4350,7 +4350,7 @@
{
"disabled": false,
"document": "告警id",
- "example": "alert-xx",
+ "example": "alert-oshger",
"member": "string",
"name": "Id",
"output_required": true,
@@ -5381,7 +5381,7 @@
{
"disabled": false,
"document": "实例ID(可通过 DescribePrometheusInstances 接口获取)",
- "example": "prom-id",
+ "example": "prom-jsbgr",
"member": "string",
"name": "InstanceId",
"required": true,
@@ -5390,7 +5390,7 @@
{
"disabled": false,
"document": "告警策略ID列表(可通过 DescribePrometheusAlertPolicy 接口获取)",
- "example": "[\"alert-id\"]",
+ "example": "[\"alert-oshbve\"]",
"member": "string",
"name": "AlertIds",
"required": true,
@@ -5399,7 +5399,7 @@
{
"disabled": false,
"document": "告警策略名称(可通过 DescribePrometheusAlertPolicy 接口获取),名称完全相同的告警策略才会删除",
- "example": "[\"name\"]",
+ "example": "[\"testName\"]",
"member": "string",
"name": "Names",
"required": false,
@@ -11365,8 +11365,8 @@
"members": [
{
"disabled": false,
- "document": "实例id",
- "example": "prom-xxx",
+ "document": "实例ID",
+ "example": "prom-253ac24d",
"member": "string",
"name": "InstanceId",
"required": true,
@@ -11374,8 +11374,8 @@
},
{
"disabled": false,
- "document": "分页",
- "example": "1",
+ "document": "分页偏移量,默认为0。 示例值:1",
+ "example": "0",
"member": "uint64",
"name": "Offset",
"required": false,
@@ -11383,7 +11383,7 @@
},
{
"disabled": false,
- "document": "分页",
+ "document": "分页返回数量,默认为20,最大值为100",
"example": "100",
"member": "uint64",
"name": "Limit",
@@ -11392,8 +11392,8 @@
},
{
"disabled": false,
- "document": "过滤\n支持ID,Name",
- "example": "无",
+ "document": "仅支持按Name, Values字段过滤:\n- Name = Name \n 按照给定的告警规则名称列表匹配\n- Name = ID\n 按照给定的告警规则ID列表匹配",
+ "example": "{Name: \"Name\", Values: [\"test-alert\"]}",
"member": "Filter",
"name": "Filters",
"required": false,
@@ -12296,7 +12296,7 @@
"members": [
{
"disabled": false,
- "document": "实例id",
+ "document": "实例ID\n\n示例值:prom-343kafd34",
"example": "prom-xxx",
"member": "string",
"name": "InstanceId",
@@ -12305,7 +12305,7 @@
},
{
"disabled": false,
- "document": "分页",
+ "document": "偏移量,默认为0。 示例值:1",
"example": "无",
"member": "uint64",
"name": "Offset",
@@ -12314,7 +12314,7 @@
},
{
"disabled": false,
- "document": "分页",
+ "document": "返回数量,默认为20,最大值为100。\n示例值:1",
"example": "无",
"member": "uint64",
"name": "Limit",
@@ -12323,7 +12323,7 @@
},
{
"disabled": false,
- "document": "过滤",
+ "document": "仅支持按Name, Values字段过滤:\n- Name = Name\n 按照给定的预聚合名称列表匹配",
"example": "无",
"member": "Filter",
"name": "Filters",
@@ -12581,7 +12581,7 @@
"members": [
{
"disabled": false,
- "document": "模糊过滤条件,支持\nLevel 按模板级别过滤\nName 按名称过滤\nDescribe 按描述过滤\nID 按templateId过滤",
+ "document": "仅支持按Name, Values字段过滤:\n* Name = Name\n 按照给定的模板名称列表匹配\n* Name = ID\n 按照给定的模板ID列表匹配\n* Name = Describe\n 按照给定的模板描述列表匹配\n* Name = Level\n 按照给定的模板维度(instance, cluster)列表匹配",
"example": " [{\"Name\": \"Name\",\"Values\": [\"test\"]}]",
"member": "Filter",
"name": "Filters",
@@ -12599,7 +12599,7 @@
},
{
"disabled": false,
- "document": "总数限制",
+ "document": "分页返回数量,默认为20,最大值为100",
"example": "10",
"member": "uint64",
"name": "Limit",
@@ -12793,7 +12793,7 @@
"example": "1",
"member": "int64",
"name": "TotalCount",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
@@ -12803,7 +12803,7 @@
"example": "无",
"member": "RecordingRuleSet",
"name": "RecordingRuleSet",
- "required": true,
+ "output_required": true,
"type": "list",
"value_allowed_null": true
},
@@ -15745,8 +15745,8 @@
"members": [
{
"disabled": false,
- "document": "实例id",
- "example": "无",
+ "document": "Prometheus 实例 ID",
+ "example": "prom-23x33df",
"member": "string",
"name": "InstanceId",
"required": true,
@@ -15754,7 +15754,7 @@
},
{
"disabled": false,
- "document": "告警配置",
+ "document": "告警配置,[具体参考](https://cloud.tencent.com/document/api/248/30354#PrometheusAlertPolicyItem)",
"example": "无",
"member": "PrometheusAlertPolicyItem",
"name": "AlertRule",
diff --git a/tccli/services/monitor/v20180724/examples.json b/tccli/services/monitor/v20180724/examples.json
index 48308a6100..edcb460f77 100644
--- a/tccli/services/monitor/v20180724/examples.json
+++ b/tccli/services/monitor/v20180724/examples.json
@@ -243,13 +243,13 @@
"CreatePrometheusAlertPolicy": [
{
"document": "新增告警",
- "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreatePrometheusAlertPolicy\n<公共请求参数>\n\n{\n \"InstanceId\": \"abc\",\n \"AlertRule\": {\n \"Id\": \"abc\",\n \"Name\": \"abc\",\n \"TemplateId\": \"abc\",\n \"Notification\": {\n \"Enabled\": true,\n \"Type\": \"abc\",\n \"WebHook\": \"abc\",\n \"AlertManager\": {\n \"ClusterType\": \"abc\",\n \"ClusterId\": \"abc\",\n \"Url\": \"abc\"\n },\n \"RepeatInterval\": \"abc\",\n \"TimeRangeStart\": \"abc\",\n \"TimeRangeEnd\": \"abc\",\n \"NotifyWay\": [\n \"abc\"\n ],\n \"ReceiverGroups\": [\n \"abc\"\n ],\n \"PhoneNotifyOrder\": [\n 1\n ],\n \"PhoneCircleTimes\": 0,\n \"PhoneInnerInterval\": 0,\n \"PhoneCircleInterval\": 0,\n \"PhoneArriveNotice\": true\n },\n \"Rules\": [\n {\n \"Name\": \"abc\",\n \"Rule\": \"abc\",\n \"Labels\": [\n {\n \"Name\": \"abc\",\n \"Value\": \"abc\"\n }\n ],\n \"Template\": \"abc\",\n \"For\": \"abc\",\n \"Describe\": \"abc\",\n \"Annotations\": [\n {\n \"Name\": \"abc\",\n \"Value\": \"abc\"\n }\n ],\n \"RuleState\": 0\n }\n ],\n \"UpdatedAt\": \"abc\",\n \"ClusterId\": \"abc\"\n }\n}",
- "output": "{\n \"Response\": {\n \"Id\": \"ac\",\n \"RequestId\": \"ac\"\n }\n}",
+ "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreatePrometheusAlertPolicy\n<公共请求参数>\n\n{\n \"InstanceId\": \"prom-kshrsdf\",\n \"AlertRule\": {\n \"Id\": \"alert-odhjeg\",\n \"Name\": \"资源告警\",\n \"TemplateId\": \"temp-cjhger\",\n \"Notification\": {\n \"Enabled\": true,\n \"Type\": \"amp\",\n \"WebHook\": \"\",\n \"AlertManager\": {\n \"ClusterType\": \"eks\",\n \"ClusterId\": \"cls-ojeg\",\n \"Url\": \"http://10.0.0.1:9000\"\n },\n \"RepeatInterval\": \"5m\",\n \"TimeRangeStart\": \"00:00:00\",\n \"TimeRangeEnd\": \"23:59:59\",\n \"NotifyWay\": [\n \"wechat\"\n ],\n \"ReceiverGroups\": [\n \"skjehrsheb\"\n ],\n \"PhoneNotifyOrder\": [\n 1\n ],\n \"PhoneCircleTimes\": 0,\n \"PhoneInnerInterval\": 0,\n \"PhoneCircleInterval\": 0,\n \"PhoneArriveNotice\": true\n },\n \"Rules\": [\n {\n \"Annotations\": [\n {\n \"Name\": \"summary\",\n \"Value\": \"磁盘使用率过高\"\n }\n ],\n \"Describe\": \"\",\n \"For\": \"2m\",\n \"Labels\": [\n {\n \"Name\": \"severity\",\n \"Value\": \"warning\"\n }\n ],\n \"Name\": \"磁盘使用率过高\",\n \"Rule\": \"1- node_filesystem_avail_bytes / node_filesystem_size_bytes > 0.85\",\n \"RuleState\": 0,\n \"Template\": \"磁盘使用率过高,实例: {{$labels.instance}},ID: {{$labels.instance_id}},当前值: {{ $value | humanizePercentage }}。\"\n }\n ],\n \"UpdatedAt\": \"2024-07-15T16:46:42+08:00\",\n \"ClusterId\": \"cls-iehgr\"\n }\n}",
+ "output": "{\n \"Response\": {\n \"Id\": \"alert-ojnfb\",\n \"RequestId\": \"ac-khgr-iohvr\"\n }\n}",
"title": "新增告警"
},
{
"document": "添加告警策略,告警渠道为Alertmanager",
- "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreatePrometheusAlertPolicy\n<公共请求参数>\n\n{\n \"InstanceId\": \"abc\",\n \"AlertRule\": {\n \"Id\": \"abc\",\n \"Name\": \"abc\",\n \"TemplateId\": \"abc\",\n \"Notification\": {\n \"Enabled\": true,\n \"Type\": \"abc\",\n \"WebHook\": \"abc\",\n \"AlertManager\": {\n \"ClusterType\": \"abc\",\n \"ClusterId\": \"abc\",\n \"Url\": \"abc\"\n },\n \"RepeatInterval\": \"abc\",\n \"TimeRangeStart\": \"abc\",\n \"TimeRangeEnd\": \"abc\",\n \"NotifyWay\": [\n \"abc\"\n ],\n \"ReceiverGroups\": [\n \"abc\"\n ],\n \"PhoneNotifyOrder\": [\n 1\n ],\n \"PhoneCircleTimes\": 0,\n \"PhoneInnerInterval\": 0,\n \"PhoneCircleInterval\": 0,\n \"PhoneArriveNotice\": true\n },\n \"Rules\": [\n {\n \"Name\": \"abc\",\n \"Rule\": \"abc\",\n \"Labels\": [\n {\n \"Name\": \"abc\",\n \"Value\": \"abc\"\n }\n ],\n \"Template\": \"abc\",\n \"For\": \"abc\",\n \"Describe\": \"abc\",\n \"Annotations\": [\n {\n \"Name\": \"abc\",\n \"Value\": \"abc\"\n }\n ],\n \"RuleState\": 0\n }\n ],\n \"UpdatedAt\": \"abc\",\n \"ClusterId\": \"abc\"\n }\n}",
+ "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreatePrometheusAlertPolicy\n<公共请求参数>\n\n{\n \"InstanceId\": \"prom-kshrsdf\",\n \"AlertRule\": {\n \"Id\": \"alert-odhjeg\",\n \"Name\": \"资源告警\",\n \"TemplateId\": \"temp-cjhger\",\n \"Notification\": {\n \"AlertManager\": {\n \"ClusterId\": \"cls-ksjbr\",\n \"ClusterType\": \"eks\",\n \"Url\": \"http://10.0.0.1:9000/api/v1/alerts\"\n },\n \"Enabled\": true,\n \"NotifyWay\": null,\n \"PhoneArriveNotice\": false,\n \"PhoneCircleInterval\": 0,\n \"PhoneCircleTimes\": 0,\n \"PhoneInnerInterval\": 0,\n \"PhoneNotifyOrder\": null,\n \"ReceiverGroups\": null,\n \"RepeatInterval\": \"5m\",\n \"TimeRangeEnd\": \"23:59:59\",\n \"TimeRangeStart\": \"00:00:00\",\n \"Type\": \"alertmanager\",\n \"WebHook\": \"\"\n },\n \"Rules\": [\n {\n \"Annotations\": [\n {\n \"Name\": \"summary\",\n \"Value\": \"MySQL High CPU Usage\"\n }\n ],\n \"Describe\": \"\",\n \"For\": \"5m\",\n \"Labels\": [\n {\n \"Name\": \"severity\",\n \"Value\": \"warning\"\n }\n ],\n \"Name\": \"MySQL High CPU Usage\",\n \"Rule\": \"avg by (instance_id,cluster_id,instance_region) (qce_cynosdb_mysql_cpuuserate_max) > 85\",\n \"RuleState\": 0,\n \"Template\": \"MySQL cpu usage is higher than 85%. Instance ID: {{ $labels.instance_id }}, cluster ID: {{ $labels.cluster_id }}, region: {{ $labels.instance_region }}\"\n }\n ],\n \"ClusterId\": \"cls-iehgr\"\n }\n}",
"output": "{\n \"Response\": {\n \"Id\": \"alert-xxx\",\n \"RequestId\": \"3dfe620f-11b8-4301-b279-1fdadedf7a59\"\n }\n}",
"title": "添加告警策略,告警渠道为Alertmanager"
}
@@ -415,7 +415,7 @@
"DeletePrometheusAlertPolicy": [
{
"document": "删除Prometheus告警规则",
- "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DeletePrometheusAlertPolicy\n<公共请求参数>\n\n{\n \"InstanceId\": \"abc\",\n \"AlertIds\": [\n \"abc\"\n ],\n \"Names\": [\n \"abc\"\n ]\n}",
+ "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DeletePrometheusAlertPolicy\n<公共请求参数>\n\n{\n \"InstanceId\": \"prom-kjshgr\",\n \"AlertIds\": [\n \"alert-jsbgvr\"\n ],\n \"Names\": [\n \"test\"\n ]\n}",
"output": "{\n \"Response\": {\n \"RequestId\": \"eac6b301-a322-493a-8e36-83b295459397\"\n }\n}",
"title": "删除Prometheus告警规则"
}
@@ -830,10 +830,10 @@
],
"DescribePrometheusAlertPolicy": [
{
- "document": "告警列表",
- "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribePrometheusAlertPolicy\n<公共请求参数>\n\n{\n \"InstanceId\": \"xxx\",\n \"Limit\": 1,\n \"Filters\": [\n {\n \"Name\": \"Name\",\n \"Values\": [\n \"alert-test\"\n ]\n }\n ],\n \"Offset\": 1\n}",
- "output": "{\n \"Response\": {\n \"AlertRules\": [\n {\n \"Id\": \"abc\",\n \"Name\": \"abc\",\n \"TemplateId\": \"abc\",\n \"Notification\": {\n \"Enabled\": true,\n \"Type\": \"abc\",\n \"WebHook\": \"abc\",\n \"AlertManager\": {\n \"ClusterType\": \"abc\",\n \"ClusterId\": \"abc\",\n \"Url\": \"abc\"\n },\n \"RepeatInterval\": \"abc\",\n \"TimeRangeStart\": \"abc\",\n \"TimeRangeEnd\": \"abc\",\n \"NotifyWay\": [\n \"abc\"\n ],\n \"ReceiverGroups\": [\n \"abc\"\n ],\n \"PhoneNotifyOrder\": [\n 1\n ],\n \"PhoneCircleTimes\": 0,\n \"PhoneInnerInterval\": 0,\n \"PhoneCircleInterval\": 0,\n \"PhoneArriveNotice\": true\n },\n \"Rules\": [\n {\n \"Name\": \"abc\",\n \"Rule\": \"abc\",\n \"Labels\": [\n {\n \"Name\": \"abc\",\n \"Value\": \"abc\"\n }\n ],\n \"Template\": \"abc\",\n \"For\": \"abc\",\n \"Describe\": \"abc\",\n \"Annotations\": [\n {\n \"Name\": \"abc\",\n \"Value\": \"abc\"\n }\n ],\n \"RuleState\": 0\n }\n ],\n \"UpdatedAt\": \"abc\",\n \"ClusterId\": \"abc\"\n }\n ],\n \"Total\": 1,\n \"RequestId\": \"abc\"\n }\n}",
- "title": "告警列表"
+ "document": "查询实例告警列表",
+ "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribePrometheusAlertPolicy\n<公共请求参数>\n\n{\n \"InstanceId\": \"prom-as3d2s1a\",\n \"Limit\": 1,\n \"Filters\": [\n {\n \"Name\": \"Name\",\n \"Values\": [\n \"alert-test\"\n ]\n }\n ],\n \"Offset\": 0\n}",
+ "output": "{\n \"Response\": {\n \"AlertRules\": [\n {\n \"Id\": \"alert-23a6d2ga\",\n \"Name\": \"alert-test\",\n \"TemplateId\": \"temp-as12sf12\",\n \"ClusterId\": \"\",\n \"Notification\": {\n \"Enabled\": true,\n \"Type\": \"amp\",\n \"RepeatInterval\": \"5m\",\n \"TimeRangeStart\": \"0:00:00\",\n \"TimeRangeEnd\": \"23:59:59\",\n \"ReceiverGroups\": [\n \"notice-13hs61s2\"\n ],\n \"WebHook\": \"http://127.0.0.1:9090/alert\",\n \"AlertManager\": {\n \"ClusterType\": \"tke\",\n \"ClusterId\": \"cls-a2df21xa\",\n \"Url\": \"http://127.0.0.1:9090\"\n },\n \"PhoneNotifyOrder\": [\n 1\n ],\n \"PhoneCircleTimes\": 0,\n \"PhoneInnerInterval\": 0,\n \"PhoneCircleInterval\": 0,\n \"PhoneArriveNotice\": true,\n \"NotifyWay\": [\n \"abc\"\n ]\n },\n \"Rules\": [\n {\n \"Name\": \"rule-1\",\n \"Rule\": \"up{} != 1\",\n \"Labels\": [\n {\n \"Name\": \"level\",\n \"Value\": \"warnning\"\n }\n ],\n \"Template\": \"test alert\",\n \"For\": \"5m\",\n \"Describe\": \"test alert\",\n \"Annotations\": [\n {\n \"Name\": \"creator\",\n \"Value\": \"programer\"\n }\n ],\n \"RuleState\": 1\n }\n ],\n \"UpdatedAt\": \"2024-07-21 18:10:14\"\n }\n ],\n \"Total\": 1,\n \"RequestId\": \"3f04883c-eda1-4498-b024-d266baec6040\"\n }\n}",
+ "title": "查询实例告警列表"
}
],
"DescribePrometheusClusterAgents": [
@@ -925,7 +925,7 @@
"DescribePrometheusRecordRules": [
{
"document": "拉取聚合规则",
- "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribePrometheusRecordRules\n<公共请求参数>\n\n{\n \"InstanceId\": \"xxx\"\n}",
+ "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribePrometheusRecordRules\n<公共请求参数>\n\n{\n \"InstanceId\": \"prom-22kxd343\"\n}",
"output": "{\n \"Response\": {\n \"Records\": [\n {\n \"Content\": \"xdx\",\n \"UpdateTime\": \"xdx\",\n \"ClusterId\": \"xdx\",\n \"Name\": \"xdx\",\n \"TemplateId\": \"xdx\",\n \"Id\": \"de\",\n \"Status\": 1,\n \"Count\": 1\n }\n ],\n \"Total\": 1,\n \"RequestId\": \"xxx\"\n }\n}",
"title": "拉取聚合规则"
}
@@ -981,8 +981,8 @@
"DescribeRecordingRules": [
{
"document": "",
- "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeRecordingRules\n<公共请求参数>\n\n{\n \"InstanceId\": \"prom-sdf342\",\n \"RuleState\": \"2\",\n \"Limit\": \"10\"\n}",
- "output": "{\n \"Response\": {\n \"RecordingRuleSet\": [\n {\n \"RuleId\": \"rrule-45hkgiyc\",\n \"RuleState\": 2,\n \"Name\": \"example6\",\n \"Group\": \"LS0tDQpuYW1lOiBleGFtcGxlDQpydWxlczoNCiAgLSByZWNvcmQ6IGpvYjpodHRwX2lucHJvZ3Jlc3NfcmVxdWVzdHM6c3VtDQogICAgZXhwcjogc3VtIGJ5IChqb2IpIChodHRwX2lucHJvZ3Jlc3NfcmVxdWVzdHMp\",\n \"Total\": 1,\n \"UpdatedAt\": \"2020-08-10T17:50:06Z\",\n \"CreatedAt\": \"2020-08-10T09:32:51Z\"\n }\n ],\n \"RequestId\": \"-1y24pm54antkuiziyii7hxwv2974riq\",\n \"TotalCount\": 1\n }\n}",
+ "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeRecordingRules\n<公共请求参数>\n\n{\n \"InstanceId\": \"prom-sdf342\",\n \"RuleState\": 1,\n \"Limit\": 10\n}",
+ "output": "{\n \"Response\": {\n \"RecordingRuleSet\": [\n {\n \"RuleId\": \"rrule-45hkgiyc\",\n \"RuleState\": 2,\n \"Name\": \"example6\",\n \"RuleName\": \"example6\",\n \"Group\": \"LS0tDQpuYW1lOiBleGFtcGxlDQpydWxlczoNCiAgLSByZWNvcmQ6IGpvYjpodHRwX2lucHJvZ3Jlc3NfcmVxdWVzdHM6c3VtDQogICAgZXhwcjogc3VtIGJ5IChqb2IpIChodHRwX2lucHJvZ3Jlc3NfcmVxdWVzdHMp\",\n \"Total\": 1,\n \"UpdatedAt\": \"2020-08-10T17:50:06Z\",\n \"CreatedAt\": \"2020-08-10T09:32:51Z\"\n }\n ],\n \"RequestId\": \"-1y24pm54antkuiziyii7hxwv2974riq\",\n \"TotalCount\": 1\n }\n}",
"title": "查询预聚合规则"
}
],
@@ -1167,7 +1167,7 @@
"ModifyPrometheusAlertPolicy": [
{
"document": "修改告警",
- "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ModifyPrometheusAlertPolicy\n<公共请求参数>\n\n{\n \"InstanceId\": \"abc\",\n \"AlertRule\": {\n \"Id\": \"abc\",\n \"Name\": \"abc\",\n \"TemplateId\": \"abc\",\n \"Notification\": {\n \"Enabled\": true,\n \"Type\": \"abc\",\n \"WebHook\": \"abc\",\n \"AlertManager\": {\n \"ClusterType\": \"abc\",\n \"ClusterId\": \"abc\",\n \"Url\": \"abc\"\n },\n \"RepeatInterval\": \"abc\",\n \"TimeRangeStart\": \"abc\",\n \"TimeRangeEnd\": \"abc\",\n \"NotifyWay\": [\n \"abc\"\n ],\n \"ReceiverGroups\": [\n \"abc\"\n ],\n \"PhoneNotifyOrder\": [\n 1\n ],\n \"PhoneCircleTimes\": 0,\n \"PhoneInnerInterval\": 0,\n \"PhoneCircleInterval\": 0,\n \"PhoneArriveNotice\": true\n },\n \"Rules\": [\n {\n \"Name\": \"abc\",\n \"Rule\": \"abc\",\n \"Labels\": [\n {\n \"Name\": \"abc\",\n \"Value\": \"abc\"\n }\n ],\n \"Template\": \"abc\",\n \"For\": \"abc\",\n \"Describe\": \"abc\",\n \"Annotations\": [\n {\n \"Name\": \"abc\",\n \"Value\": \"abc\"\n }\n ],\n \"RuleState\": 0\n }\n ],\n \"UpdatedAt\": \"abc\",\n \"ClusterId\": \"abc\"\n }\n}",
+ "input": "POST / HTTP/1.1\nHost: monitor.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ModifyPrometheusAlertPolicy\n<公共请求参数>\n\n{\n \"InstanceId\": \"prom-jsgref\",\n \"AlertRule\": {\n \"Id\": \"alert-odhjeg\",\n \"Name\": \"资源告警\",\n \"TemplateId\": \"temp-cjhger\",\n \"Notification\": {\n \"Enabled\": true,\n \"Type\": \"amp\",\n \"WebHook\": \"\",\n \"AlertManager\": {\n \"ClusterType\": \"eks\",\n \"ClusterId\": \"cls-ojeg\",\n \"Url\": \"http://10.0.0.1:9000\"\n },\n \"RepeatInterval\": \"5m\",\n \"TimeRangeStart\": \"00:00:00\",\n \"TimeRangeEnd\": \"23:59:59\",\n \"NotifyWay\": [\n \"wechat\"\n ],\n \"ReceiverGroups\": [\n \"skjehrsheb\"\n ],\n \"PhoneNotifyOrder\": [\n 1\n ],\n \"PhoneCircleTimes\": 0,\n \"PhoneInnerInterval\": 0,\n \"PhoneCircleInterval\": 0,\n \"PhoneArriveNotice\": true\n },\n \"Rules\": [\n {\n \"Annotations\": [\n {\n \"Name\": \"summary\",\n \"Value\": \"磁盘使用率过高\"\n }\n ],\n \"Describe\": \"\",\n \"For\": \"2m\",\n \"Labels\": [\n {\n \"Name\": \"severity\",\n \"Value\": \"warning\"\n }\n ],\n \"Name\": \"磁盘使用率过高\",\n \"Rule\": \"1- node_filesystem_avail_bytes / node_filesystem_size_bytes > 0.85\",\n \"RuleState\": 0,\n \"Template\": \"磁盘使用率过高,实例: {{$labels.instance}},ID: {{$labels.instance_id}},当前值: {{ $value | humanizePercentage }}。\"\n }\n ],\n \"UpdatedAt\": \"2024-07-15T16:46:42+08:00\",\n \"ClusterId\": \"cls-iehgr\"\n }\n}",
"output": "{\n \"Response\": {\n \"RequestId\": \"eac6b301-a322-493a-8e36-83b295459397\"\n }\n}",
"title": "修改告警"
}
diff --git a/tccli/services/oceanus/v20190422/api.json b/tccli/services/oceanus/v20190422/api.json
index c67075b8b2..e9492813b2 100644
--- a/tccli/services/oceanus/v20190422/api.json
+++ b/tccli/services/oceanus/v20190422/api.json
@@ -6504,6 +6504,15 @@
"name": "CustomTimestamp",
"required": false,
"type": "int"
+ },
+ {
+ "disabled": false,
+ "document": "timestamp; latest-offset; earliest-offset; 任选一种",
+ "example": "earliest-offset",
+ "member": "string",
+ "name": "KafkaScanMode",
+ "required": false,
+ "type": "string"
}
],
"usage": "in"
diff --git a/tccli/services/postgres/postgres_client.py b/tccli/services/postgres/postgres_client.py
index c018d8ccca..836ab227af 100644
--- a/tccli/services/postgres/postgres_client.py
+++ b/tccli/services/postgres/postgres_client.py
@@ -17,7 +17,7 @@
from jmespath import search
import time
-def doCreateReadOnlyGroupNetworkAccess(args, parsed_globals):
+def doDescribeDatabaseObjects(args, parsed_globals):
g_param = parse_global_arg(parsed_globals)
if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -46,11 +46,11 @@ def doCreateReadOnlyGroupNetworkAccess(args, parsed_globals):
client = mod.PostgresClient(cred, g_param[OptionsDefine.Region], profile)
client._sdkVersion += ("_CLI_" + __version__)
models = MODELS_MAP[g_param[OptionsDefine.Version]]
- model = models.CreateReadOnlyGroupNetworkAccessRequest()
+ model = models.DescribeDatabaseObjectsRequest()
model.from_json_string(json.dumps(args))
start_time = time.time()
while True:
- rsp = client.CreateReadOnlyGroupNetworkAccess(model)
+ rsp = client.DescribeDatabaseObjects(model)
result = rsp.to_json_string()
try:
json_obj = json.loads(result)
@@ -225,7 +225,7 @@ def doDescribeDBInstanceHAConfig(args, parsed_globals):
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
-def doRebalanceReadOnlyGroup(args, parsed_globals):
+def doDescribeBackupOverview(args, parsed_globals):
g_param = parse_global_arg(parsed_globals)
if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -254,11 +254,11 @@ def doRebalanceReadOnlyGroup(args, parsed_globals):
client = mod.PostgresClient(cred, g_param[OptionsDefine.Region], profile)
client._sdkVersion += ("_CLI_" + __version__)
models = MODELS_MAP[g_param[OptionsDefine.Version]]
- model = models.RebalanceReadOnlyGroupRequest()
+ model = models.DescribeBackupOverviewRequest()
model.from_json_string(json.dumps(args))
start_time = time.time()
while True:
- rsp = client.RebalanceReadOnlyGroup(model)
+ rsp = client.DescribeBackupOverview(model)
result = rsp.to_json_string()
try:
json_obj = json.loads(result)
@@ -745,7 +745,7 @@ def doModifyDBInstanceSecurityGroups(args, parsed_globals):
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
-def doCreateServerlessDBInstance(args, parsed_globals):
+def doRenewInstance(args, parsed_globals):
g_param = parse_global_arg(parsed_globals)
if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -774,11 +774,11 @@ def doCreateServerlessDBInstance(args, parsed_globals):
client = mod.PostgresClient(cred, g_param[OptionsDefine.Region], profile)
client._sdkVersion += ("_CLI_" + __version__)
models = MODELS_MAP[g_param[OptionsDefine.Version]]
- model = models.CreateServerlessDBInstanceRequest()
+ model = models.RenewInstanceRequest()
model.from_json_string(json.dumps(args))
start_time = time.time()
while True:
- rsp = client.CreateServerlessDBInstance(model)
+ rsp = client.RenewInstance(model)
result = rsp.to_json_string()
try:
json_obj = json.loads(result)
@@ -1005,6 +1005,58 @@ def doDescribeDBSlowlogs(args, parsed_globals):
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+def doDescribeAccountPrivileges(args, parsed_globals):
+ g_param = parse_global_arg(parsed_globals)
+
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
+ cred = credential.CVMRoleCredential()
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
+ cred = credential.STSAssumeRoleCredential(
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
+ )
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
+ else:
+ cred = credential.Credential(
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
+ )
+ http_profile = HttpProfile(
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
+ reqMethod="POST",
+ endpoint=g_param[OptionsDefine.Endpoint],
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
+ )
+ profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+ if g_param[OptionsDefine.Language]:
+ profile.language = g_param[OptionsDefine.Language]
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+ client = mod.PostgresClient(cred, g_param[OptionsDefine.Region], profile)
+ client._sdkVersion += ("_CLI_" + __version__)
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
+ model = models.DescribeAccountPrivilegesRequest()
+ model.from_json_string(json.dumps(args))
+ start_time = time.time()
+ while True:
+ rsp = client.DescribeAccountPrivileges(model)
+ result = rsp.to_json_string()
+ try:
+ json_obj = json.loads(result)
+ except TypeError as e:
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
+ break
+ cur_time = time.time()
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
+ else:
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+
+
def doDeleteReadOnlyGroupNetworkAccess(args, parsed_globals):
g_param = parse_global_arg(parsed_globals)
@@ -1109,6 +1161,58 @@ def doDescribeDefaultParameters(args, parsed_globals):
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+def doUnlockAccount(args, parsed_globals):
+ g_param = parse_global_arg(parsed_globals)
+
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
+ cred = credential.CVMRoleCredential()
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
+ cred = credential.STSAssumeRoleCredential(
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
+ )
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
+ else:
+ cred = credential.Credential(
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
+ )
+ http_profile = HttpProfile(
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
+ reqMethod="POST",
+ endpoint=g_param[OptionsDefine.Endpoint],
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
+ )
+ profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+ if g_param[OptionsDefine.Language]:
+ profile.language = g_param[OptionsDefine.Language]
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+ client = mod.PostgresClient(cred, g_param[OptionsDefine.Region], profile)
+ client._sdkVersion += ("_CLI_" + __version__)
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
+ model = models.UnlockAccountRequest()
+ model.from_json_string(json.dumps(args))
+ start_time = time.time()
+ while True:
+ rsp = client.UnlockAccount(model)
+ result = rsp.to_json_string()
+ try:
+ json_obj = json.loads(result)
+ except TypeError as e:
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
+ break
+ cur_time = time.time()
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
+ else:
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+
+
def doDestroyDBInstance(args, parsed_globals):
g_param = parse_global_arg(parsed_globals)
@@ -1577,7 +1681,7 @@ def doModifyDBInstanceDeployment(args, parsed_globals):
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
-def doRenewInstance(args, parsed_globals):
+def doCreateServerlessDBInstance(args, parsed_globals):
g_param = parse_global_arg(parsed_globals)
if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1606,11 +1710,63 @@ def doRenewInstance(args, parsed_globals):
client = mod.PostgresClient(cred, g_param[OptionsDefine.Region], profile)
client._sdkVersion += ("_CLI_" + __version__)
models = MODELS_MAP[g_param[OptionsDefine.Version]]
- model = models.RenewInstanceRequest()
+ model = models.CreateServerlessDBInstanceRequest()
model.from_json_string(json.dumps(args))
start_time = time.time()
while True:
- rsp = client.RenewInstance(model)
+ rsp = client.CreateServerlessDBInstance(model)
+ result = rsp.to_json_string()
+ try:
+ json_obj = json.loads(result)
+ except TypeError as e:
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
+ break
+ cur_time = time.time()
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
+ else:
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+
+
+def doCreateAccount(args, parsed_globals):
+ g_param = parse_global_arg(parsed_globals)
+
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
+ cred = credential.CVMRoleCredential()
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
+ cred = credential.STSAssumeRoleCredential(
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
+ )
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
+ else:
+ cred = credential.Credential(
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
+ )
+ http_profile = HttpProfile(
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
+ reqMethod="POST",
+ endpoint=g_param[OptionsDefine.Endpoint],
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
+ )
+ profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+ if g_param[OptionsDefine.Language]:
+ profile.language = g_param[OptionsDefine.Language]
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+ client = mod.PostgresClient(cred, g_param[OptionsDefine.Region], profile)
+ client._sdkVersion += ("_CLI_" + __version__)
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
+ model = models.CreateAccountRequest()
+ model.from_json_string(json.dumps(args))
+ start_time = time.time()
+ while True:
+ rsp = client.CreateAccount(model)
result = rsp.to_json_string()
try:
json_obj = json.loads(result)
@@ -2409,7 +2565,7 @@ def doUpgradeDBInstanceMajorVersion(args, parsed_globals):
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
-def doDescribeBackupOverview(args, parsed_globals):
+def doRebalanceReadOnlyGroup(args, parsed_globals):
g_param = parse_global_arg(parsed_globals)
if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -2438,11 +2594,11 @@ def doDescribeBackupOverview(args, parsed_globals):
client = mod.PostgresClient(cred, g_param[OptionsDefine.Region], profile)
client._sdkVersion += ("_CLI_" + __version__)
models = MODELS_MAP[g_param[OptionsDefine.Version]]
- model = models.DescribeBackupOverviewRequest()
+ model = models.RebalanceReadOnlyGroupRequest()
model.from_json_string(json.dumps(args))
start_time = time.time()
while True:
- rsp = client.DescribeBackupOverview(model)
+ rsp = client.RebalanceReadOnlyGroup(model)
result = rsp.to_json_string()
try:
json_obj = json.loads(result)
@@ -3241,7 +3397,7 @@ def doModifyBaseBackupExpireTime(args, parsed_globals):
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
-def doCreateReadOnlyGroup(args, parsed_globals):
+def doModifyAccountPrivileges(args, parsed_globals):
g_param = parse_global_arg(parsed_globals)
if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -3270,11 +3426,11 @@ def doCreateReadOnlyGroup(args, parsed_globals):
client = mod.PostgresClient(cred, g_param[OptionsDefine.Region], profile)
client._sdkVersion += ("_CLI_" + __version__)
models = MODELS_MAP[g_param[OptionsDefine.Version]]
- model = models.CreateReadOnlyGroupRequest()
+ model = models.ModifyAccountPrivilegesRequest()
model.from_json_string(json.dumps(args))
start_time = time.time()
while True:
- rsp = client.CreateReadOnlyGroup(model)
+ rsp = client.ModifyAccountPrivileges(model)
result = rsp.to_json_string()
try:
json_obj = json.loads(result)
@@ -4177,6 +4333,58 @@ def doOpenDBExtranetAccess(args, parsed_globals):
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+def doDeleteAccount(args, parsed_globals):
+ g_param = parse_global_arg(parsed_globals)
+
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
+ cred = credential.CVMRoleCredential()
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
+ cred = credential.STSAssumeRoleCredential(
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
+ )
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
+ else:
+ cred = credential.Credential(
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
+ )
+ http_profile = HttpProfile(
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
+ reqMethod="POST",
+ endpoint=g_param[OptionsDefine.Endpoint],
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
+ )
+ profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+ if g_param[OptionsDefine.Language]:
+ profile.language = g_param[OptionsDefine.Language]
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+ client = mod.PostgresClient(cred, g_param[OptionsDefine.Region], profile)
+ client._sdkVersion += ("_CLI_" + __version__)
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
+ model = models.DeleteAccountRequest()
+ model.from_json_string(json.dumps(args))
+ start_time = time.time()
+ while True:
+ rsp = client.DeleteAccount(model)
+ result = rsp.to_json_string()
+ try:
+ json_obj = json.loads(result)
+ except TypeError as e:
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
+ break
+ cur_time = time.time()
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
+ else:
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+
+
def doModifyBackupPlan(args, parsed_globals):
g_param = parse_global_arg(parsed_globals)
@@ -4281,6 +4489,58 @@ def doInitDBInstances(args, parsed_globals):
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+def doCreateReadOnlyGroupNetworkAccess(args, parsed_globals):
+ g_param = parse_global_arg(parsed_globals)
+
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
+ cred = credential.CVMRoleCredential()
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
+ cred = credential.STSAssumeRoleCredential(
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
+ )
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
+ else:
+ cred = credential.Credential(
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
+ )
+ http_profile = HttpProfile(
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
+ reqMethod="POST",
+ endpoint=g_param[OptionsDefine.Endpoint],
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
+ )
+ profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+ if g_param[OptionsDefine.Language]:
+ profile.language = g_param[OptionsDefine.Language]
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+ client = mod.PostgresClient(cred, g_param[OptionsDefine.Region], profile)
+ client._sdkVersion += ("_CLI_" + __version__)
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
+ model = models.CreateReadOnlyGroupNetworkAccessRequest()
+ model.from_json_string(json.dumps(args))
+ start_time = time.time()
+ while True:
+ rsp = client.CreateReadOnlyGroupNetworkAccess(model)
+ result = rsp.to_json_string()
+ try:
+ json_obj = json.loads(result)
+ except TypeError as e:
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
+ break
+ cur_time = time.time()
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
+ else:
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+
+
def doDescribeZones(args, parsed_globals):
g_param = parse_global_arg(parsed_globals)
@@ -4385,6 +4645,58 @@ def doInquiryPriceUpgradeDBInstance(args, parsed_globals):
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+def doCreateReadOnlyGroup(args, parsed_globals):
+ g_param = parse_global_arg(parsed_globals)
+
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
+ cred = credential.CVMRoleCredential()
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
+ cred = credential.STSAssumeRoleCredential(
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
+ )
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
+ else:
+ cred = credential.Credential(
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
+ )
+ http_profile = HttpProfile(
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
+ reqMethod="POST",
+ endpoint=g_param[OptionsDefine.Endpoint],
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
+ )
+ profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+ if g_param[OptionsDefine.Language]:
+ profile.language = g_param[OptionsDefine.Language]
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+ client = mod.PostgresClient(cred, g_param[OptionsDefine.Region], profile)
+ client._sdkVersion += ("_CLI_" + __version__)
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
+ model = models.CreateReadOnlyGroupRequest()
+ model.from_json_string(json.dumps(args))
+ start_time = time.time()
+ while True:
+ rsp = client.CreateReadOnlyGroup(model)
+ result = rsp.to_json_string()
+ try:
+ json_obj = json.loads(result)
+ except TypeError as e:
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
+ break
+ cur_time = time.time()
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
+ else:
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+
+
def doInquiryPriceRenewDBInstance(args, parsed_globals):
g_param = parse_global_arg(parsed_globals)
@@ -4541,6 +4853,58 @@ def doDescribeDBVersions(args, parsed_globals):
FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+def doLockAccount(args, parsed_globals):
+ g_param = parse_global_arg(parsed_globals)
+
+ if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
+ cred = credential.CVMRoleCredential()
+ elif g_param[OptionsDefine.RoleArn.replace('-', '_')] and g_param[OptionsDefine.RoleSessionName.replace('-', '_')]:
+ cred = credential.STSAssumeRoleCredential(
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.RoleArn.replace('-', '_')],
+ g_param[OptionsDefine.RoleSessionName.replace('-', '_')], endpoint=g_param["sts_cred_endpoint"]
+ )
+ elif os.getenv(OptionsDefine.ENV_TKE_REGION) and os.getenv(OptionsDefine.ENV_TKE_PROVIDER_ID) and os.getenv(OptionsDefine.ENV_TKE_WEB_IDENTITY_TOKEN_FILE) and os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN):
+ cred = credential.DefaultTkeOIDCRoleArnProvider().get_credentials()
+ else:
+ cred = credential.Credential(
+ g_param[OptionsDefine.SecretId], g_param[OptionsDefine.SecretKey], g_param[OptionsDefine.Token]
+ )
+ http_profile = HttpProfile(
+ reqTimeout=60 if g_param[OptionsDefine.Timeout] is None else int(g_param[OptionsDefine.Timeout]),
+ reqMethod="POST",
+ endpoint=g_param[OptionsDefine.Endpoint],
+ proxy=g_param[OptionsDefine.HttpsProxy.replace('-', '_')]
+ )
+ profile = ClientProfile(httpProfile=http_profile, signMethod="HmacSHA256")
+ if g_param[OptionsDefine.Language]:
+ profile.language = g_param[OptionsDefine.Language]
+ mod = CLIENT_MAP[g_param[OptionsDefine.Version]]
+ client = mod.PostgresClient(cred, g_param[OptionsDefine.Region], profile)
+ client._sdkVersion += ("_CLI_" + __version__)
+ models = MODELS_MAP[g_param[OptionsDefine.Version]]
+ model = models.LockAccountRequest()
+ model.from_json_string(json.dumps(args))
+ start_time = time.time()
+ while True:
+ rsp = client.LockAccount(model)
+ result = rsp.to_json_string()
+ try:
+ json_obj = json.loads(result)
+ except TypeError as e:
+ json_obj = json.loads(result.decode('utf-8')) # python3.3
+ if not g_param[OptionsDefine.Waiter] or search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj) == g_param['OptionsDefine.WaiterInfo']['to']:
+ break
+ cur_time = time.time()
+ if cur_time - start_time >= g_param['OptionsDefine.WaiterInfo']['timeout']:
+ raise ClientError('Request timeout, wait `%s` to `%s` timeout, last request is %s' %
+ (g_param['OptionsDefine.WaiterInfo']['expr'], g_param['OptionsDefine.WaiterInfo']['to'],
+ search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj)))
+ else:
+ print('Inquiry result is %s.' % search(g_param['OptionsDefine.WaiterInfo']['expr'], json_obj))
+ time.sleep(g_param['OptionsDefine.WaiterInfo']['interval'])
+ FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
+
+
def doDescribeReadOnlyGroups(args, parsed_globals):
g_param = parse_global_arg(parsed_globals)
@@ -4760,11 +5124,11 @@ def doCreateInstances(args, parsed_globals):
}
ACTION_MAP = {
- "CreateReadOnlyGroupNetworkAccess": doCreateReadOnlyGroupNetworkAccess,
+ "DescribeDatabaseObjects": doDescribeDatabaseObjects,
"ModifyDBInstanceChargeType": doModifyDBInstanceChargeType,
"DescribeDBErrlogs": doDescribeDBErrlogs,
"DescribeDBInstanceHAConfig": doDescribeDBInstanceHAConfig,
- "RebalanceReadOnlyGroup": doRebalanceReadOnlyGroup,
+ "DescribeBackupOverview": doDescribeBackupOverview,
"ModifyAccountRemark": doModifyAccountRemark,
"SetAutoRenewFlag": doSetAutoRenewFlag,
"ModifyDBInstanceName": doModifyDBInstanceName,
@@ -4774,13 +5138,15 @@ def doCreateInstances(args, parsed_globals):
"CreateDBInstanceNetworkAccess": doCreateDBInstanceNetworkAccess,
"ModifyDBInstanceSpec": doModifyDBInstanceSpec,
"ModifyDBInstanceSecurityGroups": doModifyDBInstanceSecurityGroups,
- "CreateServerlessDBInstance": doCreateServerlessDBInstance,
+ "RenewInstance": doRenewInstance,
"DescribeDatabases": doDescribeDatabases,
"DescribeSlowQueryAnalysis": doDescribeSlowQueryAnalysis,
"DescribeProductConfig": doDescribeProductConfig,
"DescribeDBSlowlogs": doDescribeDBSlowlogs,
+ "DescribeAccountPrivileges": doDescribeAccountPrivileges,
"DeleteReadOnlyGroupNetworkAccess": doDeleteReadOnlyGroupNetworkAccess,
"DescribeDefaultParameters": doDescribeDefaultParameters,
+ "UnlockAccount": doUnlockAccount,
"DestroyDBInstance": doDestroyDBInstance,
"DescribeDBBackups": doDescribeDBBackups,
"DescribeParameterTemplates": doDescribeParameterTemplates,
@@ -4790,7 +5156,8 @@ def doCreateInstances(args, parsed_globals):
"DescribeParameterTemplateAttributes": doDescribeParameterTemplateAttributes,
"CloseServerlessDBExtranetAccess": doCloseServerlessDBExtranetAccess,
"ModifyDBInstanceDeployment": doModifyDBInstanceDeployment,
- "RenewInstance": doRenewInstance,
+ "CreateServerlessDBInstance": doCreateServerlessDBInstance,
+ "CreateAccount": doCreateAccount,
"ModifyDBInstanceParameters": doModifyDBInstanceParameters,
"DescribeBaseBackups": doDescribeBaseBackups,
"DescribeAvailableRecoveryTime": doDescribeAvailableRecoveryTime,
@@ -4806,7 +5173,7 @@ def doCreateInstances(args, parsed_globals):
"CreateReadOnlyDBInstance": doCreateReadOnlyDBInstance,
"DescribeBackupSummaries": doDescribeBackupSummaries,
"UpgradeDBInstanceMajorVersion": doUpgradeDBInstanceMajorVersion,
- "DescribeBackupOverview": doDescribeBackupOverview,
+ "RebalanceReadOnlyGroup": doRebalanceReadOnlyGroup,
"DescribeBackupDownloadURL": doDescribeBackupDownloadURL,
"DescribeEncryptionKeys": doDescribeEncryptionKeys,
"DeleteReadOnlyGroup": doDeleteReadOnlyGroup,
@@ -4822,7 +5189,7 @@ def doCreateInstances(args, parsed_globals):
"DescribeDBInstances": doDescribeDBInstances,
"IsolateDBInstances": doIsolateDBInstances,
"ModifyBaseBackupExpireTime": doModifyBaseBackupExpireTime,
- "CreateReadOnlyGroup": doCreateReadOnlyGroup,
+ "ModifyAccountPrivileges": doModifyAccountPrivileges,
"DescribeSlowQueryList": doDescribeSlowQueryList,
"DescribeLogBackups": doDescribeLogBackups,
"CloseDBExtranetAccess": doCloseDBExtranetAccess,
@@ -4840,13 +5207,17 @@ def doCreateInstances(args, parsed_globals):
"DescribeBackupPlans": doDescribeBackupPlans,
"ModifySwitchTimePeriod": doModifySwitchTimePeriod,
"OpenDBExtranetAccess": doOpenDBExtranetAccess,
+ "DeleteAccount": doDeleteAccount,
"ModifyBackupPlan": doModifyBackupPlan,
"InitDBInstances": doInitDBInstances,
+ "CreateReadOnlyGroupNetworkAccess": doCreateReadOnlyGroupNetworkAccess,
"DescribeZones": doDescribeZones,
"InquiryPriceUpgradeDBInstance": doInquiryPriceUpgradeDBInstance,
+ "CreateReadOnlyGroup": doCreateReadOnlyGroup,
"InquiryPriceRenewDBInstance": doInquiryPriceRenewDBInstance,
"ModifyBackupDownloadRestriction": doModifyBackupDownloadRestriction,
"DescribeDBVersions": doDescribeDBVersions,
+ "LockAccount": doLockAccount,
"DescribeReadOnlyGroups": doDescribeReadOnlyGroups,
"DescribeDBInstanceAttribute": doDescribeDBInstanceAttribute,
"UpgradeDBInstance": doUpgradeDBInstance,
diff --git a/tccli/services/postgres/v20170312/api.json b/tccli/services/postgres/v20170312/api.json
index 8d06eb9c6f..e50da3ce34 100644
--- a/tccli/services/postgres/v20170312/api.json
+++ b/tccli/services/postgres/v20170312/api.json
@@ -28,6 +28,13 @@
"output": "CloseServerlessDBExtranetAccessResponse",
"status": "online"
},
+ "CreateAccount": {
+ "document": "此接口用于创建数据账号,返回的Oid为账号唯一标识。与数据库系统表pg_roles中记录的oid一致。",
+ "input": "CreateAccountRequest",
+ "name": "创建数据库账号",
+ "output": "CreateAccountResponse",
+ "status": "online"
+ },
"CreateBaseBackup": {
"document": "本接口(CreateBaseBackup)用于创建实例的数据备份。",
"input": "CreateBaseBackupRequest",
@@ -91,6 +98,13 @@
"output": "CreateServerlessDBInstanceResponse",
"status": "online"
},
+ "DeleteAccount": {
+ "document": "此接口用于删除数据库账号,需要同时输入Oid与UserName,避免误删。",
+ "input": "DeleteAccountRequest",
+ "name": "删除数据库账号",
+ "output": "DeleteAccountResponse",
+ "status": "online"
+ },
"DeleteBaseBackup": {
"document": "本接口(DeleteBaseBackup)用于删除实例指定数据备份。",
"input": "DeleteBaseBackupRequest",
@@ -140,6 +154,13 @@
"output": "DeleteServerlessDBInstanceResponse",
"status": "online"
},
+ "DescribeAccountPrivileges": {
+ "document": "查询数据库账号对某数据库对象拥有的权限列表。",
+ "input": "DescribeAccountPrivilegesRequest",
+ "name": "查询数据库账号的权限信息",
+ "output": "DescribeAccountPrivilegesResponse",
+ "status": "online"
+ },
"DescribeAccounts": {
"document": "本接口(DescribeAccounts)用于查询实例的数据库账号列表。",
"input": "DescribeAccountsRequest",
@@ -280,6 +301,13 @@
"output": "DescribeDBXlogsResponse",
"status": "online"
},
+ "DescribeDatabaseObjects": {
+ "document": "本接口用于查询数据库对象列表。例如查询test数据库下的模式列表。",
+ "input": "DescribeDatabaseObjectsRequest",
+ "name": "查询数据库对象列表",
+ "output": "DescribeDatabaseObjectsResponse",
+ "status": "online"
+ },
"DescribeDatabases": {
"document": "接口(DescribeDatabases)用来查询实例的数据库列表。",
"input": "DescribeDatabasesRequest",
@@ -434,6 +462,20 @@
"output": "IsolateDBInstancesResponse",
"status": "online"
},
+ "LockAccount": {
+ "document": "此接口用于锁定数据库账号,锁定后账号当前连接会断开,并且无法建立新连接。",
+ "input": "LockAccountRequest",
+ "name": "锁定数据库账号",
+ "output": "LockAccountResponse",
+ "status": "online"
+ },
+ "ModifyAccountPrivileges": {
+ "document": "修改某账号对某数据库对象的权限、修改账号类型。",
+ "input": "ModifyAccountPrivilegesRequest",
+ "name": "修改数据库账号的权限、类型",
+ "output": "ModifyAccountPrivilegesResponse",
+ "status": "online"
+ },
"ModifyAccountRemark": {
"document": "本接口(ModifyAccountRemark)用于修改账号备注。",
"input": "ModifyAccountRemarkRequest",
@@ -616,6 +658,13 @@
"output": "SwitchDBInstancePrimaryResponse",
"status": "online"
},
+ "UnlockAccount": {
+ "document": "解除数据库账号的锁定,解锁后账号可以登陆数据库。",
+ "input": "UnlockAccountRequest",
+ "name": "解除数据库账号锁定",
+ "output": "UnlockAccountResponse",
+ "status": "online"
+ },
"UpgradeDBInstance": {
"document": "本接口(UpgradeDBInstance)用于升级实例配置。本接口已废弃,推荐使用接口[ModifyDBInstanceSpec](https://cloud.tencent.com/document/api/409/63689)替代。",
"input": "UpgradeDBInstanceRequest",
@@ -1568,6 +1617,69 @@
],
"type": "object"
},
+ "CreateAccountRequest": {
+ "document": "CreateAccount请求参数结构体",
+ "members": [
+ {
+ "disabled": false,
+ "document": "实例ID。",
+ "example": "postgres-4sfuv15b",
+ "member": "string",
+ "name": "DBInstanceId",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "创建的账号名称。",
+ "example": "test",
+ "member": "string",
+ "name": "UserName",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "账号对应的密码。",
+ "example": "1234qwe",
+ "member": "string",
+ "name": "Password",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "账号类型。当前支持normal、tencentDBSuper两个输入。normal指代普通用户,tencentDBSuper为拥有pg_tencentdb_superuser角色的账号。",
+ "example": "normal",
+ "member": "string",
+ "name": "Type",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "账号备注。",
+ "example": "test Remark",
+ "member": "string",
+ "name": "Remark",
+ "required": false,
+ "type": "string"
+ }
+ ],
+ "type": "object"
+ },
+ "CreateAccountResponse": {
+ "document": "CreateAccount返回参数结构体",
+ "members": [
+ {
+ "document": "唯一请求 ID,由服务端生成,每次请求都会返回(若请求因其他原因未能抵达服务端,则该次请求不会获得 RequestId)。定位问题时需要提供该次请求的 RequestId。",
+ "member": "string",
+ "name": "RequestId",
+ "type": "string"
+ }
+ ],
+ "type": "object"
+ },
"CreateBaseBackupRequest": {
"document": "CreateBaseBackup请求参数结构体",
"members": [
@@ -3460,6 +3572,131 @@
],
"usage": "both"
},
+ "DatabaseObject": {
+ "document": "描述数据库中某个对象所属的类型、是在哪个数据库、模式、表中的对象。",
+ "members": [
+ {
+ "disabled": false,
+ "document": "支持使用的数据库对象类型有:account,database,schema,sequence,procedure,type,function,table,view,matview,column。\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "database",
+ "member": "string",
+ "name": "ObjectType",
+ "output_required": true,
+ "required": true,
+ "type": "string",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "所描述的数据库对象名称\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "test_database\t",
+ "member": "string",
+ "name": "ObjectName",
+ "output_required": true,
+ "required": true,
+ "type": "string",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "所要描述的数据库对象,所属的数据库名称。当描述对象类型不为database时,此参数必选。\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "test_database",
+ "member": "string",
+ "name": "DatabaseName",
+ "output_required": false,
+ "required": false,
+ "type": "string",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "所要描述的数据库对象,所属的模式名称。当描述对象不为database、schema时,此参数必选。\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "test_schema",
+ "member": "string",
+ "name": "SchemaName",
+ "output_required": false,
+ "required": false,
+ "type": "string",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "所要描述的数据库对象,所属的表名称。当描述的对象类型为column时,此参数必填。\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "test_table",
+ "member": "string",
+ "name": "TableName",
+ "output_required": false,
+ "required": false,
+ "type": "string",
+ "value_allowed_null": true
+ }
+ ],
+ "usage": "both"
+ },
+ "DatabasePrivilege": {
+ "document": "指定账号对数据库对象拥有的权限列表",
+ "members": [
+ {
+ "disabled": false,
+ "document": "数据库对象,当ObjectType为database时,DataseName/SchemaName/TableName可为空;当ObjectType为schema时,SchemaName/TableName可为空;当ObjectType为column时,TableName不可为空,其余情况均可为空。\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "{\"ObjectType\":\"table\",\"ObjectName\":\"test_table\",\"DatabaseName\":\"test_database\",\"SchemaName\":\"test_schema\"}",
+ "member": "DatabaseObject",
+ "name": "Object",
+ "output_required": false,
+ "required": false,
+ "type": "object",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "指定账号对数据库对象拥有的权限列表\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "[\"SELECT\"]",
+ "member": "string",
+ "name": "PrivilegeSet",
+ "output_required": false,
+ "required": false,
+ "type": "list",
+ "value_allowed_null": true
+ }
+ ],
+ "usage": "both"
+ },
+ "DeleteAccountRequest": {
+ "document": "DeleteAccount请求参数结构体",
+ "members": [
+ {
+ "disabled": false,
+ "document": "实例ID。\t",
+ "example": "postgres-4sfuv15b\t",
+ "member": "string",
+ "name": "DBInstanceId",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "删除的账号名称。\t",
+ "example": "test",
+ "member": "string",
+ "name": "UserName",
+ "required": true,
+ "type": "string"
+ }
+ ],
+ "type": "object"
+ },
+ "DeleteAccountResponse": {
+ "document": "DeleteAccount返回参数结构体",
+ "members": [
+ {
+ "document": "唯一请求 ID,由服务端生成,每次请求都会返回(若请求因其他原因未能抵达服务端,则该次请求不会获得 RequestId)。定位问题时需要提供该次请求的 RequestId。",
+ "member": "string",
+ "name": "RequestId",
+ "type": "string"
+ }
+ ],
+ "type": "object"
+ },
"DeleteBaseBackupRequest": {
"document": "DeleteBaseBackup请求参数结构体",
"members": [
@@ -3760,6 +3997,61 @@
],
"type": "object"
},
+ "DescribeAccountPrivilegesRequest": {
+ "document": "DescribeAccountPrivileges请求参数结构体",
+ "members": [
+ {
+ "disabled": false,
+ "document": "实例ID。\t",
+ "example": "postgres-4sfuv15b\t",
+ "member": "string",
+ "name": "DBInstanceId",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "查询此账号对某数据库对象所拥有的权限信息。",
+ "example": "test",
+ "member": "string",
+ "name": "UserName",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "要查询的数据库对象信息",
+ "example": "[{\"ObjectType\":\"table\",\"ObjectName\":\"users\",\"DatabaseName\":\"user_database\",\"SchemaName\":\"user_schema\"}]",
+ "member": "DatabaseObject",
+ "name": "DatabaseObjectSet",
+ "required": true,
+ "type": "list"
+ }
+ ],
+ "type": "object"
+ },
+ "DescribeAccountPrivilegesResponse": {
+ "document": "DescribeAccountPrivileges返回参数结构体",
+ "members": [
+ {
+ "disabled": false,
+ "document": "用户拥有数据库user_database的CREATE、CONNECT、TEMPORARY权限",
+ "example": "{\"Object\": {\"DatabaseName\": \"\", \"ObjectName\": \"user_database\", \"ObjectType\": \"database\", \"SchemaName\": \"\", \"TableName\": \"\" }, \"PrivilegeSet\": [ \"CREATE\", \"CONNECT\", \"TEMPORARY\"] }",
+ "member": "DatabasePrivilege",
+ "name": "PrivilegeSet",
+ "output_required": false,
+ "type": "list",
+ "value_allowed_null": false
+ },
+ {
+ "document": "唯一请求 ID,由服务端生成,每次请求都会返回(若请求因其他原因未能抵达服务端,则该次请求不会获得 RequestId)。定位问题时需要提供该次请求的 RequestId。",
+ "member": "string",
+ "name": "RequestId",
+ "type": "string"
+ }
+ ],
+ "type": "object"
+ },
"DescribeAccountsRequest": {
"document": "DescribeAccounts请求参数结构体",
"members": [
@@ -5190,6 +5482,107 @@
],
"type": "object"
},
+ "DescribeDatabaseObjectsRequest": {
+ "document": "DescribeDatabaseObjects请求参数结构体",
+ "members": [
+ {
+ "disabled": false,
+ "document": "实例ID。\t",
+ "example": "postgres-4sfuv15b\t",
+ "member": "string",
+ "name": "DBInstanceId",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "查询的对象类型。支持查询的数据对象有:database,schema,sequence,procedure,type,function,table,view,matview,column。",
+ "example": "table",
+ "member": "string",
+ "name": "ObjectType",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "单次显示数量,默认20。可选范围为[0,100]。",
+ "example": "20",
+ "member": "int64",
+ "name": "Limit",
+ "required": false,
+ "type": "int"
+ },
+ {
+ "disabled": false,
+ "document": "数据偏移量,从0开始。\t",
+ "example": "0",
+ "member": "int64",
+ "name": "Offset",
+ "required": false,
+ "type": "int"
+ },
+ {
+ "disabled": false,
+ "document": "查询对象所属的数据库。当查询对象类型不为database时,此参数必填。",
+ "example": "test_database",
+ "member": "string",
+ "name": "DatabaseName",
+ "required": false,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "查询对象所属的模式。当查询对象类型不为database、schema时,此参数必填。",
+ "example": "test_schema",
+ "member": "string",
+ "name": "SchemaName",
+ "required": false,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "查询对象所属的表。当查询对象类型为column时,此参数必填。",
+ "example": "test_table",
+ "member": "string",
+ "name": "TableName",
+ "required": false,
+ "type": "string"
+ }
+ ],
+ "type": "object"
+ },
+ "DescribeDatabaseObjectsResponse": {
+ "document": "DescribeDatabaseObjects返回参数结构体",
+ "members": [
+ {
+ "disabled": false,
+ "document": "查询对象列表。\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "[\"test\"]",
+ "member": "string",
+ "name": "ObjectSet",
+ "output_required": false,
+ "type": "list",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "查询对象总数量\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "1",
+ "member": "uint64",
+ "name": "TotalCount",
+ "output_required": false,
+ "type": "int",
+ "value_allowed_null": true
+ },
+ {
+ "document": "唯一请求 ID,由服务端生成,每次请求都会返回(若请求因其他原因未能抵达服务端,则该次请求不会获得 RequestId)。定位问题时需要提供该次请求的 RequestId。",
+ "member": "string",
+ "name": "RequestId",
+ "type": "string"
+ }
+ ],
+ "type": "object"
+ },
"DescribeDatabasesRequest": {
"document": "DescribeDatabases请求参数结构体",
"members": [
@@ -7013,6 +7406,42 @@
],
"type": "object"
},
+ "LockAccountRequest": {
+ "document": "LockAccount请求参数结构体",
+ "members": [
+ {
+ "disabled": false,
+ "document": "实例ID。\t",
+ "example": "postgres-4sfuv15b\t",
+ "member": "string",
+ "name": "DBInstanceId",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "账号名称。",
+ "example": "test",
+ "member": "string",
+ "name": "UserName",
+ "required": true,
+ "type": "string"
+ }
+ ],
+ "type": "object"
+ },
+ "LockAccountResponse": {
+ "document": "LockAccount返回参数结构体",
+ "members": [
+ {
+ "document": "唯一请求 ID,由服务端生成,每次请求都会返回(若请求因其他原因未能抵达服务端,则该次请求不会获得 RequestId)。定位问题时需要提供该次请求的 RequestId。",
+ "member": "string",
+ "name": "RequestId",
+ "type": "string"
+ }
+ ],
+ "type": "object"
+ },
"LogBackup": {
"document": "数据库日志备份信息",
"members": [
@@ -7119,6 +7548,51 @@
],
"usage": "out"
},
+ "ModifyAccountPrivilegesRequest": {
+ "document": "ModifyAccountPrivileges请求参数结构体",
+ "members": [
+ {
+ "disabled": false,
+ "document": "实例ID。\t",
+ "example": "postgres-4sfuv15b\t",
+ "member": "string",
+ "name": "DBInstanceId",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "修改此账号对某数据库对象的权限。",
+ "example": "test",
+ "member": "string",
+ "name": "UserName",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "修改的权限信息,支持批量修改,一次最高修改50条。",
+ "example": "[{\"DatabasePrivilege\":{\"Object\":{\"ObjectType\":\"account\",\"ObjectName\":\"user_without_permission\"},\"PrivilegeSet\":[\"tencentDBSuper\"]},\"ModifyType\":\"alterRole\"}]",
+ "member": "ModifyPrivilege",
+ "name": "ModifyPrivilegeSet",
+ "required": true,
+ "type": "list"
+ }
+ ],
+ "type": "object"
+ },
+ "ModifyAccountPrivilegesResponse": {
+ "document": "ModifyAccountPrivileges返回参数结构体",
+ "members": [
+ {
+ "document": "唯一请求 ID,由服务端生成,每次请求都会返回(若请求因其他原因未能抵达服务端,则该次请求不会获得 RequestId)。定位问题时需要提供该次请求的 RequestId。",
+ "member": "string",
+ "name": "RequestId",
+ "type": "string"
+ }
+ ],
+ "type": "object"
+ },
"ModifyAccountRemarkRequest": {
"document": "ModifyAccountRemark请求参数结构体",
"members": [
@@ -7960,6 +8434,45 @@
],
"type": "object"
},
+ "ModifyPrivilege": {
+ "document": "用于修改数据库对象的权限,其中包含了数据库对象描述的数据结构、需要修改的权限列表以及修改的类型等。",
+ "members": [
+ {
+ "disabled": false,
+ "document": "要修改的数据库对象及权限列表\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "\"Object\":{\"ObjectType\":\"table\",\"ObjectName\":\"test_table\",\"DatabaseName\":\"test_database\",\"SchemaName\":\"test_schema\"},\"Privileges\":[\"SELECT\"]",
+ "member": "DatabasePrivilege",
+ "name": "DatabasePrivilege",
+ "output_required": false,
+ "required": false,
+ "type": "object",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "修改的方式,当前仅支持grantObject、revokeObject、alterRole。grantObject代表授权、revokeObject代表收回权、alterRole代表修改账号类型。\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "grantObject",
+ "member": "string",
+ "name": "ModifyType",
+ "output_required": false,
+ "required": false,
+ "type": "string",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "当ModifyType为revokeObject才需要此参数,参数为true时,撤销权限会级联撤销。默认为false。\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "false",
+ "member": "bool",
+ "name": "IsCascade",
+ "output_required": false,
+ "required": false,
+ "type": "bool",
+ "value_allowed_null": true
+ }
+ ],
+ "usage": "both"
+ },
"ModifyReadOnlyGroupConfigRequest": {
"document": "ModifyReadOnlyGroupConfig请求参数结构体",
"members": [
@@ -10249,6 +10762,42 @@
],
"usage": "both"
},
+ "UnlockAccountRequest": {
+ "document": "UnlockAccount请求参数结构体",
+ "members": [
+ {
+ "disabled": false,
+ "document": "实例ID。\t",
+ "example": "postgres-4sfuv15b\t",
+ "member": "string",
+ "name": "DBInstanceId",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "账号名称。",
+ "example": "test",
+ "member": "string",
+ "name": "UserName",
+ "required": true,
+ "type": "string"
+ }
+ ],
+ "type": "object"
+ },
+ "UnlockAccountResponse": {
+ "document": "UnlockAccount返回参数结构体",
+ "members": [
+ {
+ "document": "唯一请求 ID,由服务端生成,每次请求都会返回(若请求因其他原因未能抵达服务端,则该次请求不会获得 RequestId)。定位问题时需要提供该次请求的 RequestId。",
+ "member": "string",
+ "name": "RequestId",
+ "type": "string"
+ }
+ ],
+ "type": "object"
+ },
"UpgradeDBInstanceKernelVersionRequest": {
"document": "UpgradeDBInstanceKernelVersion请求参数结构体",
"members": [
diff --git a/tccli/services/postgres/v20170312/examples.json b/tccli/services/postgres/v20170312/examples.json
index 95a9cfbfe9..3b873b5347 100644
--- a/tccli/services/postgres/v20170312/examples.json
+++ b/tccli/services/postgres/v20170312/examples.json
@@ -32,6 +32,20 @@
"title": "关闭serverless公网地址"
}
],
+ "CreateAccount": [
+ {
+ "document": "创建数据库普通账号",
+ "input": "POST / HTTP/1.1\nHost: postgres.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateAccount\n<公共请求参数>\n\n{\n \"DBInstanceId\": \"postgres-5cz25tr5\",\n \"UserName\": \"user_normal\",\n \"Password\": \"Test_password1\",\n \"Type\": \"normal\",\n \"Remark\": \"\"\n}",
+ "output": "{\n \"Response\": {\n \"RequestId\": \"5d19322f-50fe-4084-a5d3-b0bc680fd3a1\"\n }\n}",
+ "title": "创建数据库普通账号"
+ },
+ {
+ "document": "创建数据库超级账号\n",
+ "input": "POST / HTTP/1.1\nHost: postgres.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateAccount\n<公共请求参数>\n\n{\n \"DBInstanceId\": \"postgres-5cz25tr5\",\n \"UserName\": \"user_Super\",\n \"Password\": \"Test_password1\",\n \"Type\": \"tencentDBSuper\",\n \"Remark\": \"超级用户\"\n}",
+ "output": "{\n \"Response\": {\n \"RequestId\": \"fad9ac43-c906-4494-bbb5-88d154d2829c\"\n }\n}",
+ "title": "创建数据库超级账号"
+ }
+ ],
"CreateBaseBackup": [
{
"document": "手动创建实例数据备份。",
@@ -116,6 +130,14 @@
"title": "创建serverlessDB实例"
}
],
+ "DeleteAccount": [
+ {
+ "document": "删除数据库账号",
+ "input": "POST / HTTP/1.1\nHost: postgres.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DeleteAccount\n<公共请求参数>\n\n{\n \"DBInstanceId\": \"postgres-5cz25tr5\",\n \"UserName\": \"asdfghjkl\"\n}",
+ "output": "{\n \"Response\": {\n \"RequestId\": \"eac6a620-d337-4c7e-a4cc-8b7c082de489\"\n }\n}",
+ "title": "删除数据库账号"
+ }
+ ],
"DeleteBaseBackup": [
{
"document": "",
@@ -178,6 +200,32 @@
"title": "指定实例名删除serverlessDB实例"
}
],
+ "DescribeAccountPrivileges": [
+ {
+ "document": "查看账号类型",
+ "input": "POST / HTTP/1.1\nHost: postgres.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeAccountPrivileges\n<公共请求参数>\n\n{\n \"DBInstanceId\": \"postgres-5cz25tr5\",\n \"UserName\": \"user_without_permission\",\n \"DatabaseObjectSet\": [\n {\n \"ObjectType\": \"account\",\n \"ObjectName\": \"user_without_permission\"\n }\n ]\n}",
+ "output": "{\n \"Response\": {\n \"PrivilegeSet\": [\n {\n \"Object\": {\n \"DatabaseName\": \"\",\n \"ObjectName\": \"without_per\",\n \"ObjectType\": \"account\",\n \"SchemaName\": \"\",\n \"TableName\": \"\"\n },\n \"PrivilegeSet\": [\n \"tencentDBSuper\"\n ]\n }\n ],\n \"RequestId\": \"dc43ec52-efbe-4bde-b588-bfa427a8c29b\"\n }\n}",
+ "title": "查看账号类型"
+ },
+ {
+ "document": "查询账号without_per对数据库user_database的权限",
+ "input": "POST / HTTP/1.1\nHost: postgres.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeAccountPrivileges\n<公共请求参数>\n\n{\n \"DBInstanceId\": \"postgres-5cz25tr5\",\n \"UserName\": \"without_per\",\n \"DatabaseObjectSet\": [\n {\n \"ObjectType\": \"database\",\n \"ObjectName\": \"user_database\"\n }\n ]\n}",
+ "output": "{\n \"Response\": {\n \"PrivilegeSet\": [\n {\n \"Object\": {\n \"DatabaseName\": \"\",\n \"ObjectName\": \"user_database\",\n \"ObjectType\": \"database\",\n \"SchemaName\": \"\",\n \"TableName\": \"\"\n },\n \"PrivilegeSet\": [\n \"CREATE\",\n \"CONNECT\",\n \"TEMPORARY\"\n ]\n }\n ],\n \"RequestId\": \"fc891ba1-8943-4116-8eb6-4696873d90c8\"\n }\n}",
+ "title": "查询数据库权限"
+ },
+ {
+ "document": "查询账号without_per对user_database数据库下,user_schema的权限",
+ "input": "POST / HTTP/1.1\nHost: postgres.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeAccountPrivileges\n<公共请求参数>\n\n{\n \"DBInstanceId\": \"postgres-5cz25tr5\",\n \"UserName\": \"without_per\",\n \"DatabaseObjectSet\": [\n {\n \"ObjectType\": \"schema\",\n \"ObjectName\": \"user_schema\",\n \"DatabaseName\": \"user_database\"\n }\n ]\n}",
+ "output": "{\n \"Response\": {\n \"PrivilegeSet\": [\n {\n \"Object\": {\n \"DatabaseName\": \"user_database\",\n \"ObjectName\": \"user_schema\",\n \"ObjectType\": \"schema\",\n \"SchemaName\": \"\",\n \"TableName\": \"\"\n },\n \"PrivilegeSet\": [\n \"USAGE\",\n \"CREATE\"\n ]\n }\n ],\n \"RequestId\": \"410f0673-c35c-401e-97c8-d4e196d1f33c\"\n }\n}",
+ "title": "查询模式权限"
+ },
+ {
+ "document": "批量查询",
+ "input": "POST / HTTP/1.1\nHost: postgres.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeAccountPrivileges\n<公共请求参数>\n\n{\n \"DBInstanceId\": \"postgres-5cz25tr5\",\n \"UserName\": \"without_per\",\n \"DatabaseObjectSet\": [\n {\n \"ObjectType\": \"table\",\n \"ObjectName\": \"users\",\n \"DatabaseName\": \"user_database\",\n \"SchemaName\": \"user_schema\"\n },\n {\n \"ObjectType\": \"schema\",\n \"ObjectName\": \"user_schema\",\n \"DatabaseName\": \"user_database\"\n }\n ]\n}",
+ "output": "{\n \"Response\": {\n \"PrivilegeSet\": [\n {\n \"Object\": {\n \"DatabaseName\": \"user_database\",\n \"ObjectName\": \"users\",\n \"ObjectType\": \"table\",\n \"SchemaName\": \"user_schema\",\n \"TableName\": \"\"\n },\n \"PrivilegeSet\": [\n \"DELETE\",\n \"TRUNCATE\",\n \"REFERENCES\",\n \"TRIGGER\",\n \"SELECT\",\n \"INSERT\",\n \"UPDATE\"\n ]\n },\n {\n \"Object\": {\n \"DatabaseName\": \"user_database\",\n \"ObjectName\": \"user_schema\",\n \"ObjectType\": \"schema\",\n \"SchemaName\": \"\",\n \"TableName\": \"\"\n },\n \"PrivilegeSet\": [\n \"CREATE\",\n \"USAGE\"\n ]\n }\n ],\n \"RequestId\": \"41d71515-447d-4557-a799-3b60ad86323d\"\n }\n}",
+ "title": "批量查询"
+ }
+ ],
"DescribeAccounts": [
{
"document": "获取实例postgres-hpe52jnz的账户列表",
@@ -362,6 +410,26 @@
"title": "获取实例postgres-apzvwncr的Xlog列表"
}
],
+ "DescribeDatabaseObjects": [
+ {
+ "document": "查询数据库列表",
+ "input": "POST / HTTP/1.1\nHost: postgres.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeDatabaseObjects\n<公共请求参数>\n\n{\n \"DBInstanceId\": \"postgres-5cz25tr5\",\n \"ObjectType\": \"database\"\n}",
+ "output": "{\n \"Response\": {\n \"ObjectSet\": [\n \"postgres\",\n \"postgres_bak_1715170243\",\n \"user_database\"\n ],\n \"TotalCount\": 3,\n \"RequestId\": \"c90f7a9d-f519-4d2f-bb2f-e3966cd102b6\"\n }\n}",
+ "title": "查询对象为database"
+ },
+ {
+ "document": "查询user_database下的模式",
+ "input": "POST / HTTP/1.1\nHost: postgres.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeDatabaseObjects\n<公共请求参数>\n\n{\n \"DBInstanceId\": \"postgres-5cz25tr5\",\n \"ObjectType\": \"schema\",\n \"Limit\": 2,\n \"Offset\": 1,\n \"DatabaseName\": \"user_database\"\n}",
+ "output": "{\n \"Response\": {\n \"ObjectSet\": [\n \"information_schema\",\n \"pg_catalog\"\n ],\n \"TotalCount\": 2,\n \"RequestId\": \"bb6146b9-0c63-40ea-b89a-d83944805b79\"\n }\n}",
+ "title": "查询对象为schema"
+ },
+ {
+ "document": "查询user_database数据库下,属于user_schema模式的表",
+ "input": "POST / HTTP/1.1\nHost: postgres.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeDatabaseObjects\n<公共请求参数>\n\n{\n \"DBInstanceId\": \"postgres-5cz25tr5\",\n \"ObjectType\": \"table\",\n \"DatabaseName\": \"user_database\",\n \"SchemaName\": \"user_schema\"\n}",
+ "output": "{\n \"Response\": {\n \"ObjectSet\": [\n \"users\",\n \"users1\",\n \"users2\"\n ],\n \"TotalCount\": 3,\n \"RequestId\": \"80530420-d73e-4a60-8149-93cf800220b9\"\n }\n}",
+ "title": "查询对象为table"
+ }
+ ],
"DescribeDatabases": [
{
"document": "不做筛选,全量拉取实例的数据库列表。",
@@ -550,6 +618,22 @@
"title": "隔离实例"
}
],
+ "LockAccount": [
+ {
+ "document": "锁定数据库账号",
+ "input": "POST / HTTP/1.1\nHost: postgres.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: LockAccount\n<公共请求参数>\n\n{\n \"DBInstanceId\": \"postgres-4sfuv15b\",\n \"UserName\": \"test\"\n}",
+ "output": "{\n \"Response\": {\n \"RequestId\": \"6ace8140-6b9e-4e81-a8ad-ef3f92b2aa90\"\n }\n}",
+ "title": "锁定数据库账号"
+ }
+ ],
+ "ModifyAccountPrivileges": [
+ {
+ "document": "批量修改without_per账号的权限:授予user_database库下user_schema模式的CREATE权限,并撤销对应USAGE权限;授予user_database库下,属于user_schema模式的users表的SELECT权限。修改without_per账号的类型为tencentDBSuper。",
+ "input": "POST / HTTP/1.1\nHost: postgres.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: ModifyAccountPrivileges\n<公共请求参数>\n\n{\n \"DBInstanceId\": \"postgres-5cz25tr5\",\n \"UserName\": \"without_per\",\n \"ModifyPrivilegeSet\": [\n {\n \"DatabasePrivilege\": {\n \"Object\": {\n \"ObjectType\": \"schema\",\n \"ObjectName\": \"user_schema\",\n \"DatabaseName\": \"user_database\"\n },\n \"PrivilegeSet\": [\n \"USAGE\"\n ]\n },\n \"ModifyType\": \"revokeObject\",\n \"IsCascade\": false\n },\n {\n \"DatabasePrivilege\": {\n \"Object\": {\n \"ObjectType\": \"schema\",\n \"ObjectName\": \"user_schema\",\n \"DatabaseName\": \"user_database\"\n },\n \"PrivilegeSet\": [\n \"CREATE\"\n ]\n },\n \"ModifyType\": \"grantObject\"\n },\n {\n \"DatabasePrivilege\": {\n \"Object\": {\n \"ObjectType\": \"table\",\n \"ObjectName\": \"users\",\n \"DatabaseName\": \"user_database\",\n \"SchemaName\": \"user_schema\"\n },\n \"PrivilegeSet\": [\n \"SELECT\"\n ]\n },\n \"ModifyType\": \"grantObject\"\n },\n {\n \"DatabasePrivilege\": {\n \"Object\": {\n \"ObjectType\": \"account\",\n \"ObjectName\": \"without_per\"\n },\n \"PrivilegeSet\": [\n \"tencentDBSuper\"\n ]\n },\n \"ModifyType\": \"alterRole\"\n }\n ]\n}",
+ "output": "{\n \"Response\": {\n \"RequestId\": \"73086328-bdfa-4bf9-8206-8a3d6b2438b1\"\n }\n}",
+ "title": "批量修改权限"
+ }
+ ],
"ModifyAccountRemark": [
{
"document": "",
@@ -806,6 +890,14 @@
"title": "切换实例主备关系"
}
],
+ "UnlockAccount": [
+ {
+ "document": "账号锁定之后,通过此操作解锁。",
+ "input": "POST / HTTP/1.1\nHost: postgres.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: UnlockAccount\n<公共请求参数>\n\n{\n \"DBInstanceId\": \"postgres-4sfuv15b\",\n \"UserName\": \"test\"\n}",
+ "output": "{\n \"Response\": {\n \"RequestId\": \"6ace8140-6b9e-4e81-a8ad-ef3f92b2aa90\"\n }\n}",
+ "title": "解除数据库账号锁定"
+ }
+ ],
"UpgradeDBInstance": [
{
"document": "调整实例postgres-6bwgamo3规格为内存2GB、存储100GB。",
diff --git a/tccli/services/rce/v20201103/api.json b/tccli/services/rce/v20201103/api.json
index d8757a1f68..300f31a9e7 100644
--- a/tccli/services/rce/v20201103/api.json
+++ b/tccli/services/rce/v20201103/api.json
@@ -57,6 +57,75 @@
],
"usage": "in"
},
+ "DataAuthorizationInfo": {
+ "document": "数据授权信息",
+ "members": [
+ {
+ "disabled": false,
+ "document": "客户主体名称。\n\n示例值:某某有限公司。",
+ "example": "无",
+ "member": "string",
+ "name": "DataProviderName",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "接收方主体名称。\n\n固定填:腾讯云计算(北京)有限责任公司\n\n示例值:腾讯云计算(北京)有限责任公司",
+ "example": "无",
+ "member": "string",
+ "name": "DataRecipientName",
+ "required": true,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "客户请求RCE所涉及的用户敏感数据类型,支持多选。实际以接口请求传参为准。\n\n1-手机号;\n\n2-微信开放账号;\n\n3-QQ开放账号;\n\n4-IP地址;\n\n5-设备指纹;\n\n999-其它;\n\n示例值:[1, 4]",
+ "example": "无",
+ "member": "uint64",
+ "name": "UserDataType",
+ "required": true,
+ "type": "list"
+ },
+ {
+ "disabled": false,
+ "document": "客户是否已经获取用户授权。\n\n1-已授权;其它值为未授权。\n\n示例值:1",
+ "example": "无",
+ "member": "uint64",
+ "name": "IsAuthorize",
+ "required": true,
+ "type": "int"
+ },
+ {
+ "disabled": false,
+ "document": "是否是用户个人敏感数据。\n\n固定填:1。\n\n示例值:1",
+ "example": "无",
+ "member": "uint64",
+ "name": "IsPersonalData",
+ "required": true,
+ "type": "int"
+ },
+ {
+ "disabled": false,
+ "document": "客户获得的用户授权期限时间戳(单位秒)。\n\n不填默认无固定期限。\n\n示例值:1719805604",
+ "example": "无",
+ "member": "uint64",
+ "name": "AuthorizationTerm",
+ "required": false,
+ "type": "int"
+ },
+ {
+ "disabled": false,
+ "document": "客户获得用户授权所依赖的协议地址。\n\n示例值:https://www.*****.com/*****",
+ "example": "无",
+ "member": "string",
+ "name": "PrivacyPolicyLink",
+ "required": false,
+ "type": "string"
+ }
+ ],
+ "usage": "in"
+ },
"InputCryptoManageMarketingRisk": {
"document": "全栈式风控引擎入参",
"members": [
@@ -319,6 +388,15 @@
"name": "Platform",
"required": false,
"type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "数据授权信息。",
+ "example": "无",
+ "member": "DataAuthorizationInfo",
+ "name": "DataAuthorization",
+ "required": false,
+ "type": "object"
}
],
"usage": "in"
diff --git a/tccli/services/tcr/v20190924/api.json b/tccli/services/tcr/v20190924/api.json
index f7d95cea90..f16eacbcf0 100644
--- a/tccli/services/tcr/v20190924/api.json
+++ b/tccli/services/tcr/v20190924/api.json
@@ -428,7 +428,7 @@
"status": "online"
},
"DescribeInstanceAllNamespaces": {
- "document": "查询所有实例命名空间列表",
+ "document": "查询所有有实例命名空间列表",
"input": "DescribeInstanceAllNamespacesRequest",
"name": "查询所有实例命名空间",
"output": "DescribeInstanceAllNamespacesResponse",
@@ -575,9 +575,9 @@
"status": "online"
},
"DescribeTagRetentionRules": {
- "document": "查询版本保留规则",
+ "document": "查询镜像版本保留规则",
"input": "DescribeTagRetentionRulesRequest",
- "name": "查询版本保留规则",
+ "name": "查询镜像版本保留规则",
"output": "DescribeTagRetentionRulesResponse",
"status": "online"
},
@@ -2627,7 +2627,7 @@
{
"disabled": false,
"document": "实例Id",
- "example": "",
+ "example": "tcr-xxx",
"member": "string",
"name": "RegistryId",
"required": true,
@@ -2635,28 +2635,28 @@
},
{
"disabled": false,
- "document": "镜像仓库名称",
- "example": "",
+ "document": "命名空间名称",
+ "example": "ns",
"member": "string",
- "name": "RepositoryName",
+ "name": "NamespaceName",
"required": true,
"type": "string"
},
{
"disabled": false,
- "document": "镜像版本",
- "example": "",
+ "document": "镜像仓库名称",
+ "example": "repo",
"member": "string",
- "name": "ImageVersion",
+ "name": "RepositoryName",
"required": true,
"type": "string"
},
{
"disabled": false,
- "document": "命名空间名称",
- "example": "",
+ "document": "镜像版本",
+ "example": "v1",
"member": "string",
- "name": "NamespaceName",
+ "name": "ImageVersion",
"required": true,
"type": "string"
}
@@ -3966,7 +3966,7 @@
{
"disabled": false,
"document": "实例ID",
- "example": "",
+ "example": "tcr-xx",
"member": "string",
"name": "RegistryId",
"required": true,
@@ -3975,7 +3975,7 @@
{
"disabled": false,
"document": "命名空间名称",
- "example": "",
+ "example": "ns",
"member": "string",
"name": "NamespaceName",
"required": true,
@@ -3984,7 +3984,7 @@
{
"disabled": false,
"document": "镜像仓库名称",
- "example": "",
+ "example": "repo",
"member": "string",
"name": "RepositoryName",
"required": true,
@@ -3993,7 +3993,7 @@
{
"disabled": false,
"document": "镜像版本",
- "example": "",
+ "example": "v1",
"member": "string",
"name": "ImageVersion",
"required": true,
@@ -4008,21 +4008,43 @@
{
"disabled": false,
"document": "镜像的Manifest信息",
- "example": "",
+ "example": "\"\"",
"member": "string",
"name": "Manifest",
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
{
"disabled": false,
"document": "镜像的配置信息",
- "example": "",
+ "example": "\"\"",
"member": "string",
"name": "Config",
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
+ {
+ "disabled": false,
+ "document": "镜像的Labels信息\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "无",
+ "member": "KeyValueString",
+ "name": "Labels",
+ "output_required": false,
+ "type": "list",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "镜像大小,单位:byte\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "1570",
+ "member": "int64",
+ "name": "Size",
+ "output_required": false,
+ "type": "int",
+ "value_allowed_null": true
+ },
{
"document": "唯一请求 ID,由服务端生成,每次请求都会返回(若请求因其他原因未能抵达服务端,则该次请求不会获得 RequestId)。定位问题时需要提供该次请求的 RequestId。",
"member": "string",
@@ -4183,7 +4205,7 @@
"example": "无",
"member": "TcrImageInfo",
"name": "ImageInfoList",
- "required": true,
+ "output_required": true,
"type": "list",
"value_allowed_null": false
},
@@ -4193,7 +4215,7 @@
"example": "2",
"member": "int64",
"name": "TotalCount",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
@@ -5483,7 +5505,7 @@
"example": "无",
"member": "RetentionExecution",
"name": "RetentionExecutionList",
- "required": true,
+ "output_required": true,
"type": "list",
"value_allowed_null": false
},
@@ -5493,7 +5515,7 @@
"example": "1",
"member": "int64",
"name": "TotalCount",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
@@ -5566,7 +5588,7 @@
"example": "无",
"member": "RetentionTask",
"name": "RetentionTaskList",
- "required": true,
+ "output_required": true,
"type": "list",
"value_allowed_null": false
},
@@ -5576,7 +5598,7 @@
"example": "1",
"member": "int64",
"name": "TotalCount",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
@@ -5640,7 +5662,7 @@
"example": "无",
"member": "RetentionPolicy",
"name": "RetentionPolicyList",
- "required": true,
+ "output_required": true,
"type": "list",
"value_allowed_null": false
},
@@ -5650,7 +5672,7 @@
"example": "1",
"member": "int64",
"name": "TotalCount",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
@@ -5696,7 +5718,7 @@
{
"disabled": false,
"document": "实例 Id",
- "example": "",
+ "example": "tcr-xxx",
"member": "string",
"name": "RegistryId",
"required": true,
@@ -5705,7 +5727,7 @@
{
"disabled": false,
"document": "命名空间",
- "example": "",
+ "example": "ns",
"member": "string",
"name": "Namespace",
"required": true,
@@ -5714,7 +5736,7 @@
{
"disabled": false,
"document": "触发器 Id",
- "example": "",
+ "example": "10",
"member": "int64",
"name": "Id",
"required": false,
@@ -5723,7 +5745,7 @@
{
"disabled": false,
"document": "分页单页数量",
- "example": "",
+ "example": "20",
"member": "int64",
"name": "Limit",
"required": false,
@@ -5732,7 +5754,7 @@
{
"disabled": false,
"document": "分页偏移量",
- "example": "",
+ "example": "0",
"member": "int64",
"name": "Offset",
"required": false,
@@ -5747,18 +5769,20 @@
{
"disabled": false,
"document": "总数",
- "example": "",
+ "example": "10",
"member": "int64",
"name": "TotalCount",
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
{
"disabled": false,
"document": "日志列表",
- "example": "",
+ "example": "无",
"member": "WebhookTriggerLog",
"name": "Logs",
+ "output_required": true,
"type": "list",
"value_allowed_null": false
},
@@ -8709,7 +8733,7 @@
"example": "1",
"member": "int64",
"name": "RetentionId",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
@@ -8719,7 +8743,7 @@
"example": "mytest",
"member": "string",
"name": "NamespaceName",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
@@ -8729,7 +8753,7 @@
"example": "无",
"member": "RetentionRule",
"name": "RetentionRuleList",
- "required": true,
+ "output_required": true,
"type": "list",
"value_allowed_null": false
},
@@ -8739,7 +8763,7 @@
"example": "manual",
"member": "string",
"name": "CronSetting",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
@@ -8749,7 +8773,7 @@
"example": "false",
"member": "bool",
"name": "Disabled",
- "required": true,
+ "output_required": true,
"type": "bool",
"value_allowed_null": false
},
@@ -8759,7 +8783,7 @@
"example": "2021-02-03",
"member": "string",
"name": "NextExecutionTime",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
}
@@ -8771,26 +8795,28 @@
"members": [
{
"disabled": false,
- "document": "支持的策略,可选值为latestPushedK(保留最新推送多少个版本)nDaysSinceLastPush(保留近天内推送)",
+ "document": "支持的策略,可选值为latestPushedK(保留最新推送多少个版本)nDaysSinceLastPush(保留近天内推送)\n注意:此字段可能返回 null,表示取不到有效值。",
"example": "latestPushedK",
"member": "string",
"name": "Key",
+ "output_required": false,
"required": true,
"type": "string",
- "value_allowed_null": false
+ "value_allowed_null": true
},
{
"disabled": false,
- "document": "规则设置下的对应值",
+ "document": "规则设置下的对应值\n注意:此字段可能返回 null,表示取不到有效值。",
"example": "0",
"member": "int64",
"name": "Value",
+ "output_required": false,
"required": true,
"type": "int",
- "value_allowed_null": false
+ "value_allowed_null": true
}
],
- "usage": "in"
+ "usage": "both"
},
"RetentionTask": {
"document": "版本保留执行的规则",
diff --git a/tccli/services/tcr/v20190924/examples.json b/tccli/services/tcr/v20190924/examples.json
index b06a8cbacf..55cad5449a 100644
--- a/tccli/services/tcr/v20190924/examples.json
+++ b/tccli/services/tcr/v20190924/examples.json
@@ -470,9 +470,9 @@
],
"DescribeImageManifests": [
{
- "document": "",
- "input": "https://tcr.tencentcloudapi.com/?Action=DescribeImageManifests\r\n&<公共请求参数>\r\n&RegistryId=tcr-7s2d14fn\r\n&NamespaceName=test\r\n&RepositoryName=mytest\r\n&ImageVersion=1.0",
- "output": "{\n \"Response\": {\n \"RequestId\": \"6ef83620-c92e-496c-b206-25b0b638f409\",\n \"Manifest\": \"{\\\"config\\\":{\\\"digest\\\":\\\"sha256:72f6114b119f1423a2713aca1e15cb9aeadf835a714d36f7a2cf88d10e4bb6be\\\",\\\"mediaType\\\":\\\"application/vnd.docker.container.image.v1+json\\\",\\\"size\\\":2396},\\\"layers\\\":[{\\\"digest\\\":\\\"sha256:9123ac7c32f74759e6283f04dbf571f18246abe5bb2c779efcb32cd50f3ff13c\\\",\\\"mediaType\\\":\\\"application/vnd.docker.image.rootfs.diff.tar.gzip\\\",\\\"size\\\":2764173},{\\\"digest\\\":\\\"sha256:8673ef3ff8fc5ede7363cbe74d295b013ef7959ba002af607314d8ee77b58a5a\\\",\\\"mediaType\\\":\\\"application/vnd.docker.image.rootfs.diff.tar.gzip\\\",\\\"size\\\":1616975},{\\\"digest\\\":\\\"sha256:a8e22d4a83517ee59537183a2f7ca35fa7b81d36176a9d5d42ca2ab0486af779\\\",\\\"mediaType\\\":\\\"application/vnd.docker.image.rootfs.diff.tar.gzip\\\",\\\"size\\\":8446306}],\\\"mediaType\\\":\\\"application/vnd.docker.distribution.manifest.v2+json\\\",\\\"schemaVersion\\\":2}\",\n \"Config\": \"\"\n }\n}",
+ "document": "查询容器镜像Manifest、Config和Labels信息",
+ "input": "POST / HTTP/1.1\nHost: tcr.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeImageManifests\n<公共请求参数>\n\n{\n \"RegistryId\": \"tcr-7s2d14fn\",\n \"NamespaceName\": \"test\",\n \"RepositoryName\": \"mytest\",\n \"ImageVersion\": \"1.0\"\n}",
+ "output": "{\n \"Response\": {\n \"Manifest\": \"{\\\"config\\\":{\\\"digest\\\":\\\"sha256:72f6114b119f1423a2713aca1e15cb9aeadf835a714d36f7a2cf88d10e4bb6be\\\",\\\"mediaType\\\":\\\"application/vnd.docker.container.image.v1+json\\\",\\\"size\\\":2396},\\\"layers\\\":[{\\\"digest\\\":\\\"sha256:9123ac7c32f74759e6283f04dbf571f18246abe5bb2c779efcb32cd50f3ff13c\\\",\\\"mediaType\\\":\\\"application/vnd.docker.image.rootfs.diff.tar.gzip\\\",\\\"size\\\":2764173},{\\\"digest\\\":\\\"sha256:8673ef3ff8fc5ede7363cbe74d295b013ef7959ba002af607314d8ee77b58a5a\\\",\\\"mediaType\\\":\\\"application/vnd.docker.image.rootfs.diff.tar.gzip\\\",\\\"size\\\":1616975},{\\\"digest\\\":\\\"sha256:a8e22d4a83517ee59537183a2f7ca35fa7b81d36176a9d5d42ca2ab0486af779\\\",\\\"mediaType\\\":\\\"application/vnd.docker.image.rootfs.diff.tar.gzip\\\",\\\"size\\\":8446306}],\\\"mediaType\\\":\\\"application/vnd.docker.distribution.manifest.v2+json\\\",\\\"schemaVersion\\\":2}\",\n \"Config\": \"abc\",\n \"Labels\": [\n {\n \"Key\": \"abc\",\n \"Value\": \"abc\"\n }\n ],\n \"RequestId\": \"6ef83620-c92e-496c-b206-25b0b638f409\"\n }\n}",
"title": "查询容器镜像Manifest信息"
}
],
@@ -664,7 +664,7 @@
{
"document": "",
"input": "https://tcr.tencentcloudapi.com/?Action=DescribeTagRetentionExecutionTask\n&RegistryId=tcr-12345\n&RetentionId=1\n&ExecutionId=1\n&Limit=20\n&Offset=1\n&<公共请求参数>",
- "output": "{\n \"Response\": {\n \"TotalCount\": 1,\n \"RetentionTaskList\": [\n {\n \"Status\": \"xx\",\n \"Total\": 0,\n \"Retained\": 0,\n \"TaskId\": 0,\n \"Repository\": \"xx\",\n \"ExecutionId\": 0,\n \"StartTime\": \"xx\",\n \"EndTime\": \"xx\"\n }\n ],\n \"RequestId\": \"xx\"\n }\n}",
+ "output": "{\n \"Response\": {\n \"TotalCount\": 1,\n \"RetentionTaskList\": [\n {\n \"Status\": \"success\",\n \"Total\": 0,\n \"Retained\": 0,\n \"TaskId\": 0,\n \"Repository\": \"repo\",\n \"ExecutionId\": 0,\n \"StartTime\": \"2024-06-01\",\n \"EndTime\": \"2024-06-01\"\n }\n ],\n \"RequestId\": \"1234-666\"\n }\n}",
"title": "查询版本保留执行任务"
}
],
@@ -672,8 +672,8 @@
{
"document": "",
"input": "https://tcr.tencentcloudapi.com/?Action=DescribeTagRetentionRules\n&RegistryId=tcr-12345\n&NamespaceName=test\n&Limit=20\n&Offset=1\n&<公共请求参数>",
- "output": "{\n \"Response\": {\n \"RequestId\": \"c7abb9f2-9440-43ea-a12f-ae58875acf3d\",\n \"RetentionPolicyList\": [\n {\n \"NextExecutionTime\": \"xx\",\n \"RetentionId\": 1,\n \"NamespaceName\": \"aaaa\",\n \"RetentionRuleList\": [\n {\n \"Key\": \"latestPushedK\",\n \"Value\": 10\n }\n ],\n \"CronSetting\": \"weekly\",\n \"Disabled\": false\n }\n ],\n \"TotalCount\": 0\n }\n}",
- "title": "查询版本保留规则"
+ "output": "{\n \"Response\": {\n \"RequestId\": \"c7abb9f2-9440-43ea-a12f-ae58875acf3d\",\n \"RetentionPolicyList\": [\n {\n \"NextExecutionTime\": \"2024-06-24\",\n \"RetentionId\": 1,\n \"NamespaceName\": \"aaaa\",\n \"RetentionRuleList\": [\n {\n \"Key\": \"latestPushedK\",\n \"Value\": 10\n }\n ],\n \"CronSetting\": \"weekly\",\n \"Disabled\": false\n }\n ],\n \"TotalCount\": 0\n }\n}",
+ "title": "查询镜像版本保留规则"
}
],
"DescribeUserQuotaPersonal": [
@@ -694,9 +694,9 @@
],
"DescribeWebhookTriggerLog": [
{
- "document": "",
- "input": "https://tcr.tencentcloudapi.com/?Action=DescribeWebhookTriggerLog\r\n&<公共请求参数>\r\n&RegistryId=tcr-ak9876\r\n&Namespace=someNs\r\n&Id=9",
- "output": "{\n \"Response\": {\n \"RequestId\": \"be17f554-32fd-451c-a1cd-64f9bd164e3f\",\n \"TotalCount\": 3,\n \"Logs\": [\n {\n \"Id\": 2,\n \"TriggerId\": 25,\n \"EventType\": \"pushImage\",\n \"NotifyType\": \"http\",\n \"Status\": \"finished\",\n \"Detail\": \"{\\\"type\\\":\\\"pushImage\\\",\\\"occur_at\\\":1586774843,\\\"event_data\\\":{\\\"resources\\\":[{\\\"digest\\\":\\\"sha256:7ac7819e1523911399b798309025935a9968b277d86d50e5255465d6592c0266\\\",\\\"tag\\\":\\\"v1\\\",\\\"resource_url\\\":\\\"wcctest.tencentcloudcr.com/nginx/nginx:v1\\\"}],\\\"repository\\\":{\\\"date_created\\\":1586777885,\\\"name\\\":\\\"nginx\\\",\\\"namespace\\\":\\\"nginx\\\",\\\"repo_full_name\\\":\\\"nginx/nginx\\\",\\\"repo_type\\\":\\\"public\\\"}},\\\"operator\\\":\\\"3211064422\\\"}\",\n \"CreationTime\": \"2020-04-14T02:47:23.177329+08:00\",\n \"UpdateTime\": \"2020-04-14T02:47:24.244664+08:00\"\n }\n ]\n }\n}",
+ "document": "用于查询触发器日志",
+ "input": "POST / HTTP/1.1\nHost: tcr.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeWebhookTriggerLog\n<公共请求参数>\n\n{\n \"RegistryId\": \"tcr-ab12345\",\n \"Namespace\": \"someNs\",\n \"Id\": 9\n}",
+ "output": "{\n \"Response\": {\n \"RequestId\": \"e8cbb3a5-ae7a-41f3-ba79-950d39ea653b\",\n \"TotalCount\": 3,\n \"Logs\": [\n {\n \"Id\": 2,\n \"TriggerId\": 25,\n \"EventType\": \"pushImage\",\n \"NotifyType\": \"http\",\n \"Status\": \"finished\",\n \"Detail\": \"{\\\"type\\\":\\\"pushImage\\\",\\\"occur_at\\\":1586774843,\\\"event_data\\\":{\\\"resources\\\":[{\\\"digest\\\":\\\"sha256:7ac7819e1523911399b798309025935a9968b277d86d50e5255465d6592c0266\\\",\\\"tag\\\":\\\"v1\\\",\\\"resource_url\\\":\\\"wcctest.tencentcloudcr.com/nginx/nginx:v1\\\"}],\\\"repository\\\":{\\\"date_created\\\":1586777885,\\\"name\\\":\\\"nginx\\\",\\\"namespace\\\":\\\"nginx\\\",\\\"repo_full_name\\\":\\\"nginx/nginx\\\",\\\"repo_type\\\":\\\"public\\\"}},\\\"operator\\\":\\\"3211064422\\\"}\",\n \"CreationTime\": \"2020-04-14T02:47:23.177329+08:00\",\n \"UpdateTime\": \"2020-04-14T02:47:24.244664+08:00\"\n }\n ]\n }\n}",
"title": "查询触发器日志"
}
],
diff --git a/tccli/services/waf/v20180125/api.json b/tccli/services/waf/v20180125/api.json
index d14ac037b8..076b38f21a 100644
--- a/tccli/services/waf/v20180125/api.json
+++ b/tccli/services/waf/v20180125/api.json
@@ -80,7 +80,7 @@
"CreateIpAccessControl": {
"document": "Waf IP黑白名单新增接口",
"input": "CreateIpAccessControlRequest",
- "name": "Waf IP黑白名单新增接口",
+ "name": "IP黑白名单新增接口",
"output": "CreateIpAccessControlResponse",
"status": "online"
},
@@ -290,7 +290,7 @@
"DescribeBatchIpAccessControl": {
"document": "Waf 批量防护IP黑白名单查询",
"input": "DescribeBatchIpAccessControlRequest",
- "name": "Waf 批量防护IP黑白名单查询",
+ "name": "批量防护IP黑白名单查询",
"output": "DescribeBatchIpAccessControlResponse",
"status": "online"
},
@@ -444,7 +444,7 @@
"DescribeIpAccessControl": {
"document": "Waf ip黑白名单查询",
"input": "DescribeIpAccessControlRequest",
- "name": "Waf IP黑白名单查询",
+ "name": "IP黑白名单查询",
"output": "DescribeIpAccessControlResponse",
"status": "online"
},
@@ -843,7 +843,7 @@
"ModifyIpAccessControl": {
"document": "Waf IP黑白名单编辑接口",
"input": "ModifyIpAccessControlRequest",
- "name": "Waf IP黑白名单编辑接口",
+ "name": "IP黑白名单编辑接口",
"output": "ModifyIpAccessControlResponse",
"status": "online"
},
@@ -1648,6 +1648,33 @@
"name": "SignatureIds",
"required": false,
"type": "list"
+ },
+ {
+ "disabled": false,
+ "document": "加白的大类规则ID",
+ "example": "[\"010000000\",\"020000000\"]",
+ "member": "string",
+ "name": "TypeIds",
+ "required": false,
+ "type": "list"
+ },
+ {
+ "disabled": false,
+ "document": "0:按照特定规则ID加白, 1:按照规则类型加白",
+ "example": "0",
+ "member": "int64",
+ "name": "Mode",
+ "required": false,
+ "type": "int"
+ },
+ {
+ "disabled": false,
+ "document": "规则名",
+ "example": "无",
+ "member": "string",
+ "name": "Name",
+ "required": false,
+ "type": "string"
}
],
"type": "object"
@@ -2798,6 +2825,46 @@
"output_required": false,
"type": "int",
"value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "定时任务类型\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "无",
+ "member": "string",
+ "name": "JobType",
+ "output_required": false,
+ "type": "string",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "周期任务类型\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "无",
+ "member": "string",
+ "name": "CronType",
+ "output_required": false,
+ "type": "string",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "定时任务配置详情\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "无",
+ "member": "JobDateTime",
+ "name": "JobDateTime",
+ "output_required": false,
+ "type": "object",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "生效状态\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "无",
+ "member": "int64",
+ "name": "ValidStatus",
+ "output_required": false,
+ "type": "int",
+ "value_allowed_null": true
}
],
"usage": "out"
@@ -3090,122 +3157,172 @@
{
"disabled": false,
"document": "动作",
- "example": "",
+ "example": "22",
"member": "uint64",
"name": "ActionType",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
{
"disabled": false,
"document": "高级模式",
- "example": "",
+ "example": "1",
"member": "uint64",
"name": "Advance",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
{
"disabled": false,
"document": "时间周期",
- "example": "",
+ "example": "1",
"member": "uint64",
"name": "Interval",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
{
"disabled": false,
"document": "限制次数",
- "example": "",
+ "example": "1",
"member": "uint64",
"name": "Limit",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
{
"disabled": false,
"document": "匹配方法",
- "example": "",
+ "example": "1",
"member": "uint64",
"name": "MatchFunc",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
{
"disabled": false,
"document": "名称",
- "example": "",
+ "example": "test.com",
"member": "string",
"name": "Name",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
{
"disabled": false,
"document": "优先级",
- "example": "",
+ "example": "1",
"member": "uint64",
"name": "Priority",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
{
"disabled": false,
"document": "状态",
- "example": "",
+ "example": "1",
"member": "int64",
"name": "Status",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
{
"disabled": false,
"document": "更新时间戳",
- "example": "",
+ "example": "1",
"member": "uint64",
"name": "TsVersion",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
{
"disabled": false,
"document": "匹配url",
- "example": "",
+ "example": "test.com",
"member": "string",
"name": "Url",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
{
"disabled": false,
"document": "策略动作有效时间",
- "example": "",
+ "example": "1",
"member": "uint64",
"name": "ValidTime",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
{
"disabled": false,
"document": "高级参数\n注意:此字段可能返回 null,表示取不到有效值。",
- "example": "",
+ "example": "test.com",
"member": "string",
"name": "OptionsArr",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "url长度\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "无",
+ "member": "uint64",
+ "name": "Length",
+ "output_required": false,
+ "type": "int",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "规则ID\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "0",
+ "member": "int64",
+ "name": "RuleId",
+ "output_required": false,
+ "type": "int",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "事件id\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "api_aaa",
+ "member": "string",
+ "name": "EventId",
+ "output_required": false,
+ "type": "string",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "关联的Session规则\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "[0,200000001]",
+ "member": "int64",
+ "name": "SessionApplied",
+ "output_required": false,
+ "type": "list",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "创建时间\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "0",
+ "member": "uint64",
+ "name": "CreateTime",
+ "output_required": false,
+ "type": "int",
+ "value_allowed_null": true
}
],
"usage": "out"
@@ -4465,8 +4582,8 @@
},
{
"disabled": false,
- "document": "可选值为:batch(批量添加)、bot、cc、custom(非批量添加时的默认值)",
- "example": "batch",
+ "document": "可选值为:batch(批量添加)、bot(BOT流量分析中的BOT详情列表中添加时)、cc(在攻击日志列表中对攻击类型为CC的IP添加时)、custom(非批量添加时的默认值)",
+ "example": "custom",
"member": "string",
"name": "SourceType",
"required": false,
@@ -4480,6 +4597,24 @@
"name": "Note",
"required": false,
"type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "定时配置类型",
+ "example": "无",
+ "member": "string",
+ "name": "JobType",
+ "required": false,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "定时配置详情",
+ "example": "无",
+ "member": "JobDateTime",
+ "name": "JobDateTime",
+ "required": false,
+ "type": "object"
}
],
"type": "object"
@@ -6531,7 +6666,7 @@
},
{
"disabled": false,
- "document": "排序字段,支持user_id, signature_id, modify_time",
+ "document": "排序的字段,支持user_id, signature_id, modify_time",
"example": "signature_id",
"member": "string",
"name": "By",
@@ -6550,7 +6685,7 @@
{
"disabled": false,
"document": "筛选条件,支持SignatureId, MatchContent",
- "example": "无",
+ "example": "[]",
"member": "FiltersItemNew",
"name": "Filters",
"required": false,
@@ -6568,17 +6703,17 @@
"example": "1",
"member": "uint64",
"name": "Total",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
{
"disabled": false,
"document": "规则白名单列表\n注意:此字段可能返回 null,表示取不到有效值。",
- "example": "无",
+ "example": "[]",
"member": "UserWhiteRule",
"name": "List",
- "required": true,
+ "output_required": true,
"type": "list",
"value_allowed_null": true
},
@@ -8412,6 +8547,15 @@
"name": "Filters",
"required": false,
"type": "list"
+ },
+ {
+ "disabled": false,
+ "document": "释放延期标识",
+ "example": "1",
+ "member": "uint64",
+ "name": "FreeDelayFlag",
+ "required": false,
+ "type": "int"
}
],
"type": "object"
@@ -8525,7 +8669,7 @@
},
{
"disabled": false,
- "document": "每页返回的数量",
+ "document": "每页返回的数量,默认为20",
"example": "20",
"member": "uint64",
"name": "Limit",
@@ -8594,6 +8738,15 @@
"name": "RuleId",
"required": false,
"type": "int"
+ },
+ {
+ "disabled": false,
+ "document": "定时任务类型筛选0 1 2 3 4",
+ "example": "无",
+ "member": "int64",
+ "name": "TimerType",
+ "required": false,
+ "type": "int"
}
],
"type": "object"
@@ -8653,7 +8806,7 @@
},
{
"disabled": false,
- "document": "类别",
+ "document": "类别,ip封禁传值auto_deny",
"example": "threat_intelligence",
"member": "string",
"name": "Category",
@@ -9919,7 +10072,7 @@
{
"disabled": false,
"document": "筛选条件,支持 MainClassName,SubClassID ,CveID, Status, ID; ID为规则id",
- "example": "无",
+ "example": "[]",
"member": "FiltersItemNew",
"name": "Filters",
"required": false,
@@ -9937,17 +10090,17 @@
"example": "1",
"member": "uint64",
"name": "Total",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
{
"disabled": false,
"document": "规则列表\n注意:此字段可能返回 null,表示取不到有效值。",
- "example": "无",
+ "example": "[]",
"member": "UserSignatureRule",
"name": "Rules",
- "required": true,
+ "output_required": true,
"type": "list",
"value_allowed_null": true
},
@@ -13021,7 +13174,7 @@
{
"disabled": false,
"document": "业务安全包\n注意:此字段可能返回 null,表示取不到有效值。",
- "example": "无",
+ "example": "{}",
"member": "FraudPkg",
"name": "FraudPkg",
"output_required": true,
@@ -13032,7 +13185,7 @@
{
"disabled": false,
"document": "Bot资源包\n注意:此字段可能返回 null,表示取不到有效值。",
- "example": "无",
+ "example": "{}",
"member": "BotPkg",
"name": "BotPkg",
"output_required": true,
@@ -13043,7 +13196,7 @@
{
"disabled": false,
"document": "bot的qps详情\n注意:此字段可能返回 null,表示取不到有效值。",
- "example": "无",
+ "example": "{}",
"member": "BotQPS",
"name": "BotQPS",
"output_required": true,
@@ -13219,7 +13372,7 @@
{
"disabled": false,
"document": "最近一次超量时间\n注意:此字段可能返回 null,表示取不到有效值。",
- "example": "无",
+ "example": "2023-11-15 19:23:06",
"member": "string",
"name": "LastQpsExceedTime",
"output_required": false,
@@ -13248,6 +13401,17 @@
"required": false,
"type": "string",
"value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "实例延期释放标识\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "1",
+ "member": "uint64",
+ "name": "FreeDelayFlag",
+ "output_required": false,
+ "required": false,
+ "type": "int",
+ "value_allowed_null": true
}
],
"usage": "both"
@@ -13294,7 +13458,7 @@
{
"disabled": false,
"document": "动作",
- "example": "无",
+ "example": "0",
"member": "uint64",
"name": "ActionType",
"output_required": true,
@@ -13304,7 +13468,7 @@
{
"disabled": false,
"document": "ip",
- "example": "无",
+ "example": "1.1.1.1",
"member": "string",
"name": "Ip",
"output_required": true,
@@ -13314,7 +13478,7 @@
{
"disabled": false,
"document": "备注",
- "example": "无",
+ "example": "test",
"member": "string",
"name": "Note",
"output_required": true,
@@ -13324,7 +13488,7 @@
{
"disabled": false,
"document": "来源",
- "example": "无",
+ "example": "test",
"member": "string",
"name": "Source",
"output_required": true,
@@ -13334,7 +13498,7 @@
{
"disabled": false,
"document": "更新时间戳\n注意:此字段可能返回 null,表示取不到有效值。",
- "example": "无",
+ "example": "0",
"member": "uint64",
"name": "TsVersion",
"output_required": true,
@@ -13344,7 +13508,7 @@
{
"disabled": false,
"document": "有效截止时间戳",
- "example": "无",
+ "example": "0",
"member": "uint64",
"name": "ValidTs",
"output_required": true,
@@ -13384,12 +13548,42 @@
{
"disabled": false,
"document": "规则创建时间\n注意:此字段可能返回 null,表示取不到有效值。",
- "example": "无",
+ "example": "0",
"member": "uint64",
"name": "CreateTime",
"output_required": false,
"type": "int",
"value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "定时任务类型\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "test",
+ "member": "string",
+ "name": "JobType",
+ "output_required": false,
+ "type": "string",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "周期任务类型\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "test",
+ "member": "string",
+ "name": "CronType",
+ "output_required": false,
+ "type": "string",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "定时任务配置详情\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "{}",
+ "member": "JobDateTime",
+ "name": "JobDateTime",
+ "output_required": false,
+ "type": "object",
+ "value_allowed_null": true
}
],
"usage": "out"
@@ -14559,7 +14753,7 @@
{
"disabled": false,
"document": "判断是否是更新api的备注,更新api备注的时候,为true",
- "example": "无",
+ "example": "false",
"member": "bool",
"name": "UpdateApiRemark",
"required": false,
@@ -14726,6 +14920,33 @@
"name": "SignatureIds",
"required": false,
"type": "list"
+ },
+ {
+ "disabled": false,
+ "document": "加白的大类规则ID",
+ "example": "[\"01000000\"]",
+ "member": "string",
+ "name": "TypeIds",
+ "required": false,
+ "type": "list"
+ },
+ {
+ "disabled": false,
+ "document": "0表示按照特定规则ID加白, 1表示按照规则类型加白",
+ "example": "0",
+ "member": "int64",
+ "name": "Mode",
+ "required": false,
+ "type": "int"
+ },
+ {
+ "disabled": false,
+ "document": "规则名",
+ "example": "无",
+ "member": "string",
+ "name": "Name",
+ "required": false,
+ "type": "string"
}
],
"type": "object"
@@ -16021,6 +16242,24 @@
"name": "Note",
"required": false,
"type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "定时配置类型",
+ "example": "无",
+ "member": "string",
+ "name": "JobType",
+ "required": false,
+ "type": "string"
+ },
+ {
+ "disabled": false,
+ "document": "定时配置详情",
+ "example": "无",
+ "member": "JobDateTime",
+ "name": "JobDateTime",
+ "required": false,
+ "type": "object"
}
],
"type": "object"
@@ -18805,6 +19044,15 @@
"name": "CreateTime",
"required": false,
"type": "int"
+ },
+ {
+ "disabled": false,
+ "document": "url长度",
+ "example": "10",
+ "member": "uint64",
+ "name": "Length",
+ "required": false,
+ "type": "int"
}
],
"type": "object"
@@ -19207,7 +19455,7 @@
"example": "010000001",
"member": "string",
"name": "ID",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
@@ -19217,7 +19465,7 @@
"example": "1",
"member": "int64",
"name": "Status",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
@@ -19227,7 +19475,7 @@
"example": "010000000",
"member": "string",
"name": "MainClassID",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
@@ -19237,7 +19485,7 @@
"example": "000000000",
"member": "string",
"name": "SubClassID",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
@@ -19247,7 +19495,7 @@
"example": "reference item1 <#BID-28277::http://www.securityfocus.com/bid/28",
"member": "string",
"name": "CveID",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
@@ -19257,7 +19505,7 @@
"example": "2021-11-24 19:55:55",
"member": "datetime_iso",
"name": "CreateTime",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
@@ -19267,7 +19515,7 @@
"example": "2021-11-24 19:55:55",
"member": "datetime_iso",
"name": "ModifyTime",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
@@ -19277,7 +19525,7 @@
"example": "Cross Site Scripting",
"member": "string",
"name": "MainClassName",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
@@ -19287,7 +19535,7 @@
"example": "Signatures for Database",
"member": "string",
"name": "SubClassName",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
@@ -19297,7 +19545,7 @@
"example": "rule description",
"member": "string",
"name": "Description",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
@@ -19307,9 +19555,19 @@
"example": "reason",
"member": "int64",
"name": "Reason",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
+ },
+ {
+ "disabled": false,
+ "document": "1: 高危 2:中危 3:低危\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "1",
+ "member": "int64",
+ "name": "RiskLevel",
+ "output_required": false,
+ "type": "int",
+ "value_allowed_null": true
}
],
"usage": "out"
@@ -19323,7 +19581,7 @@
"example": "1",
"member": "uint64",
"name": "WhiteRuleId",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
@@ -19333,7 +19591,7 @@
"example": "010000030",
"member": "string",
"name": "SignatureId",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
@@ -19343,7 +19601,7 @@
"example": "1",
"member": "int64",
"name": "Status",
- "required": true,
+ "output_required": true,
"type": "int",
"value_allowed_null": false
},
@@ -19353,17 +19611,27 @@
"example": "URL",
"member": "string",
"name": "MatchField",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
+ {
+ "disabled": false,
+ "document": "匹配参数\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "无",
+ "member": "string",
+ "name": "MatchParams",
+ "output_required": false,
+ "type": "string",
+ "value_allowed_null": true
+ },
{
"disabled": false,
"document": "匹配方法",
"example": "eq",
"member": "string",
"name": "MatchMethod",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
@@ -19373,7 +19641,7 @@
"example": "/api",
"member": "string",
"name": "MatchContent",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
@@ -19383,7 +19651,7 @@
"example": "2021-11-19T19:53:53+08:00",
"member": "datetime_iso",
"name": "CreateTime",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
},
@@ -19393,9 +19661,79 @@
"example": "2021-11-19T19:53:53+08:00",
"member": "datetime_iso",
"name": "ModifyTime",
- "required": true,
+ "output_required": true,
"type": "string",
"value_allowed_null": false
+ },
+ {
+ "disabled": false,
+ "document": "规则ID列表\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "[\"010000030\", \"010000031\"]",
+ "member": "string",
+ "name": "SignatureIds",
+ "output_required": false,
+ "type": "list",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "大类规则ID列表\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "[\"010000000\",\"020000000\"]",
+ "member": "string",
+ "name": "TypeIds",
+ "output_required": false,
+ "type": "list",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "大类规则ID\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "无",
+ "member": "string",
+ "name": "TypeId",
+ "output_required": false,
+ "type": "string",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "0:按照特定规则ID加白, 1:按照规则类型加白\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "0",
+ "member": "int64",
+ "name": "Mode",
+ "output_required": false,
+ "type": "int",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "规则名\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "testRule",
+ "member": "string",
+ "name": "Name",
+ "output_required": false,
+ "type": "string",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "匹配规则列表\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "无",
+ "member": "UserWhiteRuleItem",
+ "name": "MatchInfo",
+ "output_required": false,
+ "type": "list",
+ "value_allowed_null": true
+ },
+ {
+ "disabled": false,
+ "document": "MatchInfo字符串\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "无",
+ "member": "string",
+ "name": "MatchInfoStr",
+ "output_required": false,
+ "type": "string",
+ "value_allowed_null": true
}
],
"usage": "out"
@@ -19435,6 +19773,17 @@
"required": true,
"type": "string",
"value_allowed_null": false
+ },
+ {
+ "disabled": false,
+ "document": "匹配参数名\n注意:此字段可能返回 null,表示取不到有效值。",
+ "example": "keya",
+ "member": "string",
+ "name": "MatchParams",
+ "output_required": false,
+ "required": false,
+ "type": "string",
+ "value_allowed_null": true
}
],
"usage": "both"
diff --git a/tccli/services/waf/v20180125/examples.json b/tccli/services/waf/v20180125/examples.json
index 8bccc1755d..ee4c6018fe 100644
--- a/tccli/services/waf/v20180125/examples.json
+++ b/tccli/services/waf/v20180125/examples.json
@@ -343,8 +343,8 @@
"DescribeAttackWhiteRule": [
{
"document": "",
- "input": "POST / HTTP/1.1\nHost: waf.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeAttackWhiteRule\n<公共请求参数>\n\n{\n \"Domain\": \"xx\",\n \"Offset\": 1,\n \"Limit\": 1,\n \"Order\": \"xx\",\n \"By\": \"xx\"\n}",
- "output": "{\n \"Response\": {\n \"Total\": 1,\n \"List\": [\n {\n \"Status\": 0,\n \"MatchField\": \"xx\",\n \"MatchMethod\": \"xx\",\n \"MatchContent\": \"xx\",\n \"SignatureId\": \"xx\",\n \"ModifyTime\": \"2020-09-22T00:00:00+00:00\",\n \"WhiteRuleId\": 1,\n \"CreateTime\": \"2020-09-22T00:00:00+00:00\"\n },\n {\n \"Status\": 1,\n \"MatchField\": \"xx\",\n \"MatchMethod\": \"xx\",\n \"MatchContent\": \"xx\",\n \"SignatureId\": \"xx\",\n \"ModifyTime\": \"2020-09-22T00:00:00+00:00\",\n \"WhiteRuleId\": 1,\n \"CreateTime\": \"2020-09-22T00:00:00+00:00\"\n }\n ],\n \"RequestId\": \"xx\"\n }\n}",
+ "input": "POST / HTTP/1.1\nHost: waf.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeAttackWhiteRule\n<公共请求参数>\n\n{\n \"Domain\": \"\",\n \"Offset\": 1,\n \"Limit\": 1,\n \"Order\": \"\",\n \"By\": \"\"\n}",
+ "output": "{\n \"Response\": {\n \"Total\": 1,\n \"List\": [\n {\n \"WhiteRuleId\": 1,\n \"SignatureId\": \"abc\",\n \"Status\": 0,\n \"MatchField\": \"abc\",\n \"MatchParams\": \"abc\",\n \"MatchMethod\": \"abc\",\n \"MatchContent\": \"abc\",\n \"CreateTime\": \"2020-09-22T00:00:00+00:00\",\n \"ModifyTime\": \"2020-09-22T00:00:00+00:00\",\n \"SignatureIds\": [\n \"abc\"\n ],\n \"TypeIds\": [\n \"abc\"\n ],\n \"TypeId\": \"abc\",\n \"Mode\": 0,\n \"Name\": \"abc\",\n \"MatchInfo\": [\n {\n \"MatchField\": \"abc\",\n \"MatchMethod\": \"abc\",\n \"MatchContent\": \"abc\",\n \"MatchParams\": \"abc\"\n }\n ],\n \"MatchInfoStr\": \"abc\"\n }\n ],\n \"RequestId\": \"abc\"\n }\n}",
"title": "查询示例"
}
],
@@ -546,7 +546,7 @@
{
"document": "查询用户所有实例的详细信息",
"input": "POST / HTTP/1.1\nHost: waf.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeInstances\n<公共请求参数>\n\n{\n \"Offset\": 1,\n \"Limit\": 20,\n \"Filters\": [\n {\n \"Name\": \"Edition\",\n \"Values\": [],\n \"ExactMatch\": true\n },\n {\n \"Name\": \"Region\",\n \"Values\": [\n \"ap-beijing\",\n \"ap-guangzhou\"\n ],\n \"ExactMatch\": true\n },\n {\n \"Name\": \"InstanceName\",\n \"Values\": [\n \"实例\"\n ],\n \"ExactMatch\": false\n },\n {\n \"Name\": \"InstanceId\",\n \"Values\": [\n \"waf\"\n ],\n \"ExactMatch\": false\n }\n ]\n}",
- "output": "{\n \"Response\": {\n \"RequestId\": \"b7984267-1b60-4979-accb-8f1ca497f827\",\n \"Total\": 11,\n \"Instances\": [\n {\n \"AppId\": 251197211,\n \"InstanceId\": \"waf_2kuj4t1k00awo4gp\",\n \"InstanceName\": \"gz-Default\",\n \"ResourceIds\": \"waf_2kuj4t1k00awo4gp\",\n \"Edition\": \"sparta-waf\",\n \"Region\": \"gz\",\n \"PayMode\": 1,\n \"RenewFlag\": 1,\n \"Level\": 4,\n \"ValidTime\": \"2021-11-09 10:37:20\",\n \"BeginTime\": \"0001-01-01 00:00:00\",\n \"SubDomainLimit\": 40,\n \"MainDomainLimit\": 4,\n \"Mode\": 0,\n \"DomainCount\": 6,\n \"MainDomainCount\": 2,\n \"MaxQPS\": 0,\n \"QPS\": {\n \"ResourceIds\": \"\",\n \"ValidTime\": \"\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"\"\n },\n \"DomainPkg\": {\n \"ResourceIds\": \"\",\n \"ValidTime\": \"\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"\"\n },\n \"BotPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n },\n \"FraudPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 1,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n }\n },\n {\n \"AppId\": 251197211,\n \"InstanceId\": \"waf_2kui15ko00a19t0r\",\n \"InstanceName\": \"cd-Default\",\n \"ResourceIds\": \"waf_2kui15ko00a19t0r\",\n \"Edition\": \"sparta-waf\",\n \"Region\": \"cd\",\n \"PayMode\": 1,\n \"RenewFlag\": 1,\n \"Level\": 4,\n \"ValidTime\": \"2021-09-24 15:34:09\",\n \"BeginTime\": \"0001-01-01 00:00:00\",\n \"SubDomainLimit\": 40,\n \"MainDomainLimit\": 4,\n \"Mode\": 0,\n \"DomainCount\": 7,\n \"MainDomainCount\": 1,\n \"MaxQPS\": 0,\n \"QPS\": {\n \"ResourceIds\": \"\",\n \"ValidTime\": \"\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"\"\n },\n \"DomainPkg\": {\n \"ResourceIds\": \"\",\n \"ValidTime\": \"\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"\"\n },\n \"BotPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n },\n \"FraudPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n }\n },\n {\n \"AppId\": 251197211,\n \"InstanceId\": \"waf_2kui15ko00a19pwt\",\n \"InstanceName\": \"gz-Default\",\n \"ResourceIds\": \"waf_2kui15ko00a19pwt\",\n \"Edition\": \"sparta-waf\",\n \"Region\": \"gz\",\n \"PayMode\": 1,\n \"RenewFlag\": 1,\n \"Level\": 4,\n \"ValidTime\": \"2021-09-24 15:30:15\",\n \"BeginTime\": \"0001-01-01 00:00:00\",\n \"SubDomainLimit\": 40,\n \"MainDomainLimit\": 4,\n \"Mode\": 0,\n \"DomainCount\": 1,\n \"MainDomainCount\": 1,\n \"MaxQPS\": 0,\n \"QPS\": {\n \"ResourceIds\": \"\",\n \"ValidTime\": \"\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"\"\n },\n \"DomainPkg\": {\n \"ResourceIds\": \"\",\n \"ValidTime\": \"\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"\"\n },\n \"BotPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n },\n \"FraudPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 1,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n }\n },\n {\n \"AppId\": 251197211,\n \"InstanceId\": \"waf_2kui15ko00a19p7j\",\n \"InstanceName\": \"测试删除域名\",\n \"ResourceIds\": \"waf_2kui15ko00a19p7j\",\n \"Edition\": \"sparta-waf\",\n \"Region\": \"cd\",\n \"PayMode\": 1,\n \"RenewFlag\": 1,\n \"Level\": 4,\n \"ValidTime\": \"2022-09-24 15:28:34\",\n \"BeginTime\": \"0001-01-01 00:00:00\",\n \"SubDomainLimit\": 40,\n \"MainDomainLimit\": 4,\n \"Mode\": 0,\n \"DomainCount\": 2,\n \"MainDomainCount\": 2,\n \"MaxQPS\": 0,\n \"QPS\": {\n \"ResourceIds\": \"\",\n \"ValidTime\": \"\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"\"\n },\n \"DomainPkg\": {\n \"ResourceIds\": \"\",\n \"ValidTime\": \"\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"\"\n },\n \"BotPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n },\n \"FraudPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 1,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n }\n },\n {\n \"AppId\": 251197211,\n \"InstanceId\": \"waf_2kuhdsiw008rwhxt\",\n \"InstanceName\": \"gz-Defaultssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss\",\n \"ResourceIds\": \"waf_2kuhdsiw008rwhxt\",\n \"Edition\": \"clb-waf\",\n \"Region\": \"\",\n \"PayMode\": 1,\n \"RenewFlag\": 1,\n \"Level\": 4,\n \"ValidTime\": \"2021-08-15 14:21:58\",\n \"BeginTime\": \"0001-01-01 00:00:00\",\n \"SubDomainLimit\": 40,\n \"MainDomainLimit\": 4,\n \"Mode\": 0,\n \"DomainCount\": 0,\n \"MainDomainCount\": 0,\n \"MaxQPS\": 0,\n \"QPS\": {\n \"ResourceIds\": \"\",\n \"ValidTime\": \"\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"\"\n },\n \"DomainPkg\": {\n \"ResourceIds\": \"\",\n \"ValidTime\": \"\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"\"\n },\n \"BotPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n },\n \"FraudPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n }\n },\n {\n \"AppId\": 251197211,\n \"InstanceId\": \"waf_2kuhdkt4008qolw5\",\n \"InstanceName\": \"带服务实例\",\n \"ResourceIds\": \"waf_2kuhdkt4008qolw5\",\n \"Edition\": \"sparta-waf\",\n \"Region\": \"gz\",\n \"PayMode\": 1,\n \"RenewFlag\": 1,\n \"Level\": 4,\n \"ValidTime\": \"2021-08-14 15:14:55\",\n \"BeginTime\": \"0001-01-01 00:00:00\",\n \"SubDomainLimit\": 40,\n \"MainDomainLimit\": 4,\n \"Mode\": 0,\n \"DomainCount\": 12,\n \"MainDomainCount\": 1,\n \"MaxQPS\": 0,\n \"QPS\": {\n \"ResourceIds\": \"waf_2kuhdkt4008qolw5_qps\",\n \"ValidTime\": \"2021-08-14 15:15:01\",\n \"RenewFlag\": 1,\n \"Count\": 1000,\n \"Region\": \"gz\"\n },\n \"DomainPkg\": {\n \"ResourceIds\": \"waf_2kuhdkt4008qolw5_dmn\",\n \"ValidTime\": \"2021-08-14 15:15:10\",\n \"RenewFlag\": 1,\n \"Count\": 1,\n \"Region\": \"gz\"\n },\n \"BotPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n },\n \"FraudPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n }\n },\n {\n \"AppId\": 251197211,\n \"InstanceId\": \"waf_2kuhdkt4008qnip1\",\n \"InstanceName\": \"gz-Default\",\n \"ResourceIds\": \"waf_2kuhdkt4008qnip1\",\n \"Edition\": \"clb-waf\",\n \"Region\": \"\",\n \"PayMode\": 1,\n \"RenewFlag\": 1,\n \"Level\": 4,\n \"ValidTime\": \"2021-08-14 15:10:38\",\n \"BeginTime\": \"0001-01-01 00:00:00\",\n \"SubDomainLimit\": 40,\n \"MainDomainLimit\": 4,\n \"Mode\": 0,\n \"DomainCount\": 0,\n \"MainDomainCount\": 0,\n \"MaxQPS\": 0,\n \"QPS\": {\n \"ResourceIds\": \"waf_2kuhdkt4008qnip1_qps\",\n \"ValidTime\": \"2021-08-14 15:10:38\",\n \"RenewFlag\": 1,\n \"Count\": 1000,\n \"Region\": \"gz\"\n },\n \"DomainPkg\": {\n \"ResourceIds\": \"\",\n \"ValidTime\": \"\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"\"\n },\n \"BotPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n },\n \"FraudPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n }\n },\n {\n \"AppId\": 251197211,\n \"InstanceId\": \"waf_2kuhdkt4008qnsr9\",\n \"InstanceName\": \"测试实例\",\n \"ResourceIds\": \"waf_2kuhdkt4008qnsr9\",\n \"Edition\": \"sparta-waf\",\n \"Region\": \"gz\",\n \"PayMode\": 1,\n \"RenewFlag\": 1,\n \"Level\": 4,\n \"ValidTime\": \"2022-09-14 14:24:02\",\n \"BeginTime\": \"2021-10-09 15:10:55\",\n \"SubDomainLimit\": 40,\n \"MainDomainLimit\": 4,\n \"Mode\": 0,\n \"DomainCount\": 7,\n \"MainDomainCount\": 2,\n \"MaxQPS\": 5,\n \"QPS\": {\n \"ResourceIds\": \"\",\n \"ValidTime\": \"\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"\"\n },\n \"DomainPkg\": {\n \"ResourceIds\": \"\",\n \"ValidTime\": \"\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"\"\n },\n \"BotPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n },\n \"FraudPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 1,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n }\n },\n {\n \"AppId\": 251197211,\n \"InstanceId\": \"yuyuyuyuyu\",\n \"InstanceName\": \"ModifyNamessssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss\",\n \"ResourceIds\": \"waf_2kuf279k004v9eb7\",\n \"Edition\": \"sparta-waf\",\n \"Region\": \"cd\",\n \"PayMode\": 1,\n \"RenewFlag\": 0,\n \"Level\": 4,\n \"ValidTime\": \"2021-07-01 20:27:54\",\n \"BeginTime\": \"0001-01-01 00:00:00\",\n \"SubDomainLimit\": 40,\n \"MainDomainLimit\": 4,\n \"Mode\": 0,\n \"DomainCount\": 38,\n \"MainDomainCount\": 4,\n \"MaxQPS\": 2,\n \"QPS\": {\n \"ResourceIds\": \"\",\n \"ValidTime\": \"\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"\"\n },\n \"DomainPkg\": {\n \"ResourceIds\": \"\",\n \"ValidTime\": \"\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"\"\n },\n \"BotPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n },\n \"FraudPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n }\n },\n {\n \"AppId\": 251197211,\n \"InstanceId\": \"waf_2kugqn6w007lhqhd\",\n \"InstanceName\": \"gz-Default\",\n \"ResourceIds\": \"waf_2kugqn6w007lhqhd\",\n \"Edition\": \"clb-waf\",\n \"Region\": \"gz\",\n \"PayMode\": 1,\n \"RenewFlag\": 1,\n \"Level\": 4,\n \"ValidTime\": \"2021-07-07 16:45:33\",\n \"BeginTime\": \"0001-01-01 00:00:00\",\n \"SubDomainLimit\": 40,\n \"MainDomainLimit\": 4,\n \"Mode\": 1,\n \"DomainCount\": 2,\n \"MainDomainCount\": 2,\n \"MaxQPS\": 0,\n \"QPS\": {\n \"ResourceIds\": \"\",\n \"ValidTime\": \"\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"\"\n },\n \"DomainPkg\": {\n \"ResourceIds\": \"\",\n \"ValidTime\": \"\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"\"\n },\n \"BotPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n },\n \"FraudPkg\": {\n \"ResourceIds\": \"\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"\",\n \"EndTime\": \"\",\n \"InquireNum\": 0,\n \"UsedNum\": 0\n }\n }\n ]\n }\n}",
+ "output": "{\n \"Response\": {\n \"Total\": 1,\n \"Instances\": [\n {\n \"InstanceId\": \"abc\",\n \"InstanceName\": \"abc\",\n \"ResourceIds\": \"abc\",\n \"Region\": \"abc\",\n \"PayMode\": 1,\n \"RenewFlag\": 1,\n \"Mode\": 1,\n \"Level\": 1,\n \"ValidTime\": \"abc\",\n \"BeginTime\": \"abc\",\n \"DomainCount\": 1,\n \"SubDomainLimit\": 1,\n \"MainDomainCount\": 1,\n \"MainDomainLimit\": 1,\n \"MaxQPS\": 1,\n \"QPS\": {\n \"ResourceIds\": \"abc\",\n \"ValidTime\": \"abc\",\n \"RenewFlag\": 0,\n \"Count\": 0,\n \"Region\": \"abc\",\n \"BillingItem\": \"abc\"\n },\n \"DomainPkg\": {\n \"ResourceIds\": \"abc\",\n \"ValidTime\": \"abc\",\n \"RenewFlag\": 1,\n \"Count\": 1,\n \"Region\": \"abc\"\n },\n \"AppId\": 1,\n \"Edition\": \"abc\",\n \"FraudPkg\": {\n \"ResourceIds\": \"abc\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"abc\",\n \"EndTime\": \"abc\",\n \"InquireNum\": 0,\n \"UsedNum\": 0,\n \"RenewFlag\": 1\n },\n \"BotPkg\": {\n \"ResourceIds\": \"abc\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"abc\",\n \"EndTime\": \"abc\",\n \"InquireNum\": 0,\n \"UsedNum\": 0,\n \"Type\": \"abc\",\n \"RenewFlag\": 1,\n \"BotCPWaf\": 0,\n \"BotNPWaf\": 0,\n \"IsBotTrial\": 0\n },\n \"BotQPS\": {\n \"ResourceIds\": \"abc\",\n \"ValidTime\": \"abc\",\n \"Count\": 1,\n \"Region\": \"abc\",\n \"MaxBotQPS\": 1,\n \"RenewFlag\": 1\n },\n \"ElasticBilling\": 1,\n \"AttackLogPost\": 0,\n \"MaxBandwidth\": 1,\n \"APISecurity\": 1,\n \"QpsStandard\": 1,\n \"BandwidthStandard\": 1,\n \"Status\": 1,\n \"SandboxQps\": 1,\n \"IsAPISecurityTrial\": 1,\n \"MajorEventsPkg\": {\n \"ResourceIds\": \"abc\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"abc\",\n \"EndTime\": \"abc\",\n \"InquireNum\": 0,\n \"UsedNum\": 0,\n \"RenewFlag\": 1,\n \"BillingItem\": \"abc\",\n \"HWState\": 0\n },\n \"HybridPkg\": {\n \"ResourceIds\": \"abc\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"abc\",\n \"EndTime\": \"abc\",\n \"InquireNum\": 0,\n \"UsedNum\": 0,\n \"RenewFlag\": 1\n },\n \"ApiPkg\": {\n \"ResourceIds\": \"abc\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"abc\",\n \"EndTime\": \"abc\",\n \"InquireNum\": 0,\n \"UsedNum\": 0,\n \"RenewFlag\": 1,\n \"BillingItem\": \"abc\",\n \"IsAPISecurityTrial\": 0\n },\n \"MiniPkg\": {\n \"ResourceIds\": \"abc\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"abc\",\n \"EndTime\": \"abc\",\n \"Count\": 0,\n \"RenewFlag\": 1,\n \"BillingItem\": \"abc\"\n },\n \"MiniQpsStandard\": 1,\n \"MiniMaxQPS\": 1,\n \"LastQpsExceedTime\": \"abc\",\n \"MiniExtendPkg\": {\n \"ResourceIds\": \"abc\",\n \"Status\": 0,\n \"Region\": 0,\n \"BeginTime\": \"abc\",\n \"EndTime\": \"abc\",\n \"Count\": 0,\n \"RenewFlag\": 1,\n \"BillingItem\": \"abc\"\n },\n \"BillingItem\": \"abc\",\n \"FreeDelayFlag\": 1\n }\n ],\n \"RequestId\": \"abc\"\n }\n}",
"title": "查询用户所有实例的详细信息"
}
],
@@ -700,9 +700,9 @@
],
"DescribeUserSignatureRule": [
{
- "document": "",
- "input": "POST / HTTP/1.1\nHost: waf.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeUserSignatureRule\n<公共请求参数>\n\n{\n \"Domain\": \"xx\",\n \"Offset\": 1,\n \"Limit\": 20,\n \"Order\": \"asc\",\n \"By\": \"signature_id\",\n \"Filters\": [\n {\n \"Name\": \"MainClassID\",\n \"Values\": [\n \"010000000\"\n ],\n \"ExactMatch\": false\n }\n ]\n}",
- "output": "{\n \"Response\": {\n \"RequestId\": \"xx\",\n \"Total\": 8,\n \"Rules\": [\n {\n \"ID\": \"010000002\",\n \"Description\": \"xx\",\n \"Status\": 0,\n \"MainClassID\": \"010000000\",\n \"MainClassName\": \"Cross Site Scripting\",\n \"SubClassID\": \"000000000\",\n \"SubClassName\": \"\",\n \"CveID\": \"\",\n \"CreateTime\": \"2020-09-22T00:00:00+00:00\",\n \"ModifyTime\": \"2021-11-22T16:16:52+08:00\"\n },\n {\n \"ID\": \"050000022\",\n \"Description\": \"xx\",\n \"Status\": 1,\n \"MainClassID\": \"050000000\",\n \"MainClassName\": \"Cross Site Scripting\",\n \"SubClassID\": \"050030000\",\n \"SubClassName\": \"data\",\n \"CveID\": \"\",\n \"CreateTime\": \"2020-09-22T00:00:00+00:00\",\n \"ModifyTime\": \"2021-11-22T16:16:52+08:00\"\n }\n ]\n }\n}",
+ "document": "查询示例",
+ "input": "POST / HTTP/1.1\nHost: waf.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeUserSignatureRule\n<公共请求参数>\n\n{\n \"Domain\": \"\",\n \"Offset\": 1,\n \"Limit\": 20,\n \"Order\": \"asc\",\n \"By\": \"signature_id\",\n \"Filters\": [\n {\n \"Name\": \"MainClassID\",\n \"Values\": [\n \"010000000\"\n ],\n \"ExactMatch\": false\n }\n ]\n}",
+ "output": "{\n \"Response\": {\n \"Total\": 1,\n \"Rules\": [\n {\n \"ID\": \"abc\",\n \"Status\": 0,\n \"MainClassID\": \"abc\",\n \"SubClassID\": \"abc\",\n \"CveID\": \"abc\",\n \"CreateTime\": \"2020-09-22T00:00:00+00:00\",\n \"ModifyTime\": \"2020-09-22T00:00:00+00:00\",\n \"MainClassName\": \"abc\",\n \"SubClassName\": \"abc\",\n \"Description\": \"abc\",\n \"Reason\": 0,\n \"RiskLevel\": 0\n }\n ],\n \"RequestId\": \"abc\"\n }\n}",
"title": "查询示例"
}
],