tccli 3.0.1348.1__py2.py3-none-any.whl → 3.0.1349.1__py2.py3-none-any.whl

tccli/services/cdwdoris/v20211228/api.json

@@ -707,6 +707,17 @@
           "required": false,
           "type": "string",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "快照保留策略",
+          "example": "无",
+          "member": "SnapshotRemainPolicy",
+          "name": "SnapshotRemainPolicy",
+          "output_required": false,
+          "required": false,
+          "type": "object",
+          "value_allowed_null": false
         }
       ],
       "usage": "both"
@@ -746,6 +757,17 @@
           "required": false,
           "type": "string",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "cos桶所在地域",
+          "example": "ap-chongqing",
+          "member": "string",
+          "name": "Region",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
         }
       ],
       "usage": "both"
@@ -1670,7 +1692,7 @@
           "type": "list"
         },
         {
-          "disabled": false,
+          "disabled": true,
           "document": "0为默认。1时是对远端的doris进行备份，不周期，一次性",
           "example": "1",
           "member": "int64",
@@ -1679,7 +1701,7 @@
           "type": "int"
         },
         {
-          "disabled": false,
+          "disabled": true,
           "document": "远端doris集群的连接信息",
           "example": "DorisSourceInfo",
           "member": "DorisSourceInfo",
@@ -1689,7 +1711,7 @@
         },
         {
           "disabled": false,
-          "document": "0为默认。1时是一次性备份。2时是远端备份",
+          "document": "0为周期备份。1时是立即备份。3时是定时备份。",
           "example": "1",
           "member": "int64",
           "name": "BackupTimeType",
@@ -1697,7 +1719,7 @@
           "type": "int"
         },
         {
-          "disabled": false,
+          "disabled": true,
           "document": "0为默认。1时是备份完成后立即恢复",
           "example": "1",
           "member": "int64",
@@ -1706,7 +1728,7 @@
           "type": "int"
         },
         {
-          "disabled": false,
+          "disabled": true,
           "document": "0为默认。1时是提供自定义的secret连接cos",
           "example": "1",
           "member": "int64",
@@ -1715,7 +1737,7 @@
           "type": "int"
         },
         {
-          "disabled": false,
+          "disabled": true,
           "document": "cos认证的信息",
           "example": "1",
           "member": "CosSourceInfo",
@@ -1758,6 +1780,24 @@
           "name": "CosBucket",
           "required": false,
           "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "快照保留策略",
+          "example": "无",
+          "member": "SnapshotRemainPolicy",
+          "name": "SnapshotRemainPolicy",
+          "required": false,
+          "type": "object"
+        },
+        {
+          "disabled": false,
+          "document": "备份数据所在地域，当前地域应该为空",
+          "example": "ap-chongqing",
+          "member": "string",
+          "name": "DataRemoteRegion",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"
@@ -4852,6 +4892,15 @@
           "name": "TableName",
           "required": false,
           "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "用户名列表",
+          "example": "[ ]",
+          "member": "string",
+          "name": "UserNames",
+          "required": false,
+          "type": "list"
         }
       ],
       "type": "object"
@@ -5999,6 +6048,16 @@
           "type": "string",
           "value_allowed_null": false
         },
+        {
+          "disabled": false,
+          "document": "虚拟可用区",
+          "example": "virtual-ap-guangzhou-5-0",
+          "member": "string",
+          "name": "VirtualZone",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
+        },
         {
           "disabled": false,
           "document": "创建时间",
@@ -6666,7 +6725,7 @@
         },
         {
           "disabled": false,
-          "document": "更新类型，默认0，1为更新绑定计算组",
+          "document": "更新类型，默认0，1为更新绑定计算组，2为更新默认计算组",
           "example": "0",
           "member": "int64",
           "name": "UpdateType",
@@ -6681,6 +6740,15 @@
           "name": "UpdateComputeGroups",
           "required": false,
           "type": "list"
+        },
+        {
+          "disabled": false,
+          "document": "默认计算组",
+          "example": "tchd-ekwold58-gdviogwc",
+          "member": "string",
+          "name": "DefaultComputeGroup",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"
@@ -6960,6 +7028,16 @@
           "output_required": false,
           "type": "string",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "虚拟可用区",
+          "example": "virtual-ap-chongqing-1-1",
+          "member": "string",
+          "name": "VirtualZone",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": false
         }
       ],
       "usage": "out"
@@ -7087,6 +7165,17 @@
           "required": false,
           "type": "string",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "虚拟可用区",
+          "example": "virtual-ap-chongqing-1-1",
+          "member": "string",
+          "name": "VirtualZone",
+          "output_required": false,
+          "required": false,
+          "type": "string",
+          "value_allowed_null": false
         }
       ],
       "usage": "both"
@@ -8340,6 +8429,16 @@
           "output_required": false,
           "type": "int",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "恢复任务id",
+          "example": "3412",
+          "member": "int64",
+          "name": "ID",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
         }
       ],
       "usage": "out"
@@ -8842,6 +8941,45 @@
       ],
       "usage": "out"
     },
