tccli 3.0.1405.1__py2.py3-none-any.whl → 3.0.1406.1__py2.py3-none-any.whl

tccli/services/oceanus/oceanus_client.py

@@ -1057,6 +1057,58 @@ def doDeleteWorkSpace(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doCheckConnectorName(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.OceanusClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.CheckConnectorNameRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.CheckConnectorName(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 doDeleteFolders(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -1317,7 +1369,7 @@ def doRunJobs(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doCheckConnectorName(args, parsed_globals):
+def doCreateVariable(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -1346,11 +1398,11 @@ def doCheckConnectorName(args, parsed_globals):
     client = mod.OceanusClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.CheckConnectorNameRequest()
+    model = models.CreateVariableRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.CheckConnectorName(model)
+        rsp = client.CreateVariable(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -1889,6 +1941,58 @@ def doDescribeTreeJobs(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doDescribeVariables(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.OceanusClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.DescribeVariablesRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.DescribeVariables(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 doDescribeJobs(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -2284,12 +2388,13 @@ ACTION_MAP = {
     "ParseConnector": doParseConnector,
     "DescribeJobEvents": doDescribeJobEvents,
     "DeleteWorkSpace": doDeleteWorkSpace,
+    "CheckConnectorName": doCheckConnectorName,
     "DeleteFolders": doDeleteFolders,
     "DeleteJobs": doDeleteJobs,
     "DeleteTableConfig": doDeleteTableConfig,
     "TriggerJobSavepoint": doTriggerJobSavepoint,
     "RunJobs": doRunJobs,
-    "CheckConnectorName": doCheckConnectorName,
+    "CreateVariable": doCreateVariable,
     "DescribeWorkSpaces": doDescribeWorkSpaces,
     "CreateFolder": doCreateFolder,
     "CheckSavepoint": doCheckSavepoint,
@@ -2300,6 +2405,7 @@ ACTION_MAP = {
     "DescribeResourceRelatedJobs": doDescribeResourceRelatedJobs,
     "ModifyWorkSpace": doModifyWorkSpace,
     "DescribeTreeJobs": doDescribeTreeJobs,
+    "DescribeVariables": doDescribeVariables,
     "DescribeJobs": doDescribeJobs,
     "ModifyJob": doModifyJob,
     "ModifyConnector": doModifyConnector,

tccli/services/oceanus/v20190422/api.json

@@ -63,6 +63,13 @@
       "output": "CreateResourceConfigResponse",
       "status": "online"
     },
+    "CreateVariable": {
+      "document": "创建变量 ",
+      "input": "CreateVariableRequest",
+      "name": "创建变量",
+      "output": "CreateVariableResponse",
+      "status": "online"
+    },
     "CreateWorkSpace": {
       "document": "创建工作空间",
       "input": "CreateWorkSpaceRequest",
@@ -217,6 +224,13 @@
       "output": "DescribeTreeResourcesResponse",
       "status": "online"
     },
+    "DescribeVariables": {
+      "document": "变量列表展示",
+      "input": "DescribeVariablesRequest",
+      "name": "变量描述",
+      "output": "DescribeVariablesResponse",
+      "status": "online"
+    },
     "DescribeWorkSpaces": {
       "document": "授权工作空间列表",
       "input": "DescribeWorkSpacesRequest",
@@ -2639,6 +2653,79 @@
       ],
       "type": "object"
     },
+    "CreateVariableRequest": {
+      "document": "CreateVariable请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "变量名",
+          "example": "Key",
+          "member": "string",
+          "name": "Name",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "变量值",
+          "example": "Value",
+          "member": "string",
+          "name": "Value",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "变量类型  1：显式   2：隐藏",
+          "example": "2",
+          "member": "int64",
+          "name": "Type",
+          "required": true,
+          "type": "int"
+        },
+        {
+          "disabled": false,
+          "document": "描述信息",
+          "example": "无",
+          "member": "string",
+          "name": "Remark",
+          "required": false,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "工作空间 SerialId",
+          "example": "space-1327",
+          "member": "string",
+          "name": "WorkSpaceId",
+          "required": false,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "CreateVariableResponse": {
+      "document": "CreateVariable返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "变量Id",
+          "example": "无",
+          "member": "string",
+          "name": "VariableId",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "CreateWorkSpaceRequest": {
       "document": "CreateWorkSpace请求参数结构体",
       "members": [
@@ -4549,6 +4636,33 @@
       ],
       "usage": "out"
     },
+    "DescribeVariablesRequest": {
+      "document": "DescribeVariables请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "工作空间 SerialId",
+          "example": "space-1327",
+          "member": "string",
+          "name": "WorkSpaceId",
+          "required": false,
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
+    "DescribeVariablesResponse": {
+      "document": "DescribeVariables返回参数结构体",
+      "members": [
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "DescribeWorkSpacesRequest": {
       "document": "DescribeWorkSpaces请求参数结构体",
       "members": [
@@ -5771,7 +5885,7 @@
         {
           "disabled": false,
           "document": "作业名字\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "test",
+          "example": "demo",
           "member": "string",
           "name": "Name",
           "output_required": true,
@@ -5851,7 +5965,7 @@
         {
           "disabled": false,
           "document": "备注信息\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "test",
+          "example": "demo",
           "member": "string",
           "name": "Remark",
           "output_required": true,
@@ -5871,7 +5985,7 @@
         {
           "disabled": false,
           "document": "集群名字\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "test",
+          "example": "demo",
           "member": "string",
           "name": "ClusterName",
           "output_required": true,
@@ -5880,7 +5994,7 @@
         },
         {
           "disabled": false,
-          "document": "最新配置版本号\n注意：此字段可能返回 null，表示取不到有效值。",
+          "document": "最新配置版本号，包括已经删除的版本\n注意：此字段可能返回 null，表示取不到有效值。",
           "example": "2",
           "member": "int64",
           "name": "LatestJobConfigVersion",
@@ -5888,6 +6002,16 @@
           "type": "int",
           "value_allowed_null": true
         },
+        {
+          "disabled": false,
+          "document": "最新的版本号，不包括已经删除的版本号",
+          "example": "1",
+          "member": "int64",
+          "name": "LatestValidJobConfigVersion",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
+        },
         {
           "disabled": false,
           "document": "已发布的配置版本\n注意：此字段可能返回 null，表示取不到有效值。",
@@ -6061,7 +6185,7 @@
         {
           "disabled": false,
           "document": "使用CPU数目\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "1",
+          "example": "1.0",
           "member": "float",
           "name": "RunningCpu",
           "output_required": false,
@@ -6071,7 +6195,7 @@
         {
           "disabled": false,
           "document": "使用内存数量\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "1",
+          "example": "2.0",
           "member": "float",
           "name": "RunningMem",
           "output_required": false,
@@ -6107,6 +6231,16 @@
           "output_required": false,
           "type": "int",
           "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "作业重启次数",
+          "example": "1",
+          "member": "int64",
+          "name": "RestartCount",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
         }
       ],
       "usage": "out"
@@ -8830,7 +8964,7 @@
         {
           "disabled": false,
           "document": "RunningCpu\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "0",
+          "example": "1.0",
           "member": "float",
           "name": "RunningCpu",
           "output_required": false,
@@ -8840,7 +8974,7 @@
         {
           "disabled": false,
           "document": "RunningMem\n注意：此字段可能返回 null，表示取不到有效值。",
-          "example": "0",
+          "example": "1.0",
           "member": "float",
           "name": "RunningMem",
           "output_required": false,
@@ -8856,6 +8990,16 @@
           "output_required": false,
           "type": "string",
           "value_allowed_null": true
+        },
+        {
+          "disabled": false,
+          "document": "发布版本配置id",
+          "example": "1",
+          "member": "int64",
+          "name": "PublishedJobConfigId",
+          "output_required": false,
+          "type": "int",
+          "value_allowed_null": false
         }
       ],
       "usage": "out"

tccli/services/oceanus/v20190422/examples.json

@@ -90,6 +90,14 @@
         "title": "创建依赖版本"
       }
     ],
+    "CreateVariable": [
+      {
+        "document": "",
+        "input": "POST / HTTP/1.1\nHost: oceanus.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: CreateVariable\n<公共请求参数>\n\n{\n    \"Name\": \"MyPassword\",\n    \"Value\": \"abcabc\",\n    \"Type\": 2\n}",
+        "output": "{\n    \"Response\": {\n        \"VariableId\": \"var-b035ds\",\n        \"RequestId\": \"5f124d6f-b035-4d29-9467-dd62eccdbf23\"\n    }\n}",
+        "title": "创建变量"
+      }
+    ],
     "CreateWorkSpace": [
       {
         "document": "",
@@ -284,6 +292,14 @@
         "title": "分类中的自定义树状结构并筛选"
       }
     ],
+    "DescribeVariables": [
+      {
+        "document": "查询变量列表",
+        "input": "POST / HTTP/1.1\nHost: oceanus.tencentcloudapi.com\nContent-Type: application/json\nX-TC-Action: DescribeVariables\n<公共请求参数>\n\n{}",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"123\"\n    }\n}",
+        "title": "变量列表展示"
+      }
+    ],
     "DescribeWorkSpaces": [
       {
         "document": "获取用户的空间列表",