tccli 3.0.1174.1__py2.py3-none-any.whl → 3.0.1176.1__py2.py3-none-any.whl

tccli/services/sqlserver/sqlserver_client.py

@@ -3033,6 +3033,58 @@ def doDescribeInstanceParams(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
+def doModifyDatabasePrivilege(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.SqlserverClient(cred, g_param[OptionsDefine.Region], profile)
+    client._sdkVersion += ("_CLI_" + __version__)
+    models = MODELS_MAP[g_param[OptionsDefine.Version]]
+    model = models.ModifyDatabasePrivilegeRequest()
+    model.from_json_string(json.dumps(args))
+    start_time = time.time()
+    while True:
+        rsp = client.ModifyDatabasePrivilege(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 doCompleteExpansion(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
@@ -7730,6 +7782,7 @@ ACTION_MAP = {
     "DescribeRegions": doDescribeRegions,
     "DescribeRestoreTask": doDescribeRestoreTask,
     "DescribeInstanceParams": doDescribeInstanceParams,
+    "ModifyDatabasePrivilege": doModifyDatabasePrivilege,
     "CompleteExpansion": doCompleteExpansion,
     "DescribeBackupStatistical": doDescribeBackupStatistical,
     "CreateDB": doCreateDB,

tccli/services/sqlserver/v20180328/api.json

@@ -819,6 +819,13 @@
       "output": "ModifyDatabaseMdfResponse",
       "status": "online"
     },
+    "ModifyDatabasePrivilege": {
+      "document": "本接口（ModifyDatabasePrivilege）用于修改实例数据库权限。",
+      "input": "ModifyDatabasePrivilegeRequest",
+      "name": "修改实例数据库权限",
+      "output": "ModifyDatabasePrivilegeResponse",
+      "status": "online"
+    },
     "ModifyDatabaseShrinkMDF": {
       "document": "本接口(ModifyDatabaseShrinkDMF)用于收缩数据库mdf(Shrink mdf)。",
       "input": "ModifyDatabaseShrinkMDFRequest",
@@ -1323,18 +1330,16 @@
           "member": "string",
           "name": "UserName",
           "required": true,
-          "type": "string",
-          "value_allowed_null": false
+          "type": "string"
         },
         {
           "disabled": false,
-          "document": "账号权限变更信息",
+          "document": "账号权限变更信息。参数DBPrivileges和AccAllDB只能二选一",
           "example": "无",
           "member": "DBPrivilegeModifyInfo",
           "name": "DBPrivileges",
           "required": true,
-          "type": "list",
-          "value_allowed_null": false
+          "type": "list"
         },
         {
           "disabled": false,
@@ -1343,8 +1348,7 @@
           "member": "bool",
           "name": "IsAdmin",
           "required": false,
-          "type": "bool",
-          "value_allowed_null": false
+          "type": "bool"
         },
         {
           "disabled": false,
@@ -1353,8 +1357,16 @@
           "member": "string",
           "name": "AccountType",
           "required": false,
-          "type": "string",
-          "value_allowed_null": false
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "全量修改指定账号下的所有DB权限，只支持特殊权限账号和普通权限账号。参数DBPrivileges和AccAllDB只能二选一",
+          "example": "无",
+          "member": "SelectAllDB",
+          "name": "AccAllDB",
+          "required": false,
+          "type": "object"
         }
       ],
       "usage": "in"
@@ -5026,6 +5038,32 @@
       ],
       "usage": "in"
     },
+    "DataBasePrivilegeModifyInfo": {
+      "document": "数据库账号权限变更信息",
+      "members": [
+        {
+          "disabled": false,
+          "document": "数据库名称",
+          "example": "",
+          "member": "string",
+          "name": "DataBaseName",
+          "required": true,
+          "type": "string",
+          "value_allowed_null": false
+        },
+        {
+          "disabled": false,
+          "document": "数据库权限变更信息",
+          "example": "",
+          "member": "AccountPrivilege",
+          "name": "AccountPrivileges",
+          "required": true,
+          "type": "list",
+          "value_allowed_null": false
+        }
+      ],
+      "usage": "in"
+    },
     "DatabaseTuple": {
       "document": "该数据结构表示具有发布订阅关系的两个数据库。",
       "members": [
@@ -14134,6 +14172,52 @@
       ],
       "type": "object"
     },
+    "ModifyDatabasePrivilegeRequest": {
+      "document": "ModifyDatabasePrivilege请求参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "数据库实例ID，形如mssql-njj2mtpl",
+          "example": "mssql-njj2mtpl",
+          "member": "string",
+          "name": "InstanceId",
+          "required": true,
+          "type": "string"
+        },
+        {
+          "disabled": false,
+          "document": "数据库权限变更信息",
+          "example": "无",
+          "member": "DataBasePrivilegeModifyInfo",
+          "name": "DataBaseSet",
+          "required": true,
+          "type": "list"
+        }
+      ],
+      "type": "object"
+    },
+    "ModifyDatabasePrivilegeResponse": {
+      "document": "ModifyDatabasePrivilege返回参数结构体",
+      "members": [
+        {
+          "disabled": false,
+          "document": "异步任务流程ID",
+          "example": "30321",
+          "member": "uint64",
+          "name": "FlowId",
+          "required": true,
+          "type": "int",
+          "value_allowed_null": false
+        },
+        {
+          "document": "唯一请求 ID，由服务端生成，每次请求都会返回（若请求因其他原因未能抵达服务端，则该次请求不会获得 RequestId）。定位问题时需要提供该次请求的 RequestId。",
+          "member": "string",
+          "name": "RequestId",
+          "type": "string"
+        }
+      ],
+      "type": "object"
+    },
     "ModifyDatabaseShrinkMDFRequest": {
       "document": "ModifyDatabaseShrinkMDF请求参数结构体",
       "members": [
@@ -16588,6 +16672,21 @@
       ],
       "usage": "out"
     },
