tccli 3.0.1151.1__py2.py3-none-any.whl → 3.0.1153.1__py2.py3-none-any.whl

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1151.1'
+__version__ = '3.0.1153.1'

tccli/services/__init__.py

@@ -200,6 +200,9 @@ SERVICE_VERSIONS = {
     "clb": [
         "2018-03-17"
     ],
+    "cloudapp": [
+        "2022-05-30"
+    ],
     "cloudaudit": [
         "2019-03-19"
     ],

tccli/services/cdc/v20201214/api.json

@@ -862,7 +862,7 @@
           "example": "无",
           "member": "string",
           "name": "DedicatedClusterId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -872,7 +872,7 @@
           "example": "无",
           "member": "string",
           "name": "DedicatedClusterTypeId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -882,7 +882,7 @@
           "example": "无",
           "member": "string",
           "name": "SupportedStorageType",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -892,7 +892,7 @@
           "example": "无",
           "member": "int64",
           "name": "SupportedUplinkSpeed",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -902,7 +902,7 @@
           "example": "无",
           "member": "string",
           "name": "SupportedInstanceFamily",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -912,7 +912,7 @@
           "example": "无",
           "member": "int64",
           "name": "Weight",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },
@@ -922,7 +922,7 @@
           "example": "无",
           "member": "float",
           "name": "PowerDraw",
-          "required": true,
+          "output_required": true,
           "type": "float",
           "value_allowed_null": false
         },
@@ -932,7 +932,7 @@
           "example": "无",
           "member": "string",
           "name": "OrderStatus",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -942,7 +942,7 @@
           "example": "无",
           "member": "datetime_iso",
           "name": "CreateTime",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -952,7 +952,7 @@
           "example": "ord-aijx4ets ",
           "member": "string",
           "name": "DedicatedClusterOrderId",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -962,7 +962,7 @@
           "example": "CREATE",
           "member": "string",
           "name": "Action",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
@@ -972,7 +972,7 @@
           "example": "无",
           "member": "DedicatedClusterOrderItem",
           "name": "DedicatedClusterOrderItems",
-          "required": true,
+          "output_required": true,
           "type": "list",
           "value_allowed_null": true
         },
@@ -982,7 +982,7 @@
           "example": "无",
           "member": "int64",
           "name": "Cpu",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -992,7 +992,7 @@
           "example": "无",
           "member": "int64",
           "name": "Mem",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -1002,7 +1002,7 @@
           "example": "无",
           "member": "int64",
           "name": "Gpu",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -1012,7 +1012,7 @@
           "example": "1",
           "member": "int64",
           "name": "PayStatus",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -1022,7 +1022,7 @@
           "example": "MONTHLY",
           "member": "string",
           "name": "PayType",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -1032,7 +1032,7 @@
           "example": "YEAR",
           "member": "string",
           "name": "TimeUnit",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": true
         },
@@ -1042,7 +1042,7 @@
           "example": "1",
           "member": "int64",
           "name": "TimeSpan",
-          "required": true,
+          "output_required": true,
           "type": "int",
           "value_allowed_null": true
         },
@@ -1052,7 +1052,77 @@
           "example": "CUSTOM",
           "member": "string",
           "name": "OrderType",
-          "required": true,
+          "output_required": true,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "验收状态\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "DELIVERING",
+          "member": "string",
+          "name": "CheckStatus",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "交付预期时间\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "2024-01-01 12:00:00",
+          "member": "string",
+          "name": "DeliverExpectTime",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "交付实际完成时间\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "2024-01-01 12:00:00",
+          "member": "string",
+          "name": "DeliverFinishTime",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "验收预期时间\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "2024-01-01 12:00:00",
+          "member": "string",
+          "name": "CheckExpectTime",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "验收实际完成时间\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "2024-01-01 12:00:00",
+          "member": "string",
+          "name": "CheckFinishTime",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "订单SLA\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "OrderSLA",
+          "output_required": false,
+          "type": "string",
+          "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "订单支付计划\n注意：此字段可能返回 null，表示取不到有效值。",
+          "example": "无",
+          "member": "string",
+          "name": "OrderPayPlan",
+          "output_required": false,
           "type": "string",
           "value_allowed_null": true
         }
