tccli 3.0.1282.1__py2.py3-none-any.whl → 3.0.1283.1__py2.py3-none-any.whl

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1282.1'
+__version__ = '3.0.1283.1'

tccli/services/antiddos/v20200309/api.json

@@ -3220,7 +3220,7 @@
         },
         {
           "disabled": false,
-          "document": "策略方式，可取值alg表示验证码，drop表示丢弃",
+          "document": "策略方式，可取值alg表示验证码，drop表示丢弃，trans表示放行",
           "example": "alg",
           "member": "string",
           "name": "PolicyAction",

tccli/services/cdwch/v20200915/api.json

@@ -1508,7 +1508,7 @@
         },
         {
           "disabled": false,
-          "document": "集群角色类型，默认为 \"data\"数据节点",
+          "document": "集群角色类型，“DATA” 为数据节点、“COMMON” 为 ZooKeeper 节点，默认为 \"DATA\" 数据节点。",
           "example": "DATA",
           "member": "string",
           "name": "NodeRole",
@@ -1563,7 +1563,7 @@
           "example": "2",
           "member": "int64",
           "name": "TotalCount",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -1573,7 +1573,7 @@
           "example": "无",
           "member": "InstanceNode",
           "name": "InstanceNodesList",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },

tccli/services/cdwch/v20200915/examples.json

@@ -108,7 +108,7 @@
       {
         "document": "获取实例节点信息列表",
         "input": "https://cdwch.tencentcloudapi.com/?Action=DescribeInstanceNodes\n&InstanceId=cdwch-12345678\n&<公共请求参数>",
-        "output": "{\n    \"Response\": {\n        \"RequestId\": \"f510b0e8-4bc7-44c7-a191-79e467b556c4\",\n        \"TotalCount\": 2,\n        \"InstanceNodesList\": [\n            {\n                \"Ip\": \"172.31.1.5\",\n                \"Spec\": \"CVM.SA2\",\n                \"Core\": 16,\n                \"Memory\": 32,\n                \"DiskType\": \"CLOUD_PREMIUM\",\n                \"DiskSize\": 1000,\n                \"Cluster\": \"default-cluster\"\n            },\n            {\n                \"Ip\": \"172.31.1.4\",\n                \"Spec\": \"CVM.SA2\",\n                \"Core\": 16,\n                \"Memory\": 32,\n                \"DiskType\": \"CLOUD_PREMIUM\",\n                \"DiskSize\": 1000,\n                \"Cluster\": \"default-cluster\"\n            }\n        ]\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"InstanceNodesList\": [\n            {\n                \"Cluster\": \"default_cluster\",\n                \"Core\": 2,\n                \"DiskSize\": 200,\n                \"DiskType\": \"CLOUD_HSSD\",\n                \"Ip\": \"10.0.0.x\",\n                \"IsCHProxy\": false,\n                \"Memory\": 4,\n                \"NodeGroups\": [],\n                \"RealResourceId\": \"ins-xxxxxxxx\",\n                \"Rip\": \"9.0.x.x\",\n                \"Spec\": \"S_2_4_H\",\n                \"Status\": \"Running\",\n                \"UUID\": \"939cd0af-b336-4e83-ad1f-1bc11ea097b\",\n                \"Zone\": \"ap-chongqing-1\",\n                \"ZoneDesc\": \"重庆一区\"\n            },\n            {\n                \"Cluster\": \"default_cluster\",\n                \"Core\": 2,\n                \"DiskSize\": 200,\n                \"DiskType\": \"CLOUD_HSSD\",\n                \"Ip\": \"10.0.0.x\",\n                \"IsCHProxy\": false,\n                \"Memory\": 4,\n                \"NodeGroups\": [],\n                \"RealResourceId\": \"ins-xxxxxxxx\",\n                \"Rip\": \"9.0.x.x\",\n                \"Spec\": \"S_2_4_H\",\n                \"Status\": \"Running\",\n                \"UUID\": \"939cd0af-b336-4e83-ad1f-1bc11ea097b\",\n                \"Zone\": \"ap-chongqing-1\",\n                \"ZoneDesc\": \"重庆一区\"\n            }\n        ],\n        \"RequestId\": \"xxxxxxxxxx\",\n        \"TotalCount\": 2\n    }\n}",
         "title": "获取实例节点信息列表"
       }
     ],

tccli/services/chdfs/v20201112/api.json