+    "SnapshotRemainPolicy": {
+      "document": "备份快照保留策略",
+      "members": [
+        {
+          "disabled": false,
+          "document": "0-不主动删除；1-超过指定时间周期自动删除；2-保留指定数据快照",
+          "example": "1",
+          "member": "int64",
+          "name": "Type",
+          "output_required": false,
+          "required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "保留快照的时间",
+          "example": "7",
+          "member": "int64",
+          "name": "RemainDays",
+          "output_required": false,
+          "required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "保留最新快照的数量",
+          "example": "10",
+          "member": "int64",
+          "name": "RemainLatestNum",
+          "output_required": false,
+          "required": false,
+          "type": "int",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "both"
+    },
     "Tag": {
       "document": "标签描述",
       "members": [

tccli/services/cfg/v20210820/api.json

@@ -3833,6 +3833,26 @@
           "output_required": false,
           "type": "int",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "演练场景",
+          "example": "[{\"TargetId\": 17, \"TargetDesc\": \"张三\"}]\t",
+          "member": "TaskTarget",
+          "name": "TemplateScenario",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "演练目的",
+          "example": "[{\"TargetId\": 23, \"TargetDesc\": \"张三\"}]",
+          "member": "TaskTarget",
+          "name": "TemplatePurpose",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": false
         }
       ],
       "usage": "out"

tccli/services/cfs/v20190719/api.json

@@ -1433,7 +1433,7 @@
         },
         {
           "disabled": false,
-          "document": "迁移方式标志位，默认为0。0: 桶迁移；1: 清单迁移",
+          "document": "迁移方式标志位，默认为0。0：桶迁移；1：清单迁移",
           "example": "0",
           "member": "uint64",
           "name": "MigrationType",
@@ -1451,7 +1451,7 @@
         },
         {
           "disabled": false,
-          "document": "数据源账号的SecretId",
+          "document": "数据源账号的 SecretId",
           "example": "secretid",
           "member": "string",
           "name": "SrcSecretId",
@@ -1460,7 +1460,7 @@
         },
         {
           "disabled": false,
-          "document": "数据源账号的SecretKey",
+          "document": "数据源账号的 SecretKey",
           "example": "secretkey",
           "member": "string",
           "name": "SrcSecretKey",
@@ -1469,7 +1469,7 @@
         },
         {
           "disabled": false,
-          "document": "文件系统实例Id",
+          "document": "文件系统实例 ID，通过查询文件系统 [DescribeCfsFileSystems](https://cloud.tencent.com/document/product/582/38170) 获取",
           "example": "cfs-xxxxxx",
           "member": "string",
           "name": "FileSystemId",
@@ -1496,7 +1496,7 @@
         },
         {
           "disabled": false,
-          "document": "数据源服务商。COS: 腾讯云COS，OSS: 阿里云OSS，OBS:华为云OBS",
+          "document": "数据源服务商。COS：腾讯云COS，OSS：阿里云OSS，OBS：华为云OBS",
           "example": "OSS",
           "member": "string",
           "name": "SrcService",
@@ -1505,7 +1505,7 @@
         },
         {
           "disabled": false,
-          "document": "数据源桶名称，名称和地址至少有一个",
+          "document": "数据源桶名称；桶迁移时，BucketName 和 BucketAddress 必填其一，清单迁移时无需填写此参数",
           "example": "testbucket-125xxxxxxx",
           "member": "string",
           "name": "BucketName",
@@ -1523,7 +1523,7 @@
         },
         {
           "disabled": false,
-          "document": "数据源桶地址，名称和地址至少有一个",
+          "document": "数据源桶地址；桶迁移时，BucketName 和 BucketAddress 必填其一，清单迁移时无需填写此参数",
           "example": "https://testbucket-125xxxxxx.cos.ap-guangzhou.myqcloud.com",
           "member": "string",
           "name": "BucketAddress",
@@ -1550,7 +1550,7 @@
         },
         {
           "disabled": false,
-          "document": "源桶路径，默认为/",
+          "document": "源桶路径，默认为 /",
           "example": "cos/",
           "member": "string",
           "name": "BucketPath",
@@ -1559,7 +1559,7 @@
         },
         {
           "disabled": false,
-          "document": "迁移方向。0: 对象存储迁移至文件系统，1: 文件系统迁移至对象存储。默认 0",
+          "document": "迁移方向；0：对象存储迁移至文件系统，1：文件系统迁移至对象存储。默认为0",
           "example": "0",
           "member": "uint64",
           "name": "Direction",
@@ -1574,7 +1574,7 @@
       "members": [
         {
           "disabled": false,
-          "document": "迁移任务Id",
+          "document": "迁移任务 ID",
           "example": "tasgagagagi",
           "member": "string",
           "name": "TaskId",

tccli/services/cfw/cfw_client.py

@@ -4385,6 +4385,58 @@ def doDescribeAcLists(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeLogStorageStatistic(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.CfwClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeLogStorageStatisticRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeLogStorageStatistic(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 doExpandCfwVertical(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -6040,6 +6092,7 @@ ACTION_MAP = {
     "DescribeBlockIgnoreList": doDescribeBlockIgnoreList,
     "RemoveNatAcRule": doRemoveNatAcRule,
     "DescribeAcLists": doDescribeAcLists,
+    "DescribeLogStorageStatistic": doDescribeLogStorageStatistic,
     "ExpandCfwVertical": doExpandCfwVertical,
     "CreateVpcFwGroup": doCreateVpcFwGroup,
     "ModifyAllPublicIPSwitchStatus": doModifyAllPublicIPSwitchStatus,