+    "SelectAllDB": {
+      "document": "DB权限修改类型",
+      "members": [
+        {
+          "disabled": false,
+          "document": "权限变更信息。ReadWrite表示可读写，ReadOnly表示只读，Delete表示删除账号对该DB的权限，DBOwner所有者",
+          "example": "ReadWrite",
+          "member": "string",
+          "name": "Privilege",
+          "required": true,
+          "type": "string"
+        }
+      ],
+      "usage": "in"
+    },
     "SlaveZones": {
       "document": "备可用区信息",
       "members": [

tccli/services/sqlserver/v20180328/examples.json

@@ -966,6 +966,14 @@
         "title": "收缩数据库mdf"
       }
     ],
+    "ModifyDatabasePrivilege": [
+      {
+        "document": "以数据库维度修改权限",
+        "input": "https://sqlserver.tencentcloudapi.com/?Action=ModifyDatabasePrivilege\n&InstanceId=mssql-njj2mtpl\n&DataBaseSet.0.DataBaseName=testuser\n&DataBaseSet.0.AccountPrivileges.0.UserName=testdb\n&DataBaseSet.0.AccountPrivileges.0.Privilege=ReadOnly\n&<公共请求参数>",
+        "output": "{\n    \"Response\": {\n        \"RequestId\": \"8a61e500-aa33-454c-9ec2-da2a368c39ab\",\n        \"FlowId\": \"30321\"\n    }\n}",
+        "title": "修改数据库的权限"
+      }
+    ],
     "ModifyDatabaseShrinkMDF": [
       {
         "document": "",

tccli/services/tiia/tiia_client.py

@@ -121,7 +121,7 @@ def doDescribeImages(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDetectProductBeta(args, parsed_globals):
+def doDetectPet(args, parsed_globals):
     g_param = parse_global_arg(parsed_globals)
 
     if g_param[OptionsDefine.UseCVMRole.replace('-', '_')]:
@@ -150,11 +150,11 @@ def doDetectProductBeta(args, parsed_globals):
     client = mod.TiiaClient(cred, g_param[OptionsDefine.Region], profile)
     client._sdkVersion += ("_CLI_" + __version__)
     models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DetectProductBetaRequest()
+    model = models.DetectPetRequest()
     model.from_json_string(json.dumps(args))
     start_time = time.time()
     while True:
-        rsp = client.DetectProductBeta(model)
+        rsp = client.DetectPet(model)
         result = rsp.to_json_string()
         try:
             json_obj = json.loads(result)
@@ -1161,58 +1161,6 @@ def doUpdateImage(args, parsed_globals):
     FormatOutput.output("action", json_obj, g_param[OptionsDefine.Output], g_param[OptionsDefine.Filter])
 
 
-def doDetectPet(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.TiiaClient(cred, g_param[OptionsDefine.Region], profile)
-    client._sdkVersion += ("_CLI_" + __version__)
-    models = MODELS_MAP[g_param[OptionsDefine.Version]]
-    model = models.DetectPetRequest()
-    model.from_json_string(json.dumps(args))
-    start_time = time.time()
-    while True:
-        rsp = client.DetectPet(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 = {
     "v20190529": tiia_client_v20190529,
 
@@ -1226,7 +1174,7 @@ MODELS_MAP = {
 ACTION_MAP = {
     "DetectEnvelope": doDetectEnvelope,
     "DescribeImages": doDescribeImages,
-    "DetectProductBeta": doDetectProductBeta,
+    "DetectPet": doDetectPet,
     "CreateGroup": doCreateGroup,
     "DetectLabel": doDetectLabel,
     "DetectChefDress": doDetectChefDress,
@@ -1246,7 +1194,6 @@ ACTION_MAP = {
     "DetectLabelBeta": doDetectLabelBeta,
     "SearchImage": doSearchImage,
     "UpdateImage": doUpdateImage,
-    "DetectPet": doDetectPet,
 
 }