tccli 3.0.1237.1__py2.py3-none-any.whl → 3.0.1238.1__py2.py3-none-any.whl

tccli/services/emr/v20190103/api.json

@@ -8700,15 +8700,6 @@
           "required": true,
           "type": "int"
         },
-        {
-          "disabled": false,
-          "document": "待续费节点的资源ID列表。资源ID形如：emr-vm-xxxxxxxx。有效的资源ID可通过登录[控制台](https://console.cloud.tencent.com/emr)查询。",
-          "example": "[\"emr-vm-jv1s4zas\\r\\n\"]",
-          "member": "string",
-          "name": "ResourceIds",
-          "required": true,
-          "type": "list"
-        },
         {
           "disabled": false,
           "document": "实例计费模式。此处只支持取值为1，表示包年包月。",
@@ -8718,6 +8709,15 @@
           "required": true,
           "type": "int"
         },
+        {
+          "disabled": false,
+          "document": "待续费节点的资源ID列表。资源ID形如：emr-vm-xxxxxxxx。有效的资源ID可通过登录[控制台](https://console.cloud.tencent.com/emr)查询。",
+          "example": "[\"emr-vm-jv1s4zas\\r\\n\"]",
+          "member": "string",
+          "name": "ResourceIds",
+          "required": false,
+          "type": "list"
+        },
         {
           "disabled": false,
           "document": "实例续费的时间单位。取值范围：\n<li>m：表示月份。</li>",
@@ -8753,6 +8753,24 @@
           "name": "ModifyPayMode",
           "required": false,
           "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "是否需要每个节点续费价格",
+          "example": "false",
+          "member": "bool",
+          "name": "NeedDetail",
+          "required": false,
+          "type": "bool"
+        },
+        {
+          "disabled": false,
+          "document": "集群id，如果需要集群所有包年包月节点续费信息，可以填写该参数",
+          "example": "emr-21adfa",
+          "member": "string",
+          "name": "InstanceId",
+          "required": false,
+          "type": "string"
         }
       ],
       "type": "object"
@@ -8800,6 +8818,16 @@
           "type": "int",
           "value_allowed_null": true
         },