@@ -1808,6 +1878,15 @@
           "name": "ActionType",
           "required": false,
           "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "订单类型列表",
+          "example": "无",
+          "member": "string",
+          "name": "OrderTypes",
+          "required": false,
+          "type": "list"
         }
       ],
       "type": "object"
@@ -1821,6 +1900,7 @@
           "example": "无",
           "member": "DedicatedClusterOrder",
           "name": "DedicatedClusterOrderSet",
+          "output_required": true,
           "type": "list",
           "value_allowed_null": false
         },
@@ -1830,6 +1910,7 @@
           "example": "20",
           "member": "int64",
           "name": "TotalCount",
+          "output_required": true,
           "type": "int",
           "value_allowed_null": false
         },

tccli/services/cdc/v20201214/examples.json

@@ -84,7 +84,7 @@
       {
         "document": "查询专用集群订单列表",
         "input": "https://cdc.tencentcloudapi.com/?Action=DescribeDedicatedClusterOrders\n&<公共请求参数>",
-        "output": "{\n    \"Response\": {\n        \"DedicatedClusterOrderSet\": [\n            {\n                \"DedicatedClusterId\": \"xx\",\n                \"DedicatedClusterTypeId\": \"xx\",\n                \"SupportedStorageType\": [\n                    \"xx\"\n                ],\n                \"SupportedUplinkSpeed\": [\n                    0\n                ],\n                \"SupportedInstanceFamily\": [\n                    \"xx\"\n                ],\n                \"Weight\": 0,\n                \"PowerDraw\": 0,\n                \"OrderStatus\": \"xx\",\n                \"CreateTime\": \"2020-09-22T00:00:00+00:00\",\n                \"DedicatedClusterOrderId\": \"xx\",\n                \"Action\": \"xx\",\n                \"DedicatedClusterOrderItems\": [\n                    {\n                        \"DedicatedClusterTypeId\": \"xx\",\n                        \"SupportedStorageType\": [\n                            \"xx\"\n                        ],\n                        \"SupportedUplinkSpeed\": [\n                            0\n                        ],\n                        \"SupportedInstanceFamily\": [\n                            \"xx\"\n                        ],\n                        \"Weight\": 0,\n                        \"PowerDraw\": 0,\n                        \"SubOrderStatus\": \"xx\",\n                        \"CreateTime\": \"2020-09-22T00:00:00+00:00\",\n                        \"SubOrderId\": \"xx\",\n                        \"Count\": 0,\n                        \"Name\": \"xx\",\n                        \"Description\": \"xx\",\n                        \"TotalCpu\": 0,\n                        \"TotalMem\": 0,\n                        \"TotalGpu\": 0,\n                        \"TypeName\": \"xx\",\n                        \"ComputeFormat\": \"xx\",\n                        \"TypeFamily\": \"xx\",\n                        \"SubOrderPayStatus\": 0\n                    }\n                ],\n                \"Cpu\": 0,\n                \"Mem\": 0,\n                \"Gpu\": 0,\n                \"PayStatus\": 0,\n                \"PayType\": \"xx\",\n                \"TimeUnit\": \"xx\",\n                \"TimeSpan\": 0,\n                \"OrderType\": \"xx\"\n            }\n        ],\n        \"TotalCount\": 0,\n        \"RequestId\": \"xx\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"DedicatedClusterOrderSet\": [\n            {\n                \"DedicatedClusterId\": \"abc\",\n                \"DedicatedClusterTypeId\": \"abc\",\n                \"SupportedStorageType\": [\n                    \"abc\"\n                ],\n                \"SupportedUplinkSpeed\": [\n                    0\n                ],\n                \"SupportedInstanceFamily\": [\n                    \"abc\"\n                ],\n                \"Weight\": 0,\n                \"PowerDraw\": 0,\n                \"OrderStatus\": \"abc\",\n                \"CreateTime\": \"2020-09-22T00:00:00+00:00\",\n                \"DedicatedClusterOrderId\": \"abc\",\n                \"Action\": \"abc\",\n                \"DedicatedClusterOrderItems\": [\n                    {\n                        \"DedicatedClusterTypeId\": \"abc\",\n                        \"SupportedStorageType\": [\n                            \"abc\"\n                        ],\n                        \"SupportedUplinkSpeed\": [\n                            0\n                        ],\n                        \"SupportedInstanceFamily\": [\n                            \"abc\"\n                        ],\n                        \"Weight\": 0,\n                        \"PowerDraw\": 0,\n                        \"SubOrderStatus\": \"abc\",\n                        \"CreateTime\": \"2020-09-22T00:00:00+00:00\",\n                        \"SubOrderId\": \"abc\",\n                        \"Count\": 0,\n                        \"Name\": \"abc\",\n                        \"Description\": \"abc\",\n                        \"TotalCpu\": 0,\n                        \"TotalMem\": 0,\n                        \"TotalGpu\": 0,\n                        \"TypeName\": \"abc\",\n                        \"ComputeFormat\": \"abc\",\n                        \"TypeFamily\": \"abc\",\n                        \"SubOrderPayStatus\": 0\n                    }\n                ],\n                \"Cpu\": 0,\n                \"Mem\": 0,\n                \"Gpu\": 0,\n                \"PayStatus\": 0,\n                \"PayType\": \"abc\",\n                \"TimeUnit\": \"abc\",\n                \"TimeSpan\": 0,\n                \"OrderType\": \"abc\",\n                \"CheckStatus\": \"abc\",\n                \"DeliverExpectTime\": \"abc\",\n                \"DeliverFinishTime\": \"abc\",\n                \"CheckExpectTime\": \"abc\",\n                \"CheckFinishTime\": \"abc\",\n                \"OrderSLA\": \"abc\",\n                \"OrderPayPlan\": \"abc\"\n            }\n        ],\n        \"TotalCount\": 0,\n        \"RequestId\": \"abc\"\n    }\n}",
         "title": "查询专用集群订单列表"
       }
     ],

