tccli 3.0.1340.1__py2.py3-none-any.whl → 3.0.1342.1__py2.py3-none-any.whl

tccli/__init__.py

@@ -1 +1 @@
-__version__ = '3.0.1340.1'
+__version__ = '3.0.1342.1'

tccli/plugins/sso/__init__.py

@@ -45,6 +45,20 @@ _spec = {
                     "required": False,
                     "document": "duration for credential",
                 },
+                {
+                    "name": "uin",
+                    "member": "string",
+                    "type": "string",
+                    "required": False,
+                    "document": "Account uin to use",
+                },
+                {
+                    "name": "rolename",
+                    "member": "string",
+                    "type": "string",
+                    "required": False,
+                    "document": "Role to use",
+                },
             ],
         },
         "loginResponse": {"members": []},

tccli/plugins/sso/login.py

@@ -65,9 +65,17 @@ def login(args, profile, language):
         print_message(_("no_account"))
         return
 
-    idx = terminal.select_from_items(
-        _("account_select_prompt"), ["%s:%s" % (x["Name"], x["Uin"]) for x in accounts], 10)
-    account = accounts[idx]
+    specified_uin = args.get("uin", "")
+    if specified_uin:
+        account = next((x for x in accounts if str(x["Uin"]) == specified_uin), None)
+        if not account:
+            print_message(_("specified_uin_not_found") % (specified_uin, ",".join(str(x["Uin"]) for x in accounts)))
+            return
+    else:
+        idx = terminal.select_from_items(
+            _("account_select_prompt"), ["%s:%s" % (x["Name"], x["Uin"]) for x in accounts], 10)
+        account = accounts[idx]
+
     print_message("uin: %s" % account["Uin"])
     print_message("username: %s" % account["Name"])
 
@@ -76,9 +84,18 @@ def login(args, profile, language):
         print_message(_("no_role"))
         return
 
-    idx = terminal.select_from_items(
-        _("role_select_prompt"), [x["RoleConfigurationName"] for x in roles], 10)
-    role = roles[idx]
+    specified_role = args.get("rolename", "")
+    if specified_role:
+        role = next((x for x in roles if x["RoleConfigurationName"] == specified_role), None)
+        if not role:
+            print_message(
+                _("specified_role_not_found") % (specified_role, ",".join(x["RoleConfigurationName"] for x in roles)))
+            return
+    else:
+        idx = terminal.select_from_items(
+            _("role_select_prompt"), [x["RoleConfigurationName"] for x in roles], 10)
+        role = roles[idx]
+
     print_message("role: %s" % role["RoleConfigurationName"])
 
     saml_resp = sso.gen_saml_response(

tccli/plugins/sso/texts.py

@@ -15,6 +15,8 @@ texts = {
         "logout_success": "登出成功, 密钥凭证已被删除: %s",
         "no_account": "未找到成员账号, 请确认是否同步过 CAM 角色",
         "no_role": "当前成员账号不存在授权角色",
+        "specified_uin_not_found": "未找到指定的 uin，uin=%s，all=[%s]",
+        "specified_role_not_found": "未找到指定的 role, role=%s, all=[%s]",
     },
     "en-US": {
         "invalid_auth_url": "The entered url is invalid: %s",
@@ -27,6 +29,8 @@ texts = {
         "logout_success": "Logout succeed, credential has been removed: %s",
         "no_account": "no account found, please confirm the account is synchronized",
         "no_role": "no role found in current account",
+        "specified_uin_not_found": "Specified uin not found, uin=%s, all=[%s]",
+        "specified_role_not_found": "Specified role not found, role=%s, all=[%s]",
     }
 }
 

tccli/services/__init__.py

@@ -245,6 +245,9 @@ SERVICE_VERSIONS = {
     "csxg": [
         "2023-03-03"
     ],
+    "ctem": [
+        "2023-11-28"
+    ],
     "cvm": [
         "2017-03-12"
     ],