tccli 3.0.1004.1__py2.py3-none-any.whl → 3.0.1005.1__py2.py3-none-any.whl

tccli/services/tcss/v20201101/examples.json

@@ -86,7 +86,7 @@
       {
         "document": "",
         "input": "https://tcss.tencentcloudapi.com/?Action=AddEditImageAutoAuthorizedRule\n&RangeType=\"MANUAL\"\n&HostIdSet.0=\"xx\"\n&MaxDailyCount=1\n&RuleId=1\n&IsEnabled=1\n&<公共请求参数>",
-        "output": "{\n    \"Response\": {\n        \"RequestId\": \"xx\"\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"aaa\"\n    }\n}",
         "title": "新增或编辑本地镜像自动授权规则"
       }
     ],
@@ -211,8 +211,8 @@
     "CreateAssetImageScanSetting": [
       {
         "document": "添加容器安全镜像扫描设置",
-        "input": "POST / HTTP/1.1\nHost: tcss.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateAssetImageScanSetting\n<公共请求参数>\n\n{\n    \"Enable\": true,\n    \"ScanTime\": \"2020-12-28 15:53:26\",\n    \"ScanPeriod\": 3600,\n    \"ScanVirus\": true,\n    \"ScanRisk\": true,\n    \"ScanVul\": true,\n    \"All\": true,\n    \"Images\": []\n}",
-        "output": "{\n    \"Response\": {\n        \"RequestId\": \"af170769-a009-4c51-879a-8fe182ace76e\"\n    }\n}",
+        "input": "POST / HTTP/1.1\nHost: tcss.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateAssetImageScanSetting\n<公共请求参数>\n\n{\n    \"Enable\": true,\n    \"ScanTime\": \"00:00\",\n    \"ScanPeriod\": 1,\n    \"ScanVirus\": true,\n    \"ScanRisk\": true,\n    \"ScanVul\": true,\n    \"ScanEndTime\": \"02:00\"\n}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"e3526ac5-6a37-46c4-8f65-c722973f4f65\"\n    }\n}",
         "title": "添加容器安全镜像扫描设置"
       }
     ],
@@ -888,7 +888,7 @@
       {
         "document": "查询镜像详细信息",
         "input": "POST / HTTP/1.1\nHost: tcss.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeAssetImageDetail\n<公共请求参数>\n\n{\n    \"ImageID\": \"dskaldjskld\"\n}",
-        "output": "{\n    \"Response\": {\n        \"AgentError\": \"\",\n        \"Architecture\": \"\",\n        \"Author\": \"\",\n        \"BuildHistory\": \"file:c92c248239f8c7b9b3c067650954815f391b7bcb09023f984972c082ace2a8d0 in  \",\n        \"ContainerCnt\": 0,\n        \"CreateTime\": \"2021-01-29T04:03:11Z\",\n        \"HostCnt\": 1,\n        \"ImageID\": \"sha256:1c19ee40bfafd313400cde57a50b38b16ed4751c6b62a64141f18629a0e9d430\",\n        \"ImageName\": \"<none>:<none>\",\n        \"IsTrustImage\": true,\n        \"OsName\": \"alpine:v3.12\",\n        \"RemainScanTime\": 0,\n        \"RequestId\": \"1d1ca0b5-f2ca-40bb-8797-39132bdbf35e\",\n        \"RiskCnt\": 7,\n        \"ScanError\": \"\",\n        \"ScanRiskError\": \"\",\n        \"ScanRiskProgress\": 100,\n        \"ScanStatus\": \"SCAN_ERR\",\n        \"ScanTime\": \"2021-01-29T05:26:18.07Z\",\n        \"ScanVirusError\": \" 失败\",\n        \"ScanVirusProgress\": 100,\n        \"ScanVulError\": \"\",\n        \"ScanVulProgress\": 100,\n        \"SensitiveInfoCnt\": 0,\n        \"Size\": 16159906,\n        \"Status\": 3,\n        \"VirusCnt\": 11,\n        \"VulCnt\": 5,\n        \"IsAuthorized\": 0\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"ImageID\": \"abc\",\n        \"ImageName\": \"abc\",\n        \"CreateTime\": \"abc\",\n        \"Size\": 1,\n        \"HostCnt\": 1,\n        \"ContainerCnt\": 1,\n        \"ScanTime\": \"abc\",\n        \"VulCnt\": 1,\n        \"RiskCnt\": 1,\n        \"SensitiveInfoCnt\": 1,\n        \"IsTrustImage\": true,\n        \"OsName\": \"abc\",\n        \"AgentError\": \"abc\",\n        \"ScanError\": \"abc\",\n        \"Architecture\": \"abc\",\n        \"Author\": \"abc\",\n        \"BuildHistory\": \"abc\",\n        \"ScanVirusProgress\": 1,\n        \"ScanVulProgress\": 1,\n        \"ScanRiskProgress\": 1,\n        \"ScanVirusError\": \"abc\",\n        \"ScanVulError\": \"abc\",\n        \"ScanRiskError\": \"abc\",\n        \"ScanStatus\": \"abc\",\n        \"VirusCnt\": 1,\n        \"Status\": 1,\n        \"RemainScanTime\": 1,\n        \"IsAuthorized\": 0,\n        \"ImageDigest\": \"abc\",\n        \"RequestId\": \"abc\"\n    }\n}",
         "title": "查询镜像详细信息"
       }
     ],
