oks-cli 1.21__tar.gz → 1.22__tar.gz

{oks_cli-1.21 → oks_cli-1.22}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oks-cli
-Version: 1.21
+Version: 1.22
 Author: Outscale SAS
 Author-email: opensource@outscale.com
 License: BSD

{oks_cli-1.21 → oks_cli-1.22}/oks_cli/cluster.py

@@ -373,8 +373,8 @@ def _create_cluster(project_name, cluster_config, output):
 @click.option('--cidr-service', help='CIDR of services')
 @click.option('--control-plane', shell_complete=shell_completions, help="Controlplane plan")
 @click.option('--zone', '-z', multiple=True, shell_complete=shell_completions, help="List of Control Plane availability zones")
-@click.option('--enable-admission-plugins', help="List of admission plugins, separated by commas")
-@click.option('--disable-admission-plugins', help="List of admission plugins, separated by commas")
+@click.option('--enable-admission-plugins', shell_complete=shell_completions, help="List of admission plugins, separated by commas")
+@click.option('--disable-admission-plugins', shell_complete=shell_completions, help="List of admission plugins, separated by commas")
 @click.option('--quirk', '-q', multiple=True, help="Quirk")
 @click.option('--tags', '-t', help="Comma-separated list of tags, example: 'key1=value1,key2=value2'")
 @click.option('--disable-api-termination', type=click.BOOL, help="Disable delete action by API")
@@ -472,8 +472,8 @@ def cluster_create_command(ctx, project_name, cluster_name, description, admin,
 @click.option('--admin', '-a', help="Admin Whitelist ips. you can use 'my-ip' to automatically use your current IP.")
 @click.option('--version', '-v', shell_complete=shell_completions, help="Kubernetes version")
 @click.option('--tags', '-t', help="Comma-separated list of tags, example: 'key1=value1,key2=value2'")
-@click.option('--enable-admission-plugins', help="List of admission plugins, separated by commas")
-@click.option('--disable-admission-plugins', help="List of admission plugins, separated by commas")
+@click.option('--enable-admission-plugins', shell_complete=shell_completions, help="List of admission plugins, separated by commas")
+@click.option('--disable-admission-plugins', shell_complete=shell_completions, help="List of admission plugins, separated by commas")
 @click.option('--quirk', '-q', multiple=True, help="Quirk")
 @click.option('--disable-api-termination', type=click.BOOL, help="Disable delete action by API")
 @click.option('--control-plane', shell_complete=shell_completions, help="Controlplane plan")

{oks_cli-1.21 → oks_cli-1.22}/oks_cli/project.py

@@ -365,7 +365,8 @@ def project_get_quotas(ctx, project_name, output, profile):
                                      ["Collection", "QuotaCollection"],
                                      ["Description", "ShortDescription"],
                                      ["Max Value", "MaxValue"],
-                                     ["Used Value", "UsedValue"]])
+                                     ["Used Value", "UsedValue"],
+                                     ["AccountId", "AccountId"]])
         print_table(data["subregions"], [["Region", "RegionName"],
                                          ["Availability Zone", "SubregionName"],
                                          ["State", "State"]])

{oks_cli-1.21 → oks_cli-1.22}/oks_cli/user.py

@@ -7,6 +7,7 @@ import json
 
 from nacl.public import PrivateKey, SealedBox
 from nacl.encoding import Base64Encoder
+from prettytable import TableStyle
 
 from .utils import do_request, print_output, find_project_id_by_name, ctx_update, login_profile, profile_completer, project_completer, JSONClickException
 
@@ -166,4 +167,38 @@ def user_delete(ctx, project_name, user, output, dry_run, force, profile):
     if force or click.confirm(f"Are you sure you want to delete the user '{user}'?", abort=True):
         data = do_request("DELETE", f"projects/{project_id}/eim_users/{user}")
         print_output(data, output)
+
+
+@user.command('types', help="List available user types")
+@click.option('--project-name', '-p', required=False, help="Project Name", shell_complete=project_completer)
+@click.option('--output', '-o', type=click.Choice(["json", "yaml"]), help="Specify output format")
+@click.option('--plain', is_flag=True, help="Plain table format")
+@click.option('--profile', help="Configuration profile to use", shell_complete=profile_completer)
+@click.pass_context
+def user_types(ctx, project_name, output, plain, profile):
+    """Display available user types."""
+    project_name, _, profile = ctx_update(ctx, project_name, None, profile)
+    login_profile(profile)
+
+    project_id = find_project_id_by_name(project_name)
+
+    data = do_request("GET", f'projects/{project_id}/eim_users/types')
+
+    if output:
+        print_output(data, output)
+        return
+
+    table = prettytable.PrettyTable()
+    table.field_names = ["USER TYPE", "DESCRIPTION"]
+
+    if plain:
+        table.set_style(TableStyle.PLAIN_COLUMNS)
+
+    for entry in data:
+        table.add_row([
+            entry.get("UserType", ""),
+            entry.get("Description") or "-"
+        ])
+
+    click.echo(table)
     

{oks_cli-1.21 → oks_cli-1.22}/oks_cli/utils.py

@@ -83,8 +83,12 @@ def find_response_object(data):
             return response["EimUsers"]
         elif key == "EimUser":
             return response["EimUser"]
+        elif key == "AdmissionPlugins":
+            return response["AdmissionPlugins"]
         elif key == "Data":
             return response
+        elif key == "EimUserTypes":
+            return response["EimUserTypes"]
 
     raise click.ClickException("The API response format is incorrect.")
 