tccli/services/cloudapp/__init__.py

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from tccli.services.cloudapp.cloudapp_client import action_caller
+    

tccli/services/cloudapp/cloudapp_client.py

@@ -0,0 +1,195 @@
+# -*- coding: utf-8 -*-
+import os
+import sys
+import six
+import json
+import tccli.options_define as OptionsDefine
+import tccli.format_output as FormatOutput
+from tccli import __version__
+from tccli.utils import Utils
+from tccli.exceptions import ConfigurationError, ClientError, ParamError
+from tencentcloud.common import credential
+from tencentcloud.common.profile.http_profile import HttpProfile
+from tencentcloud.common.profile.client_profile import ClientProfile
+from tencentcloud.cloudapp.v20220530 import cloudapp_client as cloudapp_client_v20220530
+from tencentcloud.cloudapp.v20220530 import models as models_v20220530
+
+from jmespath import search
+import time
+
+def doVerifyLicense(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.CloudappClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.VerifyLicenseRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.VerifyLicense(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 = {
+    "v20220530": cloudapp_client_v20220530,
+
+}
+
+MODELS_MAP = {
+    "v20220530": models_v20220530,
+
+}
+
+ACTION_MAP = {
+    "VerifyLicense": doVerifyLicense,
+
+}
+
+AVAILABLE_VERSION_LIST = [
+    "v20220530",
+
+]
+
+
+def action_caller():
+    return ACTION_MAP
+
+
+def parse_global_arg(parsed_globals):
+    g_param = parsed_globals
+
+    is_exist_profile = True
+    if not parsed_globals["profile"]:
+        is_exist_profile = False
+        g_param["profile"] = os.environ.get("TCCLI_PROFILE", "default")
+
+    configure_path = os.path.join(os.path.expanduser("~"), ".tccli")
+    is_conf_exist, conf_path = Utils.file_existed(configure_path, g_param["profile"] + ".configure")
+    is_cred_exist, cred_path = Utils.file_existed(configure_path, g_param["profile"] + ".credential")
+
+    conf = {}
+    cred = {}
+
+    if is_conf_exist:
+        conf = Utils.load_json_msg(conf_path)
+    if is_cred_exist:
+        cred = Utils.load_json_msg(cred_path)
+
+    if not (isinstance(conf, dict) and isinstance(cred, dict)):
+        raise ConfigurationError(
+            "file: %s or %s is not json format"
+            % (g_param["profile"] + ".configure", g_param["profile"] + ".credential"))
+
+    if OptionsDefine.Token not in cred:
+        cred[OptionsDefine.Token] = None
+
+    if not is_exist_profile:
+        if os.environ.get(OptionsDefine.ENV_SECRET_ID) and os.environ.get(OptionsDefine.ENV_SECRET_KEY):
+            cred[OptionsDefine.SecretId] = os.environ.get(OptionsDefine.ENV_SECRET_ID)
+            cred[OptionsDefine.SecretKey] = os.environ.get(OptionsDefine.ENV_SECRET_KEY)
+            cred[OptionsDefine.Token] = os.environ.get(OptionsDefine.ENV_TOKEN)
+
+        if os.environ.get(OptionsDefine.ENV_REGION):
+            conf[OptionsDefine.SysParam][OptionsDefine.Region] = os.environ.get(OptionsDefine.ENV_REGION)
+
+        if os.environ.get(OptionsDefine.ENV_ROLE_ARN) and os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME):
+            cred[OptionsDefine.RoleArn] = os.environ.get(OptionsDefine.ENV_ROLE_ARN)
+            cred[OptionsDefine.RoleSessionName] = os.environ.get(OptionsDefine.ENV_ROLE_SESSION_NAME)
+
+    for param in g_param.keys():
+        if g_param[param] is None:
+            if param in [OptionsDefine.SecretKey, OptionsDefine.SecretId, OptionsDefine.Token]:
+                if param in cred:
+                    g_param[param] = cred[param]
+                elif not (g_param[OptionsDefine.UseCVMRole.replace('-', '_')]
+                          or os.getenv(OptionsDefine.ENV_TKE_ROLE_ARN)):
+                    raise ConfigurationError("%s is invalid" % param)
+            elif param in [OptionsDefine.Region, OptionsDefine.Output, OptionsDefine.Language]:
+                if param in conf[OptionsDefine.SysParam]:
+                    g_param[param] = conf[OptionsDefine.SysParam][param]
+                elif param != OptionsDefine.Language:
+                    raise ConfigurationError("%s is invalid" % param)
+            elif param.replace('_', '-') in [OptionsDefine.RoleArn, OptionsDefine.RoleSessionName]:
+                if param.replace('_', '-') in cred:
+                    g_param[param] = cred[param.replace('_', '-')]
+
+    try:
+        if g_param[OptionsDefine.ServiceVersion]:
+            g_param[OptionsDefine.Version] = "v" + g_param[OptionsDefine.ServiceVersion].replace('-', '')
+        else:
+            version = conf["cloudapp"][OptionsDefine.Version]
+            g_param[OptionsDefine.Version] = "v" + version.replace('-', '')
+
+        if g_param[OptionsDefine.Endpoint] is None:
+            g_param[OptionsDefine.Endpoint] = conf["cloudapp"][OptionsDefine.Endpoint]
+        g_param["sts_cred_endpoint"] = conf.get("sts", {}).get("endpoint")
+    except Exception as err:
+        raise ConfigurationError("config file:%s error, %s" % (conf_path, str(err)))
+
+    if g_param[OptionsDefine.Version] not in AVAILABLE_VERSION_LIST:
+        raise Exception("available versions: %s" % " ".join(AVAILABLE_VERSION_LIST))
+
+    if g_param[OptionsDefine.Waiter]:
+        param = eval(g_param[OptionsDefine.Waiter])
+        if 'expr' not in param:
+            raise Exception('`expr` in `--waiter` must be defined')
+        if 'to' not in param:
+            raise Exception('`to` in `--waiter` must be defined')
+        if 'timeout' not in param:
+            if 'waiter' in conf and 'timeout' in conf['waiter']:
+                param['timeout'] = conf['waiter']['timeout']
+            else:
+                param['timeout'] = 180
+        if 'interval' not in param:
+            if 'waiter' in conf and 'interval' in conf['waiter']:
+                param['interval'] = conf['waiter']['interval']
+            else:
+                param['interval'] = 5
+        param['interval'] = min(param['interval'], param['timeout'])
+        g_param['OptionsDefine.WaiterInfo'] = param
+
+    if six.PY2:
+        for key, value in g_param.items():
+            if isinstance(value, six.text_type):
+                g_param[key] = value.encode('utf-8')
+    return g_param
+