tccli 3.0.1125.1__py2.py3-none-any.whl → 3.0.1127.1__py2.py3-none-any.whl

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1125.1'
+__version__ = '3.0.1127.1'

tccli/services/billing/v20180709/api.json

@@ -8784,7 +8784,7 @@
         },
         {
           "disabled": false,
-          "document": "分页偏移量，Offset=0表示第一页，如果Limit=100，则Offset=100表示第二页，Offset=200表示第三页，依次类推",
+          "document": "分页偏移量，Offset=0表示第一页，如果Limit=100，则Offset=100表示第二页，Offset=200表示第三页，以此类推",
           "example": "0",
           "member": "uint64",
           "name": "Offset",
@@ -8904,7 +8904,7 @@
         },
         {
           "disabled": false,
-          "document": "分页偏移量，Offset=0表示第一页，如果Limit=100，则Offset=100表示第二页，Offset=200表示第三页，依次类推",
+          "document": "分页偏移量，Offset=0表示第一页，如果Limit=100，则Offset=100表示第二页，Offset=200表示第三页，以此类推",
           "example": "0",
           "member": "uint64",
           "name": "Offset",

tccli/services/cam/cam_client.py

@@ -901,6 +901,58 @@ def doUpdateRoleDescription(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doBuildDataFlowAuthToken(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.CamClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.BuildDataFlowAuthTokenRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.BuildDataFlowAuthToken(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 doUpdateSAMLProvider(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2617,58 +2669,6 @@ def doGetSecurityLastUsed(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCreateGroup(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.CamClient(cred, g_param[OptionsDefine.Region], profile)
-    client._sdkVersion += ("_CLI_" + __version__)
-    models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CreateGroupRequest()
-    model.from_json_string(json.dumps(args))
-    start_time = time.time()
-    while True:
-        rsp = client.CreateGroup(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 doDeletePolicy(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2721,7 +2721,7 @@ def doDeletePolicy(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDeletePolicyVersion(args, parsed_globals):
+def doCreateGroup(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -2750,11 +2750,11 @@ def doDeletePolicyVersion(args, parsed_globals):
     client = mod.CamClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DeletePolicyVersionRequest()
+    model = models.CreateGroupRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DeletePolicyVersion(model)
+        rsp = client.CreateGroup(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -4437,6 +4437,58 @@ def doGetRole(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDeletePolicyVersion(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.CamClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DeletePolicyVersionRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DeletePolicyVersion(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 doListPolicies(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -4569,6 +4621,7 @@ ACTION_MAP = {
     "CreateAccessKey": doCreateAccessKey,
     "DeleteUser": doDeleteUser,
     "UpdateRoleDescription": doUpdateRoleDescription,
+    "BuildDataFlowAuthToken": doBuildDataFlowAuthToken,
     "UpdateSAMLProvider": doUpdateSAMLProvider,
     "UntagRole": doUntagRole,
     "DescribeSubAccounts": doDescribeSubAccounts,
@@ -4602,9 +4655,8 @@ ACTION_MAP = {
     "UpdateAssumeRolePolicy": doUpdateAssumeRolePolicy,
     "SetMfaFlag": doSetMfaFlag,
     "GetSecurityLastUsed": doGetSecurityLastUsed,
-    "CreateGroup": doCreateGroup,
     "DeletePolicy": doDeletePolicy,
-    "DeletePolicyVersion": doDeletePolicyVersion,
+    "CreateGroup": doCreateGroup,
     "ListAccessKeys": doListAccessKeys,
     "DeleteGroup": doDeleteGroup,
     "CreateMessageReceiver": doCreateMessageReceiver,
@@ -4637,6 +4689,7 @@ ACTION_MAP = {
     "AttachRolePolicy": doAttachRolePolicy,
     "DescribeSafeAuthFlagColl": doDescribeSafeAuthFlagColl,
     "GetRole": doGetRole,
+    "DeletePolicyVersion": doDeletePolicyVersion,
     "ListPolicies": doListPolicies,
     "DisableUserSSO": doDisableUserSSO,
 

tccli/services/cam/v20190116/api.json

@@ -35,6 +35,13 @@
       "output": "AttachUserPolicyResponse",
       "status": "online"
     },
+    "BuildDataFlowAuthToken": {
+      "document": "获取数据流认证Token",
+      "input": "BuildDataFlowAuthTokenRequest",
+      "name": "获取数据流认证Token",
+      "output": "BuildDataFlowAuthTokenResponse",
+      "status": "online"
+    },
     "ConsumeCustomMFAToken": {
       "document": "验证自定义多因子Token",
       "input": "ConsumeCustomMFATokenRequest",
@@ -1385,6 +1392,127 @@
       ],
       "usage": "out"
     },
+    "AuthToken": {
+      "document": "认证凭据Token",
+      "members": [
+        {
+          "disabled": false,
+          "document": "认证Token",
+          "example": "Ad3**asf3",
+          "member": "string",
+          "name": "Token",
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "服务器时间戳\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "987654321",
+          "member": "int64",
+          "name": "CurrentTime",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "毫秒时间戳，根据轮转周期准确计算得到\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1234567890",
+          "member": "int64",
+          "name": "NextRotationTime",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "毫秒，如果轮转失败则为 -1\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "150",
+          "member": "int64",
+          "name": "LastRotationTimeCost",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "成功：success\n失败：failed\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "success",
+          "member": "string",
+          "name": "RotationStatus",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "成功：success\n失败：失败信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "success",
+          "member": "string",
+          "name": "RotationMessage",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        }
+      ],
+      "usage": "out"
+    },
+    "BuildDataFlowAuthTokenRequest": {
+      "document": "BuildDataFlowAuthToken请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "资源ID",
+          "example": "cbd-esq42",
+          "member": "string",
+          "name": "ResourceId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "资源地域",
+          "example": "ap-guangzhou",
+          "member": "string",
+          "name": "ResourceRegion",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "资源用户名",
+          "example": "readOnly",
+          "member": "string",
+          "name": "ResourceAccount",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "BuildDataFlowAuthTokenResponse": {
+      "document": "BuildDataFlowAuthToken返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "认证凭据AuthToken信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "AuthToken",
+          "name": "Credentials",
+          "output_required": true,
+          "type": "object",
+          "value_allowed_null": true
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "ConsumeCustomMFATokenRequest": {
       "document": "ConsumeCustomMFAToken请求参数结构体",
       "members": [

tccli/services/cam/v20190116/examples.json

@@ -40,6 +40,14 @@
         "title": "绑定策略到用户"
       }
     ],
+    "BuildDataFlowAuthToken": [
+      {
+        "document": "生成AuthToken",
+        "input": "POST / HTTP/1.1\nHost: cam.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: BuildDataFlowAuthToken\n<公共请求参数>\n\n{\n    \"ResourceId\": \"cdb-12dd3d\",\n    \"ResourceRegion\": \"ap-shanghai\",\n    \"ResourceAccount\": \"ReadOnly\"\n}",
+        "output": "{\n    \"Response\": {\n        \"Credentials\": {\n            \"CurrentTime\": 12332343423,\n            \"LastRotationTimeCost\": 343,\n            \"NextRotationTime\": 10,\n            \"RotationMessage\": \"success\",\n            \"RotationStatus\": \"success\",\n            \"Token\": \"944a***mtHS\"\n        },\n        \"RequestId\": \"5bc7f0df-18a3-426b-84ce-ddbc8d1c95d1\"\n    }\n}",
+        "title": "生成AuthToken"
+      }
+    ],
     "ConsumeCustomMFAToken": [
       {
         "document": "",

tccli/services/cat/v20180409/api.json

@@ -1422,6 +1422,16 @@
           "output_required": true,
           "type": "list",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "是否为同步账号\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "同步标记",
+          "member": "int64",
+          "name": "SubSyncFlag",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": true
         }
       ],
       "usage": "out"

tccli/services/cds/v20180420/api.json

@@ -1,11 +1,11 @@
 {
   "actions": {
     "DescribeDasbImageIds": {
-      "document": "获取镜像列表",
+      "document": "这些接口是传统版堡垒机接口.数审未用到，堡垒机的已全部迁移到dasb下，cds这边预下线\n\n获取镜像列表",
       "input": "DescribeDasbImageIdsRequest",
       "name": "数盾-DASB-获取镜像列表",
       "output": "DescribeDasbImageIdsResponse",
-      "status": "online"
+      "status": "deprecated"
     },
     "DescribeDbauditInstanceType": {
       "document": "本接口 (DescribeDbauditInstanceType) 用于查询可售卖的产品规格列表。",

tccli/services/cls/v20201016/api.json

@@ -3971,6 +3971,15 @@
           "name": "SyntaxRule",
           "required": false,
           "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "导出字段",
+          "example": "[\"__timestamp__\",\"a\",\"b\"]",
+          "member": "string",
+          "name": "DerivedFields",
+          "required": false,
+          "type": "list"
         }
       ],
       "type": "object"
@@ -7891,6 +7900,16 @@
           "output_required": true,
           "type": "int",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "导出字段\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "[\"__timestamp__\",\"a\",\"b\"]",
+          "member": "string",
+          "name": "DerivedFields",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": true
         }
       ],
       "usage": "out"