@@ -847,9 +851,11 @@ def kubeconfig_parse_fields(kubeconfig, cluster_name, user, group):
 
     return kubedata
 
-def retrieve_cp_sized(filepath, endpoint):
+def retrieve_cp_sized(filepath, endpoint, key = None):
     """Fetch control plane sizes from API and save to file."""
     cp_list = do_request("GET", endpoint)
+    if key:
+        cp_list = cp_list.get(key)
 
     with open(filepath, "w") as file:
         json.dump(cp_list, file)
@@ -871,6 +877,8 @@ def shell_completions(ctx, param: click.core.Option, incomplete):
     if profile not in profiles:
         return []
 
+    key = None
+
     login_profile(profile)
 
     if param.name == "version":
@@ -879,6 +887,16 @@ def shell_completions(ctx, param: click.core.Option, incomplete):
         endpoint = "clusters/limits/control_plane_plans"
     elif param.name == "zone":
         endpoint = "clusters/limits/cp_subregions"
+    elif param.name == "disable_admission_plugins" and ctx.params["version"]:
+        key = "DisableAdmissionPlugins"
+        version = ctx.params["version"]
+        endpoint = f"clusters/limits/admission_plugins?version={version}"
+        param.name += f".{version}"
+    elif param.name == "enable_admission_plugins" and ctx.params["version"]:
+        key = "EnableAdmissionPlugins"
+        version = ctx.params["version"]
+        endpoint = f"clusters/limits/admission_plugins?version={version}"
+        param.name += f".{version}"
     else:
         return []
     
@@ -888,9 +906,9 @@ def shell_completions(ctx, param: click.core.Option, incomplete):
     if os.path.exists(CP_SIZES_PATH):
         file_ctime = os.path.getctime(CP_SIZES_PATH)
         if datetime.timestamp(datetime.now()) - file_ctime > 300:
-            retrieve_cp_sized(CP_SIZES_PATH, endpoint)
+            retrieve_cp_sized(CP_SIZES_PATH, endpoint, key)
     else:
-        retrieve_cp_sized(CP_SIZES_PATH, endpoint)
+        retrieve_cp_sized(CP_SIZES_PATH, endpoint, key)
 
     if os.path.exists(CP_SIZES_PATH):
         with open(CP_SIZES_PATH, "r") as file:
@@ -898,6 +916,19 @@ def shell_completions(ctx, param: click.core.Option, incomplete):
     else:
         cp_list = []
 
+    # Handle comma-separated values
+    if "," in incomplete:
+        parts = incomplete.split(",")
+        selected = set(parts[:-1])
+        current = parts[-1]
+        prefix = ",".join(parts[:-1])
+
+        return [
+            f"{prefix},{item}"
+            for item in cp_list
+            if item.startswith(current) and item not in selected
+        ]
+
     return [k for k in cp_list if k.startswith(incomplete)]
 
 def update_shell_profile(shell_profile, filepath):

{oks_cli-1.21 → oks_cli-1.22}/oks_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oks-cli
-Version: 1.21
+Version: 1.22
 Author: Outscale SAS
 Author-email: opensource@outscale.com
 License: BSD

{oks_cli-1.21 → oks_cli-1.22}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="oks-cli",
-    version="1.21",
+    version="1.22",
     packages=['oks_cli'],
     author="Outscale SAS",
     author_email="opensource@outscale.com",

{oks_cli-1.21 → oks_cli-1.22}/tests/test_user.py

@@ -53,4 +53,36 @@ def test_user_delete_command(mock_request, add_default_profile):
     runner = CliRunner()
     result = runner.invoke(cli, ["user", "delete", "-p", "test", "-u", "OKSAuditor", "--force"])
     assert result.exit_code == 0
-    assert 'User has been deleted.' in result.output
+    assert 'User has been deleted.' in result.output
+
+@patch("oks_cli.utils.requests.request")
+def test_user_types_command(mock_request, add_default_profile):
+    mock_request.side_effect = [
+        MagicMock(status_code=200, headers={}, json=lambda: {"ResponseContext": {}, "Projects": [{"id": "12345"}]}),
+        MagicMock(status_code=200, headers={}, json=lambda: {"ResponseContext": {}, "EimUserTypes": [
+            {"UserType": "OKSSnapshotsManager", "Description": "OKS user with full access to snapshots"},
+            {"UserType": "OKSVolumesManager", "Description": "OKS user with management access to volumes BSU"},
+        ]})
+    ]
+
+    runner = CliRunner()
+    result = runner.invoke(cli, ["user", "types", "-p", "test"])
+    assert result.exit_code == 0
+    assert 'OKSSnapshotsManager' in result.output
+    assert 'OKSVolumesManager' in result.output
+
+@patch("oks_cli.utils.requests.request")
+def test_user_types_command_json(mock_request, add_default_profile):
+    mock_request.side_effect = [
+        MagicMock(status_code=200, headers={}, json=lambda: {"ResponseContext": {}, "Projects": [{"id": "12345"}]}),
+        MagicMock(status_code=200, headers={}, json=lambda: {"ResponseContext": {}, "EimUserTypes": [
+            {"UserType": "OKSSnapshotsManager", "Description": "OKS user with full access to snapshots"},
+            {"UserType": "OKSVolumesManager", "Description": "OKS user with management access to volumes BSU"},
+        ]})
+    ]
+
+    runner = CliRunner()
+    result = runner.invoke(cli, ["user", "types", "-p", "test", "-o", "json"])
+    assert result.exit_code == 0
+    assert 'OKSSnapshotsManager' in result.output
+    assert 'OKS user with full access to snapshots' in result.output