tccli 3.0.1294.1__py2.py3-none-any.whl → 3.0.1295.1__py2.py3-none-any.whl

tccli/services/tcr/v20190924/api.json

@@ -3684,19 +3684,19 @@
           "example": "Opened",
           "member": "string",
           "name": "Status",
-          "required": true,
+          "output_required": true,
           "type": "string",
           "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "原因\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "原因",
           "example": "error",
           "member": "string",
           "name": "Reason",
-          "required": true,
+          "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
@@ -4033,23 +4033,23 @@
         },
         {
           "disabled": false,
-          "document": "镜像的Labels信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "镜像的Labels信息",
           "example": "无",
           "member": "KeyValueString",
           "name": "Labels",
           "output_required": false,
           "type": "list",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "镜像大小，单位：byte\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "镜像大小，单位：byte",
           "example": "39436994",
           "member": "int64",
           "name": "Size",
           "output_required": false,
           "type": "int",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
@@ -4245,6 +4245,24 @@
           "name": "RegistryId",
           "required": true,
           "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "页数，默认为1",
+          "example": "1",
+          "member": "int64",
+          "name": "Page",
+          "required": false,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "每页展示个数，最大值为100",
+          "example": "100",
+          "member": "int64",
+          "name": "PageSize",
+          "required": false,
+          "type": "int"
         }
       ],
       "type": "object"
@@ -4254,23 +4272,23 @@
       "members": [
         {
           "disabled": false,
-          "document": "规则列表\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "规则列表",
           "example": "无",
           "member": "ImmutableTagRule",
           "name": "Rules",
           "output_required": true,
           "type": "list",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
-          "document": "未创建规则的命名空间\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "未创建规则的命名空间",
           "example": "[\"ns1\",\"ns2\"]",
           "member": "string",
           "name": "EmptyNs",
           "output_required": true,
           "type": "list",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
@@ -4365,13 +4383,13 @@
       "members": [
         {
           "disabled": false,
-          "document": "域名信息列表\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "域名信息列表",
           "example": "无",
           "member": "CustomizedDomainInfo",
           "name": "DomainInfoList",
           "output_required": true,
           "type": "list",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
@@ -4557,13 +4575,13 @@
         },
         {
           "disabled": false,
-          "document": "实例信息列表\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "实例信息列表",
           "example": "nil",
           "member": "Registry",
           "name": "Registries",
           "output_required": true,
           "type": "list",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
@@ -4594,13 +4612,13 @@
       "members": [
         {
           "disabled": false,
-          "document": "vpc私有域名解析状态列表\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "vpc私有域名解析状态列表",
           "example": "[{\"Region\":\"ap-guangzhou\",\"Status\":\"DISABLED\",\"VpcId\":\"vpc-5sdsx9k9\"}]",
           "member": "VpcPrivateDomainStatus",
           "name": "VpcSet",
-          "required": true,
+          "output_required": true,
           "type": "list",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
@@ -5433,13 +5451,13 @@
       "members": [
         {
           "disabled": false,
-          "document": "服务级账号列表\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "服务级账号列表",
           "example": "无",
           "member": "ServiceAccount",
           "name": "ServiceAccounts",
           "output_required": true,
           "type": "list",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,
@@ -9090,14 +9108,14 @@
         },
         {
           "disabled": false,
-          "document": "创建时间\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "创建时间",
           "example": "2023-02-14T07:14:43+08:00",
           "member": "datetime_iso",
           "name": "CreateTime",
           "output_required": true,
           "required": false,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,

tccli/services/tdmq/v20200217/api.json

@@ -19449,13 +19449,13 @@
         },
         {
           "disabled": false,
-          "document": "备注信息\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "备注信息",
           "example": "remark-info",
           "member": "string",
           "name": "Remark",
           "output_required": true,
           "type": "string",
-          "value_allowed_null": true
+          "value_allowed_null": false
         },
         {
           "disabled": false,

tccli/services/tke/tke_client.py

@@ -747,7 +747,7 @@ def doDeleteEdgeClusterInstances(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doModifyPrometheusAlertRule(args, parsed_globals):
+def doDescribeTKEEdgeExternalKubeconfig(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -776,11 +776,11 @@ def doModifyPrometheusAlertRule(args, parsed_globals):
     client = mod.TkeClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.ModifyPrometheusAlertRuleRequest()
+    model = models.DescribeTKEEdgeExternalKubeconfigRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.ModifyPrometheusAlertRule(model)
+        rsp = client.DescribeTKEEdgeExternalKubeconfig(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -2203,7 +2203,7 @@ def doModifyReservedInstanceScope(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDescribeTKEEdgeExternalKubeconfig(args, parsed_globals):
+def doDescribeOSImages(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -2232,11 +2232,11 @@ def doDescribeTKEEdgeExternalKubeconfig(args, parsed_globals):
     client = mod.TkeClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DescribeTKEEdgeExternalKubeconfigRequest()
+    model = models.DescribeOSImagesRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DescribeTKEEdgeExternalKubeconfig(model)
+        rsp = client.DescribeOSImages(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -4699,6 +4699,58 @@ def doAddExistedInstances(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doModifyPrometheusAlertRule(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.TkeClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.ModifyPrometheusAlertRuleRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.ModifyPrometheusAlertRule(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 doCreateEdgeCVMInstances(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -12578,7 +12630,7 @@ ACTION_MAP = {
     "UpdateEdgeClusterVersion": doUpdateEdgeClusterVersion,
     "DescribeExternalNodeSupportConfig": doDescribeExternalNodeSupportConfig,
     "DeleteEdgeClusterInstances": doDeleteEdgeClusterInstances,
-    "ModifyPrometheusAlertRule": doModifyPrometheusAlertRule,
+    "DescribeTKEEdgeExternalKubeconfig": doDescribeTKEEdgeExternalKubeconfig,
     "SetNodePoolNodeProtection": doSetNodePoolNodeProtection,
     "DescribeEKSContainerInstanceEvent": doDescribeEKSContainerInstanceEvent,
     "DescribeEdgeAvailableExtraArgs": doDescribeEdgeAvailableExtraArgs,
@@ -12606,7 +12658,7 @@ ACTION_MAP = {
     "DeleteEKSCluster": doDeleteEKSCluster,
     "AddNodeToNodePool": doAddNodeToNodePool,
     "ModifyReservedInstanceScope": doModifyReservedInstanceScope,
-    "DescribeTKEEdgeExternalKubeconfig": doDescribeTKEEdgeExternalKubeconfig,
+    "DescribeOSImages": doDescribeOSImages,
     "DescribeClusters": doDescribeClusters,
     "CreateCLSLogConfig": doCreateCLSLogConfig,
     "EnableClusterAudit": doEnableClusterAudit,
@@ -12654,6 +12706,7 @@ ACTION_MAP = {
     "DescribeRegions": doDescribeRegions,
     "DescribeReservedInstanceUtilizationRate": doDescribeReservedInstanceUtilizationRate,
     "AddExistedInstances": doAddExistedInstances,
+    "ModifyPrometheusAlertRule": doModifyPrometheusAlertRule,
     "CreateEdgeCVMInstances": doCreateEdgeCVMInstances,
     "DisableClusterDeletionProtection": doDisableClusterDeletionProtection,
     "DescribePrometheusTargets": doDescribePrometheusTargets,