+        {
+          "disabled": false,
+          "document": "价格详情\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "PriceDetail",
+          "name": "PriceDetail",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": true
+        },
         {
           "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
           "member": "string",
@@ -12219,9 +12247,10 @@
         {
           "disabled": false,
           "document": "外部资源提供者的标识符，例如\"cls-a1cd23fa\"。",
-          "example": "\"\"",
+          "example": "cls-a1cd2dsx",
           "member": "string",
           "name": "ResourceProviderIdentifier",
+          "output_required": true,
           "required": true,
           "type": "string",
           "value_allowed_null": false
@@ -12229,9 +12258,10 @@
         {
           "disabled": false,
           "document": "外部资源提供者类型，例如\"tke\",当前仅支持\"tke\"。",
-          "example": "\"\"",
+          "example": "tke",
           "member": "string",
           "name": "ResourceProviderType",
+          "output_required": true,
           "required": true,
           "type": "string",
           "value_allowed_null": false
@@ -12239,9 +12269,10 @@
         {
           "disabled": false,
           "document": "资源的用途，即节点类型，当前仅支持\"TASK\"。",
-          "example": "\"\"",
+          "example": "TASK",
           "member": "string",
           "name": "NodeFlag",
+          "output_required": true,
           "required": true,
           "type": "string",
           "value_allowed_null": false
@@ -12249,9 +12280,10 @@
         {
           "disabled": false,
           "document": "CPU核数。",
-          "example": "\"\"",
+          "example": "1",
           "member": "uint64",
           "name": "Cpu",
+          "output_required": true,
           "required": true,
           "type": "int",
           "value_allowed_null": false
@@ -12259,9 +12291,10 @@
         {
           "disabled": false,
           "document": "内存大小，单位为GB。",
-          "example": "\"\"",
+          "example": "1",
           "member": "uint64",
           "name": "Memory",
+          "output_required": true,
           "required": true,
           "type": "int",
           "value_allowed_null": false
@@ -12269,9 +12302,10 @@
         {
           "disabled": false,
           "document": "Eks集群-CPU类型，当前支持\"intel\"和\"amd\"",
-          "example": "\"\"",
+          "example": "intel",
           "member": "string",
           "name": "CpuType",
+          "output_required": true,
           "required": false,
           "type": "string",
           "value_allowed_null": false
@@ -12279,9 +12313,10 @@
         {
           "disabled": false,
           "document": "Pod节点数据目录挂载信息。",
-          "example": "\"\"",
+          "example": "[\"/data\"]",
           "member": "PodVolume",
           "name": "PodVolumes",
+          "output_required": true,
           "required": false,
           "type": "list",
           "value_allowed_null": false
@@ -12289,9 +12324,10 @@
         {
           "disabled": false,
           "document": "是否浮动规格，默认否\n<li>true：代表是</li>\n<li>false：代表否</li>",
-          "example": "\"\"",
+          "example": "true",
           "member": "bool",
           "name": "EnableDynamicSpecFlag",
+          "output_required": true,
           "required": false,
           "type": "bool",
           "value_allowed_null": false
@@ -12299,9 +12335,10 @@
         {
           "disabled": false,
           "document": "浮动规格\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "\"\"",
+          "example": "无",
           "member": "DynamicPodSpec",
           "name": "DynamicPodSpec",
+          "output_required": true,
           "required": false,
           "type": "object",
           "value_allowed_null": true
@@ -12309,9 +12346,10 @@
         {
           "disabled": false,
           "document": "代表vpc网络唯一id\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "\"\"",
+          "example": "vpc-se938xw9",
           "member": "string",
           "name": "VpcId",
+          "output_required": true,
           "required": false,
           "type": "string",
           "value_allowed_null": true
@@ -12319,9 +12357,10 @@
         {
           "disabled": false,
           "document": "代表vpc子网唯一id\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "\"\"",
+          "example": "sub-ei39s9xx",
           "member": "string",
           "name": "SubnetId",
+          "output_required": true,
           "required": false,
           "type": "string",
           "value_allowed_null": true
@@ -12332,6 +12371,7 @@
           "example": "无",
           "member": "string",
           "name": "PodName",
+          "output_required": true,
           "required": false,
           "type": "string",
           "value_allowed_null": true
@@ -14201,6 +14241,26 @@
           "type": "string",
           "value_allowed_null": true
         },
+        {
+          "disabled": false,
+          "document": "订单号。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "1731867961-23673-5000362",
+          "member": "string",
+          "name": "DealNames",
+          "output_required": false,
+          "type": "list",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "大订单号。\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "20241118053073481639521",
+          "member": "string",
+          "name": "BillId",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
         {
           "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
           "member": "string",

tccli/services/ess/ess_client.py

@@ -1525,6 +1525,58 @@ def doBindEmployeeUserIdWithClientOpenId(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doCreateOrganizationAuthFile(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.CreateOrganizationAuthFileRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.CreateOrganizationAuthFile(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 doDeleteIntegrationRoleUsers(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2877,7 +2929,7 @@ def doCreateFlowBlockchainEvidenceUrl(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCreateBatchOrganizationRegistrationTasks(args, parsed_globals):
+def doCreateBatchOrganizationAuthorizationUrl(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -2906,11 +2958,11 @@ def doCreateBatchOrganizationRegistrationTasks(args, parsed_globals):
     client = mod.EssClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CreateBatchOrganizationRegistrationTasksRequest()
+    model = models.CreateBatchOrganizationAuthorizationUrlRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.CreateBatchOrganizationRegistrationTasks(model)
+        rsp = client.CreateBatchOrganizationAuthorizationUrl(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -3033,7 +3085,7 @@ def doModifyIntegrationRole(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCreateBatchOrganizationAuthorizationUrl(args, parsed_globals):
+def doCreateBatchOrganizationRegistrationTasks(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -3062,11 +3114,11 @@ def doCreateBatchOrganizationAuthorizationUrl(args, parsed_globals):
     client = mod.EssClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CreateBatchOrganizationAuthorizationUrlRequest()
+    model = models.CreateBatchOrganizationRegistrationTasksRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.CreateBatchOrganizationAuthorizationUrl(model)
+        rsp = client.CreateBatchOrganizationRegistrationTasks(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -4997,6 +5049,7 @@ ACTION_MAP = {
     "RenewAutoSignLicense": doRenewAutoSignLicense,
     "VerifyPdf": doVerifyPdf,
     "BindEmployeeUserIdWithClientOpenId": doBindEmployeeUserIdWithClientOpenId,
+    "CreateOrganizationAuthFile": doCreateOrganizationAuthFile,
     "DeleteIntegrationRoleUsers": doDeleteIntegrationRoleUsers,
     "CreateFlowGroupByFiles": doCreateFlowGroupByFiles,
     "CreateIntegrationDepartment": doCreateIntegrationDepartment,
@@ -5023,10 +5076,10 @@ ACTION_MAP = {
     "CreateIntegrationRole": doCreateIntegrationRole,
     "ModifyExtendedService": doModifyExtendedService,
     "CreateFlowBlockchainEvidenceUrl": doCreateFlowBlockchainEvidenceUrl,
-    "CreateBatchOrganizationRegistrationTasks": doCreateBatchOrganizationRegistrationTasks,
+    "CreateBatchOrganizationAuthorizationUrl": doCreateBatchOrganizationAuthorizationUrl,
     "DescribeUserVerifyStatus": doDescribeUserVerifyStatus,
     "ModifyIntegrationRole": doModifyIntegrationRole,
-    "CreateBatchOrganizationAuthorizationUrl": doCreateBatchOrganizationAuthorizationUrl,
+    "CreateBatchOrganizationRegistrationTasks": doCreateBatchOrganizationRegistrationTasks,
     "CreateEmployeeQualificationSealQrCode": doCreateEmployeeQualificationSealQrCode,
     "CreateExtendedServiceAuthInfos": doCreateExtendedServiceAuthInfos,
     "CreateOrganizationInfoChangeUrl": doCreateOrganizationInfoChangeUrl,