@@ -1009,63 +1009,63 @@
         },
         {
           "disabled": false,
-          "document": "文件系统已使用容量（byte）\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "文件系统已使用容量（byte）",
           "example": "0",
           "member": "uint64",
           "name": "CapacityUsed",
           "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "已使用COS归档存储容量（byte）\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "已使用COS归档存储容量（byte）",
           "example": "0",
           "member": "uint64",
           "name": "ArchiveCapacityUsed",
           "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "已使用COS标准存储容量（byte）\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "已使用COS标准存储容量（byte）",
           "example": "0",
           "member": "uint64",
           "name": "StandardCapacityUsed",
           "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "已使用COS低频存储容量（byte）\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "已使用COS低频存储容量（byte）",
           "example": "0",
           "member": "uint64",
           "name": "DegradeCapacityUsed",
           "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "已使用COS深度归档存储容量（byte）\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "已使用COS深度归档存储容量（byte）",
           "example": "0",
           "member": "uint64",
           "name": "DeepArchiveCapacityUsed",
           "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "已使用COS智能分层存储容量（byte）\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "已使用COS智能分层存储容量（byte）",
           "example": "0",
           "member": "uint64",
           "name": "IntelligentCapacityUsed",
           "output_required": true,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",

tccli/services/mongodb/v20190725/api.json

@@ -197,7 +197,7 @@
       "status": "online"
     },
     "EnableTransparentDataEncryption": {
-      "document": "本接口(EnableTransparentDataEncryption)用于开启云数据库 MongoDB 的透明加密能力。",
+      "document": "本接口（EnableTransparentDataEncryption）用于开启云数据库 MongoDB 的透明加密能力。",
       "input": "EnableTransparentDataEncryptionRequest",
       "name": "开启实例数据透明加密",
       "output": "EnableTransparentDataEncryptionResponse",
@@ -3416,7 +3416,7 @@
         {
           "disabled": false,
           "document": "密钥 ID。若不设置该参数，不指定具体的密钥 ID，由腾讯云自动生成密钥。",
-          "example": "AKIDnRsa6OfiW8**********************",
+          "example": "AKID********************************",
           "member": "string",
           "name": "KeyId",
           "required": false,

tccli/services/mongodb/v20190725/examples.json

@@ -227,8 +227,8 @@
     "EnableTransparentDataEncryption": [
       {
         "document": "",
-        "input": "POST / HTTP/1.1\nHost: mongodb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: EnableTransparentDataEncryption\n<公共请求参数>\n\n{\n    \"InstanceId\": \"cmgo-igjysqkr\",\n    \"KmsRegion\": \"ap-guangzhou\",\n    \"KeyId\": \"myEncryptionkey\"\n}",
-        "output": "{\n    \"Response\": {\n        \"FlowId\": 0,\n        \"RequestId\": \"a8dce7a4-d488-49c9-8d24-33cf623f5992\"\n    }\n}",
+        "input": "POST / HTTP/1.1\nHost: mongodb.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: EnableTransparentDataEncryption\n<公共请求参数>\n\n{\n    \"InstanceId\": \"cmgo-igjy****\",\n    \"KmsRegion\": \"ap-guangzhou\",\n    \"KeyId\": \"AKID********************************\"\n}",
+        "output": "{\n    \"Response\": {\n        \"FlowId\": 17316505316,\n        \"RequestId\": \"a8dce7a4-d488-49c9-8d24-33cf623f5992\"\n    }\n}",
         "title": "开启实例数据透明加密"
       }
     ],

tccli/services/mqtt/mqtt_client.py

@@ -2097,6 +2097,58 @@ def doDeleteAuthorizationPolicy(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doModifyHttpAuthenticator(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.MqttClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.ModifyHttpAuthenticatorRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.ModifyHttpAuthenticator(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 doDescribeTopic(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2617,6 +2669,58 @@ def doModifyInstance(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doCreateHttpAuthenticator(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.MqttClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.CreateHttpAuthenticatorRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.CreateHttpAuthenticator(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])
+
+
 CLIENT_MAP = {
     "v20240516": mqtt_client_v20240516,
 
@@ -2668,6 +2772,7 @@ ACTION_MAP = {
     "DescribeInstanceList": doDescribeInstanceList,
     "ModifyAuthorizationPolicy": doModifyAuthorizationPolicy,
     "DeleteAuthorizationPolicy": doDeleteAuthorizationPolicy,
+    "ModifyHttpAuthenticator": doModifyHttpAuthenticator,
     "DescribeTopic": doDescribeTopic,
     "RegisterCaCertificate": doRegisterCaCertificate,
     "ModifyInsPublicEndpoint": doModifyInsPublicEndpoint,
@@ -2678,6 +2783,7 @@ ACTION_MAP = {
     "DescribeTopicList": doDescribeTopicList,
     "CreateAuthorizationPolicy": doCreateAuthorizationPolicy,
     "ModifyInstance": doModifyInstance,
+    "CreateHttpAuthenticator": doCreateHttpAuthenticator,
 
 }