@@ -1426,7 +1426,7 @@
       {
         "document": "",
         "input": "https://tcss.tencentcloudapi.com/?Action=DescribeImageAutoAuthorizedRule\n&<公共请求参数>",
-        "output": "{\n    \"Response\": {\n        \"MaxDailyCount\": 0,\n        \"RangeType\": \"xx\",\n        \"RuleId\": 1,\n        \"HostCount\": 0,\n        \"RequestId\": \"xx\",\n        \"IsEnabled\": 0\n    }\n}",
+        "output": "{\n    \"Response\": {\n        \"MaxDailyCount\": 0,\n        \"RangeType\": \"ALL\",\n        \"RuleId\": 1,\n        \"HostCount\": 0,\n        \"RequestId\": \"abc\",\n        \"IsEnabled\": 0\n    }\n}",
         "title": "查询本地镜像自动授权规则"
       }
     ],
@@ -2633,8 +2633,8 @@
     "RenewImageAuthorizeState": [
       {
         "document": "",
-        "input": "https://tcss.tencentcloudapi.com/?Action=RenewImageAuthorizeState\n&AllImages=false\n&ImageIds.0=xx\n&<公共请求参数>",
-        "output": "{\n    \"Response\": {\n        \"RequestId\": \"xx\"\n    }\n}",
+        "input": "https://tcss.tencentcloudapi.com/?Action=RenewImageAuthorizeState\n&AllImages=false\n&ImageIds.0=aaa\n&<公共请求参数>",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"aaa\"\n    }\n}",
         "title": "授权镜像扫描"
       }
     ],

tccli/services/tdmq/v20200217/api.json

@@ -3219,15 +3219,6 @@
           "required": true,
           "type": "int"
         },
-        {
-          "disabled": false,
-          "document": "集群的标签列表(已废弃)",
-          "example": "NULL",
-          "member": "Tag",
-          "name": "Tags",
-          "required": true,
-          "type": "list"
-        },
         {
           "disabled": false,
           "document": "集群名称，不支持中字以及除了短线和下划线外的特殊字符且不超过64个字符。",
@@ -3254,6 +3245,15 @@
           "name": "Vpcs",
           "required": false,
           "type": "object"
+        },
+        {
+          "disabled": false,
+          "document": "集群的标签列表(已废弃)",
+          "example": "NULL",
+          "member": "Tag",
+          "name": "Tags",
+          "required": false,
+          "type": "list"
         }
       ],
       "type": "object"

tccli/services/tke/tke_client.py

@@ -537,6 +537,58 @@ def doUpdateEdgeClusterVersion(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeExternalNodeSupportConfig(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('-', '_')]
+        )
+    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.DescribeExternalNodeSupportConfigRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeExternalNodeSupportConfig(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 doDeleteEdgeClusterInstances(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -1005,6 +1057,58 @@ def doDescribeClusterAsGroups(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeIPAMD(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('-', '_')]
+        )
+    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.DescribeIPAMDRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeIPAMD(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 doCreateClusterRouteTable(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -5165,6 +5269,58 @@ def doCreateEKSCluster(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeClusterExtraArgs(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('-', '_')]
+        )
+    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.DescribeClusterExtraArgsRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeClusterExtraArgs(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 doUpdateClusterKubeconfig(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -11062,6 +11218,7 @@ ACTION_MAP = {
     "EnableVpcCniNetworkType": doEnableVpcCniNetworkType,
     "DeleteCluster": doDeleteCluster,
     "UpdateEdgeClusterVersion": doUpdateEdgeClusterVersion,
+    "DescribeExternalNodeSupportConfig": doDescribeExternalNodeSupportConfig,
     "DeleteEdgeClusterInstances": doDeleteEdgeClusterInstances,
     "ModifyPrometheusAlertRule": doModifyPrometheusAlertRule,
     "SetNodePoolNodeProtection": doSetNodePoolNodeProtection,
@@ -11071,6 +11228,7 @@ ACTION_MAP = {
     "EnableEventPersistence": doEnableEventPersistence,
     "DescribePrometheusAlertHistory": doDescribePrometheusAlertHistory,
     "DescribeClusterAsGroups": doDescribeClusterAsGroups,
+    "DescribeIPAMD": doDescribeIPAMD,
     "CreateClusterRouteTable": doCreateClusterRouteTable,
     "GetUpgradeInstanceProgress": doGetUpgradeInstanceProgress,
     "ModifyPrometheusAgentExternalLabels": doModifyPrometheusAgentExternalLabels,
@@ -11151,6 +11309,7 @@ ACTION_MAP = {
     "ModifyPrometheusTemplate": doModifyPrometheusTemplate,
     "ModifyNodePoolDesiredCapacityAboutAsg": doModifyNodePoolDesiredCapacityAboutAsg,
     "CreateEKSCluster": doCreateEKSCluster,
+    "DescribeClusterExtraArgs": doDescribeClusterExtraArgs,
     "UpdateClusterKubeconfig": doUpdateClusterKubeconfig,
     "DescribeVpcCniPodLimits": doDescribeVpcCniPodLimits,
     "DescribeImageCaches": doDescribeImageCaches,